From cvs at cvs.gnupg.org Wed Dec 1 04:53:55 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 1 04:54:08 2004 Subject: gnupg/cipher (ChangeLog md.c) Message-ID: Date: Wednesday, December 1, 2004 @ 05:01:16 Author: dshaw Path: /cvs/gnupg/gnupg/cipher Modified: ChangeLog md.c * md.c (string_to_digest_algo): Allow read/write SHA384 and SHA512. -----------+ ChangeLog | 5 +++++ md.c | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) Index: gnupg/cipher/ChangeLog diff -u gnupg/cipher/ChangeLog:1.145 gnupg/cipher/ChangeLog:1.146 --- gnupg/cipher/ChangeLog:1.145 Wed Nov 3 21:03:46 2004 +++ gnupg/cipher/ChangeLog Wed Dec 1 05:01:16 2004 @@ -1,3 +1,8 @@ +2004-11-30 David Shaw + + * md.c (string_to_digest_algo): Allow read/write SHA384 and + SHA512. + 2004-11-03 Timo Schulz * idea-stub.c (dlopen, dlsym): Use w32_strerror instead of Index: gnupg/cipher/md.c diff -u gnupg/cipher/md.c:1.56 gnupg/cipher/md.c:1.57 --- gnupg/cipher/md.c:1.56 Thu Sep 4 13:53:10 2003 +++ gnupg/cipher/md.c Wed Dec 1 05:01:16 2004 @@ -124,21 +124,6 @@ { struct md_digest_list_s *r; - /* Hi there. I see you changing that code so you can use the new - SHA hashes. Before you do it, please think about it. There - are no official releases of any OpenPGP programs that generate - these hashes, and we're trying to get a code base that can - understand the hashes before we release one that generates - them. - dshaw */ - - if(!ascii_strcasecmp("sha384",string) - || !ascii_strcasecmp("sha512",string)) - { - log_info(_("digest algorithm `%s' is read-only in this release\n"), - string); - return 0; - } - do { for(r = digest_list; r; r = r->next ) if( !ascii_strcasecmp( r->name, string ) ) From cvs at cvs.gnupg.org Wed Dec 1 17:03:48 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 1 17:03:52 2004 Subject: dirmngr/src (8 files) Message-ID: Date: Wednesday, December 1, 2004 @ 17:11:15 Author: wk Path: /cvs/dirmngr/dirmngr/src Modified: ChangeLog Makefile.am crlfetch.c dirmngr.c dirmngr.h dirmngr_ldap.c ldap.c validate.c * Makefile.am (dirmngr_LDADD): Don't use LDAP_LIBS. * validate.c (validate_cert_chain): Fixed test; as written in the comment we want to do this only in daemon mode. For clarity reworked by using a linked list of certificates and include root and tragte certificate. (check_revocations): Likewise. Introduced a recursion sentinel. ----------------+ ChangeLog | 21 ++++++++ Makefile.am | 2 crlfetch.c | 4 - dirmngr.c | 2 dirmngr.h | 2 dirmngr_ldap.c | 19 +++++-- ldap.c | 2 validate.c | 143 +++++++++++++++++++++++++++++++++---------------------- 8 files changed, 132 insertions(+), 63 deletions(-) Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.30 dirmngr/src/ChangeLog:1.31 --- dirmngr/src/ChangeLog:1.30 Thu Nov 25 14:19:07 2004 +++ dirmngr/src/ChangeLog Wed Dec 1 17:11:14 2004 @@ -1,3 +1,24 @@ +2004-12-01 Werner Koch + + * Makefile.am (dirmngr_LDADD): Don't use LDAP_LIBS. + + * validate.c (validate_cert_chain): Fixed test; as written in the + comment we want to do this only in daemon mode. For clarity + reworked by using a linked list of certificates and include root + and tragte certificate. + (check_revocations): Likewise. Introduced a recursion sentinel. + +2004-11-30 Werner Koch + + * crlfetch.c (ca_cert_fetch, crl_fetch_default): Do not use the + binary prefix as this will be handled in the driver. + + * dirmngr_ldap.c: New option --log-with-pid. + (fetch_ldap): Handle LDAP_NO_SUCH_OBJECT. + * ldap.c (run_ldap_wrapper, start_cert_fetch_ldap): Use new log + option. + + 2004-11-25 Werner Koch * Makefile.am (dirmngr_ldap_CFLAGS): Added GPG_ERROR_CFLAGS. Index: dirmngr/src/Makefile.am diff -u dirmngr/src/Makefile.am:1.21 dirmngr/src/Makefile.am:1.22 --- dirmngr/src/Makefile.am:1.21 Thu Nov 25 14:19:07 2004 +++ dirmngr/src/Makefile.am Wed Dec 1 17:11:14 2004 @@ -46,7 +46,7 @@ dirmngr_LDADD = ../jnlib/libjnlib.a @LIBOBJS@ @LIBASSUAN_LIBS@ \ - @LIBGCRYPT_LIBS@ @KSBA_LIBS@ @LDAP_LIBS@ $(PTH_LIBS) + @LIBGCRYPT_LIBS@ @KSBA_LIBS@ $(PTH_LIBS) dirmngr_ldap_SOURCES = dirmngr_ldap.c i18n.h util.h \ no-libgcrypt.c no-libgcrypt.h Index: dirmngr/src/crlfetch.c diff -u dirmngr/src/crlfetch.c:1.22 dirmngr/src/crlfetch.c:1.23 --- dirmngr/src/crlfetch.c:1.22 Tue Nov 23 14:20:44 2004 +++ dirmngr/src/crlfetch.c Wed Dec 1 17:11:14 2004 @@ -137,7 +137,7 @@ "LDAP"); return gpg_error (GPG_ERR_NOT_SUPPORTED); } - return attr_fetch_ldap (ctrl, issuer, "certificateRevocationList;binary", + return attr_fetch_ldap (ctrl, issuer, "certificateRevocationList", reader); } @@ -152,7 +152,7 @@ "LDAP"); return gpg_error (GPG_ERR_NOT_SUPPORTED); } - return attr_fetch_ldap (ctrl, dn, "cACertificate;binary", reader); + return attr_fetch_ldap (ctrl, dn, "cACertificate", reader); } Index: dirmngr/src/dirmngr.c diff -u dirmngr/src/dirmngr.c:1.48 dirmngr/src/dirmngr.c:1.49 --- dirmngr/src/dirmngr.c:1.48 Wed Nov 24 15:45:27 2004 +++ dirmngr/src/dirmngr.c Wed Dec 1 17:11:14 2004 @@ -1363,7 +1363,7 @@ tattr = pth_attr_new(); pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0); - pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 256*1024); + pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 1024*1024); pth_attr_set (tattr, PTH_ATTR_NAME, "dirmngr"); sigemptyset (&sigs ); Index: dirmngr/src/dirmngr.h diff -u dirmngr/src/dirmngr.h:1.23 dirmngr/src/dirmngr.h:1.24 --- dirmngr/src/dirmngr.h:1.23 Wed Nov 24 15:44:01 2004 +++ dirmngr/src/dirmngr.h Wed Dec 1 17:11:14 2004 @@ -134,6 +134,8 @@ int status_fd; /* Only for non-server mode. */ struct server_local_s *server_local; int force_crl_refresh; /* Always load a fresh CRL. */ + + int check_revocations_nest_level; /* Internal to check_revovations. */ }; typedef struct server_control_s *ctrl_t; Index: dirmngr/src/dirmngr_ldap.c diff -u dirmngr/src/dirmngr_ldap.c:1.5 dirmngr/src/dirmngr_ldap.c:1.6 --- dirmngr/src/dirmngr_ldap.c:1.5 Wed Nov 24 13:25:53 2004 +++ dirmngr/src/dirmngr_ldap.c Wed Dec 1 17:11:14 2004 @@ -64,7 +64,7 @@ oFilter, oAttr, - oDummy + oLogWithPID }; @@ -86,6 +86,7 @@ { oDN, "dn", 2, N_("|STRING|query DN STRING")}, { oFilter, "filter", 2, N_("|STRING|use STRING as filter expression")}, { oAttr, "attr", 2, N_("|STRING|return the attribute STRING")}, + { oLogWithPID,"log-with-pid", 0, "@"}, {0} }; @@ -208,6 +209,13 @@ case oDN: opt.dn = pargs.r.ret_str; break; case oFilter: opt.filter = pargs.r.ret_str; break; case oAttr: opt.attr = pargs.r.ret_str; break; + case oLogWithPID: + { + unsigned int oldflags; + log_get_prefix (&oldflags); + log_set_prefix (NULL, oldflags | JNLIB_LOG_WITH_PID); + } + break; default : pargs.err = 2; break; } @@ -479,9 +487,12 @@ { log_error (_("searching `%s' failed: %s\n"), url, ldap_err2string (rc)); - /* FIXME: Need deinit (ld)? */ - /* Hmmm: Do we need to released MSG in case of an error? */ - return -1; + if (rc != LDAP_NO_SUCH_OBJECT) + { + /* FIXME: Need deinit (ld)? */ + /* Hmmm: Do we need to released MSG in case of an error? */ + return -1; + } } rc = print_ldap_entries (ld, msg, opt.multi? NULL:attr); Index: dirmngr/src/ldap.c diff -u dirmngr/src/ldap.c:1.39 dirmngr/src/ldap.c:1.40 --- dirmngr/src/ldap.c:1.39 Wed Nov 24 18:19:25 2004 +++ dirmngr/src/ldap.c Wed Dec 1 17:11:14 2004 @@ -713,6 +713,7 @@ } if (opt.verbose) argv[argc++] = "-vv"; + argv[argc++] = "--log-with-pid"; if (proxy) { argv[argc++] = "--proxy"; @@ -1058,6 +1059,7 @@ } if (opt.verbose) argv[argc++] = "-vv"; + argv[argc++] = "--log-with-pid"; argv[argc++] = "--multi"; if (opt.ldap_proxy) { Index: dirmngr/src/validate.c diff -u dirmngr/src/validate.c:1.5 dirmngr/src/validate.c:1.6 --- dirmngr/src/validate.c:1.5 Wed Nov 24 13:25:53 2004 +++ dirmngr/src/validate.c Wed Dec 1 17:11:14 2004 @@ -40,6 +40,7 @@ for it. */ struct chain_item_s { + struct chain_item_s *next; ksba_cert_t cert; /* The certificate. */ unsigned char fpr[20]; /* Fingerprint of the certificate. */ int is_self_signed; /* This certificate is self-signed. */ @@ -180,31 +181,46 @@ return 0; } -/* Helper for validate_cert_chain. IDX is the index to the last - element in the chain and NOT the length of the chain. */ +/* Helper for validate_cert_chain. */ static gpg_error_t -check_revocations (ctrl_t ctrl, chain_item_t *chain, int idx) +check_revocations (ctrl_t ctrl, chain_item_t chain) { gpg_error_t err = 0; int any_revoked = 0; int any_no_crl = 0; int any_crl_too_old = 0; + chain_item_t ci; + assert (ctrl->check_revocations_nest_level >= 0); - assert (idx >=0); - if (!idx && !chain[0]->cert) - return 0; /* Target certificate is a trusted root certificate. */ - - for (;idx >= 0 && !err; idx--) + assert (chain); + if (!chain->next) + { + /* We only have one certificate in the chain. This is the + traget and the Root CA certificate. We can't do a + revocation check for the root certificate because this will + in most cases lead to a catch-22. */ + return 0; /* Target certificate is a trusted root certificate. */ + } + + if (ctrl->check_revocations_nest_level > 10) + { + log_error (_("CRL checking too deeply nested\n")); + return gpg_error(GPG_ERR_BAD_CERT_CHAIN); + } + ctrl->check_revocations_nest_level++; + + + for (ci=chain; ci; ci = ci->next) { - assert (chain[idx]->cert); + assert (ci->cert); - err = crl_cache_cert_isvalid (ctrl, chain[idx]->cert, 0); + err = crl_cache_cert_isvalid (ctrl, chain->cert, 0); if (gpg_err_code (err) == GPG_ERR_NO_CRL_KNOWN) { - err = crl_cache_reload_crl (ctrl, chain[idx]->cert); + err = crl_cache_reload_crl (ctrl, chain->cert); if (!err) - err = crl_cache_cert_isvalid (ctrl, chain[idx]->cert, 0); + err = crl_cache_cert_isvalid (ctrl, chain->cert, 0); } switch (gpg_err_code (err)) { @@ -215,6 +231,7 @@ default: break; } } + ctrl->check_revocations_nest_level--; if (err) @@ -248,14 +265,14 @@ ksba_isotime_t exptime; int any_expired = 0; int any_no_policy_match = 0; - chain_item_t *chain; + chain_item_t chain; if (r_exptime) *r_exptime = 0; *exptime = 0; - if (opt.system_daemon) + if (!opt.system_daemon) return 0; /* For backward compatibility we only do this in daemon mode. */ @@ -264,16 +281,23 @@ if (DBG_X509) dump_cert ("subject", cert); - - /* We walk up the the path until we find a trust anchor. */ + subject_cert = cert; maxdepth = 50; - - chain = xtrycalloc (maxdepth+1, sizeof *chain); - if (!chain) - return gpg_error_from_errno (errno); + chain = NULL; depth = 0; + /* May the target certificate be used for OCSP response signing? */ + if (mode == VALIDATE_MODE_OCSP) + { + err = cert_use_ocsp_p (cert); + } + /* May the certificate be used for CR signing. */ + /* FIXME. */ + if (err) + goto leave; + + /* We walk up the the path until we find a trust anchor. */ for (;;) { /* Get the subject and issuer name from the current @@ -390,6 +414,22 @@ if (err) goto leave; + /* Prepend the certificate to our list. */ + { + chain_item_t ci; + + ci = xtrycalloc (1, sizeof *ci); + if (!ci) + { + err = gpg_error_from_errno (errno); + goto leave; + } + ksba_cert_ref (subject_cert); + ci->cert = subject_cert; + cert_compute_fpr (subject_cert, ci->fpr); + ci->next = chain; + chain = ci; + } break; /* Okay: a self-signed certicate is an end-point. */ } @@ -497,11 +537,22 @@ if (err) goto leave; /* No. */ - /* Append the certificate to our list. */ - assert (depth <= maxdepth); - ksba_cert_ref (subject_cert); - chain[depth]->cert = subject_cert; - cert_compute_fpr (subject_cert, chain[depth]->fpr); + /* Prepend the certificate to our list. */ + { + chain_item_t ci; + + ci = xtrycalloc (1, sizeof *ci); + if (!ci) + { + err = gpg_error_from_errno (errno); + goto leave; + } + ksba_cert_ref (subject_cert); + ci->cert = subject_cert; + cert_compute_fpr (subject_cert, ci->fpr); + ci->next = chain; + chain = ci; + } if (opt.verbose) log_info ("certificate is good\n"); @@ -520,34 +571,13 @@ err = gpg_error (GPG_ERR_NO_POLICY_MATCH); } - - /* May the certificate be used for OCSP response signing. */ - if (mode == VALIDATE_MODE_OCSP && chain[0]->cert) - { - err = cert_use_ocsp_p (chain[0]->cert); - } - - /* May the certificate be used for CR signing. */ - - /* FIXME. */ - - if (!err) { /* Now that everything is fine, walk the chain and check each certificate for revocations. - chain[0] - The target certificate. - chain[1] - The CA which signed chain[0] - ... - chain[depth] - The CA which signed chain[depth-1]. - - Note that we do not include the root certificate in this list - because we axiomatically know that it is trusted and there is - no point to do futher investigations. DEPTH might be zero in - case the target certificate is directly signed by the root - certificate or there might even be no list at all (DEPTH is 0 - and chain[0]->cert is NULL) if the target certificate is the - root certificate. + 1. item in the chain - The root certificate. + 2. item - the CA below the root + last item - the target certificate. Now for each certificate in the chain check whether it has been included in a CRL and thus be revoked. We don't do OCSP @@ -556,8 +586,7 @@ our validity results to avoid double work. Far worse a catch-22 may happen for an improper setup hierachy and we need a way to break up this deadlock. */ - - err = check_revocations (ctrl, chain, depth); + err = check_revocations (ctrl, chain); } @@ -568,10 +597,14 @@ ksba_cert_release (issuer_cert); if (subject_cert != cert) ksba_cert_release (subject_cert); - for (; depth; depth--) - if (chain[depth]->cert) - ksba_cert_release (chain[depth]->cert); - xfree (chain); + while (chain) + { + chain_item_t ci_next = chain->next; + if (chain->cert) + ksba_cert_release (chain->cert); + xfree (chain); + chain = ci_next; + } return err; } From cvs at cvs.gnupg.org Thu Dec 2 08:40:40 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 2 16:37:05 2004 Subject: GNUPG-1-9-BRANCH gnupg (22 files) Message-ID: Date: Thursday, December 2, 2004 @ 08:48:09 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: common/simple-gettext.c common/strsep.c common/w32reg.c scd/app-p15.c Modified: ChangeLog agent/gpg-agent.c common/ChangeLog common/Makefile.am common/fseeko.c common/ftello.c common/simple-pwquery.c common/util.h configure.ac jnlib/ChangeLog jnlib/logging.c jnlib/types.h kbx/ChangeLog kbx/Makefile.am kbx/keybox-defs.h kbx/keybox-update.c sm/ChangeLog sm/gpgsm.c First take on a W32 port -------------------------+ ChangeLog | 6 agent/gpg-agent.c | 12 common/ChangeLog | 9 common/Makefile.am | 2 common/fseeko.c | 1 common/ftello.c | 1 common/simple-gettext.c | 437 +++++++++++++++++++++++++++++ common/simple-pwquery.c | 8 common/strsep.c | 73 ++++ common/util.h | 4 common/w32reg.c | 172 +++++++++++ configure.ac | 18 - jnlib/ChangeLog | 4 jnlib/logging.c | 4 jnlib/types.h | 4 kbx/ChangeLog | 6 kbx/Makefile.am | 7 kbx/keybox-defs.h | 5 kbx/keybox-update.c | 2 scd/app-p15.c | 691 ++++++++++++++++++++++++++++++++++++++++++++++ sm/ChangeLog | 7 sm/gpgsm.c | 44 +- 22 files changed, 1476 insertions(+), 41 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.131.2.57 gnupg/ChangeLog:1.131.2.58 --- gnupg/ChangeLog:1.131.2.57 Fri Oct 22 21:48:12 2004 +++ gnupg/ChangeLog Thu Dec 2 08:48:09 2004 @@ -1,3 +1,9 @@ +2004-11-26 Werner Koch + + * configure.ac: Replace strsep. Replaced use of "target" by + "host". + + 2004-10-22 Werner Koch Released 1.9.12. Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.19 gnupg/agent/gpg-agent.c:1.31.2.20 --- gnupg/agent/gpg-agent.c:1.31.2.19 Fri Oct 22 11:39:47 2004 +++ gnupg/agent/gpg-agent.c Thu Dec 2 08:48:09 2004 @@ -244,12 +244,12 @@ } -/* Setup the debugging. With a LEVEL of NULL only the active debug - flags are propagated to the subsystems. With LEVEL set, a specific - set of debug flags is set; thus overriding all flags already - set. Note that we don't fail here, because it is important to keep - gpg-agent running even after re-reading the options due to a - SIGHUP. */ +/* Setup the debugging. With the global variable DEBUG_LEVEL set to NULL + only the active debug flags are propagated to the subsystems. With + DEBUG_LEVEL set, a specific set of debug flags is set; thus overriding + all flags already set. Note that we don't fail here, because it is + important to keep gpg-agent running even after re-reading the + options due to a SIGHUP. */ static void set_debug (void) { Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.29 gnupg/common/ChangeLog:1.30.2.30 --- gnupg/common/ChangeLog:1.30.2.29 Tue Nov 23 18:09:51 2004 +++ gnupg/common/ChangeLog Thu Dec 2 08:48:09 2004 @@ -1,3 +1,12 @@ +2004-11-26 Werner Koch + + * simple-gettext.c: New taken from gnupg 1.3.x + + * simple-pwquery.c [_WIN32]: Include winsock2.h. + (agent_open): Disable it until we have our AF_UNIX implementation + ready. + * fseeko.c, ftello.c: Include sys/types for the sake of W32. + 2004-11-23 Werner Koch * b64enc.c: Include stdio.h and string.h Index: gnupg/common/Makefile.am diff -u gnupg/common/Makefile.am:1.15.2.8 gnupg/common/Makefile.am:1.15.2.9 --- gnupg/common/Makefile.am:1.15.2.8 Mon Jun 14 10:32:07 2004 +++ gnupg/common/Makefile.am Thu Dec 2 08:48:09 2004 @@ -41,6 +41,8 @@ iobuf.c iobuf.h \ ttyio.c ttyio.h \ asshelp.c asshelp.h \ + simple-gettext.c \ + w32reg.c \ signal.c \ dynload.h Index: gnupg/common/fseeko.c diff -u gnupg/common/fseeko.c:1.1 gnupg/common/fseeko.c:1.1.2.1 --- gnupg/common/fseeko.c:1.1 Mon Jul 22 12:20:39 2002 +++ gnupg/common/fseeko.c Thu Dec 2 08:48:09 2004 @@ -22,6 +22,7 @@ #include #endif #include +#include /* Defines off_t under W32. */ int fseeko (FILE *stream, off_t off, int whence) Index: gnupg/common/ftello.c diff -u gnupg/common/ftello.c:1.1 gnupg/common/ftello.c:1.1.2.1 --- gnupg/common/ftello.c:1.1 Mon Jul 22 12:20:39 2002 +++ gnupg/common/ftello.c Thu Dec 2 08:48:09 2004 @@ -22,6 +22,7 @@ #include #endif #include +#include /* Defines off_t under W32. */ off_t ftello (FILE *stream) Index: gnupg/common/simple-gettext.c diff -u /dev/null gnupg/common/simple-gettext.c:1.1.2.1 --- /dev/null Thu Dec 2 08:48:09 2004 +++ gnupg/common/simple-gettext.c Thu Dec 2 08:48:09 2004 @@ -0,0 +1,437 @@ +/* simple-gettext.c - a simplified version of gettext. + * Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +/* This is a simplified version of gettext written by Ulrich Drepper. + * It is used for the Win32 version of GnuPG beucase all the overhead + * of gettext is not needed and we have to do some special Win32 stuff. + * I decided that this is far easier than to tweak gettext for the special + * cases (I tried it but it is a lot of code). wk 15.09.99 + */ + +#include +#ifdef USE_SIMPLE_GETTEXT +#if !defined (_WIN32) && !defined (__CYGWIN32__) +#error This file can only be used under Windows or Cygwin32 +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include "util.h" + + +/* The magic number of the GNU message catalog format. */ +#define MAGIC 0x950412de +#define MAGIC_SWAPPED 0xde120495 + +/* Revision number of the currently used .mo (binary) file format. */ +#define MO_REVISION_NUMBER 0 + + +/* Header for binary .mo file format. */ +struct mo_file_header +{ + /* The magic number. */ + u32 magic; + /* The revision number of the file format. */ + u32 revision; + /* The number of strings pairs. */ + u32 nstrings; + /* Offset of table with start offsets of original strings. */ + u32 orig_tab_offset; + /* Offset of table with start offsets of translation strings. */ + u32 trans_tab_offset; + /* Size of hashing table. */ + u32 hash_tab_size; + /* Offset of first hashing entry. */ + u32 hash_tab_offset; +}; + +struct string_desc +{ + /* Length of addressed string. */ + u32 length; + /* Offset of string in file. */ + u32 offset; +}; + + +struct overflow_space_s +{ + struct overflow_space_s *next; + u32 idx; + char d[1]; +}; + +struct loaded_domain +{ + char *data; + int must_swap; + u32 nstrings; + char *mapped; /* 0 = not yet mapped, 1 = mapped, + 2 = mapped to + overflow space */ + struct overflow_space_s *overflow_space; + struct string_desc *orig_tab; + struct string_desc *trans_tab; + u32 hash_size; + u32 *hash_tab; +}; + + +static struct loaded_domain *the_domain; + +static __inline__ u32 +do_swap_u32( u32 i ) +{ + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); +} + +#define SWAPIT(flag, data) ((flag) ? do_swap_u32(data) : (data) ) + + +/* We assume to have `unsigned long int' value with at least 32 bits. */ +#define HASHWORDBITS 32 + +/* The so called `hashpjw' function by P.J. Weinberger + [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, + 1986, 1987 Bell Telephone Laboratories, Inc.] */ + +static __inline__ ulong +hash_string( const char *str_param ) +{ + unsigned long int hval, g; + const char *str = str_param; + + hval = 0; + while (*str != '\0') + { + hval <<= 4; + hval += (unsigned long int) *str++; + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); + if (g != 0) + { + hval ^= g >> (HASHWORDBITS - 8); + hval ^= g; + } + } + return hval; +} + + +static struct loaded_domain * +load_domain( const char *filename ) +{ + FILE *fp; + size_t size; + struct stat st; + struct mo_file_header *data = NULL; + struct loaded_domain *domain = NULL; + size_t to_read; + char *read_ptr; + + fp = fopen( filename, "rb" ); + if( !fp ) + return NULL; /* can't open the file */ + /* we must know about the size of the file */ + if( fstat( fileno(fp ), &st ) + || (size = (size_t)st.st_size) != st.st_size + || size < sizeof (struct mo_file_header) ) { + fclose( fp ); + return NULL; + } + + data = malloc( size ); + if( !data ) { + fclose( fp ); + return NULL; /* out of memory */ + } + + to_read = size; + read_ptr = (char *) data; + do { + long int nb = fread( read_ptr, 1, to_read, fp ); + if( nb < to_read ) { + fclose (fp); + free(data); + return NULL; /* read error */ + } + read_ptr += nb; + to_read -= nb; + } while( to_read > 0 ); + fclose (fp); + + /* Using the magic number we can test whether it really is a message + * catalog file. */ + if( data->magic != MAGIC && data->magic != MAGIC_SWAPPED ) { + /* The magic number is wrong: not a message catalog file. */ + free( data ); + return NULL; + } + + domain = calloc( 1, sizeof *domain ); + if( !domain ) { + free( data ); + return NULL; + } + domain->data = (char *) data; + domain->must_swap = data->magic != MAGIC; + + /* Fill in the information about the available tables. */ + switch( SWAPIT(domain->must_swap, data->revision) ) { + case 0: + domain->nstrings = SWAPIT(domain->must_swap, data->nstrings); + domain->orig_tab = (struct string_desc *) + ((char *) data + SWAPIT(domain->must_swap, data->orig_tab_offset)); + domain->trans_tab = (struct string_desc *) + ((char *) data + SWAPIT(domain->must_swap, data->trans_tab_offset)); + domain->hash_size = SWAPIT(domain->must_swap, data->hash_tab_size); + domain->hash_tab = (u32 *) + ((char *) data + SWAPIT(domain->must_swap, data->hash_tab_offset)); + break; + + default: /* This is an invalid revision. */ + free( data ); + free( domain ); + return NULL; + } + + /* Allocate an array to keep track of code page mappings. */ + domain->mapped = calloc( 1, domain->nstrings ); + if( !domain->mapped ) { + free( data ); + free( domain ); + return NULL; + } + + return domain; +} + + +/**************** + * Set the file used for translations. Pass a NULL to disable + * translation. A new filename may be set at anytime. + * WARNING: After changing the filename you should not access any data + * retrieved by gettext(). + */ +int +set_gettext_file( const char *filename ) +{ + struct loaded_domain *domain = NULL; + + if( filename && *filename ) { + if( filename[0] == '/' +#ifdef HAVE_DRIVE_LETTERS + || ( isalpha(filename[0]) + && filename[1] == ':' + && (filename[2] == '/' || filename[2] == '\\') ) +#endif + ) { + /* absolute path - use it as is */ + domain = load_domain( filename ); + } + else { /* relative path - append ".mo" and get dir from the environment */ + char *buf = NULL; + char *dir; + char *p; + + dir = read_w32_registry_string( NULL, + "Control Panel\\Mingw32\\NLS", + "MODir" ); + if( dir && (buf=malloc(strlen(dir)+strlen(filename)+1+3+1)) ) { + strcpy(stpcpy(stpcpy(stpcpy( buf, dir),"\\"), filename),".mo"); + /* Better make sure that we don't mix forward and + backward slashes. It seems that some Windoze + versions don't accept this. */ + for (p=buf; *p; p++) + { + if (*p == '/') + *p = '\\'; + } + domain = load_domain( buf ); + free(buf); + } + free(dir); + } + if( !domain ) + return -1; + } + + if( the_domain ) { + struct overflow_space_s *os, *os2; + free( the_domain->data ); + free( the_domain->mapped ); + for (os=the_domain->overflow_space; os; os = os2) { + os2 = os->next; + free (os); + } + free( the_domain ); + the_domain = NULL; + } + the_domain = domain; + return 0; +} + + +static const char* +get_string( struct loaded_domain *domain, u32 idx ) +{ + struct overflow_space_s *os; + char *p; + + p = domain->data + SWAPIT(domain->must_swap, domain->trans_tab[idx].offset); + if (!domain->mapped[idx]) + { + size_t plen, buflen; + char *buf; + + domain->mapped[idx] = 1; + + plen = strlen (p); + buf = utf8_to_native (p, plen, -1); + buflen = strlen (buf); + if (buflen <= plen) + strcpy (p, buf); + else + { + /* There is not enough space for the translation - store it + in the overflow_space else and mark that in the mapped + array. Because we expect that this won't happen too + often, we use a simple linked list. */ + os = malloc (sizeof *os + buflen); + if (os) + { + os->idx = idx; + strcpy (os->d, buf); + os->next = domain->overflow_space; + domain->overflow_space = os; + p = os->d; + } + else + p = "ERROR in GETTEXT MALLOC"; + } + xfree (buf); + } + else if (domain->mapped[idx] == 2) + { /* We need to get the string from the overflow_space. */ + for (os=domain->overflow_space; os; os = os->next) + if (os->idx == idx) + return (const char*)os->d; + p = "ERROR in GETTEXT\n"; + } + return (const char*)p; +} + + + +const char * +gettext( const char *msgid ) +{ + struct loaded_domain *domain; + size_t act = 0; + size_t top, bottom; + + if( !(domain = the_domain) ) + goto not_found; + + /* Locate the MSGID and its translation. */ + if( domain->hash_size > 2 && domain->hash_tab ) { + /* Use the hashing table. */ + u32 len = strlen (msgid); + u32 hash_val = hash_string (msgid); + u32 idx = hash_val % domain->hash_size; + u32 incr = 1 + (hash_val % (domain->hash_size - 2)); + u32 nstr = SWAPIT (domain->must_swap, domain->hash_tab[idx]); + + if ( !nstr ) /* Hash table entry is empty. */ + goto not_found; + + if( SWAPIT(domain->must_swap, + domain->orig_tab[nstr - 1].length) == len + && !strcmp( msgid, + domain->data + SWAPIT(domain->must_swap, + domain->orig_tab[nstr - 1].offset)) ) + return get_string( domain, nstr - 1 ); + + for(;;) { + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + + nstr = SWAPIT(domain->must_swap, domain->hash_tab[idx]); + if( !nstr ) + goto not_found; /* Hash table entry is empty. */ + + if ( SWAPIT(domain->must_swap, + domain->orig_tab[nstr - 1].length) == len + && !strcmp (msgid, + domain->data + SWAPIT(domain->must_swap, + domain->orig_tab[nstr - 1].offset))) + return get_string( domain, nstr-1 ); + } + /* NOTREACHED */ + } + + /* Now we try the default method: binary search in the sorted + array of messages. */ + bottom = 0; + top = domain->nstrings; + while( bottom < top ) { + int cmp_val; + + act = (bottom + top) / 2; + cmp_val = strcmp(msgid, domain->data + + SWAPIT(domain->must_swap, + domain->orig_tab[act].offset)); + if (cmp_val < 0) + top = act; + else if (cmp_val > 0) + bottom = act + 1; + else + return get_string( domain, act ); + } + + not_found: + return msgid; +} + +#if 0 + unsigned int cp1, cp2; + + cp1 = GetConsoleCP(); + cp2 = GetConsoleOutputCP(); + + log_info("InputCP=%u OutputCP=%u\n", cp1, cp2 ); + + if( !SetConsoleOutputCP( 1252 ) ) + log_info("SetConsoleOutputCP failed: %s\n", w32_strerror (0)); + + cp1 = GetConsoleCP(); + cp2 = GetConsoleOutputCP(); + log_info("InputCP=%u OutputCP=%u after switch1\n", cp1, cp2 ); +#endif + +#endif /* USE_SIMPLE_GETTEXT */ Index: gnupg/common/simple-pwquery.c diff -u gnupg/common/simple-pwquery.c:1.1.2.4 gnupg/common/simple-pwquery.c:1.1.2.5 --- gnupg/common/simple-pwquery.c:1.1.2.4 Wed Aug 18 16:37:22 2004 +++ gnupg/common/simple-pwquery.c Thu Dec 2 08:48:09 2004 @@ -31,8 +31,12 @@ #include #include #include +#ifdef _WIN32 +#include +#else #include #include +#endif #ifdef HAVE_LOCALE_H #include #endif @@ -255,6 +259,9 @@ static int agent_open (int *rfd) { +#ifdef _WIN32 + return SPWQ_NO_AGENT; /* FIXME */ +#else int rc; int fd; char *infostr, *p; @@ -346,6 +353,7 @@ *rfd = fd; return 0; +#endif } Index: gnupg/common/strsep.c diff -u /dev/null gnupg/common/strsep.c:1.1.2.1 --- /dev/null Thu Dec 2 08:48:09 2004 +++ gnupg/common/strsep.c Thu Dec 2 08:48:09 2004 @@ -0,0 +1,73 @@ +/* strsep.c - Replacement for strsep(). + * Copyright (C) 2002 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#ifdef HAVE_CONFIG_H +#include +#endif +#include +#include + +/* Code taken from glibc-2.2.1/sysdeps/generic/strsep.c */ +#warning need to get the correct copyright years from glibc +char * +strsep (char **stringp, const char *delim) +{ + char *begin, *end; + + begin = *stringp; + if (begin == NULL) + return NULL; + + /* A frequent case is when the delimiter string contains only one + character. Here we don't need to call the expensive `strpbrk' + function and instead work using `strchr'. */ + if (delim[0] == '\0' || delim[1] == '\0') + { + char ch = delim[0]; + + if (ch == '\0') + end = NULL; + else + { + if (*begin == ch) + end = begin; + else if (*begin == '\0') + end = NULL; + else + end = strchr (begin + 1, ch); + } + } + else + /* Find the end of the token. */ + end = strpbrk (begin, delim); + + if (end) + { + /* Terminate the token and set *STRINGP past NUL character. */ + *end++ = '\0'; + *stringp = end; + } + else + /* No more delimiters; this is the last token. */ + *stringp = NULL; + + return begin; +} + Index: gnupg/common/util.h diff -u gnupg/common/util.h:1.12.2.9 gnupg/common/util.h:1.12.2.10 --- gnupg/common/util.h:1.12.2.9 Mon Jun 14 10:32:07 2004 +++ gnupg/common/util.h Thu Dec 2 08:48:09 2004 @@ -144,7 +144,9 @@ int vasprintf (char **result, const char *format, va_list args); int asprintf (char **result, const char *format, ...) JNLIB_GCC_A_PRINTF(2,3); #endif - +#ifndef HAVE_STRSEP +char *strsep (char **stringp, const char *delim); +#endif /*-- some macros to replace ctype ones and avoid locale problems --*/ Index: gnupg/common/w32reg.c diff -u /dev/null gnupg/common/w32reg.c:1.1.2.1 --- /dev/null Thu Dec 2 08:48:09 2004 +++ gnupg/common/w32reg.c Thu Dec 2 08:48:09 2004 @@ -0,0 +1,172 @@ +/* w32reg.c - MS-Windows Registry access + * Copyright (C) 1999, 2002 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include +#if defined (_WIN32) || defined (__CYGWIN32__) + /* This module is only used in this environment */ + +#include +#include +#include +#include +#include + +#include "util.h" + +static HKEY +get_root_key(const char *root) +{ + HKEY root_key; + + if( !root ) + root_key = HKEY_CURRENT_USER; + else if( !strcmp( root, "HKEY_CLASSES_ROOT" ) ) + root_key = HKEY_CLASSES_ROOT; + else if( !strcmp( root, "HKEY_CURRENT_USER" ) ) + root_key = HKEY_CURRENT_USER; + else if( !strcmp( root, "HKEY_LOCAL_MACHINE" ) ) + root_key = HKEY_LOCAL_MACHINE; + else if( !strcmp( root, "HKEY_USERS" ) ) + root_key = HKEY_USERS; + else if( !strcmp( root, "HKEY_PERFORMANCE_DATA" ) ) + root_key = HKEY_PERFORMANCE_DATA; + else if( !strcmp( root, "HKEY_CURRENT_CONFIG" ) ) + root_key = HKEY_CURRENT_CONFIG; + else + return NULL; + + return root_key; +} + + +/**************** + * Return a string from the Win32 Registry or NULL in case of + * error. Caller must release the return value. A NULL for root + * is an alias for HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE in turn. + * NOTE: The value is allocated with a plain malloc() - use free() and not + * the usual m_free()!!! + */ +char * +read_w32_registry_string( const char *root, const char *dir, const char *name ) +{ + HKEY root_key, key_handle; + DWORD n1, nbytes, type; + char *result = NULL; + + if ( !(root_key = get_root_key(root) ) ) + return NULL; + + if( RegOpenKeyEx( root_key, dir, 0, KEY_READ, &key_handle ) ) + { + if (root) + return NULL; /* no need for a RegClose, so return direct */ + /* It seems to be common practise to fall back to HLM. */ + if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) ) + return NULL; /* still no need for a RegClose, so return direct */ + } + + nbytes = 1; + if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) ) + goto leave; + result = malloc( (n1=nbytes+1) ); + if( !result ) + goto leave; + if( RegQueryValueEx( key_handle, name, 0, &type, result, &n1 ) ) { + free(result); result = NULL; + goto leave; + } + result[nbytes] = 0; /* make sure it is really a string */ + if (type == REG_EXPAND_SZ && strchr (result, '%')) { + char *tmp; + + n1 += 1000; + tmp = malloc (n1+1); + if (!tmp) + goto leave; + nbytes = ExpandEnvironmentStrings (result, tmp, n1); + if (nbytes && nbytes > n1) { + free (tmp); + n1 = nbytes; + tmp = malloc (n1 + 1); + if (!tmp) + goto leave; + nbytes = ExpandEnvironmentStrings (result, tmp, n1); + if (nbytes && nbytes > n1) { + free (tmp); /* oops - truncated, better don't expand at all */ + goto leave; + } + tmp[nbytes] = 0; + free (result); + result = tmp; + } + else if (nbytes) { /* okay, reduce the length */ + tmp[nbytes] = 0; + free (result); + result = malloc (strlen (tmp)+1); + if (!result) + result = tmp; + else { + strcpy (result, tmp); + free (tmp); + } + } + else { /* error - don't expand */ + free (tmp); + } + } + + leave: + RegCloseKey( key_handle ); + return result; +} + + +int +write_w32_registry_string(const char *root, const char *dir, + const char *name, const char *value) +{ + HKEY root_key, reg_key; + + if ( !(root_key = get_root_key(root) ) ) + return -1; + + if ( RegOpenKeyEx( root_key, dir, 0, KEY_WRITE, ®_key ) + != ERROR_SUCCESS ) + return -1; + + if ( RegSetValueEx( reg_key, name, 0, REG_SZ, (BYTE *)value, + strlen( value ) ) != ERROR_SUCCESS ) { + if ( RegCreateKey( root_key, name, ®_key ) != ERROR_SUCCESS ) { + RegCloseKey(reg_key); + return -1; + } + if ( RegSetValueEx( reg_key, name, 0, REG_SZ, (BYTE *)value, + strlen( value ) ) != ERROR_SUCCESS ) { + RegCloseKey(reg_key); + return -1; + } + } + + RegCloseKey( reg_key ); + + return 0; +} + +#endif /* __MINGW32__ || __CYGWIN32__ */ Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.67 gnupg/configure.ac:1.36.2.68 --- gnupg/configure.ac:1.36.2.67 Fri Oct 22 21:57:03 2004 +++ gnupg/configure.ac Thu Dec 2 08:48:09 2004 @@ -343,7 +343,7 @@ try_gettext=yes have_dosish_system=no -case "${target}" in +case "${host}" in *-*-mingw32*) # special stuff for Windoze NT ac_cv_have_dev_random=no @@ -660,7 +660,7 @@ AC_SUBST(GPGKEYS_MAILTO) -case "${target}" in +case "${host}" in *-*-mingw32*) PRINTABLE_OS_NAME="MingW32" ;; @@ -782,7 +782,7 @@ AC_REPLACE_FUNCS(fseeko ftello) AC_REPLACE_FUNCS(isascii) AC_REPLACE_FUNCS(putc_unlocked) - +AC_REPLACE_FUNCS(strsep) @@ -970,7 +970,7 @@ # add some extra libs here so that previous tests don't fail for # mysterious reasons - the final link step should bail out. -case "${target}" in +case "${host}" in *-*-mingw32*) W32LIBS="-lwsock32" ;; @@ -1038,6 +1038,14 @@ build_scdaemon=no fi +# We don't yet want to build some parts for W32 +case "${host}" in + *-mingw32*) + build_gpg=no + ;; +esac + + AM_CONDITIONAL(BUILD_GPG, test "$build_gpg" = "yes") AM_CONDITIONAL(BUILD_GPGSM, test "$build_gpgsm" = "yes") AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes") @@ -1140,7 +1148,7 @@ echo " GnuPG v${VERSION} has been configured as follows: - Platform: $PRINTABLE_OS_NAME ($target) + Platform: $PRINTABLE_OS_NAME ($host) OpenPGP: $build_gpg S/MIME: $build_gpgsm Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.18 gnupg/jnlib/ChangeLog:1.3.2.19 --- gnupg/jnlib/ChangeLog:1.3.2.18 Tue Nov 30 10:48:37 2004 +++ gnupg/jnlib/ChangeLog Thu Dec 2 08:48:09 2004 @@ -1,3 +1,7 @@ +2004-11-26 Werner Koch + + * logging.c [_WIN32]: Don't include socket headers. + 2004-11-30 Timo Schulz * w32-afunix.c: New. AF_UNIX emulation for W32. Index: gnupg/jnlib/logging.c diff -u gnupg/jnlib/logging.c:1.2.2.10 gnupg/jnlib/logging.c:1.2.2.11 --- gnupg/jnlib/logging.c:1.2.2.10 Tue Nov 23 18:09:51 2004 +++ gnupg/jnlib/logging.c Thu Dec 2 08:48:09 2004 @@ -34,9 +34,11 @@ #include #include #include -#include #include +#ifndef _WIN32 +#include #include +#endif #include #include #include Index: gnupg/jnlib/types.h diff -u gnupg/jnlib/types.h:1.1.2.1 gnupg/jnlib/types.h:1.1.2.2 --- gnupg/jnlib/types.h:1.1.2.1 Thu Jan 9 13:36:05 2003 +++ gnupg/jnlib/types.h Thu Dec 2 08:48:09 2004 @@ -42,7 +42,11 @@ #ifndef HAVE_BYTE_TYPEDEF #undef byte /* maybe there is a macro with this name */ +/* Windows typedefs byte in the rpc headers. Avoid warning about + double definition. */ +#if !(defined(_WIN32) && defined(cbNDRContext)) typedef unsigned char byte; +#endif #define HAVE_BYTE_TYPEDEF #endif Index: gnupg/kbx/ChangeLog diff -u gnupg/kbx/ChangeLog:1.15.2.8 gnupg/kbx/ChangeLog:1.15.2.9 --- gnupg/kbx/ChangeLog:1.15.2.8 Thu Sep 30 23:37:08 2004 +++ gnupg/kbx/ChangeLog Thu Dec 2 08:48:08 2004 @@ -1,3 +1,9 @@ +2004-11-26 Werner Koch + + * Makefile.am (kbxutil_LDADD): Add ../common/libcommon.a + + * keybox-defs.h: Include stringhelp.h. + 2004-09-30 Werner Koch * kbxutil.c (i18n_init): Always use LC_ALL. Index: gnupg/kbx/Makefile.am diff -u gnupg/kbx/Makefile.am:1.8.2.2 gnupg/kbx/Makefile.am:1.8.2.3 --- gnupg/kbx/Makefile.am:1.8.2.2 Thu Sep 30 16:34:27 2004 +++ gnupg/kbx/Makefile.am Thu Dec 2 08:48:08 2004 @@ -43,11 +43,8 @@ libkeybox_a_SOURCES = $(common_sources) +# Note that libcommon is only required to resolve the LIBOBJS. kbxutil_SOURCES = kbxutil.c $(common_sources) kbxutil_LDADD = ../jnlib/libjnlib.a $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \ - -lgpg-error @LIBINTL@ - - - - + -lgpg-error $(LIBINTL) ../common/libcommon.a Index: gnupg/kbx/keybox-defs.h diff -u gnupg/kbx/keybox-defs.h:1.6.2.7 gnupg/kbx/keybox-defs.h:1.6.2.8 --- gnupg/kbx/keybox-defs.h:1.6.2.7 Tue Aug 24 21:55:47 2004 +++ gnupg/kbx/keybox-defs.h Thu Dec 2 08:48:08 2004 @@ -31,8 +31,11 @@ /* We include the type defintions from jnlib instead of defining our owns here. This will not allow us build KBX in a standalone way - but tehre is currently no need for it anyway. */ + but there is currently no need for it anyway. Same goes for + stringhelp.h which for example provides a replacement for stpcpy - + fixme: Better the LIBOBJ mechnism. */ #include "../jnlib/types.h" +#include "../jnlib/stringhelp.h" #include "keybox.h" Index: gnupg/kbx/keybox-update.c diff -u gnupg/kbx/keybox-update.c:1.4.2.3 gnupg/kbx/keybox-update.c:1.4.2.4 --- gnupg/kbx/keybox-update.c:1.4.2.3 Mon Apr 26 10:09:22 2004 +++ gnupg/kbx/keybox-update.c Thu Dec 2 08:48:08 2004 @@ -66,7 +66,7 @@ strcpy (tmpfname + strlen (template)-4, EXTSEP_S "tmp"); } else - { /* file does not end with kbx; hmmm */ + { /* File does not end with kbx; hmmm. */ bakfname = xtrymalloc ( strlen (template) + 5); if (!bakfname) return gpg_error (gpg_err_code_from_errno (errno)); Index: gnupg/scd/app-p15.c diff -u /dev/null gnupg/scd/app-p15.c:1.1.2.1 --- /dev/null Thu Dec 2 08:48:10 2004 +++ gnupg/scd/app-p15.c Thu Dec 2 08:48:08 2004 @@ -0,0 +1,691 @@ +/* app-p15.c - The pkcs#15 card application. + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "scdaemon.h" + +#include "iso7816.h" +#include "app-common.h" +#include "tlv.h" + + +/* Context local to this application. */ +struct app_local_s +{ + unsigned short home_df; /* The home DF. Note, that we don't yet + support a multilevel hierachy. Thus we + assume this is directly below the MF. */ + struct + { + unsigned short private_keys; + unsigned short public_keys; + unsigned short trusted_public_keys; + unsigned short secret_keys; + unsigned short certificates; + unsigned short trusted_certificates; + unsigned short useful_certificates; + unsigned short data_objects; + unsigned short auth_objects; + } odf; + + +}; + + + + +/* Do a select and a read for the file with EFID. EFID is a + desctription of the EF to be used with error messages. On success + BUFFER and BUFLEN contain the entire content of the EF. The caller + must free BUFFER but only on success. */ +static gpg_error_t +select_and_read_binary (int slot, unsigned short efid, const char *efid_desc, + unsigned char **buffer, size_t *buflen) +{ + gpg_error_t err; + + err = iso7816_select_file (slot, efid, 0, NULL, NULL); + if (err) + { + log_error ("error selecting %s (0x%04X): %s\n", + efid_desc, efid, gpg_strerror (err)); + return err; + } + err = iso7816_read_binary (slot, 0, 0, buffer, buflen); + if (err) + { + log_error ("error reading %s (0x%04X): %s\n", + efid_desc, efid, gpg_strerror (err)); + return err; + } + return 0; +} + + + + +/* Read and parse the Object Directory File and store away the + pointers. + + Example of such a file: + + A0 06 30 04 04 02 60 34 = Private Keys + A4 06 30 04 04 02 60 35 = Certificates + A5 06 30 04 04 02 60 36 = TrustedCertificates + A7 06 30 04 04 02 60 37 = DataObjects + A8 06 30 04 04 02 60 38 = AuthObjects + + These are all PathOrObjects using the path CHOICE. The paths are + octet strings of length 2. Using this Path CHOICE is recommended, + so we only implement that for now. +*/ +static gpg_error_t +read_ef_odf (app_t app) +{ + gpg_error_t err; + unsigned char *buffer, *p; + size_t buflen; + unsigned short value; + + err = select_and_read_binary (app->slot, 0x5031, "ODF", &buffer, &buflen); + if (err) + return err; + + if (len < 8) + { + log_error ("error: ODF too short\n"); + xfree (buffer); + return gpg_error (GPG_ERR_INV_OBJ); + } + for (p=buffer; buflen >= 8; p += 8, buflen -= 8) + { + if ( (p[0] & 0xf0) != 0xA0 + || memcmp (p+1, "\x06\x30\x04\x04\x02", 5) ) + { + log_error ("ODF format is not supported by us\n"); + xfree (buffer); + return gpg_error (GPG_ERR_INV_OBJ); + } + switch ((p[0] & 0x0f)) + { + case 0: value = app->app_local->odf.private_keys; break; + case 1: value = app->app_local->odf.public_keys; break; + case 2: value = app->app_local->odf.trusted_public_keys; break; + case 3: value = app->app_local->odf.secret_keys; break; + case 4: value = app->app_local->odf.certificates; break; + case 5: value = app->app_local->odf.trusted_certificates; break; + case 6: value = app->app_local->odf.useful_certificates; break; + case 7: value = app->app_local->odf.data_objects; break; + case 8: value = app->app_local->odf.auth_objects; break; + default: value = 0; break; + } + if (value) + { + log_error ("duplicate object type %d in ODF ignored\n",(p[0)&0x0f)); + continue; + } + value = ((p[6] << 8) | p[7]); + switch ((p[0] & 0x0f)) + { + case 0: app->app_local->odf.private_keys = value; break; + case 1: app->app_local->odf.public_keys = value; break; + case 2: app->app_local->odf.trusted_public_keys = value; break; + case 3: app->app_local->odf.secret_keys = value; break; + case 4: app->app_local->odf.certificates = value; break; + case 5: app->app_local->odf.trusted_certificates = value; break; + case 6: app->app_local->odf.useful_certificates = value; break; + case 7: app->app_local->odf.data_objects = value; break; + case 8: app->app_local->odf.auth_objects = value; break; + default: + log_error ("unknown object type %d in ODF ignored\n", (p[0)&0x0f)); + } + } + + if (buflen) + log_info ("warning: %u bytes of garbage detected at end of ODF\n", buflen); + + xfree (buffer); + return 0; +} + + + +/* Read and parse the Private Key Directory Files. */ +/* + 6034 (privatekeys) + +30 33 30 11 0C 08 53 4B 2E 43 48 2E 44 53 03 02 030...SK.CH.DS.. +06 80 04 01 07 30 0C 04 01 01 03 03 06 00 40 02 .....0........@. +02 00 50 A1 10 30 0E 30 08 04 06 3F 00 40 16 00 ..P..0.0...?.@.. +50 02 02 04 00 30 33 30 11 0C 08 53 4B 2E 43 48 P....030...SK.CH +2E 4B 45 03 02 06 80 04 01 0A 30 0C 04 01 0C 03 .KE.......0..... +03 06 44 00 02 02 00 52 A1 10 30 0E 30 08 04 06 ..D....R..0.0... +3F 00 40 16 00 52 02 02 04 00 30 34 30 12 0C 09 ?.@..R....040... +53 4B 2E 43 48 2E 41 55 54 03 02 06 80 04 01 0A SK.CH.AUT....... +30 0C 04 01 0D 03 03 06 20 00 02 02 00 51 A1 10 0....... ....Q.. +30 0E 30 08 04 06 3F 00 40 16 00 51 02 02 04 00 0.0...?.@..Q.... +30 37 30 15 0C 0C 53 4B 2E 43 48 2E 44 53 2D 53 070...SK.CH.DS-S +50 58 03 02 06 80 04 01 0A 30 0C 04 01 02 03 03 PX.......0...... +06 20 00 02 02 00 53 A1 10 30 0E 30 08 04 06 3F . ....S..0.0...? +00 40 16 00 53 02 02 04 00 00 00 00 00 00 00 00 .@..S........... +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + +*/ +static gpg_error_t +read_ef_prkdf (app_t app) +{ + + +} + +/* Read and parse the Public Key Directory Files. */ +static gpg_error_t +read_ef_pukdf (app_t app) +{ + + +} + + +/* Read and parse the Certificate Directory Files. */ +/* + +6035 (certificates) + +30 2A 30 15 0C 0C 43 5F 58 35 30 39 2E 43 48 2E 0*0...C_X509.CH. +44 53 03 02 06 40 04 01 0A 30 03 04 01 01 A1 0C DS...@...0...... +30 0A 30 08 04 06 3F 00 40 16 C0 00 30 2A 30 15 0.0...?.@...0*0. +0C 0C 43 5F 58 35 30 39 2E 43 48 2E 4B 45 03 02 ..C_X509.CH.KE.. +06 40 04 01 0A 30 03 04 01 0C A1 0C 30 0A 30 08 .@...0......0.0. +04 06 3F 00 40 16 C2 00 30 2B 30 16 0C 0D 43 5F ..?.@...0+0...C_ +58 35 30 39 2E 43 48 2E 41 55 54 03 02 06 40 04 X509.CH.AUT...@. +01 0A 30 03 04 01 0D A1 0C 30 0A 30 08 04 06 3F ..0......0.0...? +00 40 16 C5 00 30 2E 30 19 0C 10 43 5F 58 35 30 .@...0.0...C_X50 +39 2E 43 48 2E 44 53 2D 53 50 58 03 02 06 40 04 9.CH.DS-SPX...@. +01 0A 30 03 04 01 02 A1 0C 30 0A 30 08 04 06 3F ..0......0.0...? +00 40 16 C1 20 00 00 00 00 00 00 00 00 00 00 00 .@.. ........... +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + + 0 42: SEQUENCE { + 2 21: SEQUENCE { -- commonObjectAttributes + 4 12: UTF8String 'C_X509.CH.DS' + 18 2: BIT STRING 6 unused bits + : '10'B (bit 1) + 22 1: OCTET STRING 0A + : } + 25 3: SEQUENCE { -- commonCertificateAttributes + 27 1: OCTET STRING 01 + : } + 30 12: [1] { -- certAttributes + 32 10: SEQUENCE { + 34 8: SEQUENCE { + 36 6: OCTET STRING 3F 00 40 16 C0 00 + : } + : } + : } + : } + + + +6036 (trustedcertificates) + +30 35 30 06 03 02 00 00 04 00 30 16 04 14 2D 36 050.......0...-6 +33 39 33 33 39 34 30 33 39 37 37 36 34 30 31 32 3933940397764012 +31 36 A1 13 30 11 30 0F 04 06 3F 00 40 16 C7 08 16..0.0...?.@... +02 01 00 80 02 02 29 30 35 30 06 03 02 00 00 04 ......)050...... +00 30 16 04 14 2D 34 30 31 39 30 35 32 37 32 36 .0...-4019052726 +38 30 31 36 39 33 34 39 32 A1 13 30 11 30 0F 04 801693492..0.0.. +06 3F 00 40 16 C7 0E 02 01 00 80 02 04 12 30 34 .?.@..........04 +30 06 03 02 00 00 04 00 30 15 04 13 37 39 36 33 0.......0...7963 +32 38 33 36 35 30 37 36 36 34 38 32 39 36 30 A1 283650766482960. +13 30 11 30 0F 04 06 3F 00 40 16 C0 08 02 01 00 .0.0...?.@...... +80 02 04 11 00 00 00 00 00 00 00 00 00 00 00 00 ................ +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + + 0 53: SEQUENCE { + 2 6: SEQUENCE { + 4 2: BIT STRING + : '00000000'B + : Error: Spurious zero bits in bitstring. + 8 0: OCTET STRING + : Error: Object has zero length. + : } + 10 22: SEQUENCE { + 12 20: OCTET STRING '-6393394039776401216' + : } + 34 19: [1] { + 36 17: SEQUENCE { + 38 15: SEQUENCE { + 40 6: OCTET STRING 3F 00 40 16 C7 08 + 48 1: INTEGER 0 -- index + 51 2: [0] 02 29 -- length + : } + : } + : } + : } + + +*/ +static gpg_error_t +read_ef_cdf (app_t app) +{ + gpg_error_t err; + unsigned char *buffer = NULL; + size_t buflen; + unsigned short value; + unsigned short fid; + const unsigned char *p; + size_t n, objlen, hdrlen; + int class, tag, constructed, ndef; + + fid = app->app_local->odf.certificates; + if (!fid) + return 0; /* No certificates. */ + + err = select_and_read_binary (app->slot, fid, "CDF", &buffer, &buflen); + if (err) + return err; + + p = buffer; + n = buflen; + + /* Loop over the records. We stop as soon as we detect a new record + starting with 0x00 or 0xff as these values are commonly used to pad + the the read datablocks and are no valid ASN.1 encoding. */ + while (n && *p && *p == 0xff) + { + const unsigned char *pp; + size_t nn; + + err = parse_ber_header (&p, &n, &class, &tag, &constructed, + &ndef, &objlen, &hdrlen); + if (!err && (objlen > n || tag != TAG_SEQUENCE)) + err = gpg_error (GPG_ERR_INV_OBJ); + if (err) + { + log_error ("error parsing CDF record: %s\n", gpg_strerror (err)); + goto leave; + } + pp = p; + nn = objlen; + p += objlen; + n -= objlen; + + /* Skip the commonObjectAttributes. */ + err = parse_ber_header (&pp, &nn, &class, &tag, &constructed, + &ndef, &objlen, &hdrlen); + if (!err && (objlen > nn || tag != TAG_SEQUENCE)) + err = gpg_error (GPG_ERR_INV_OBJ); + if (err) + { + log_error ("error parsing CDF record: %s - skipped\n", + gpg_strerror (err)); + continue; + } + pp += objlen; + nn -= objlen; + + /* Skip the commonCertificateAttributes. */ + err = parse_ber_header (&pp, &nn, &class, &tag, &constructed, + &ndef, &objlen, &hdrlen); + if (!err && (objlen > nn || tag != TAG_SEQUENCE)) + err = gpg_error (GPG_ERR_INV_OBJ); + if (err) + { + log_error ("error parsing CDF record: %s - skipped\n", + gpg_strerror (err)); + continue; + } + pp += objlen; + nn -= objlen; + + /* FIXME: Check that this is a reference to a certificate. */ + + + } + + + leave: + xfree (buffer); + return err; +} + +/* Read and parse Authentication Object Directory Files. */ +static gpg_error_t +read_ef_aodf (app_t app) +{ + +} + + +/* 6037 (dataobjects) + +30 1E 30 0B 0C 06 45 46 2E 47 44 4F 04 01 0A 30 0.0...EF.GDO...0 +02 0C 00 A1 0B 30 09 04 04 3F 00 2F 02 80 01 0E .....0...?./.... +30 30 30 18 0C 0F 64 69 73 70 6C 61 79 20 6D 65 000...display me +73 73 61 67 65 03 02 06 C0 04 01 0A 30 05 0C 03 ssage.......0... +42 53 53 A1 0D 30 0B 04 06 3F 00 40 16 D0 00 80 BSS..0...?.@.... +01 20 30 2B 30 0C 0C 03 53 53 4F 03 02 06 C0 04 . 0+0...SSO..... +01 0A 30 0B 0C 09 53 61 66 65 47 75 61 72 64 A1 ..0...SafeGuard. +0E 30 0C 04 06 3F 00 0F FF 30 02 80 02 03 00 30 .0...?...0.....0 +30 30 11 0C 08 53 47 41 53 64 61 74 61 03 02 06 00...SGASdata... +C0 04 01 0A 30 0B 0C 09 53 61 66 65 47 75 61 72 ....0...SafeGuar +64 A1 0E 30 0C 04 06 3F 00 0F FF 40 01 80 02 00 d..0...?...@.... +80 30 30 30 11 0C 08 55 73 65 72 64 61 74 61 03 .000...Userdata. +02 06 40 04 01 0A 30 0B 0C 09 53 61 66 65 47 75 ..@...0...SafeGu +61 72 64 A1 0E 30 0C 04 06 3F 00 0F FF 30 01 80 ard..0...?...0.. +02 01 00 30 2C 30 13 0C 0A 62 61 73 69 63 20 64 ...0,0...basic d +61 74 61 03 02 06 C0 04 01 0A 30 05 0C 03 49 44 ata.......0...ID +44 A1 0E 30 0C 04 06 3F 00 40 17 D0 01 80 02 02 D..0...?.@...... +00 30 2F 30 16 0C 0D 65 78 74 65 6E 64 65 64 20 .0/0...extended +64 61 74 61 03 02 06 C0 04 01 0A 30 05 0C 03 49 data.......0...I +44 44 A1 0E 30 0C 04 06 3F 00 40 17 D0 02 80 02 DD..0...?.@..... +08 00 30 34 30 1B 0C 12 73 70 65 63 69 61 6C 20 ..040...special +70 72 69 76 69 6C 65 67 65 73 03 02 06 C0 04 01 privileges...... +0A 30 05 0C 03 49 44 44 A1 0E 30 0C 04 06 3F 00 .0...IDD..0...?. +40 17 D0 03 80 02 04 00 @....... + + 0 30: SEQUENCE { + 2 11: SEQUENCE { + 4 6: UTF8String 'EF.GDO' + 12 1: OCTET STRING 0A + : } + 15 2: SEQUENCE { + 17 0: UTF8String + : Error: Object has zero length. + : } + 19 11: [1] { + 21 9: SEQUENCE { + 23 4: OCTET STRING 3F 00 2F 02 + 29 1: [0] 0E + : } + : } + : } + + + +6038 (authobjects) + +30 2A 30 0B 0C 05 62 61 73 69 63 03 02 00 C0 30 0*0...basic....0 +03 04 01 0A A1 16 30 14 03 03 00 0C 10 0A 01 01 ......0......... +02 01 06 02 01 06 02 01 08 80 01 01 30 51 30 19 ............0Q0. +0C 13 73 70 65 63 69 66 69 63 20 50 49 4E 20 66 ..specific PIN f +6F 72 20 44 53 03 02 00 C0 30 03 04 01 07 A1 2F or DS....0...../ +30 2D 03 03 00 4C 10 0A 01 01 02 01 06 02 01 06 0-...L.......... +02 01 08 80 01 02 18 0F 32 30 30 32 30 34 31 39 ........20020419 +31 32 31 33 34 31 5A 30 06 04 04 3F 00 40 16 121341Z0...?.@. + + 0 42: SEQUENCE { + 2 11: SEQUENCE { + 4 5: UTF8String 'basic' + 11 2: BIT STRING + : '00000011'B + : Error: Spurious zero bits in bitstring. + : } + 15 3: SEQUENCE { + 17 1: OCTET STRING 0A + : } + 20 22: [1] { + 22 20: SEQUENCE { + 24 3: BIT STRING + : '0000100000110000'B + : Error: Spurious zero bits in bitstring. + 29 1: ENUMERATED 1 + 32 1: INTEGER 6 + 35 1: INTEGER 6 + 38 1: INTEGER 8 + 41 1: [0] 01 + : } + : } + : } + + + +*/ + + +/* Read and parse the EF(TokenInfo). + +TokenInfo ::= SEQUENCE { + version INTEGER {v1(0)} (v1,...), + serialNumber OCTET STRING, + manufacturerID Label OPTIONAL, + label [0] Label OPTIONAL, + tokenflags TokenFlags, + seInfo SEQUENCE OF SecurityEnvironmentInfo OPTIONAL, + recordInfo [1] RecordInfo OPTIONAL, + supportedAlgorithms [2] SEQUENCE OF AlgorithmInfo OPTIONAL, + ..., + issuerId [3] Label OPTIONAL, + holderId [4] Label OPTIONAL, + lastUpdate [5] LastUpdate OPTIONAL, + preferredLanguage PrintableString OPTIONAL -- In accordance with + -- IETF RFC 1766 +} (CONSTRAINED BY { -- Each AlgorithmInfo.reference value must be unique --}) + +TokenFlags ::= BIT STRING { + readonly (0), + loginRequired (1), + prnGeneration (2), + eidCompliant (3) +} + + + 5032: + +30 31 02 01 00 04 04 05 45 36 9F 0C 0C 44 2D 54 01......E6...D-T +72 75 73 74 20 47 6D 62 48 80 14 4F 66 66 69 63 rust GmbH..Offic +65 20 69 64 65 6E 74 69 74 79 20 63 61 72 64 03 e identity card. +02 00 40 20 63 61 72 64 03 02 00 40 00 00 00 00 ..@ card...@.... +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ + + 0 49: SEQUENCE { + 2 1: INTEGER 0 + 5 4: OCTET STRING 05 45 36 9F + 11 12: UTF8String 'D-Trust GmbH' + 25 20: [0] 'Office identity card' + 47 2: BIT STRING + : '00000010'B (bit 1) + : Error: Spurious zero bits in bitstring. + : } + + + + + */ +static gpg_error_t +read_ef_tokeninfo (app_t app) +{ + unsigned short efid = 0x5032; + +} + + +/* Get all the basic information from the pkcs#15 card, check the + structure and init our context. This is used once at application + initialization. */ +static gpg_error_t +read_p15_info (app_t app) +{ + gpg_error_t err; + + err = read_ed_odf (app); + if (err) + return err; + +} + + +static int +do_learn_status (APP app, CTRL ctrl) +{ + gpg_error_t err; + char ct_buf[100], id_buf[100]; + int i; + + /* Output information about all useful objects. */ + for (i=0; objlist[i].fid; i++) + { + if (filelist[i].certtype) + { + size_t len; + + len = app_help_read_length_of_cert (app->slot, + filelist[i].fid, NULL); + if (len) + { + /* FIXME: We should store the length in the application's + context so that a following readcert does only need to + read that many bytes. */ + sprintf (ct_buf, "%d", filelist[i].certtype); + sprintf (id_buf, "P15-DF01.%04X", filelist[i].fid); + send_status_info (ctrl, "CERTINFO", + ct_buf, strlen (ct_buf), + id_buf, strlen (id_buf), + NULL, (size_t)0); + } + } + else if (filelist[i].iskeypair) + { + char gripstr[40+1]; + + err = keygripstr_from_pk_file (app->slot, filelist[i].fid, gripstr); + if (err) + log_error ("can't get keygrip from FID 0x%04X: %s\n", + filelist[i].fid, gpg_strerror (err)); + else + { + sprintf (id_buf, "P15-DF01.%04X", filelist[i].fid); + send_status_info (ctrl, "KEYPAIRINFO", + gripstr, 40, + id_buf, strlen (id_buf), + NULL, (size_t)0); + } + } + } + + return 0; +} + + + + +/* Release all resources. */ +static void +do_deinit (app_t app) +{ + if (app && app->app_local) + { + xfree (app->app_local); + app->app_local = NULL; + } +} + + +/* Select the PKCS#15 application on the card in SLOT. */ +int +app_select_p15 (APP app) +{ + static char const aid[] = { 0xA0, 0, 0, 0, 0x63, + 0x50, 0x4B, 0x43, 0x53, 0x2D, 0x31, 0x35 }; + int slot = app->slot; + int rc; + + rc = iso7816_select_application (slot, aid, sizeof aid); + if (!rc) + { + app->apptype = "P15"; + + app->app_local = xtrycalloc (1, sizeof *app->app_local); + if (!app->app_local) + { + rc = gpg_error_from_errno (errno); + goto leave; + } + + /* Read basic information and check whether this is a real + card. */ + rc = read_p15_info (app); + + /* Special serial number munging. We need to do one case here + because we need to access the EF(TokenInfo). */ + if (app->serialnolen == 12 + && !memcmp (app->serial, "\xD2\x76\0\0\0\0\0\0\0\0\0\0", 12)) + { + /* This is a German card with a silly serial number. Try to get + the serial number from the EF(TokenInfo). We indicate such a + serial number by the using the prefix: "FF0100". */ + const char *efser = card->p15card->serial_number; + char *p; + + if (!efser) + efser = ""; + + xfree (*serial); + *serial = NULL; + p = xtrymalloc (strlen (efser) + 7); + if (!p) + rc = gpg_error (gpg_err_code_from_errno (errno)); + else + { + strcpy (p, "FF0100"); + strcpy (p+6, efser); + *serial = p; + } + } + else + rc = app_munge_serialno (app); + + app->fnc.deinit = do_deinit; + app->fnc.learn_status = do_learn_status; + app->fnc.readcert = do_readcert; + app->fnc.getattr = NULL; + app->fnc.setattr = NULL; + app->fnc.genkey = NULL; + app->fnc.sign = do_sign; + app->fnc.auth = NULL; + app->fnc.decipher = do_decipher; + app->fnc.change_pin = NULL; + app->fnc.check_pin = NULL; + + leave: + if (rc) + { + xfree (app->app_local); + app->app_local = NULL; + } + + } + + return rc; +} + + Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.74 gnupg/sm/ChangeLog:1.101.2.75 --- gnupg/sm/ChangeLog:1.101.2.74 Tue Nov 23 18:09:51 2004 +++ gnupg/sm/ChangeLog Thu Dec 2 08:48:08 2004 @@ -1,3 +1,10 @@ +2004-11-29 Werner Koch + + * gpgsm.c (set_debug): Changed to use a globals DEBUG_LEVEL and + DEBUG_VALUE. + (main): Made DEBUG_LEVEL global and introduced DEBUG_VALUE. This + now allows to add debug flags on top of a debug-level setting. + 2004-11-23 Werner Koch * gpgsm.c: New option --prefer-system-dirmngr. Index: gnupg/sm/gpgsm.c diff -u gnupg/sm/gpgsm.c:1.67.2.31 gnupg/sm/gpgsm.c:1.67.2.32 --- gnupg/sm/gpgsm.c:1.67.2.31 Tue Nov 23 18:09:51 2004 +++ gnupg/sm/gpgsm.c Thu Dec 2 08:48:08 2004 @@ -438,6 +438,10 @@ /* It is possible that we are currentlu running under setuid permissions */ static int maybe_setuid = 1; +/* Helper to implement --debug-level and --debug*/ +static const char *debug_level; +static unsigned int debug_value; + /* Option --enable-special-filenames */ static int allow_special_filenames; @@ -580,45 +584,44 @@ } -/* Setup the debugging. With a LEVEL of NULL only the active debug - flags are propagated to the subsystems. With LEVEL set, a specific - set of debug flags is set; thus overriding all flags already - set. */ +/* Setup the debugging. With a DEBUG_LEVEL of NULL only the active + debug flags are propagated to the subsystems. With DEBUG_LEVEL + set, a specific set of debug flags is set; and individual debugging + flags will be added on top. */ static void -set_debug (const char *level) +set_debug (void) { - if (!level) + if (!debug_level) ; - else if (!strcmp (level, "none")) + else if (!strcmp (debug_level, "none")) opt.debug = 0; - else if (!strcmp (level, "basic")) + else if (!strcmp (debug_level, "basic")) opt.debug = DBG_ASSUAN_VALUE; - else if (!strcmp (level, "advanced")) + else if (!strcmp (debug_level, "advanced")) opt.debug = DBG_ASSUAN_VALUE|DBG_X509_VALUE; - else if (!strcmp (level, "expert")) + else if (!strcmp (debug_level, "expert")) opt.debug = (DBG_ASSUAN_VALUE|DBG_X509_VALUE |DBG_CACHE_VALUE|DBG_CRYPTO_VALUE); - else if (!strcmp (level, "guru")) + else if (!strcmp (debug_level, "guru")) opt.debug = ~0; else { - log_error (_("invalid debug-level `%s' given\n"), level); + log_error (_("invalid debug-level `%s' given\n"), debug_level); gpgsm_exit(2); } + opt.debug |= debug_value; if (opt.debug && !opt.verbose) - { - opt.verbose = 1; - gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose); - } - if (opt.debug && opt.quiet) + opt.verbose = 1; + if (opt.debug) opt.quiet = 0; if (opt.debug & DBG_MPI_VALUE) gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 2); if (opt.debug & DBG_CRYPTO_VALUE ) gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1); + gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose); } @@ -695,7 +698,6 @@ int greeting = 0; int nogreeting = 0; int debug_wait = 0; - const char *debug_level = NULL; int use_random_seed = 1; int with_fpr = 0; char *def_digest_string = NULL; @@ -1010,8 +1012,8 @@ case oKeyring: append_to_strlist (&nrings, pargs.r.ret_str); break; - case oDebug: opt.debug |= pargs.r.ret_ulong; break; - case oDebugAll: opt.debug = ~0; break; + case oDebug: debug_value |= pargs.r.ret_ulong; break; + case oDebugAll: debug_value = ~0; break; case oDebugLevel: debug_level = pargs.r.ret_str; break; case oDebugWait: debug_wait = pargs.r.ret_int; break; case oDebugAllowCoreDump: @@ -1201,7 +1203,7 @@ gcry_control (GCRYCTL_RESUME_SECMEM_WARN); - set_debug (debug_level); + set_debug (); /* Although we alwasy use gpgsm_exit, we better install a regualr exit handler so that at least the secure memory gets wiped From cvs at cvs.gnupg.org Fri Dec 3 15:34:58 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 3 15:35:02 2004 Subject: dirmngr (12 files) Message-ID: Date: Friday, December 3, 2004 @ 15:42:36 Author: wk Path: /cvs/dirmngr/dirmngr Modified: ChangeLog configure.ac src/ChangeLog src/certcache.c src/certcache.h src/crlcache.c src/dirmngr-client.c src/dirmngr.c src/misc.c src/misc.h src/ocsp.c src/server.c * configure.ac (canonicalize_file_name): Check for it. * crlcache.c (crl_cache_load): Re-implement it. * dirmngr-client.c: New command --load-crl (do_loadcrl): New. * dirmngr.c (parse_rereadable_options, main): Make --allow-ocsp, --ocsp-responder, --ocsp-signer and --max-replies re-readable. * ocsp.c (check_signature): try to get the cert from the cache first. (ocsp_isvalid): Print the next and this update times on time conflict. * certcache.c (load_certs_from_dir): Print the fingerprint for trusted certificates. (get_cert_byhexfpr): New. * misc.c (get_fingerprint_hexstring_colon): New. ----------------------+ ChangeLog | 4 ++ configure.ac | 2 + src/ChangeLog | 20 +++++++++++ src/certcache.c | 51 +++++++++++++++++++++++++++++- src/certcache.h | 7 ++++ src/crlcache.c | 20 ++++++++--- src/dirmngr-client.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++--- src/dirmngr.c | 17 +++++----- src/misc.c | 35 ++++++++++++++++++++ src/misc.h | 3 + src/ocsp.c | 8 ++++ src/server.c | 2 - 12 files changed, 232 insertions(+), 19 deletions(-) Index: dirmngr/ChangeLog diff -u dirmngr/ChangeLog:1.78 dirmngr/ChangeLog:1.79 --- dirmngr/ChangeLog:1.78 Thu Nov 25 14:19:07 2004 +++ dirmngr/ChangeLog Fri Dec 3 15:42:36 2004 @@ -1,3 +1,7 @@ +2004-12-03 Werner Koch + + * configure.ac (canonicalize_file_name): Check for it. + 2004-11-25 Werner Koch * configure.ac: Reverted to require autoconf/make 2.57/1.7.6 as Index: dirmngr/configure.ac diff -u dirmngr/configure.ac:1.63 dirmngr/configure.ac:1.64 --- dirmngr/configure.ac:1.63 Thu Nov 25 14:19:07 2004 +++ dirmngr/configure.ac Fri Dec 3 15:42:36 2004 @@ -363,6 +363,8 @@ AC_MSG_ERROR([[Sorry, the current implemenation requires mmap.]]) fi +AC_CHECK_FUNCS([canonicalize_file_name]) + # Check for funopen AC_CHECK_FUNCS(funopen fopencookie) if test $ac_cv_func_funopen != yes; then Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.31 dirmngr/src/ChangeLog:1.32 --- dirmngr/src/ChangeLog:1.31 Wed Dec 1 17:11:14 2004 +++ dirmngr/src/ChangeLog Fri Dec 3 15:42:36 2004 @@ -1,3 +1,23 @@ +2004-12-03 Werner Koch + + * crlcache.c (crl_cache_load): Re-implement it. + + * dirmngr-client.c: New command --load-crl + (do_loadcrl): New. + + * dirmngr.c (parse_rereadable_options, main): Make --allow-ocsp, + --ocsp-responder, --ocsp-signer and --max-replies re-readable. + + * ocsp.c (check_signature): try to get the cert from the cache + first. + (ocsp_isvalid): Print the next and this update times on time + conflict. + + * certcache.c (load_certs_from_dir): Print the fingerprint for + trusted certificates. + (get_cert_byhexfpr): New. + * misc.c (get_fingerprint_hexstring_colon): New. + 2004-12-01 Werner Koch * Makefile.am (dirmngr_LDADD): Don't use LDAP_LIBS. Index: dirmngr/src/certcache.c diff -u dirmngr/src/certcache.c:1.7 dirmngr/src/certcache.c:1.8 --- dirmngr/src/certcache.c:1.7 Wed Nov 24 13:25:53 2004 +++ dirmngr/src/certcache.c Fri Dec 3 15:42:36 2004 @@ -353,7 +353,15 @@ if (gpg_err_code (err) == GPG_ERR_DUP_VALUE) log_info (_("certificate `%s' already cached\n"), fname); else if (!err) - log_info (_("certificate `%s' loaded\n"), fname); + { + log_info (_("certificate `%s' loaded\n"), fname); + if (are_trusted || opt.verbose) + { + p = get_fingerprint_hexstring_colon (cert); + log_info (_("SHA1 fingerprint = %s\n"), p); + xfree (p); + } + } else log_error (_("error loading certificate `%s': %s\n"), fname, gpg_strerror (err)); @@ -482,6 +490,47 @@ return NULL; } +/* Return a certificate object for the given fingerprint. STRING is + expected to be a SHA-1 fingerprint in standard hex notation with or + without colons. If no matching certificate is available in the + cache NULL is returned. The caller must release a returned + certificate. Note that although we are using reference counting + the caller should not just compare the pointers to check for + identical certificates. */ +ksba_cert_t +get_cert_byhexfpr (const char *string) +{ + unsigned char fpr[20]; + const char *s; + int i; + + if (strchr (string, ':')) + { + for (s=string,i=0; i < 20 && hexdigitp (s) && hexdigitp(s+1);) + { + if (s[2] && s[2] != ':') + break; /* Invalid string. */ + fpr[i++] = xtoi_2 (s); + s += 2; + if (i!= 20 && *s == ':') + s++; + } + } + else + { + for (s=string,i=0; i < 20 && hexdigitp (s) && hexdigitp(s+1); s+=2 ) + fpr[i++] = xtoi_2 (s); + } + if (i!=20 || *s) + { + log_error (_("invalid SHA1 fingerprint string `%s'\n"), string); + return NULL; + } + + return get_cert_byfpr (fpr); +} + + /* Return the certificate matching ISSUER_DN and SERIALNO. */ ksba_cert_t Index: dirmngr/src/certcache.h diff -u dirmngr/src/certcache.h:1.4 dirmngr/src/certcache.h:1.5 --- dirmngr/src/certcache.h:1.4 Mon Nov 22 22:30:50 2004 +++ dirmngr/src/certcache.h Fri Dec 3 15:42:36 2004 @@ -49,6 +49,13 @@ must release a returned certificate. */ ksba_cert_t get_cert_byfpr (const unsigned char *fpr); +/* Return a certificate object for the given fingerprint. STRING is + expected to be a SHA-1 fingerprint in standard hex notation with or + without colons. If no matching certificate is available in the + cache NULL is returned. The caller must release a returned + certificate. */ +ksba_cert_t get_cert_byhexfpr (const char *string); + /* Return the certificate matching ISSUER_DN. SEQ should initially be set to 0 and bumped up to get the next issuer with that DN. */ Index: dirmngr/src/crlcache.c diff -u dirmngr/src/crlcache.c:1.50 dirmngr/src/crlcache.c:1.51 --- dirmngr/src/crlcache.c:1.50 Wed Nov 24 13:25:53 2004 +++ dirmngr/src/crlcache.c Fri Dec 3 15:42:36 2004 @@ -2127,13 +2127,13 @@ } -/* Load the CRL contain the the file named FILENAME into our cache - CACHE */ +/* Load the CRL containing the file named FILENAME into our CRL cache. */ gpg_error_t crl_cache_load (ctrl_t ctrl, const char *filename) { gpg_error_t err; - FILE* fp; + FILE *fp; + ksba_reader_t reader; fp = fopen (filename, "r"); if (!fp) @@ -2143,8 +2143,18 @@ return err; } - err = gpg_error (GPG_ERR_NOT_IMPLEMENTED); - /*crl_cache_insert (ctrl, filename, fo);*/ + err = ksba_reader_new (&reader); + if (!err) + err = ksba_reader_set_file (reader, fp); + if (err) + { + log_error (_("error initializing reader object: %s\n"), + gpg_strerror (err)); + ksba_reader_release (reader); + return err; + } + err = crl_cache_insert (ctrl, filename, reader); + ksba_reader_release (reader); fclose (fp); return err; } Index: dirmngr/src/dirmngr-client.c diff -u dirmngr/src/dirmngr-client.c:1.5 dirmngr/src/dirmngr-client.c:1.6 --- dirmngr/src/dirmngr-client.c:1.5 Wed Nov 24 13:25:53 2004 +++ dirmngr/src/dirmngr-client.c Fri Dec 3 15:42:36 2004 @@ -55,7 +55,7 @@ oCacheCert, oValidate, oLookup, - oDummy + oLoadCRL }; @@ -68,6 +68,7 @@ { oCacheCert,"cache-cert",0, N_("add a certificate to the cache")}, { oValidate, "validate", 0, N_("validate a certificate")}, { oLookup, "lookup", 0, N_("lookup a certificate")}, + { oLoadCRL, "load-crl", 0, N_("load a CRL into the dirmngr")}, {0} }; @@ -105,6 +106,7 @@ const unsigned char *cert, size_t certlen); static gpg_error_t do_validate (assuan_context_t ctx, const unsigned char *cert, size_t certlen); +static gpg_error_t do_loadcrl (assuan_context_t ctx, const char *filename); static gpg_error_t do_lookup (assuan_context_t ctx, const char *pattern); @@ -170,6 +172,7 @@ int cmd_cache_cert = 0; int cmd_validate = 0; int cmd_lookup = 0; + int cmd_loadcrl = 0; set_strusage (my_strusage); log_set_prefix ("dirmngr-client", @@ -198,6 +201,7 @@ case oCacheCert: cmd_cache_cert = 1; break; case oValidate: cmd_validate = 1; break; case oLookup: cmd_lookup = 1; break; + case oLoadCRL: cmd_loadcrl = 1; break; default : pargs.err = 2; break; } @@ -207,7 +211,7 @@ if (cmd_ping) err = 0; - else if (cmd_lookup) + else if (cmd_lookup || cmd_loadcrl) { if (!argc) usage (1); @@ -263,6 +267,22 @@ } err = last_err; } + else if (cmd_loadcrl) + { + int last_err = 0; + + for (; argc; argc--, argv++) + { + err = do_loadcrl (ctx, *argv); + if (err) + { + log_error (_("loading CRL `%s' failed: %s\n"), + *argv, gpg_strerror (err)); + last_err = err; + } + } + err = last_err; + } else if (cmd_cache_cert) { err = do_cache (ctx, certbuf, certbuflen); @@ -287,7 +307,7 @@ log_info (_("a dirmngr daemon is up and running\n")); return 0; } - else if (cmd_lookup) + else if (cmd_lookup||cmd_loadcrl) return err? 1:0; else if (cmd_cache_cert) { @@ -468,7 +488,7 @@ } -/* Red a binary certificate from the file FNAME. If fname is NULL the +/* Read a binary certificate from the file FNAME. If fname is NULL the file is read from stdin. The certificate is returned in an alloced buffer whos address will be returned in RBUF and its length in RBUFLEN. */ @@ -613,6 +633,60 @@ return map_assuan_err (ae); } +/* Load a CRL into the dirmngr. */ +static gpg_error_t +do_loadcrl (assuan_context_t ctx, const char *filename) +{ + assuan_error_t ae; + const char *s; + char *fname, *line, *p; + +#ifdef HAVE_CANONICALIZE_FILE_NAME + fname = canonicalize_file_name (filename); + if (!fname) + { + log_error ("error canonicalizing `%s': %s\n", + filename, strerror (errno)); + return gpg_error (GPG_ERR_GENERAL); + } +#else + fname = xstrdup (filename); +#endif + if (*fname != '/') + { + log_error (_("absolute file name expected\n")); + return gpg_error (GPG_ERR_GENERAL); + } + + line = xmalloc (8+ strlen (fname) * 3 + 1); + p = stpcpy (line, "LOADCRL "); + for (s = fname; *s; s++) + { + if (*s < ' ' || *s == '+') + { + sprintf (p, "%%%02X", *s); + p += 3; + } + else if (*s == ' ') + *p++ = '+'; + else + *p++ = *s; + } + *p = 0; + + ae = assuan_transact (ctx, line, NULL, NULL, + NULL, NULL, + status_cb, NULL); + if (opt.verbose > 1) + log_info ("response of dirmngr: %s\n", ae? assuan_strerror (ae): "okay"); + xfree (line); + xfree (fname); + return map_assuan_err (ae); +} + + +/* Do a LDAP lookup using PATTERN and print the result in a base-64 + encoded format. */ static gpg_error_t do_lookup (assuan_context_t ctx, const char *pattern) { Index: dirmngr/src/dirmngr.c diff -u dirmngr/src/dirmngr.c:1.49 dirmngr/src/dirmngr.c:1.50 --- dirmngr/src/dirmngr.c:1.49 Wed Dec 1 17:11:14 2004 +++ dirmngr/src/dirmngr.c Fri Dec 3 15:42:36 2004 @@ -384,6 +384,10 @@ opt.ignore_http_dp = 0; opt.ignore_ldap_dp = 0; opt.ignore_ocsp_service_url = 0; + opt.allow_ocsp = 0; + opt.ocsp_responder = NULL; + opt.ocsp_signer = NULL; + opt.max_replies = DEFAULT_MAX_REPLIES; return 1; } @@ -424,6 +428,12 @@ case oIgnoreLDAPDP: opt.ignore_ldap_dp = 1; break; case oIgnoreOCSPSvcUrl: opt.ignore_ocsp_service_url = 1; break; + case oAllowOCSP: opt.allow_ocsp = 1; break; + case oOCSPResponder: opt.ocsp_responder = pargs->r.ret_str; break; + case oOCSPSigner: opt.ocsp_signer = pargs->r.ret_str; break; + + case oMaxReplies: opt.max_replies = pargs->r.ret_int; break; + default: return 0; /* Not handled. */ } @@ -522,8 +532,6 @@ opt.ldaptimeout.tv_sec = DEFAULT_LDAP_TIMEOUT; opt.ldaptimeout.tv_usec = 0; - /* Default max replies */ - opt.max_replies = DEFAULT_MAX_REPLIES; /* Other defaults. */ socket_name = DEFAULT_SOCKET_NAME; @@ -650,11 +658,6 @@ opt.ldaptimeout.tv_sec = pargs.r.ret_int; opt.ldaptimeout.tv_usec = 0; break; - case oMaxReplies: opt.max_replies = pargs.r.ret_int; break; - - case oAllowOCSP: opt.allow_ocsp = 1; break; - case oOCSPResponder: opt.ocsp_responder = pargs.r.ret_str; break; - case oOCSPSigner: opt.ocsp_signer = pargs.r.ret_str; break; case oFakedSystemTime: set_time ( (time_t)pargs.r.ret_ulong, 0); Index: dirmngr/src/misc.c diff -u dirmngr/src/misc.c:1.9 dirmngr/src/misc.c:1.10 --- dirmngr/src/misc.c:1.9 Tue Nov 23 14:20:44 2004 +++ dirmngr/src/misc.c Fri Dec 3 15:42:36 2004 @@ -470,6 +470,41 @@ return buf; } +/* Return an allocated buffer with the formatted fingerprint as one + large hexnumber. This version inserts the usual colons. */ +char * +get_fingerprint_hexstring_colon (ksba_cert_t cert) +{ + unsigned char digest[20]; + gcry_md_hd_t md; + int rc; + char *buf; + int i; + + rc = gcry_md_open (&md, GCRY_MD_SHA1, 0); + if (rc) + log_fatal (_("gcry_md_open failed: %s\n"), gpg_strerror (rc)); + + rc = ksba_cert_hash (cert, 0, HASH_FNC, md); + if (rc) + { + log_error (_("oops: ksba_cert_hash failed: %s\n"), gpg_strerror (rc)); + memset (digest, 0xff, 20); /* Use a dummy value. */ + } + else + { + gcry_md_final (md); + memcpy (digest, gcry_md_read (md, GCRY_MD_SHA1), 20); + } + gcry_md_close (md); + buf = xmalloc (61); + *buf = 0; + for (i=0; i < 20; i++ ) + sprintf (buf+strlen(buf), "%02X:", digest[i]); + buf[strlen(buf)-1] = 0; /* Remove railing colon. */ + return buf; +} + /* Dump the serial number SERIALNO to the log stream. */ void Index: dirmngr/src/misc.h diff -u dirmngr/src/misc.h:1.9 dirmngr/src/misc.h:1.10 --- dirmngr/src/misc.h:1.9 Tue Nov 23 14:20:44 2004 +++ dirmngr/src/misc.h Fri Dec 3 15:42:36 2004 @@ -84,6 +84,9 @@ /* Return an allocated hex-string with the SHA-1 fingerprint of CERT. */ char *get_fingerprint_hexstring (ksba_cert_t cert); +/* Return an allocated hex-string with the SHA-1 fingerprint of + CERT. This version inserts the usual colons. */ +char *get_fingerprint_hexstring_colon (ksba_cert_t cert); /* Dump the serial number SERIALNO to the log stream. */ Index: dirmngr/src/ocsp.c diff -u dirmngr/src/ocsp.c:1.12 dirmngr/src/ocsp.c:1.13 --- dirmngr/src/ocsp.c:1.12 Wed Nov 24 15:44:01 2004 +++ dirmngr/src/ocsp.c Fri Dec 3 15:42:36 2004 @@ -348,7 +348,9 @@ { /* We should use the default OCSP reponder's certificate. Get it from the fingerprint. */ - cert = get_cert_local (ctrl, signer_fpr); + cert = get_cert_byhexfpr (signer_fpr); + if (!cert) + cert = get_cert_local (ctrl, signer_fpr); if (cert) { err = check_signature_core (ctrl, cert, s_sig, s_hash); @@ -400,6 +402,7 @@ gcry_sexp_t s_sig = NULL; ksba_isotime_t current_time; ksba_isotime_t this_update, next_update, revocation_time, produced_at; + ksba_isotime_t tmp_time; ksba_status_t status; ksba_crl_reason_t reason; char *url_buffer = NULL; @@ -589,16 +592,19 @@ if (*next_update && strcmp (next_update, current_time) < 0 ) { log_error (_("OCSP responder returned an too old status\n")); + log_info ("now: %s next_update: %s\n", current_time, next_update); if (!err) err = gpg_error (GPG_ERR_TIME_CONFLICT); } /* Check that THIS_UPDATE is not too far back in the past. We currently use 3 hours (the extra 10 minutes are for the time adjust above). */ + copy_time (tmp_time, this_update); add_isotime (this_update, 3 * 60 * 60 + 10 * 60); if (!*this_update || strcmp (this_update, current_time) < 0 ) { log_error (_("OCSP responder returned a non-current status\n")); + log_info ("now: %s this_update: %s\n", current_time, tmp_time); if (!err) err = gpg_error (GPG_ERR_TIME_CONFLICT); } Index: dirmngr/src/server.c diff -u dirmngr/src/server.c:1.47 dirmngr/src/server.c:1.48 --- dirmngr/src/server.c:1.47 Tue Nov 23 14:20:44 2004 +++ dirmngr/src/server.c Fri Dec 3 15:42:36 2004 @@ -696,7 +696,7 @@ that FILENAME should be given with an absolute path because Dirmngrs cwd is not known. This command is usually used by gpgsm using the invocation "gpgsm --call-dirmngr loadcrl ". A - direct onvocation of Dirmngr is not useful because gpgsm might need + direct invocation of Dirmngr is not useful because gpgsm might need to callback gpgsm to ask for the CA's certificate. */ From cvs at cvs.gnupg.org Fri Dec 3 18:37:28 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 3 18:37:31 2004 Subject: GNUPG-1-9-BRANCH gnupg (7 files) Message-ID: Date: Friday, December 3, 2004 @ 18:44:57 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: build-w32.sh Modified: ChangeLog NEWS configure.ac po/de.po sm/ChangeLog sm/certchain.c Preparing 1.9.13 ----------------+ ChangeLog | 5 ++- NEWS | 6 +++ build-w32.sh | 10 ++++++ configure.ac | 2 - po/de.po | 86 ++++++++++++++++++++++++++----------------------------- sm/ChangeLog | 6 +++ sm/certchain.c | 21 ++++++++++--- 7 files changed, 84 insertions(+), 52 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.131.2.58 gnupg/ChangeLog:1.131.2.59 --- gnupg/ChangeLog:1.131.2.58 Thu Dec 2 08:48:09 2004 +++ gnupg/ChangeLog Fri Dec 3 18:44:57 2004 @@ -1,9 +1,12 @@ +2004-12-03 Werner Koch + + Released 1.9.13. + 2004-11-26 Werner Koch * configure.ac: Replace strsep. Replaced use of "target" by "host". - 2004-10-22 Werner Koch Released 1.9.12. Index: gnupg/NEWS diff -u gnupg/NEWS:1.165.2.57 gnupg/NEWS:1.165.2.58 --- gnupg/NEWS:1.165.2.57 Fri Oct 22 21:57:03 2004 +++ gnupg/NEWS Fri Dec 3 18:44:57 2004 @@ -1,6 +1,10 @@ -Noteworthy changes in version 1.9.13 +Noteworthy changes in version 1.9.13 (2004-12-03) ------------------------------------------------- + * [gpgsm] New option --prefer-system-dirmngr. + + * Minor cleanups and debbuging aids. + Noteworthy changes in version 1.9.12 (2004-10-22) ------------------------------------------------- Index: gnupg/build-w32.sh diff -u /dev/null gnupg/build-w32.sh:1.1.2.1 --- /dev/null Fri Dec 3 18:44:58 2004 +++ gnupg/build-w32.sh Fri Dec 3 18:44:57 2004 @@ -0,0 +1,10 @@ + ./configure --enable-maintainer-mode --prefix=/home/wk/w32root \ + --host=i586-mingw32msvc --build=`scripts/config.guess` \ + --with-gpg-error-prefix=/home/wk/w32root \ + --with-ksba-prefix=/home/wk/w32root \ + --with-libgcrypt-prefix=/home/wk/w32root \ + --with-libassuan-prefix=/home/wk/w32root \ + --with-zlib=/home/wk/w32root + + + Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.68 gnupg/configure.ac:1.36.2.69 --- gnupg/configure.ac:1.36.2.68 Thu Dec 2 08:48:09 2004 +++ gnupg/configure.ac Fri Dec 3 18:44:57 2004 @@ -24,7 +24,7 @@ # Version number: Remember to change it immediately *after* a release. # Add a "-cvs" prefix for non-released code. -AC_INIT(gnupg, 1.9.13-cvs, gnupg-devel@gnupg.org) +AC_INIT(gnupg, 1.9.13, gnupg-devel@gnupg.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. Index: gnupg/po/de.po diff -u gnupg/po/de.po:1.84.2.14 gnupg/po/de.po:1.84.2.15 --- gnupg/po/de.po:1.84.2.14 Wed Nov 24 15:50:19 2004 +++ gnupg/po/de.po Fri Dec 3 18:44:55 2004 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: gnupg2 1.9.10\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-11-24 15:41+0100\n" +"POT-Creation-Date: 2004-12-03 18:30+0100\n" "PO-Revision-Date: 2004-11-24 15:43+0100\n" "Last-Translator: Werner Koch \n" "Language-Team: de\n" @@ -100,12 +100,12 @@ msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren" #: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168 -#: sm/gpgsm.c:487 tools/gpgconf.c:85 +#: sm/gpgsm.c:491 tools/gpgconf.c:85 msgid "Please report bugs to <" msgstr "Fehlerberichte bitte an <" #: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168 -#: sm/gpgsm.c:487 tools/gpgconf.c:85 +#: sm/gpgsm.c:491 tools/gpgconf.c:85 msgid ">.\n" msgstr ">.\n" @@ -121,30 +121,30 @@ "Syntax: gpg-agent [Optionen] [Kommando [Argumente]]\n" "Verwaltung von geheimen Schlüssel für GnuPG\n" -#: agent/gpg-agent.c:271 scd/scdaemon.c:242 sm/gpgsm.c:605 +#: agent/gpg-agent.c:271 scd/scdaemon.c:242 sm/gpgsm.c:609 #, c-format msgid "invalid debug-level `%s' given\n" msgstr "ungültige Debugebene `%s' angegeben\n" #: agent/gpg-agent.c:448 agent/protect-tool.c:1050 kbx/kbxutil.c:431 -#: scd/scdaemon.c:357 sm/gpgsm.c:728 +#: scd/scdaemon.c:357 sm/gpgsm.c:730 #, c-format msgid "libgcrypt is too old (need %s, have %s)\n" msgstr "" "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n" -#: agent/gpg-agent.c:521 scd/scdaemon.c:437 sm/gpgsm.c:826 +#: agent/gpg-agent.c:521 scd/scdaemon.c:437 sm/gpgsm.c:828 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Notiz: Voreingestellte Konfigurationsdatei `%s' fehlt\n" #: agent/gpg-agent.c:526 agent/gpg-agent.c:1000 scd/scdaemon.c:442 -#: sm/gpgsm.c:830 +#: sm/gpgsm.c:832 #, c-format msgid "option file `%s': %s\n" msgstr "Konfigurationsdatei `%s': %s\n" -#: agent/gpg-agent.c:534 scd/scdaemon.c:450 sm/gpgsm.c:837 +#: agent/gpg-agent.c:534 scd/scdaemon.c:450 sm/gpgsm.c:839 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus `%s' gelesen\n" @@ -163,11 +163,11 @@ msgid "no gpg-agent running in this session\n" msgstr "Der gpg-agent läuft nicht für diese Session\n" -#: agent/gpg-agent.c:1257 common/simple-pwquery.c:286 sm/call-agent.c:128 +#: agent/gpg-agent.c:1257 common/simple-pwquery.c:293 sm/call-agent.c:128 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "Die Variable GPG_AGENT_INFO ist fehlerhaft\n" -#: agent/gpg-agent.c:1269 common/simple-pwquery.c:298 sm/call-agent.c:140 +#: agent/gpg-agent.c:1269 common/simple-pwquery.c:305 sm/call-agent.c:140 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "Das gpg-agent Protocol %d wird nicht unterstützt\n" @@ -302,32 +302,32 @@ msgid "Warning: unsafe permissions on %s \"%s\"\n" msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n" -#: common/simple-pwquery.c:272 +#: common/simple-pwquery.c:279 msgid "gpg-agent is not available in this session\n" msgstr "Der gpg-agent ist nicht verfügbar\n" -#: common/simple-pwquery.c:320 +#: common/simple-pwquery.c:327 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu `%s' kann nicht aufgebaut werden: %s\n" -#: common/simple-pwquery.c:331 +#: common/simple-pwquery.c:338 msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit gpg-agent\n" -#: common/simple-pwquery.c:341 +#: common/simple-pwquery.c:348 msgid "problem setting the gpg-agent options\n" msgstr "Beim setzen der gpg-agent Optionen ist ein problem aufgetreten\n" -#: common/simple-pwquery.c:479 +#: common/simple-pwquery.c:487 msgid "canceled by user\n" msgstr "Vom Benutzer abgebrochen\n" -#: common/simple-pwquery.c:486 +#: common/simple-pwquery.c:494 msgid "problem with the agent\n" msgstr "Problem mit dem Agenten\n" -#: jnlib/logging.c:625 +#: jnlib/logging.c:627 #, c-format msgid "you found a bug ... (%s:%d)\n" msgstr "Sie haben einen Bug (Softwarefehler) gefunden ... (%s:%d)\n" @@ -651,7 +651,7 @@ msgid "number of issuers matching: %d\n" msgstr "Anzahl der übereinstimmenden Heruasgeber: %d\n" -#: sm/certchain.c:403 sm/certchain.c:562 sm/certchain.c:922 sm/decrypt.c:260 +#: sm/certchain.c:403 sm/certchain.c:562 sm/certchain.c:931 sm/decrypt.c:260 #: sm/encrypt.c:341 sm/sign.c:324 sm/verify.c:106 msgid "failed to allocated keyDB handle\n" msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n" @@ -699,43 +699,43 @@ msgid "selfsigned certificate has a BAD signature" msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur" -#: sm/certchain.c:675 +#: sm/certchain.c:679 msgid "root certificate is not marked trusted" msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert" -#: sm/certchain.c:686 +#: sm/certchain.c:690 #, c-format msgid "fingerprint=%s\n" msgstr "Fingerprint=%s\n" -#: sm/certchain.c:691 +#: sm/certchain.c:695 msgid "root certificate has now been marked as trusted\n" msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n" -#: sm/certchain.c:706 +#: sm/certchain.c:710 #, c-format msgid "checking the trust list failed: %s\n" msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n" -#: sm/certchain.c:732 sm/import.c:166 +#: sm/certchain.c:736 sm/import.c:166 msgid "certificate chain too long\n" msgstr "Der Zertifikatkette ist zu lang\n" -#: sm/certchain.c:744 +#: sm/certchain.c:748 msgid "issuer certificate not found" msgstr "Herausgeberzertifikat nicht gefunden" -#: sm/certchain.c:777 +#: sm/certchain.c:781 msgid "certificate has a BAD signature" msgstr "Das Zertifikat hat eine FALSCHE Signatur" -#: sm/certchain.c:800 +#: sm/certchain.c:809 msgid "found another possible matching CA certificate - trying again" msgstr "" "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche " "nochmal" -#: sm/certchain.c:823 +#: sm/certchain.c:832 #, c-format msgid "certificate chain longer than allowed by CA (%d)" msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)" @@ -1052,11 +1052,11 @@ " --list-keys [Namen] Schlüssel anzeigenn\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\\n\n" -#: sm/gpgsm.c:490 +#: sm/gpgsm.c:494 msgid "Usage: gpgsm [options] [files] (-h for help)" msgstr "Gebrauch: gpgsm [Optionen] [Dateien] (-h für Hilfe)" -#: sm/gpgsm.c:493 +#: sm/gpgsm.c:497 msgid "" "Syntax: gpgsm [options] [files]\n" "sign, check, encrypt or decrypt using the S/MIME protocol\n" @@ -1065,7 +1065,7 @@ "Gebrauch: gpgsm [Optionen] [Dateien]\n" "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n" -#: sm/gpgsm.c:500 +#: sm/gpgsm.c:504 msgid "" "\n" "Supported algorithms:\n" @@ -1073,50 +1073,50 @@ "\n" "Unterstützte Algorithmen:\n" -#: sm/gpgsm.c:576 +#: sm/gpgsm.c:580 msgid "usage: gpgsm [options] " msgstr "Gebrauch: gpgsm [Optionen] " -#: sm/gpgsm.c:642 +#: sm/gpgsm.c:645 msgid "conflicting commands\n" msgstr "Widersprechende Kommandos\n" -#: sm/gpgsm.c:658 +#: sm/gpgsm.c:661 #, c-format msgid "can't encrypt to `%s': %s\n" msgstr "Verschlüsseln für `%s' nicht möglich: %s\n" -#: sm/gpgsm.c:733 +#: sm/gpgsm.c:735 #, c-format msgid "libksba is too old (need %s, have %s)\n" msgstr "Die Bibliothek Libksba is nicht aktuell (benötige %s, habe %s)\n" -#: sm/gpgsm.c:1181 +#: sm/gpgsm.c:1183 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: sm/gpgsm.c:1193 +#: sm/gpgsm.c:1195 msgid "WARNING: running with faked system time: " msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: " -#: sm/gpgsm.c:1219 +#: sm/gpgsm.c:1221 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n" -#: sm/gpgsm.c:1227 +#: sm/gpgsm.c:1229 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: sm/gpgsm.c:1257 +#: sm/gpgsm.c:1259 #, c-format msgid "can't sign using `%s': %s\n" msgstr "Signieren mit `%s' nicht möglich: %s\n" -#: sm/gpgsm.c:1423 +#: sm/gpgsm.c:1425 msgid "this command has not yet been implemented\n" msgstr "Diee Kommando wurde noch nicht implementiert\n" -#: sm/gpgsm.c:1646 sm/gpgsm.c:1679 +#: sm/gpgsm.c:1648 sm/gpgsm.c:1681 #, c-format msgid "can't open `%s': %s\n" msgstr "Datei `%s' kann nicht geöffnet werden: %s\n" @@ -1385,10 +1385,6 @@ msgid "Configuration for OCSP" msgstr "Konfiguration zu OCSP" -#, fuzzy -#~ msgid "passphrase (CHV%d) is too short; minimum length is %d\n" -#~ msgstr "Die Passphrase (CHV%d) ist zu kurz; Mindestlänge ist %d\n" - #~ msgid "Usage: sc-investigate [options] (-h for help)\n" #~ msgstr "Gebrauch: sc-investigate [Optionen] (-h für Hilfe)\n" Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.75 gnupg/sm/ChangeLog:1.101.2.76 --- gnupg/sm/ChangeLog:1.101.2.75 Thu Dec 2 08:48:08 2004 +++ gnupg/sm/ChangeLog Fri Dec 3 18:44:54 2004 @@ -1,3 +1,9 @@ +2004-12-02 Werner Koch + + * certchain.c (gpgsm_basic_cert_check): Dump certs with bad + signature for debugging. + (gpgsm_validate_chain): Ditto. + 2004-11-29 Werner Koch * gpgsm.c (set_debug): Changed to use a globals DEBUG_LEVEL and Index: gnupg/sm/certchain.c diff -u gnupg/sm/certchain.c:1.32.2.19 gnupg/sm/certchain.c:1.32.2.20 --- gnupg/sm/certchain.c:1.32.2.19 Fri Oct 8 13:10:47 2004 +++ gnupg/sm/certchain.c Fri Dec 3 18:44:54 2004 @@ -292,7 +292,7 @@ keydb_search_reset (kh); /* In case of an error try the ephemeral DB. We can't do - that in find-netx mode because we can't keep the search + that in find-next mode because we can't keep the search state then. */ if (rc == -1 && !find_next) { @@ -311,7 +311,7 @@ signature because it is not the correct one. */ if (rc == -1) { - log_info ("issuer certificate (#"); + log_info ("%sissuer certificate (#", find_next?"next ":""); gpgsm_dump_serial (authidno); log_printf ("/"); gpgsm_dump_string (s); @@ -565,7 +565,7 @@ } if (DBG_X509 && !listmode) - gpgsm_dump_cert ("subject", cert); + gpgsm_dump_cert ("target", cert); subject_cert = cert; maxdepth = 50; @@ -659,6 +659,10 @@ { do_list (1, lm, fp, _("selfsigned certificate has a BAD signature")); + if (DBG_X509) + { + gpgsm_dump_cert ("self-signing cert", subject_cert); + } rc = gpg_error (depth? GPG_ERR_BAD_CERT_CHAIN : GPG_ERR_BAD_CERT); goto leave; @@ -775,10 +779,15 @@ if (rc) { do_list (0, lm, fp, _("certificate has a BAD signature")); + if (DBG_X509) + { + gpgsm_dump_cert ("signing issuer", issuer_cert); + gpgsm_dump_cert ("signed subject", subject_cert); + } if (gpg_err_code (rc) == GPG_ERR_BAD_SIGNATURE) { /* We now try to find other issuer certificates which - might have been used. This is rquired because some + might have been used. This is required because some CAs are reusing the issuer and subject DN for new root certificates. */ rc = find_up (kh, subject_cert, issuer, 1); @@ -940,6 +949,10 @@ { log_error ("selfsigned certificate has a BAD signature: %s\n", gpg_strerror (rc)); + if (DBG_X509) + { + gpgsm_dump_cert ("self-signing cert", cert); + } rc = gpg_error (GPG_ERR_BAD_CERT); goto leave; } From cvs at cvs.gnupg.org Fri Dec 3 19:30:43 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 3 19:30:46 2004 Subject: GNUPG-1-9-BRANCH gnupg/common (ChangeLog strsep.c) Message-ID: Date: Friday, December 3, 2004 @ 19:38:24 Author: wk Path: /cvs/gnupg/gnupg/common Tag: GNUPG-1-9-BRANCH Modified: ChangeLog strsep.c Fixed copyright comments. -----------+ ChangeLog | 4 ++++ strsep.c | 31 +++++++++++++++++-------------- 2 files changed, 21 insertions(+), 14 deletions(-) Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.30 gnupg/common/ChangeLog:1.30.2.31 --- gnupg/common/ChangeLog:1.30.2.30 Thu Dec 2 08:48:09 2004 +++ gnupg/common/ChangeLog Fri Dec 3 19:38:23 2004 @@ -1,3 +1,7 @@ +2004-12-03 Werner Koch + + * strsep.c: Fixed copyright comments. + 2004-11-26 Werner Koch * simple-gettext.c: New taken from gnupg 1.3.x Index: gnupg/common/strsep.c diff -u gnupg/common/strsep.c:1.1.2.1 gnupg/common/strsep.c:1.1.2.2 --- gnupg/common/strsep.c:1.1.2.1 Thu Dec 2 08:48:09 2004 +++ gnupg/common/strsep.c Fri Dec 3 19:38:23 2004 @@ -1,31 +1,34 @@ /* strsep.c - Replacement for strsep(). - * Copyright (C) 2002 Free Software Foundation, Inc. + * Copyright (C) 1992, 1993, 1996, 1997, 1998, 1999, + * 2004 Free Software Foundation, Inc. * - * This file is part of GnuPG. + * This file is part of the GNU C Library. * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * The GNU C Library 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. * - * GnuPG is distributed in the hope that it will be useful, + * The GNU C Library 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 General Public License for more details. + * 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 General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public + * License along with the GNU C Library; if not, write to the Free + * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. */ +/* Code taken from glibc-2.3.2/sysdeps/generic/strsep.c and slightly + modified for use with GnuPG. */ + #ifdef HAVE_CONFIG_H #include #endif #include #include -/* Code taken from glibc-2.2.1/sysdeps/generic/strsep.c */ -#warning need to get the correct copyright years from glibc char * strsep (char **stringp, const char *delim) { From cvs at cvs.gnupg.org Fri Dec 3 20:04:56 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Fri Dec 3 20:04:59 2004 Subject: gnupg/keyserver (ChangeLog Makefile.am) Message-ID: Date: Friday, December 3, 2004 @ 20:12:38 Author: dshaw Path: /cvs/gnupg/gnupg/keyserver Modified: ChangeLog Makefile.am * Makefile.am: The harmless "ignored error" on gpgkeys_ldap install on top of an existing install is bound to confuse people. Use ln -s -f to force the overwrite. -------------+ ChangeLog | 6 ++++++ Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.91 gnupg/keyserver/ChangeLog:1.92 --- gnupg/keyserver/ChangeLog:1.91 Thu Oct 28 23:53:51 2004 +++ gnupg/keyserver/ChangeLog Fri Dec 3 20:12:38 2004 @@ -1,3 +1,9 @@ +2004-12-03 David Shaw + + * Makefile.am: The harmless "ignored error" on gpgkeys_ldap + install on top of an existing install is bound to confuse people. + Use ln -s -f to force the overwrite. + 2004-10-28 David Shaw * gpgkeys_finger.c [_WIN32] (connect_server): Fix typo. Index: gnupg/keyserver/Makefile.am diff -u gnupg/keyserver/Makefile.am:1.19 gnupg/keyserver/Makefile.am:1.20 --- gnupg/keyserver/Makefile.am:1.19 Thu Oct 28 20:57:50 2004 +++ gnupg/keyserver/Makefile.am Fri Dec 3 20:12:38 2004 @@ -41,7 +41,7 @@ install-exec-hook: if GPGKEYS_LDAP - -(cd $(libexecdir) && $(LN_S) gpgkeys_ldap$(EXEEXT) gpgkeys_ldaps$(EXEEXT)) + (cd $(libexecdir) && $(LN_S) -f gpgkeys_ldap$(EXEEXT) gpgkeys_ldaps$(EXEEXT)) endif uninstall-hook: From cvs at cvs.gnupg.org Fri Dec 3 20:35:30 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 3 20:35:32 2004 Subject: GNUPG-1-9-BRANCH gnupg (NEWS configure.ac) Message-ID: Date: Friday, December 3, 2004 @ 20:43:11 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: NEWS configure.ac post release version number updates --------------+ NEWS | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) Index: gnupg/NEWS diff -u gnupg/NEWS:1.165.2.58 gnupg/NEWS:1.165.2.59 --- gnupg/NEWS:1.165.2.58 Fri Dec 3 18:44:57 2004 +++ gnupg/NEWS Fri Dec 3 20:43:11 2004 @@ -1,3 +1,7 @@ +Noteworthy changes in version 1.9.14 +------------------------------------------------- + + Noteworthy changes in version 1.9.13 (2004-12-03) ------------------------------------------------- Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.69 gnupg/configure.ac:1.36.2.70 --- gnupg/configure.ac:1.36.2.69 Fri Dec 3 18:44:57 2004 +++ gnupg/configure.ac Fri Dec 3 20:43:11 2004 @@ -24,7 +24,7 @@ # Version number: Remember to change it immediately *after* a release. # Add a "-cvs" prefix for non-released code. -AC_INIT(gnupg, 1.9.13, gnupg-devel@gnupg.org) +AC_INIT(gnupg, 1.9.14-cvs, gnupg-devel@gnupg.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. From cvs at cvs.gnupg.org Fri Dec 3 20:56:26 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Fri Dec 3 21:10:29 2004 Subject: STABLE-BRANCH-1-2 gnupg/util (ChangeLog http.c) Message-ID: Date: Friday, December 3, 2004 @ 21:04:08 Author: dshaw Path: /cvs/gnupg/gnupg/util Tag: STABLE-BRANCH-1-2 Modified: ChangeLog http.c * http.c (send_request): Include the port if non-80 in the Host: header. Noted by Jason Harris. -----------+ ChangeLog | 5 +++++ http.c | 35 +++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 14 deletions(-) Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.100.2.28 gnupg/util/ChangeLog:1.100.2.29 --- gnupg/util/ChangeLog:1.100.2.28 Mon Aug 23 17:22:46 2004 +++ gnupg/util/ChangeLog Fri Dec 3 21:04:08 2004 @@ -1,3 +1,8 @@ +2004-12-03 David Shaw + + * http.c (send_request): Include the port if non-80 in the Host: + header. Noted by Jason Harris. + 2004-08-23 Werner Koch * dotlock.c (destroy_dotlock): Remove the handle from the list of Index: gnupg/util/http.c diff -u gnupg/util/http.c:1.12.2.4 gnupg/util/http.c:1.12.2.5 --- gnupg/util/http.c:1.12.2.4 Thu Aug 19 22:28:01 2004 +++ gnupg/util/http.c Fri Dec 3 21:04:08 2004 @@ -501,21 +501,28 @@ return G10ERR_NETWORK; p = build_rel_path( hd->uri ); - request = m_alloc( strlen(server)*2 + strlen(p) + 50 ); - if( http_proxy ) { + request = m_alloc( strlen(server)*2 + strlen(p) + 65 ); + if( http_proxy ) + { sprintf( request, "%s http://%s:%hu%s%s HTTP/1.0\r\n", - hd->req_type == HTTP_REQ_GET ? "GET" : - hd->req_type == HTTP_REQ_HEAD? "HEAD": - hd->req_type == HTTP_REQ_POST? "POST": "OOPS", - server, port, *p == '/'? "":"/", p ); - } - else { - sprintf( request, "%s %s%s HTTP/1.0\r\nHost: %s\r\n", - hd->req_type == HTTP_REQ_GET ? "GET" : - hd->req_type == HTTP_REQ_HEAD? "HEAD": - hd->req_type == HTTP_REQ_POST? "POST": "OOPS", - *p == '/'? "":"/", p, server); - } + hd->req_type == HTTP_REQ_GET ? "GET" : + hd->req_type == HTTP_REQ_HEAD? "HEAD": + hd->req_type == HTTP_REQ_POST? "POST": "OOPS", + server, port, *p == '/'? "":"/", p ); + } + else + { + char portstr[15]; + + if(port!=80) + sprintf(portstr,":%u",port); + + sprintf( request, "%s %s%s HTTP/1.0\r\nHost: %s%s\r\n", + hd->req_type == HTTP_REQ_GET ? "GET" : + hd->req_type == HTTP_REQ_HEAD? "HEAD": + hd->req_type == HTTP_REQ_POST? "POST": "OOPS", + *p == '/'? "":"/", p, server, (port!=80)?portstr:""); + } m_free(p); rc = write_server( hd->sock, request, strlen(request) ); From cvs at cvs.gnupg.org Fri Dec 3 21:15:30 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Fri Dec 3 21:15:33 2004 Subject: gnupg/util (ChangeLog http.c) Message-ID: Date: Friday, December 3, 2004 @ 21:23:12 Author: dshaw Path: /cvs/gnupg/gnupg/util Modified: ChangeLog http.c * http.c (send_request): Include the port if non-80 in the Host: header. Noted by Jason Harris. -----------+ ChangeLog | 5 +++++ http.c | 20 ++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.167 gnupg/util/ChangeLog:1.168 --- gnupg/util/ChangeLog:1.167 Wed Nov 3 21:03:46 2004 +++ gnupg/util/ChangeLog Fri Dec 3 21:23:12 2004 @@ -1,3 +1,8 @@ +2004-12-03 David Shaw + + * http.c (send_request): Include the port if non-80 in the Host: + header. Noted by Jason Harris. + 2004-11-03 Timo Schulz * strgutil.c (w32_strerror): New. Index: gnupg/util/http.c diff -u gnupg/util/http.c:1.28 gnupg/util/http.c:1.29 --- gnupg/util/http.c:1.28 Mon Oct 18 17:51:43 2004 +++ gnupg/util/http.c Fri Dec 3 21:23:12 2004 @@ -553,7 +553,7 @@ p = build_rel_path( hd->uri ); - request=m_alloc(strlen(server)*2 + strlen(p) + (auth?strlen(auth):0) + 50); + request=m_alloc(strlen(server)*2 + strlen(p) + (auth?strlen(auth):0) + 65); if( proxy ) sprintf( request, "%s http://%s:%hu%s%s HTTP/1.0\r\n%s", hd->req_type == HTTP_REQ_GET ? "GET" : @@ -561,11 +561,19 @@ hd->req_type == HTTP_REQ_POST? "POST": "OOPS", server, port, *p == '/'? "":"/", p, auth?auth:"" ); else - sprintf( request, "%s %s%s HTTP/1.0\r\nHost: %s\r\n%s", - hd->req_type == HTTP_REQ_GET ? "GET" : - hd->req_type == HTTP_REQ_HEAD? "HEAD": - hd->req_type == HTTP_REQ_POST? "POST": "OOPS", - *p == '/'? "":"/", p, server, auth?auth:""); + { + char portstr[15]; + + if(port!=80) + sprintf(portstr,":%u",port); + + sprintf( request, "%s %s%s HTTP/1.0\r\nHost: %s%s\r\n%s", + hd->req_type == HTTP_REQ_GET ? "GET" : + hd->req_type == HTTP_REQ_HEAD? "HEAD": + hd->req_type == HTTP_REQ_POST? "POST": "OOPS", + *p == '/'? "":"/", p, server, (port!=80)?portstr:"", + auth?auth:""); + } m_free(p); From cvs at cvs.gnupg.org Sat Dec 4 19:31:10 2004 From: cvs at cvs.gnupg.org (cvs user mo) Date: Sat Dec 4 19:31:18 2004 Subject: libgcrypt/src (ChangeLog sexp.c) Message-ID: Date: Saturday, December 4, 2004 @ 19:31:10 Author: mo Path: /cvs/gnupg/libgcrypt/src Modified: ChangeLog sexp.c 2004-12-04 Moritz Schulte * sexp.c (suitable_encoding): Make sure that NUL bytes are correctly treated as a hint for binary encoding. Thanks to Nathan K for reporting this problem. -----------+ ChangeLog | 6 ++++++ sexp.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) From cvs at cvs.gnupg.org Sun Dec 5 16:28:59 2004 From: cvs at cvs.gnupg.org (cvs user mo) Date: Sun Dec 5 16:29:02 2004 Subject: GNUPG-1-9-BRANCH gnupg/agent (ChangeLog query.c) Message-ID: Date: Sunday, December 5, 2004 @ 16:36:49 Author: mo Path: /cvs/gnupg/gnupg/agent Tag: GNUPG-1-9-BRANCH Modified: ChangeLog query.c 2004-12-05 Moritz Schulte * query.c (start_pinentry): Allow CTRL be NULL. -----------+ ChangeLog | 4 ++++ query.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.43 gnupg/agent/ChangeLog:1.59.2.44 --- gnupg/agent/ChangeLog:1.59.2.43 Fri Oct 22 11:39:47 2004 +++ gnupg/agent/ChangeLog Sun Dec 5 16:36:49 2004 @@ -1,3 +1,7 @@ +2004-12-05 Moritz Schulte + + * query.c (start_pinentry): Allow CTRL be NULL. + 2004-10-22 Werner Koch * gpg-agent.c (parse_rereadable_options): Return "not handled" Index: gnupg/agent/query.c diff -u gnupg/agent/query.c:1.23.2.4 gnupg/agent/query.c:1.23.2.5 --- gnupg/agent/query.c:1.23.2.4 Fri Aug 20 15:03:32 2004 +++ gnupg/agent/query.c Sun Dec 5 16:36:49 2004 @@ -152,7 +152,7 @@ pgmname++; argv[0] = pgmname; - if (ctrl->display && !opt.keep_display) + if (ctrl && ctrl->display && !opt.keep_display) { argv[1] = "--display"; argv[2] = ctrl->display; @@ -189,7 +189,7 @@ NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return unlock_pinentry (map_assuan_err (rc)); - if (ctrl->ttyname) + if (ctrl && ctrl->ttyname) { char *optstr; if (asprintf (&optstr, "OPTION ttyname=%s", ctrl->ttyname) < 0 ) @@ -200,7 +200,7 @@ if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl->ttytype) + if (ctrl && ctrl->ttytype) { char *optstr; if (asprintf (&optstr, "OPTION ttytype=%s", ctrl->ttytype) < 0 ) @@ -210,7 +210,7 @@ if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl->lc_ctype) + if (ctrl && ctrl->lc_ctype) { char *optstr; if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 ) @@ -220,7 +220,7 @@ if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl->lc_messages) + if (ctrl && ctrl->lc_messages) { char *optstr; if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 ) From cvs at cvs.gnupg.org Mon Dec 6 11:24:26 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:33:53 2004 Subject: gnupg (THANKS util/ChangeLog util/iobuf.c) Message-ID: Date: Monday, December 6, 2004 @ 11:32:20 Author: wk Path: /cvs/gnupg/gnupg Modified: THANKS util/ChangeLog util/iobuf.c (fd_cache_strcmp): New. Use whenever we compare filenames for the fd_cache. This is needed because the backslash is an alias for a slash under W32. Reported by Tobias Winkler. ----------------+ THANKS | 1 + util/ChangeLog | 6 ++++++ util/iobuf.c | 26 +++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-) Index: gnupg/THANKS diff -u gnupg/THANKS:1.76 gnupg/THANKS:1.77 --- gnupg/THANKS:1.76 Wed Nov 3 21:03:46 2004 +++ gnupg/THANKS Mon Dec 6 11:32:20 2004 @@ -197,6 +197,7 @@ Thomas Roessler roessler@guug.de Tim Mooney mooney@dogbert.cc.ndsu.nodak.edu Timo Schulz twoaday@freakmail.de +Tobias Winkler tobias.winkler@s1998.tu-chemnitz.de Todd Vierling tv@pobox.com TOGAWA Satoshi Satoshi.Togawa@jp.yokogawa.com Tom Spindler dogcow@home.merit.edu Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.168 gnupg/util/ChangeLog:1.169 --- gnupg/util/ChangeLog:1.168 Fri Dec 3 21:23:12 2004 +++ gnupg/util/ChangeLog Mon Dec 6 11:32:20 2004 @@ -1,3 +1,9 @@ +2004-12-06 Werner Koch + + * iobuf.c (fd_cache_strcmp): New. Use whenever we compare + filenames for the fd_cache. This is needed because the backslash + is an alias for a slash under W32. Reported by Tobias Winkler. + 2004-12-03 David Shaw * http.c (send_request): Include the port if non-80 in the Host: Index: gnupg/util/iobuf.c diff -u gnupg/util/iobuf.c:1.70 gnupg/util/iobuf.c:1.71 --- gnupg/util/iobuf.c:1.70 Wed Nov 3 21:03:46 2004 +++ gnupg/util/iobuf.c Mon Dec 6 11:32:20 2004 @@ -130,8 +130,28 @@ static int underflow(IOBUF a); static int translate_file_handle ( int fd, int for_write ); + + #ifndef FILE_FILTER_USES_STDIO +/* This is a replacement for strcmp. Under W32 it does not + distinguish between backslash and slash. */ +static int +fd_cache_strcmp (const char *a, const char *b) +{ +#ifdef HAVE_DOSISH_SYSTEM + for (; *a && *b; a++, b++) + { + if (*a != *b && !((*a == '/' && *b == '\\') + || (*a == '\\' && *b == '/')) ) + break; + } + return *(const unsigned *)a - *(const unsigned *)b; +#else + return strcmp (a, b); +#endif +} + /* * Invalidate (i.e. close) a cached iobuf */ @@ -145,7 +165,7 @@ log_debug ("fd_cache_invalidate (%s)\n", fname); for (cc=close_cache; cc; cc = cc->next ) { - if ( cc->fp != INVALID_FP && !strcmp (cc->fname, fname) ) { + if ( cc->fp != INVALID_FP && !fd_cache_strcmp (cc->fname, fname) ) { if( DBG_IOBUF ) log_debug (" did (%s)\n", cc->fname); #ifdef HAVE_DOSISH_SYSTEM @@ -253,7 +273,7 @@ } /* try to reuse a slot */ for (cc=close_cache; cc; cc = cc->next ) { - if ( cc->fp == INVALID_FP && !strcmp (cc->fname, fname) ) { + if ( cc->fp == INVALID_FP && !fd_cache_strcmp (cc->fname, fname) ) { cc->fp = fp; if( DBG_IOBUF ) log_debug ("fd_cache_close (%s) used existing slot\n", fname); @@ -280,7 +300,7 @@ assert (fname); for (cc=close_cache; cc; cc = cc->next ) { - if ( cc->fp != INVALID_FP && !strcmp (cc->fname, fname) ) { + if ( cc->fp != INVALID_FP && !fd_cache_strcmp (cc->fname, fname) ) { FILEP_OR_FD fp = cc->fp; cc->fp = INVALID_FP; if( DBG_IOBUF ) From cvs at cvs.gnupg.org Mon Dec 6 14:41:17 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:33:57 2004 Subject: GNUPG-1-9-BRANCH gnupg (9 files) Message-ID: Date: Monday, December 6, 2004 @ 14:49:14 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: jnlib/w32-pth.h Modified: ChangeLog NEWS build-w32.sh configure.ac scd/ChangeLog scd/Makefile.am sm/ChangeLog sm/keydb.c * configure.ac (have_w32_system): New. Disable Pth checks for W32. Link jnlib/w32-pth.h to pth.h. * Makefile.am (pkglib_PROGRAMS): Build only for W32. * keydb.c: Don't define DIRSEP_S here. -----------------+ ChangeLog | 5 +++++ NEWS | 2 +- build-w32.sh | 19 ++++++++++++------- configure.ac | 40 ++++++++++++++++++++++++++++------------ jnlib/w32-pth.h | 29 +++++++++++++++++++++++++++++ scd/ChangeLog | 4 ++++ scd/Makefile.am | 2 ++ sm/ChangeLog | 4 ++++ sm/keydb.c | 2 -- 9 files changed, 85 insertions(+), 22 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.131.2.59 gnupg/ChangeLog:1.131.2.60 --- gnupg/ChangeLog:1.131.2.59 Fri Dec 3 18:44:57 2004 +++ gnupg/ChangeLog Mon Dec 6 14:49:14 2004 @@ -1,3 +1,8 @@ +2004-12-06 Werner Koch + + * configure.ac (have_w32_system): New. Disable Pth checks for W32. + Link jnlib/w32-pth.h to pth.h. + 2004-12-03 Werner Koch Released 1.9.13. Index: gnupg/NEWS diff -u gnupg/NEWS:1.165.2.59 gnupg/NEWS:1.165.2.60 --- gnupg/NEWS:1.165.2.59 Fri Dec 3 20:43:11 2004 +++ gnupg/NEWS Mon Dec 6 14:49:14 2004 @@ -7,7 +7,7 @@ * [gpgsm] New option --prefer-system-dirmngr. - * Minor cleanups and debbuging aids. + * Minor cleanups and debugging aids. Noteworthy changes in version 1.9.12 (2004-10-22) Index: gnupg/build-w32.sh diff -u gnupg/build-w32.sh:1.1.2.1 gnupg/build-w32.sh:1.1.2.2 --- gnupg/build-w32.sh:1.1.2.1 Fri Dec 3 18:44:57 2004 +++ gnupg/build-w32.sh Mon Dec 6 14:49:14 2004 @@ -1,10 +1,15 @@ - ./configure --enable-maintainer-mode --prefix=/home/wk/w32root \ +#!/bin/sh + +[ -z "$w32root" ] && w32root="$HOME/w32root" + + ./configure --enable-maintainer-mode --prefix=${w32root} \ --host=i586-mingw32msvc --build=`scripts/config.guess` \ - --with-gpg-error-prefix=/home/wk/w32root \ - --with-ksba-prefix=/home/wk/w32root \ - --with-libgcrypt-prefix=/home/wk/w32root \ - --with-libassuan-prefix=/home/wk/w32root \ - --with-zlib=/home/wk/w32root - + --with-gpg-error-prefix=${w32root} \ + --with-ksba-prefix=${w32root} \ + --with-libgcrypt-prefix=${w32root} \ + --with-libassuan-prefix=${w32root} \ + --with-zlib=${w32root} \ + --with-pth-prefix=${w32root} + Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.70 gnupg/configure.ac:1.36.2.71 --- gnupg/configure.ac:1.36.2.70 Fri Dec 3 20:43:11 2004 +++ gnupg/configure.ac Mon Dec 6 14:49:14 2004 @@ -141,7 +141,7 @@ build_agent_only=$enableval) -# Configure option to allow ot disallow execution of external +# Configure option to allow or disallow execution of external # programs, like a photo viewer. AC_MSG_CHECKING([whether to enable external program execution]) AC_ARG_ENABLE(exec, @@ -343,6 +343,7 @@ try_gettext=yes have_dosish_system=no +have_w32_system=no case "${host}" in *-*-mingw32*) # special stuff for Windoze NT @@ -356,6 +357,7 @@ MingW32 systems and these systems lack Posix functions, we use a simplified version of gettext]) have_dosish_system=yes + have_w32_system=yes try_gettext="no" ;; i?86-emx-os2 | i?86-*-os2*emx ) @@ -409,12 +411,18 @@ if test "$have_dosish_system" = yes; then AC_DEFINE(HAVE_DOSISH_SYSTEM,1, - [defined if we run on some of the PCDOS like systems + [Defined if we run on some of the PCDOS like systems (DOS, Windoze. OS/2) with special properties like no file modes]) fi AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes) +if test "$have_w32_system" = yes; then + AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system]) +fi +AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) + + # # Checks for libraries. @@ -480,6 +488,7 @@ # # Check whether the (highly desirable) GNU Pth library is available +# Note, that we include a Pth emulation for W32. # AC_ARG_WITH(pth-prefix, AC_HELP_STRING([--with-pth-prefix=PFX], @@ -489,7 +498,8 @@ PTH_CONFIG="$pth_config_prefix/bin/pth-config" fi AC_PATH_PROG(PTH_CONFIG, pth-config, no) -if test "$PTH_CONFIG" = "no"; then +if test "$have_w32_system" = no; then + if test "$PTH_CONFIG" = "no"; then AC_MSG_WARN([[ *** *** To support concurrent access to the gpg-agent and the SCdaemon @@ -498,7 +508,7 @@ *** On a Debian GNU/Linux system you might want to try *** apt-get install libpth-dev ***]]) -else + else GNUPG_PTH_VERSION_CHECK(1.3.7) if test $have_pth = yes; then PTH_CFLAGS=`$PTH_CONFIG --cflags` @@ -507,6 +517,12 @@ AC_DEFINE(USE_GNU_PTH, 1, [Defined if the GNU Portable Thread Library should be used]) fi + fi +else + have_pth=yes + PTH_CFLAGS="" + PTH_LIBS="" + AC_DEFINE(USE_GNU_PTH, 1) fi AC_SUBST(PTH_CFLAGS) AC_SUBST(PTH_LIBS) @@ -968,15 +984,11 @@ GNUPG_CHECK_GNUMAKE -# add some extra libs here so that previous tests don't fail for +# Add some extra libs here so that previous tests don't fail for # mysterious reasons - the final link step should bail out. -case "${host}" in - *-*-mingw32*) - W32LIBS="-lwsock32" - ;; - *) - ;; -esac +if test "$have_w32_system" = yes; then + W32LIBS="-lwsock32" +fi if test "$GCC" = yes; then @@ -996,6 +1008,10 @@ AC_DEFINE(HAVE_JNLIB_LOGGING, 1, [Defined if jnlib style logging functions are available]) +# For W32 we need to use our Pth emulation code +if test "$have_w32_system" = yes; then + AC_CONFIG_LINKS(pth.h:jnlib/w32-pth.h) +fi # Index: gnupg/jnlib/w32-pth.h diff -u /dev/null gnupg/jnlib/w32-pth.h:1.1.2.1 --- /dev/null Mon Dec 6 14:49:15 2004 +++ gnupg/jnlib/w32-pth.h Mon Dec 6 14:49:14 2004 @@ -0,0 +1,29 @@ +/* w32-pth.h - GNU Pth emulation for W32 (MS Windows). + * Copyright (C) 2004 g10 Code GmbH + * + * This file is part of GnuPG. + * + * GnuPG 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. + * + * GnuPG 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, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +/* Note that this header is usually through a symlinked pth.h file. + This is needed so that we don't have a pth.h file here which would + conflict if a system really has pth available. */ +#ifndef W32_PTH_H +#define W32_PTH_H + + + +#endif /*W32_PTH_H*/ Index: gnupg/scd/ChangeLog diff -u gnupg/scd/ChangeLog:1.25.2.58 gnupg/scd/ChangeLog:1.25.2.59 --- gnupg/scd/ChangeLog:1.25.2.58 Fri Oct 22 18:03:03 2004 +++ gnupg/scd/ChangeLog Mon Dec 6 14:49:14 2004 @@ -1,3 +1,7 @@ +2004-12-06 Werner Koch + + * Makefile.am (pkglib_PROGRAMS): Build only for W32. + 2004-10-22 Werner Koch * app-openpgp.c (verify_chv3): The minium length for CHV3 is Index: gnupg/scd/Makefile.am diff -u gnupg/scd/Makefile.am:1.15.2.10 gnupg/scd/Makefile.am:1.15.2.11 --- gnupg/scd/Makefile.am:1.15.2.10 Wed Oct 20 10:54:45 2004 +++ gnupg/scd/Makefile.am Mon Dec 6 14:49:14 2004 @@ -19,7 +19,9 @@ ## Process this file with automake to produce Makefile.in bin_PROGRAMS = scdaemon sc-copykeys +if HAVE_W32_SYSTEM pkglib_PROGRAMS = pcsc-wrapper +endif AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/common Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.76 gnupg/sm/ChangeLog:1.101.2.77 --- gnupg/sm/ChangeLog:1.101.2.76 Fri Dec 3 18:44:54 2004 +++ gnupg/sm/ChangeLog Mon Dec 6 14:49:14 2004 @@ -1,3 +1,7 @@ +2004-12-06 Werner Koch + + * keydb.c: Don't define DIRSEP_S here. + 2004-12-02 Werner Koch * certchain.c (gpgsm_basic_cert_check): Dump certs with bad Index: gnupg/sm/keydb.c diff -u gnupg/sm/keydb.c:1.20.2.7 gnupg/sm/keydb.c:1.20.2.8 --- gnupg/sm/keydb.c:1.20.2.7 Sun Jun 6 15:00:58 2004 +++ gnupg/sm/keydb.c Mon Dec 6 14:49:14 2004 @@ -33,8 +33,6 @@ #include "keydb.h" #include "i18n.h" -#define DIRSEP_C '/' - static int active_handles; typedef enum { From cvs at cvs.gnupg.org Mon Dec 6 18:28:35 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:34:04 2004 Subject: LIBGCRYPT-1-2-BRANCH libgcrypt/src (ChangeLog g10lib.h missing-string.c) Message-ID: Date: Monday, December 6, 2004 @ 18:36:34 Author: wk Path: /cvs/libgcrypt/libgcrypt/src Tag: LIBGCRYPT-1-2-BRANCH Modified: ChangeLog g10lib.h missing-string.c * g10lib.h (stpcpy, strcasecmp): Prefix them with _gcry_ and add macros to define them to the real name. This is needed to avoid double symbols when using static linkage. * missing-string.c: Likewise. (vasprintf): Removed as it is not used anywhere. ------------------+ ChangeLog | 8 ++++ g10lib.h | 10 +++-- missing-string.c | 102 +---------------------------------------------------- 3 files changed, 16 insertions(+), 104 deletions(-) Index: libgcrypt/src/ChangeLog diff -u libgcrypt/src/ChangeLog:1.151.2.8 libgcrypt/src/ChangeLog:1.151.2.9 --- libgcrypt/src/ChangeLog:1.151.2.8 Fri Nov 26 17:27:08 2004 +++ libgcrypt/src/ChangeLog Mon Dec 6 18:36:34 2004 @@ -1,3 +1,11 @@ +2004-12-06 Werner Koch + + * g10lib.h (stpcpy, strcasecmp): Prefix them with _gcry_ and add + macros to define them to the real name. This is needed to avoid + double symbols when using static linkage. + * missing-string.c: Likewise. + (vasprintf): Removed as it is not used anywhere. + 2004-11-26 Werner Koch * types.h [_WIN32]: Avoid warning about double defined type byte. Index: libgcrypt/src/g10lib.h diff -u libgcrypt/src/g10lib.h:1.26 libgcrypt/src/g10lib.h:1.26.2.1 --- libgcrypt/src/g10lib.h:1.26 Fri Dec 19 20:50:14 2003 +++ libgcrypt/src/g10lib.h Mon Dec 6 18:36:34 2004 @@ -131,12 +131,14 @@ gcry_mpi_t g, gcry_mpi_t **factors ); -/* replacements of missing functions (missing-string.c)*/ +/* Replacements of missing functions (missing-string.c)*/ #ifndef HAVE_STPCPY -char *stpcpy (char *a, const char *b); +char *_gcry_stpcpy (char *a, const char *b); +#define stpcpy(a,b) _gcry_stpcpy ((a), (b)) #endif #ifndef HAVE_STRCASECMP -int strcasecmp (const char *a, const char *b) GCC_ATTR_PURE; +int _gcry_strcasecmp (const char *a, const char *b) GCC_ATTR_PURE; +#define strcasecmp(a,b) _gcry_strcasecmp ((a), (b)) #endif /* macros used to rename missing functions */ @@ -153,7 +155,7 @@ #define atexit(a) (on_exit((a),0)) #endif #ifndef HAVE_RAISE -#define raise(a) kill(getpid(), (a)) +#define raise(a) kill(getpid(), (a)) #endif Index: libgcrypt/src/missing-string.c diff -u libgcrypt/src/missing-string.c:1.7 libgcrypt/src/missing-string.c:1.7.2.1 --- libgcrypt/src/missing-string.c:1.7 Thu Apr 15 11:00:22 2004 +++ libgcrypt/src/missing-string.c Mon Dec 6 18:36:34 2004 @@ -29,7 +29,7 @@ #ifndef HAVE_STPCPY char * -stpcpy(char *a,const char *b) +_gcry_stpcpy(char *a,const char *b) { while( *b ) *a++ = *b++; @@ -42,7 +42,7 @@ #ifndef HAVE_STRCASECMP int -strcasecmp( const char *a, const char *b ) +_gcry_strcasecmp( const char *a, const char *b ) { for( ; *a && *b; a++, b++ ) { if( *a != *b && toupper(*a) != toupper(*b) ) @@ -51,101 +51,3 @@ return *(const byte*)a - *(const byte*)b; } #endif - - -#ifdef __MINGW32__ -/* - * Like vsprintf but provides a pointer to malloc'd storage, which - * must be freed by the caller (gcry_free). Taken from libiberty as - * found in gcc-2.95.2 and a little bit modernized. - * FIXME: Write a new CRT for W32. - */ -int -vasprintf ( char **result, const char *format, va_list args) -{ - const char *p = format; - /* Add one to make sure that it is never zero, which might cause malloc - to return NULL. */ - int total_width = strlen (format) + 1; - va_list ap; - - /* this is not really portable but works under Windows */ - memcpy ( &ap, &args, sizeof (va_list)); - - while (*p != '\0') - { - if (*p++ == '%') - { - while (strchr ("-+ #0", *p)) - ++p; - if (*p == '*') - { - ++p; - total_width += abs (va_arg (ap, int)); - } - else - { - char *endp; - total_width += strtoul (p, &endp, 10); - p = endp; - } - if (*p == '.') - { - ++p; - if (*p == '*') - { - ++p; - total_width += abs (va_arg (ap, int)); - } - else - { - char *endp; - total_width += strtoul (p, &endp, 10); - p = endp; - } - } - while (strchr ("hlL", *p)) - ++p; - /* Should be big enough for any format specifier except %s - and floats. */ - total_width += 30; - switch (*p) - { - case 'd': - case 'i': - case 'o': - case 'u': - case 'x': - case 'X': - case 'c': - (void) va_arg (ap, int); - break; - case 'f': - case 'e': - case 'E': - case 'g': - case 'G': - (void) va_arg (ap, double); - /* Since an ieee double can have an exponent of 307, we'll - make the buffer wide enough to cover the gross case. */ - total_width += 307; - - case 's': - total_width += strlen (va_arg (ap, char *)); - break; - case 'p': - case 'n': - (void) va_arg (ap, char *); - break; - } - } - } - *result = gcry_malloc (total_width); - if (*result != NULL) - return vsprintf (*result, format, args); - else - return 0; -} - -#endif /*__MINGW32__*/ - From cvs at cvs.gnupg.org Mon Dec 6 18:42:29 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Mon Dec 13 16:34:07 2004 Subject: libassuan (build-w32.sh) Message-ID: Date: Monday, December 6, 2004 @ 18:42:29 Author: werner Path: /cvs/gnupg/libassuan Added: build-w32.sh Script to build the W32 version --------------+ build-w32.sh | 10 ++++++++++ 1 files changed, 10 insertions(+) From cvs at cvs.gnupg.org Mon Dec 6 19:20:57 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:34:09 2004 Subject: GNUPG-1-9-BRANCH gnupg (8 files) Message-ID: Date: Monday, December 6, 2004 @ 19:28:56 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: common/exechelp.c common/exechelp.h Modified: common/ChangeLog common/Makefile.am sm/ChangeLog sm/export.c sm/gpgsm.c sm/import.c * exechelp.h, exechelp.c: New. Based on code from ../sm/import.c. * gpgsm.c (run_protect_tool) [_WIN32]: Disabled. * import.c (popen_protect_tool): Simplified by making use of gnupg_spawn_process. (parse_p12): Likewise, using gnupg_wait_process. * export.c (popen_protect_tool): Ditto. (export_p12): Ditto. --------------------+ common/ChangeLog | 4 common/Makefile.am | 1 common/exechelp.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++ common/exechelp.h | 45 +++++++++ sm/ChangeLog | 8 + sm/export.c | 129 ++++------------------------ sm/gpgsm.c | 2 sm/import.c | 147 +++++--------------------------- 8 files changed, 332 insertions(+), 234 deletions(-) Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.31 gnupg/common/ChangeLog:1.30.2.32 --- gnupg/common/ChangeLog:1.30.2.31 Fri Dec 3 19:38:23 2004 +++ gnupg/common/ChangeLog Mon Dec 6 19:28:56 2004 @@ -1,3 +1,7 @@ +2004-12-06 Werner Koch + + * exechelp.h, exechelp.c: New. Based on code from ../sm/import.c. + 2004-12-03 Werner Koch * strsep.c: Fixed copyright comments. Index: gnupg/common/Makefile.am diff -u gnupg/common/Makefile.am:1.15.2.9 gnupg/common/Makefile.am:1.15.2.10 --- gnupg/common/Makefile.am:1.15.2.9 Thu Dec 2 08:48:09 2004 +++ gnupg/common/Makefile.am Mon Dec 6 19:28:56 2004 @@ -41,6 +41,7 @@ iobuf.c iobuf.h \ ttyio.c ttyio.h \ asshelp.c asshelp.h \ + exechelp.c exechelp.h \ simple-gettext.c \ w32reg.c \ signal.c \ Index: gnupg/common/exechelp.c diff -u /dev/null gnupg/common/exechelp.c:1.1.2.1 --- /dev/null Mon Dec 6 19:28:56 2004 +++ gnupg/common/exechelp.c Mon Dec 6 19:28:56 2004 @@ -0,0 +1,230 @@ +/* exechelp.c - fork and exec helpers + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#ifdef USE_GNU_PTH +#include +#endif +#ifdef _WIN32 +#else +#include +#endif + +#include "util.h" +#include "i18n.h" +#include "exechelp.h" + + +#ifdef _POSIX_OPEN_MAX +#define MAX_OPEN_FDS _POSIX_OPEN_MAX +#else +#define MAX_OPEN_FDS 20 +#endif + +/* We have the usual problem here: Some modules are linked against pth + and some are not. However we want to use pth_fork and pth_waitpid + here. Using a weak symbol works but is not portable - we should + provide a an explicit dummy pth module instead of using the + pragma. */ +#ifndef _WIN32 +#pragma weak pth_fork +#pragma weak pth_waitpid +#endif + + + +/* Fork and exec the PGMNAME, connect the file descriptor of INFILE to + stdin, write the output to OUTFILE, return a new stream in + STATUSFILE for stderr and the pid of the process in PID. The + arguments for the process are expected in the NULL terminated array + ARGV. The program name itself should not be included there. if + PREEXEC is not NULL, that function will be called right before the + exec. + + Returns 0 on success or an error code. */ +gpg_error_t +gnupg_spawn_process (const char *pgmname, const char *argv[], + FILE *infile, FILE *outfile, + void (*preexec)(void), + FILE **statusfile, pid_t *pid) +{ +#ifdef _WIN32 + return gpg_error (GPG_ERR_NOT_IMPLEMENTED); + +#else /* !_WIN32 */ + gpg_error_t err; + int fd, fdout, rp[2]; + + *statusfile = NULL; + *pid = (pid_t)(-1); + fflush (infile); + rewind (infile); + fd = fileno (infile); + fdout = fileno (outfile); + if (fd == -1 || fdout == -1) + log_fatal ("no file descriptor for file passed" + " to gnupg_spawn_process: %s\n", strerror (errno) ); + + if (pipe (rp) == -1) + { + err = gpg_error_from_errno (errno); + log_error (_("error creating a pipe: %s\n"), strerror (errno)); + return err; + } + +#ifdef USE_GNU_PTH + *pid = pth_fork? pth_fork () : fork (); +#else + *pid = fork (); +#endif + if (*pid == (pid_t)(-1)) + { + err = gpg_error_from_errno (errno); + log_error (_("error forking process: %s\n"), strerror (errno)); + close (rp[0]); + close (rp[1]); + return err; + } + + if (!*pid) + { + /* Child. */ + char **arg_list; + int n, i, j; + + /* Create the command line argument array. */ + for (i=0; argv[i]; i++) + ; + arg_list = xcalloc (i+2, sizeof *arg_list); + arg_list[0] = strrchr (pgmname, '/'); + if (arg_list[0]) + arg_list[0]++; + else + arg_list[0] = xstrdup (pgmname); + for (i=0,j=1; argv[i]; i++, j++) + arg_list[j] = (char*)argv[i]; + + /* Connect the infile to stdin. */ + if (fd != 0 && dup2 (fd, 0) == -1) + log_fatal ("dup2 stdin failed: %s\n", strerror (errno)); + + /* Connect the outfile to stdout. */ + if (fdout != 1 && dup2 (fdout, 1) == -1) + log_fatal ("dup2 stdout failed: %s\n", strerror (errno)); + + /* Connect stderr to our pipe. */ + if (rp[1] != 2 && dup2 (rp[1], 2) == -1) + log_fatal ("dup2 stderr failed: %s\n", strerror (errno)); + + /* Close all other files. */ + n = sysconf (_SC_OPEN_MAX); + if (n < 0) + n = MAX_OPEN_FDS; + for (i=3; i < n; i++) + close(i); + errno = 0; + + if (preexec) + preexec (); + execv (pgmname, arg_list); + /* No way to print anything, as we have closed all streams. */ + _exit (127); + } + + /* Parent. */ + close (rp[1]); + + *statusfile = fdopen (rp[0], "r"); + if (!*statusfile) + { + err = gpg_error_from_errno (errno); + log_error (_("can't fdopen pipe for reading: %s\n"), strerror (errno)); + kill (*pid, SIGTERM); + *pid = (pid_t)(-1); + return err; + } + + return 0; +#endif /* !_WIN32 */ +} + + +/* Wait for the process identified by PID to terminate. PGMNAME should + be the same as suplieed to the spawn fucntion and is only used for + diagnostics. Returns 0 if the process succeded, GPG_ERR_GENERAL for + any failures of the spawned program or other error codes.*/ +gpg_error_t +gnupg_wait_process (const char *pgmname, pid_t pid) +{ + gpg_err_code_t ec; + +#ifdef _WIN32 + ec = GPG_ERR_NOT_IMPLEMENTED; + +#else /* !_WIN32 */ + int i, status; + + if (pid == (pid_t)(-1)) + return gpg_error (GPG_ERR_INV_VALUE); + +#ifdef USE_GNU_PTH + i = pth_waitpid ? pth_waitpid (pid, &status, 0) : waitpid (pid, &status, 0); +#else + while ( (i=waitpid (pid, &status, 0)) == -1 && errno == EINTR) + ; +#endif + if (i == (pid_t)(-1)) + { + log_error (_("waiting for process %d to terminate failed: %s\n"), + (int)pid, strerror (errno)); + ec = gpg_err_code_from_errno (errno); + } + else if (WIFEXITED (status) && WEXITSTATUS (status) == 127) + { + log_error (_("error running `%s': probably not installed\n"), pgmname); + ec = GPG_ERR_CONFIGURATION; + } + else if (WIFEXITED (status) && WEXITSTATUS (status)) + { + log_error (_("error running `%s': exit status %d\n"), pgmname, + WEXITSTATUS (status)); + ec = GPG_ERR_GENERAL; + } + else if (!WIFEXITED (status)) + { + log_error (_("error running `%s': terminated\n"), pgmname); + ec = GPG_ERR_GENERAL; + } + else + ec = 0; +#endif /* !_WIN32 */ + + return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec); + +} + Index: gnupg/common/exechelp.h diff -u /dev/null gnupg/common/exechelp.h:1.1.2.1 --- /dev/null Mon Dec 6 19:28:56 2004 +++ gnupg/common/exechelp.h Mon Dec 6 19:28:56 2004 @@ -0,0 +1,45 @@ +/* exechelp.h - Definitions for the fork and exec helpers + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#ifndef GNUPG_COMMON_EXECHELP_H +#define GNUPG_COMMON_EXECHELP_H + + + +/* Fork and exec the PGMNAME, connect the file descriptor of INFILE to + stdin, write the output to OUTFILE, return a new stream in + STATUSFILE for stderr and the pid of the process in PID. The + arguments for the process are expected in the NULL terminated array + ARGV. The program name itself should not be included there. if + PREEXEC is not NULL, that function will be called right before the + exec. Returns 0 on success or an error code. */ +gpg_error_t gnupg_spawn_process (const char *pgmname, const char *argv[], + FILE *infile, FILE *outfile, + void (*preexec)(void), + FILE **statusfile, pid_t *pid); + +/* Wait for the process identified by PID to terminate. PGMNAME should + be the same as suplieed to the spawn fucntion and is only used for + diagnostics. Returns 0 if the process succeded, GPG_ERR_GENERAL for + any failures of the spawned program or other error codes.*/ +gpg_error_t gnupg_wait_process (const char *pgmname, pid_t pid); + + +#endif /*GNUPG_COMMON_EXECHELP_H*/ Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.77 gnupg/sm/ChangeLog:1.101.2.78 --- gnupg/sm/ChangeLog:1.101.2.77 Mon Dec 6 14:49:14 2004 +++ gnupg/sm/ChangeLog Mon Dec 6 19:28:56 2004 @@ -1,5 +1,13 @@ 2004-12-06 Werner Koch + * gpgsm.c (run_protect_tool) [_WIN32]: Disabled. + + * import.c (popen_protect_tool): Simplified by making use of + gnupg_spawn_process. + (parse_p12): Likewise, using gnupg_wait_process. + * export.c (popen_protect_tool): Ditto. + (export_p12): Ditto. + * keydb.c: Don't define DIRSEP_S here. 2004-12-02 Werner Koch Index: gnupg/sm/export.c diff -u gnupg/sm/export.c:1.6.2.9 gnupg/sm/export.c:1.6.2.10 --- gnupg/sm/export.c:1.6.2.9 Wed Sep 29 15:50:30 2004 +++ gnupg/sm/export.c Mon Dec 6 19:28:56 2004 @@ -23,25 +23,17 @@ #include #include #include -#include #include #include -#include -#include -#include #include "gpgsm.h" #include #include #include "keydb.h" +#include "exechelp.h" #include "i18n.h" -#ifdef _POSIX_OPEN_MAX -#define MAX_OPEN_FDS _POSIX_OPEN_MAX -#else -#define MAX_OPEN_FDS 20 -#endif /* A table to store a fingerprint as used in a duplicates table. We @@ -522,92 +514,23 @@ const char *prompt, const char *keygrip, pid_t *pid) { - gpg_error_t err; - int fd, fdout, rp[2]; - int n, i; - - fflush (infile); - rewind (infile); - fd = fileno (infile); - fdout = fileno (outfile); - if (fd == -1 || fdout == -1) - log_fatal ("no file descriptor for temporary file: %s\n", - strerror (errno)); + const char *argv[20]; + int i=0; - /* Now start the protect-tool. */ - if (pipe (rp) == -1) - { - err = gpg_error_from_errno (errno); - log_error (_("error creating a pipe: %s\n"), strerror (errno)); - return err; - } - - *pid = fork (); - if (*pid == -1) - { - err = gpg_error_from_errno (errno); - log_error (_("error forking process: %s\n"), strerror (errno)); - close (rp[0]); - close (rp[1]); - return err; - } - - if (!*pid) - { /* Child. */ - const char *arg0; - - arg0 = strrchr (pgmname, '/'); - if (arg0) - arg0++; - else - arg0 = pgmname; - - /* Connect the infile to stdin. */ - if (fd != 0 && dup2 (fd, 0) == -1) - log_fatal ("dup2 stdin failed: %s\n", strerror (errno)); - - /* Connect the outfile to stdout. */ - if (fdout != 1 && dup2 (fdout, 1) == -1) - log_fatal ("dup2 stdout failed: %s\n", strerror (errno)); - - /* Connect stderr to our pipe. */ - if (rp[1] != 2 && dup2 (rp[1], 2) == -1) - log_fatal ("dup2 stderr failed: %s\n", strerror (errno)); - - /* Close all other files. */ - n = sysconf (_SC_OPEN_MAX); - if (n < 0) - n = MAX_OPEN_FDS; - for (i=3; i < n; i++) - close(i); - errno = 0; - - setup_pinentry_env (); - - execlp (pgmname, arg0, - "--homedir", opt.homedir, - "--p12-export", - "--prompt", prompt?prompt:"", - "--enable-status-msg", - "--", - keygrip, - NULL); - /* No way to print anything, as we have closed all streams. */ - _exit (31); - } - - /* Parent. */ - close (rp[1]); - *statusfile = fdopen (rp[0], "r"); - if (!*statusfile) - { - err = gpg_error_from_errno (errno); - log_error ("can't fdopen pipe for reading: %s", strerror (errno)); - kill (*pid, SIGTERM); - return err; - } - - return 0; + argv[i++] = "--homedir"; + argv[i++] = opt.homedir; + argv[i++] = "--p12-export"; + argv[i++] = "--prompt"; + argv[i++] = prompt?prompt:""; + argv[i++] = "--enable-status-msg"; + argv[i++] = "--", + argv[i++] = keygrip, + argv[i] = NULL; + assert (i < sizeof argv); + + return gnupg_spawn_process (pgmname, argv, infile, outfile, + setup_pinentry_env, + statusfile, pid); } @@ -618,7 +541,7 @@ { const char *pgmname; gpg_error_t err = 0, child_err = 0; - int i, c, cont_line; + int c, cont_line; unsigned int pos; FILE *infp = NULL, *outfp = NULL, *fp = NULL; char buffer[1024]; @@ -722,21 +645,7 @@ fclose (fp); if (pid != -1) { - int status; - - while ( (i=waitpid (pid, &status, 0)) == -1 && errno == EINTR) - ; - if (i == -1) - log_error (_("waiting for protect-tools to terminate failed: %s\n"), - strerror (errno)); - else if (WIFEXITED (status) && WEXITSTATUS (status) == 31) - log_error (_("error running `%s': probably not installed\n"), pgmname); - else if (WIFEXITED (status) && WEXITSTATUS (status)) - log_error (_("error running `%s': exit status %d\n"), pgmname, - WEXITSTATUS (status)); - else if (!WIFEXITED (status)) - log_error (_("error running `%s': terminated\n"), pgmname); - else + if (!gnupg_wait_process (pgmname, pid)) child_err = 0; } if (!err) Index: gnupg/sm/gpgsm.c diff -u gnupg/sm/gpgsm.c:1.67.2.32 gnupg/sm/gpgsm.c:1.67.2.33 --- gnupg/sm/gpgsm.c:1.67.2.32 Thu Dec 2 08:48:08 2004 +++ gnupg/sm/gpgsm.c Mon Dec 6 19:28:56 2004 @@ -1688,6 +1688,7 @@ static void run_protect_tool (int argc, char **argv) { +#ifndef _WIN32 const char *pgm; char **av; int i; @@ -1706,5 +1707,6 @@ av[i] = NULL; execv (pgm, av); log_error ("error executing `%s': %s\n", pgm, strerror (errno)); +#endif gpgsm_exit (2); } Index: gnupg/sm/import.c diff -u gnupg/sm/import.c:1.22.2.14 gnupg/sm/import.c:1.22.2.15 --- gnupg/sm/import.c:1.22.2.14 Wed Sep 29 15:50:30 2004 +++ gnupg/sm/import.c Mon Dec 6 19:28:56 2004 @@ -23,27 +23,17 @@ #include #include #include -#include #include #include -#include -#include -#include #include "gpgsm.h" #include #include #include "keydb.h" +#include "exechelp.h" #include "i18n.h" -#ifdef _POSIX_OPEN_MAX -#define MAX_OPEN_FDS _POSIX_OPEN_MAX -#else -#define MAX_OPEN_FDS 20 -#endif - - struct stats_s { unsigned long count; unsigned long imported; @@ -471,103 +461,27 @@ popen_protect_tool (const char *pgmname, FILE *infile, FILE *outfile, FILE **statusfile, pid_t *pid) { - gpg_error_t err; - int fd, fdout, rp[2]; - int n, i; - - fflush (infile); - rewind (infile); - fd = fileno (infile); - fdout = fileno (outfile); - if (fd == -1 || fdout == -1) - log_fatal ("no file descriptor for temporary file: %s\n", - strerror (errno)); + const char *argv[20]; + int i=0; - /* Now start the protect-tool. */ - if (pipe (rp) == -1) - { - err = gpg_error_from_errno (errno); - log_error (_("error creating a pipe: %s\n"), strerror (errno)); - return err; - } - - *pid = fork (); - if (*pid == -1) - { - err = gpg_error_from_errno (errno); - log_error (_("error forking process: %s\n"), strerror (errno)); - close (rp[0]); - close (rp[1]); - return err; - } - - if (!*pid) - { /* Child. */ - const char *arg0; - - arg0 = strrchr (pgmname, '/'); - if (arg0) - arg0++; - else - arg0 = pgmname; - - /* Connect the infile to stdin. */ - if (fd != 0 && dup2 (fd, 0) == -1) - log_fatal ("dup2 stdin failed: %s\n", strerror (errno)); - - /* Connect the outfile to stdout. */ - if (fdout != 1 && dup2 (fdout, 1) == -1) - log_fatal ("dup2 stdout failed: %s\n", strerror (errno)); - - /* Connect stderr to our pipe. */ - if (rp[1] != 2 && dup2 (rp[1], 2) == -1) - log_fatal ("dup2 stderr failed: %s\n", strerror (errno)); - - /* Close all other files. */ - n = sysconf (_SC_OPEN_MAX); - if (n < 0) - n = MAX_OPEN_FDS; - for (i=3; i < n; i++) - close(i); - errno = 0; - - setup_pinentry_env (); - - if (opt.fixed_passphrase) - execlp (pgmname, arg0, - "--homedir", opt.homedir, - "--p12-import", - "--store", - "--no-fail-on-exist", - "--enable-status-msg", - "--passphrase", opt.fixed_passphrase, - "--", - NULL); - else - execlp (pgmname, arg0, - "--homedir", opt.homedir, - "--p12-import", - "--store", - "--no-fail-on-exist", - "--enable-status-msg", - "--", - NULL); - /* No way to print anything, as we have closed all streams. */ - _exit (31); - } - - /* Parent. */ - close (rp[1]); - *statusfile = fdopen (rp[0], "r"); - if (!*statusfile) - { - err = gpg_error_from_errno (errno); - log_error ("can't fdopen pipe for reading: %s", strerror (errno)); - kill (*pid, SIGTERM); - return err; - } - - return 0; + argv[i++] = "--homedir"; + argv[i++] = opt.homedir; + argv[i++] = "--p12-import"; + argv[i++] = "--store"; + argv[i++] = "--no-fail-on-exist"; + argv[i++] = "--enable-status-msg"; + if (opt.fixed_passphrase) + { + argv[i++] = "--passphrase"; + argv[i++] = opt.fixed_passphrase; + } + argv[i++] = "--", + argv[i] = NULL; + assert (i < sizeof argv); + + return gnupg_spawn_process (pgmname, argv, infile, outfile, + setup_pinentry_env, + statusfile, pid); } @@ -583,7 +497,7 @@ { const char *pgmname; gpg_error_t err = 0, child_err = 0; - int i, c, cont_line; + int c, cont_line; unsigned int pos; FILE *tmpfp, *certfp = NULL, *fp = NULL; char buffer[1024]; @@ -712,7 +626,6 @@ if (!child_err) child_err = gpg_error (GPG_ERR_DECRYPT_FAILED); - cleanup: if (tmpfp) fclose (tmpfp); @@ -720,21 +633,7 @@ fclose (fp); if (pid != -1) { - int status; - - while ( (i=waitpid (pid, &status, 0)) == -1 && errno == EINTR) - ; - if (i == -1) - log_error (_("waiting for protect-tool to terminate failed: %s\n"), - strerror (errno)); - else if (WIFEXITED (status) && WEXITSTATUS (status) == 31) - log_error (_("error running `%s': probably not installed\n"), pgmname); - else if (WIFEXITED (status) && WEXITSTATUS (status)) - log_error (_("error running `%s': exit status %d\n"), pgmname, - WEXITSTATUS (status)); - else if (!WIFEXITED (status)) - log_error (_("error running `%s': terminated\n"), pgmname); - else + if (!gnupg_wait_process (pgmname, pid)) child_err = 0; } if (!err) From cvs at cvs.gnupg.org Tue Dec 7 12:09:50 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Mon Dec 13 16:34:29 2004 Subject: libassuan/src (11 files) Message-ID: Date: Tuesday, December 7, 2004 @ 12:09:50 Author: werner Path: /cvs/gnupg/libassuan/src Modified: ChangeLog assuan-buffer.c assuan-connect.c assuan-defs.h assuan-domain-connect.c assuan-io.c assuan-logging.c assuan-pipe-connect.c assuan-socket-connect.c assuan-socket-server.c assuan-socket.c * configure.ac: Define HAVE_W32_SYSTEM and HAVE_DOSISH_SYSTEM. Add -lwsock2 to the config lib flags for W32. * assuan-logging.c, assuan-io.c: Include config.h * assuan-pipe-connect.c (assuan_pipe_connect2) [_WIN32]: Return error Not Imlemented. -------------------------+ ChangeLog | 10 ++++++++++ assuan-buffer.c | 2 +- assuan-connect.c | 2 +- assuan-defs.h | 6 +++--- assuan-domain-connect.c | 10 +++++----- assuan-io.c | 12 ++++++++---- assuan-logging.c | 4 ++++ assuan-pipe-connect.c | 21 ++++++++++++++------- assuan-socket-connect.c | 2 +- assuan-socket-server.c | 2 +- assuan-socket.c | 10 +++++----- 11 files changed, 53 insertions(+), 28 deletions(-) From cvs at cvs.gnupg.org Tue Dec 7 12:09:50 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Mon Dec 13 16:34:32 2004 Subject: libassuan (ChangeLog configure.ac) Message-ID: Date: Tuesday, December 7, 2004 @ 12:09:50 Author: werner Path: /cvs/gnupg/libassuan Modified: ChangeLog configure.ac * configure.ac: Define HAVE_W32_SYSTEM and HAVE_DOSISH_SYSTEM. Add -lwsock2 to the config lib flags for W32. * assuan-logging.c, assuan-io.c: Include config.h * assuan-pipe-connect.c (assuan_pipe_connect2) [_WIN32]: Return error Not Imlemented. --------------+ ChangeLog | 5 +++++ configure.ac | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) From cvs at cvs.gnupg.org Tue Dec 7 12:13:39 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:34:34 2004 Subject: GNUPG-1-9-BRANCH gnupg (10 files) Message-ID: Date: Tuesday, December 7, 2004 @ 12:21:40 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: jnlib/w32-pth.c Modified: common/ChangeLog common/asshelp.c configure.ac jnlib/ChangeLog jnlib/Makefile.am jnlib/w32-pth.h sm/ChangeLog sm/Makefile.am sm/misc.c * asshelp.c (send_pinentry_environment) [W32]: Do not use ttyname. * w32-pth.c, w32-pth.h: New. * Makefile.am (gpgsm_LDADD): Put libassuan before jnlib because under W32 we need the w32 pth code from jnlib. * misc.c (setup_pinentry_env) [W32]: Disabled. -------------------+ common/ChangeLog | 4 ++++ common/asshelp.c | 5 +++++ configure.ac | 4 ++-- jnlib/ChangeLog | 4 ++++ jnlib/Makefile.am | 4 +++- jnlib/w32-pth.c | 42 ++++++++++++++++++++++++++++++++++++++++++ jnlib/w32-pth.h | 6 +++--- sm/ChangeLog | 7 +++++++ sm/Makefile.am | 5 +++-- sm/misc.c | 3 ++- 10 files changed, 75 insertions(+), 9 deletions(-) Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.32 gnupg/common/ChangeLog:1.30.2.33 --- gnupg/common/ChangeLog:1.30.2.32 Mon Dec 6 19:28:56 2004 +++ gnupg/common/ChangeLog Tue Dec 7 12:21:40 2004 @@ -1,3 +1,7 @@ +2004-12-07 Werner Koch + + * asshelp.c (send_pinentry_environment) [W32]: Do not use ttyname. + 2004-12-06 Werner Koch * exechelp.h, exechelp.c: New. Based on code from ../sm/import.c. Index: gnupg/common/asshelp.c diff -u gnupg/common/asshelp.c:1.1.2.1 gnupg/common/asshelp.c:1.1.2.2 --- gnupg/common/asshelp.c:1.1.2.1 Sat Mar 6 21:11:17 2004 +++ gnupg/common/asshelp.c Tue Dec 7 12:21:40 2004 @@ -66,8 +66,13 @@ if (!opt_ttyname) { dft_ttyname = getenv ("GPG_TTY"); +#ifdef HAVE_DOSISH_SYSTEM + if (!dft_ttyname || !*dft_ttyname ) + dft_ttyname = "/dev/tty"; /* Use a fake. */ +#else if ((!dft_ttyname || !*dft_ttyname) && ttyname (0)) dft_ttyname = ttyname (0); +#endif } if (opt_ttyname || dft_ttyname) { Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.71 gnupg/configure.ac:1.36.2.72 --- gnupg/configure.ac:1.36.2.71 Mon Dec 6 14:49:14 2004 +++ gnupg/configure.ac Tue Dec 7 12:21:40 2004 @@ -345,7 +345,7 @@ have_dosish_system=no have_w32_system=no case "${host}" in - *-*-mingw32*) + *-mingw32*) # special stuff for Windoze NT ac_cv_have_dev_random=no AC_DEFINE(USE_ONLY_8DOT3,1, @@ -677,7 +677,7 @@ AC_SUBST(GPGKEYS_MAILTO) case "${host}" in - *-*-mingw32*) + *-mingw32*) PRINTABLE_OS_NAME="MingW32" ;; *-*-cygwin*) Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.19 gnupg/jnlib/ChangeLog:1.3.2.20 --- gnupg/jnlib/ChangeLog:1.3.2.19 Thu Dec 2 08:48:09 2004 +++ gnupg/jnlib/ChangeLog Tue Dec 7 12:21:40 2004 @@ -1,3 +1,7 @@ +2004-12-07 Werner Koch + + * w32-pth.c, w32-pth.h: New. + 2004-11-26 Werner Koch * logging.c [_WIN32]: Don't include socket headers. Index: gnupg/jnlib/Makefile.am diff -u gnupg/jnlib/Makefile.am:1.4.2.3 gnupg/jnlib/Makefile.am:1.4.2.4 --- gnupg/jnlib/Makefile.am:1.4.2.3 Thu Feb 12 10:29:00 2004 +++ gnupg/jnlib/Makefile.am Tue Dec 7 12:21:40 2004 @@ -37,7 +37,9 @@ argparse.c argparse.h \ logging.c logging.h \ dotlock.c dotlock.h \ - types.h mischelp.h + types.h mischelp.h \ + w32-pth.c w32-pth.h \ + w32-afunix.c w32-afunix.h # xmalloc.c xmalloc.h Index: gnupg/jnlib/w32-pth.c diff -u /dev/null gnupg/jnlib/w32-pth.c:1.1.2.1 --- /dev/null Tue Dec 7 12:21:40 2004 +++ gnupg/jnlib/w32-pth.c Tue Dec 7 12:21:40 2004 @@ -0,0 +1,42 @@ +/* w32-pth.c - GNU Pth emulation for W32 (MS Windows). + * Copyright (C) 2004 g10 Code GmbH + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include +#ifdef HAVE_W32_SYSTEM +#include +#include +#include + +#include "w32-pth.h" + +ssize_t +pth_read (int fd, void *buffer, size_t size) +{ + return read (fd, buffer, size); +} + +ssize_t +pth_write (int fd, const void *buffer, size_t size) +{ + return write (fd, buffer, size); +} + + +#endif /*HAVE_W32_SYSTEM*/ Index: gnupg/jnlib/w32-pth.h diff -u gnupg/jnlib/w32-pth.h:1.1.2.1 gnupg/jnlib/w32-pth.h:1.1.2.2 --- gnupg/jnlib/w32-pth.h:1.1.2.1 Mon Dec 6 14:49:14 2004 +++ gnupg/jnlib/w32-pth.h Tue Dec 7 12:21:40 2004 @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -/* Note that this header is usually through a symlinked pth.h file. - This is needed so that we don't have a pth.h file here which would - conflict if a system really has pth available. */ +/* Note that this header is usually used through a symlinked pth.h + file. This is needed so that we don't have a pth.h file here which + would conflict if a system really has pth available. */ #ifndef W32_PTH_H #define W32_PTH_H Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.78 gnupg/sm/ChangeLog:1.101.2.79 --- gnupg/sm/ChangeLog:1.101.2.78 Mon Dec 6 19:28:56 2004 +++ gnupg/sm/ChangeLog Tue Dec 7 12:21:40 2004 @@ -1,3 +1,10 @@ +2004-12-07 Werner Koch + + * Makefile.am (gpgsm_LDADD): Put libassuan before jnlib because + under W32 we need the w32 pth code from jnlib. + + * misc.c (setup_pinentry_env) [W32]: Disabled. + 2004-12-06 Werner Koch * gpgsm.c (run_protect_tool) [_WIN32]: Disabled. Index: gnupg/sm/Makefile.am diff -u gnupg/sm/Makefile.am:1.27.2.2 gnupg/sm/Makefile.am:1.27.2.3 --- gnupg/sm/Makefile.am:1.27.2.2 Thu Sep 30 16:34:23 2004 +++ gnupg/sm/Makefile.am Tue Dec 7 12:21:40 2004 @@ -51,8 +51,9 @@ certreqgen.c -gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a ../common/libcommon.a \ - $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(KSBA_LIBS) -lgpg-error \ +gpgsm_LDADD = $(LIBASSUAN_LIBS) ../jnlib/libjnlib.a ../kbx/libkeybox.a \ + ../common/libcommon.a \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) -lgpg-error \ $(LIBINTL) Index: gnupg/sm/misc.c diff -u gnupg/sm/misc.c:1.3.2.3 gnupg/sm/misc.c:1.3.2.4 --- gnupg/sm/misc.c:1.3.2.3 Mon Oct 4 15:21:37 2004 +++ gnupg/sm/misc.c Tue Dec 7 12:21:40 2004 @@ -38,6 +38,7 @@ void setup_pinentry_env (void) { +#ifndef HAVE_W32_SYSTEM char *lc; if (opt.display) @@ -75,6 +76,6 @@ else if ( (lc = setlocale (LC_MESSAGES, "")) ) setenv ("LC_MESSAGES", lc, 1); #endif - +#endif /*!HAVE_W32_SYSTEM*/ } From cvs at cvs.gnupg.org Tue Dec 7 15:28:55 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:34:42 2004 Subject: gpgme (ChangeLog configure.ac) Message-ID: Date: Tuesday, December 7, 2004 @ 15:37:00 Author: marcus Path: /cvs/gpgme/gpgme Modified: ChangeLog configure.ac 2004-12-07 Marcus Brinkmann * configure.ac (GPGSM_VERSION): Fix filter to get it. --------------+ ChangeLog | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.105 gpgme/ChangeLog:1.106 --- gpgme/ChangeLog:1.105 Fri Oct 22 20:21:43 2004 +++ gpgme/ChangeLog Tue Dec 7 15:37:00 2004 @@ -1,3 +1,7 @@ +2004-12-07 Marcus Brinkmann + + * configure.ac (GPGSM_VERSION): Fix filter to get it. + 2004-10-22 Marcus Brinkmann Released 1.0.1. Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.89 gpgme/configure.ac:1.90 --- gpgme/configure.ac:1.89 Fri Oct 22 20:19:04 2004 +++ gpgme/configure.ac Tue Dec 7 15:37:00 2004 @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.89 $) +AC_REVISION($Revision: 1.90 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -362,7 +362,7 @@ sed 's/^gpgsm (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` micro=`echo $gpgsm_version | \ sed 's/^gpgsm (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - GPGSM_VERSION=`echo $gpgsm_version | sed 's/^gpg (GnuPG) //'` + GPGSM_VERSION=`echo $gpgsm_version | sed 's/^gpgsm (GnuPG) //'` if test "$major" -gt "$req_major"; then ok=yes From cvs at cvs.gnupg.org Tue Dec 7 16:17:44 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:34:44 2004 Subject: gpgme (ChangeLog configure.ac) Message-ID: Date: Tuesday, December 7, 2004 @ 16:25:48 Author: marcus Path: /cvs/gpgme/gpgme Modified: ChangeLog configure.ac Revert change to fix up gpgme-1.0.1 release tag glitch. --------------+ ChangeLog | 4 ---- configure.ac | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.106 gpgme/ChangeLog:1.107 --- gpgme/ChangeLog:1.106 Tue Dec 7 15:37:00 2004 +++ gpgme/ChangeLog Tue Dec 7 16:25:48 2004 @@ -1,7 +1,3 @@ -2004-12-07 Marcus Brinkmann - - * configure.ac (GPGSM_VERSION): Fix filter to get it. - 2004-10-22 Marcus Brinkmann Released 1.0.1. Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.90 gpgme/configure.ac:1.91 --- gpgme/configure.ac:1.90 Tue Dec 7 15:37:00 2004 +++ gpgme/configure.ac Tue Dec 7 16:25:48 2004 @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.90 $) +AC_REVISION($Revision: 1.91 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -362,7 +362,7 @@ sed 's/^gpgsm (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` micro=`echo $gpgsm_version | \ sed 's/^gpgsm (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - GPGSM_VERSION=`echo $gpgsm_version | sed 's/^gpgsm (GnuPG) //'` + GPGSM_VERSION=`echo $gpgsm_version | sed 's/^gpg (GnuPG) //'` if test "$major" -gt "$req_major"; then ok=yes From cvs at cvs.gnupg.org Tue Dec 7 16:19:07 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:34:47 2004 Subject: gpgme (configure.ac gpgme/gpgme.h) Message-ID: Date: Tuesday, December 7, 2004 @ 16:27:11 Author: marcus Path: /cvs/gpgme/gpgme Modified: configure.ac gpgme/gpgme.h Fix up gpgme-1.0.1 release changes. Somehow the correct change didn't make it into the repository. ---------------+ configure.ac | 8 ++++---- gpgme/gpgme.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.91 gpgme/configure.ac:1.92 --- gpgme/configure.ac:1.91 Tue Dec 7 16:25:48 2004 +++ gpgme/configure.ac Tue Dec 7 16:27:11 2004 @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.91 $) +AC_REVISION($Revision: 1.92 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -295,7 +295,7 @@ AC_MSG_WARN([GnuPG must be at least version $NEED_GPG_VERSION]) fi fi -AM_CONDITIONAL(RUN_GPG_TESTS, [test "$ok" = "yes" ]) +AM_CONDITIONAL(RUN_GPG_TESTS, test "$ok" = "yes") AC_SUBST(GPG_PATH) NO_OVERRIDE=no @@ -330,7 +330,7 @@ AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM", [Path to the GPGSM binary.]) AC_SUBST(GPGSM) fi -AM_CONDITIONAL(HAVE_GPGSM, ["$GPGSM" != "no"]) +AM_CONDITIONAL(HAVE_GPGSM, test "$GPGSM" != "no") dnl Check for GPGSM version requirement. GPGSM_VERSION=unknown ok=maybe @@ -386,7 +386,7 @@ AC_MSG_WARN([GPGSM must be at least version $NEED_GPGSM_VERSION]) fi fi -AM_CONDITIONAL(RUN_GPGSM_TESTS, [test "$ok" = "yes" ]) +AM_CONDITIONAL(RUN_GPGSM_TESTS, test "$ok" = "yes") # FIXME: Only build if supported. AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no") Index: gpgme/gpgme/gpgme.h diff -u gpgme/gpgme/gpgme.h:1.148 gpgme/gpgme/gpgme.h:1.149 --- gpgme/gpgme/gpgme.h:1.148 Wed Sep 29 01:15:39 2004 +++ gpgme/gpgme/gpgme.h Tue Dec 7 16:27:11 2004 @@ -74,7 +74,7 @@ AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "0.9.1-cvs" +#define GPGME_VERSION "1.0.1" /* Some opaque data types used by GPGME. */ From cvs at cvs.gnupg.org Tue Dec 7 16:22:32 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:34:49 2004 Subject: gpgme (ChangeLog configure.ac) Message-ID: Date: Tuesday, December 7, 2004 @ 16:30:36 Author: marcus Path: /cvs/gpgme/gpgme Modified: ChangeLog configure.ac 2004-12-07 Marcus Brinkmann * configure.ac (GPGSM_VERSION): Fix filter to get it. --------------+ ChangeLog | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.107 gpgme/ChangeLog:1.108 --- gpgme/ChangeLog:1.107 Tue Dec 7 16:25:48 2004 +++ gpgme/ChangeLog Tue Dec 7 16:30:36 2004 @@ -1,3 +1,7 @@ +2004-12-07 Marcus Brinkmann + + * configure.ac (GPGSM_VERSION): Fix filter to get it. + 2004-10-22 Marcus Brinkmann Released 1.0.1. Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.92 gpgme/configure.ac:1.93 --- gpgme/configure.ac:1.92 Tue Dec 7 16:27:11 2004 +++ gpgme/configure.ac Tue Dec 7 16:30:36 2004 @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.92 $) +AC_REVISION($Revision: 1.93 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -362,7 +362,7 @@ sed 's/^gpgsm (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` micro=`echo $gpgsm_version | \ sed 's/^gpgsm (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - GPGSM_VERSION=`echo $gpgsm_version | sed 's/^gpg (GnuPG) //'` + GPGSM_VERSION=`echo $gpgsm_version | sed 's/^gpgsm (GnuPG) //'` if test "$major" -gt "$req_major"; then ok=yes From cvs at cvs.gnupg.org Tue Dec 7 18:50:31 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 13 16:34:58 2004 Subject: gnupg/g10 (ChangeLog keygen.c) Message-ID: Date: Tuesday, December 7, 2004 @ 18:58:35 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keygen.c * keygen.c (ask_keysize): Change strings to always use %u instead of hardcoding key sizes. Bump default to 2048. Bump minimum down to 512, where possible, but require --expert to get there. DSA is always 1024 unless --expert is given. -----------+ ChangeLog | 7 +++ keygen.c | 123 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 71 insertions(+), 59 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.646 gnupg/g10/ChangeLog:1.647 --- gnupg/g10/ChangeLog:1.646 Mon Nov 29 22:21:52 2004 +++ gnupg/g10/ChangeLog Tue Dec 7 18:58:35 2004 @@ -1,3 +1,10 @@ +2004-12-07 David Shaw + + * keygen.c (ask_keysize): Change strings to always use %u instead + of hardcoding key sizes. Bump default to 2048. Bump minimum down + to 512, where possible, but require --expert to get there. DSA is + always 1024 unless --expert is given. + 2004-11-29 David Shaw * getkey.c (parse_key_usage): New function to parse out key usage Index: gnupg/g10/keygen.c diff -u gnupg/g10/keygen.c:1.135 gnupg/g10/keygen.c:1.136 --- gnupg/g10/keygen.c:1.135 Thu Oct 28 05:57:30 2004 +++ gnupg/g10/keygen.c Tue Dec 7 18:58:35 2004 @@ -1402,69 +1402,74 @@ static unsigned ask_keysize( int algo ) { - char *answer; - unsigned nbits; + unsigned nbits,min,def=2048,max=4096; - if (algo != PUBKEY_ALGO_DSA && algo != PUBKEY_ALGO_RSA) { - tty_printf (_("About to generate a new %s keypair.\n" - " minimum keysize is 768 bits\n" - " default keysize is 1024 bits\n" - " highest suggested keysize is 2048 bits\n"), - pubkey_algo_to_string(algo) ); - } + if(opt.expert) + min=512; + else + min=1024; - for(;;) { - answer = cpr_get("keygen.size", - _("What keysize do you want? (1024) ")); - cpr_kill_prompt(); - nbits = *answer? atoi(answer): 1024; - m_free(answer); - if( algo == PUBKEY_ALGO_DSA && (nbits < 512 || nbits > 1024) ) - tty_printf(_("DSA only allows keysizes from 512 to 1024\n")); - else if( algo == PUBKEY_ALGO_RSA && nbits < 1024 ) - tty_printf(_("keysize too small;" - " 1024 is smallest value allowed for RSA.\n")); - else if( nbits < 768 ) - tty_printf(_("keysize too small;" - " 768 is smallest value allowed.\n")); - else if( nbits > 4096 ) { - /* It is ridiculous and an annoyance to use larger key sizes! - * GnuPG can handle much larger sizes; but it takes an eternity - * to create such a key (but less than the time the Sirius - * Computer Corporation needs to process one of the usual - * complaints) and {de,en}cryption although needs some time. - * So, before you complain about this limitation, I suggest that - * you start a discussion with Marvin about this theme and then - * do whatever you want. */ - tty_printf(_("keysize too large; %d is largest value allowed.\n"), - 4096); - } - else if( nbits > 2048 && !cpr_enabled() ) { - tty_printf( - _("Keysizes larger than 2048 are not suggested because\n" - "computations take REALLY long!\n")); - if( cpr_get_answer_is_yes("keygen.size.huge.okay",_( - "Are you sure that you want this keysize? (y/N) ")) ) - { - tty_printf(_("Okay, but keep in mind that your monitor " - "and keyboard radiation is also very vulnerable " - "to attacks!\n")); - break; - } + switch(algo) + { + case PUBKEY_ALGO_DSA: + if(opt.expert) + { + def=1024; + max=1024; + } + else + { + tty_printf(_("DSA keypair will have %u bits.\n"),1024); + return 1024; } - else - break; + break; + + case PUBKEY_ALGO_RSA: + min=1024; + break; } - tty_printf(_("Requested keysize is %u bits\n"), nbits ); - if( algo == PUBKEY_ALGO_DSA && (nbits % 64) ) { - nbits = ((nbits + 63) / 64) * 64; - tty_printf(_("rounded up to %u bits\n"), nbits ); - } - else if( (nbits % 32) ) { - nbits = ((nbits + 31) / 32) * 32; - tty_printf(_("rounded up to %u bits\n"), nbits ); + + tty_printf(_("%s keys may be between %u and %u bits long.\n"), + pubkey_algo_to_string(algo),min,max); + + for(;;) + { + char *prompt,*answer; + +#define PROMPTSTRING _("What keysize do you want? (%u) ") + + prompt=m_alloc(strlen(PROMPTSTRING)+20); + sprintf(prompt,PROMPTSTRING,def); + +#undef PROMPTSTRING + + answer = cpr_get("keygen.size",prompt); + cpr_kill_prompt(); + nbits = *answer? atoi(answer): def; + m_free(prompt); + m_free(answer); + + if(nbitsmax) + tty_printf(_("%s keysizes must be in the range %u-%u\n"), + pubkey_algo_to_string(algo),min,max); + else + break; + } + + tty_printf(_("Requested keysize is %u bits\n"), nbits ); + + if( algo == PUBKEY_ALGO_DSA && (nbits % 64) ) + { + nbits = ((nbits + 63) / 64) * 64; + tty_printf(_("rounded up to %u bits\n"), nbits ); } - return nbits; + else if( (nbits % 32) ) + { + nbits = ((nbits + 31) / 32) * 32; + tty_printf(_("rounded up to %u bits\n"), nbits ); + } + + return nbits; } @@ -2487,7 +2492,7 @@ sprintf( r->u.value, "%d", PUBKEY_ALGO_DSA ); r->next = para; para = r; - tty_printf(_("DSA keypair will have 1024 bits.\n")); + tty_printf(_("DSA keypair will have %u bits.\n"),1024); r = m_alloc_clear( sizeof *r + 20 ); r->key = pKEYLENGTH; strcpy( r->u.value, "1024" ); From cvs at cvs.gnupg.org Tue Dec 7 18:59:25 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:35:00 2004 Subject: GNUPG-1-9-BRANCH gnupg/kbx (ChangeLog keybox-init.c) Message-ID: Date: Tuesday, December 7, 2004 @ 19:07:30 Author: wk Path: /cvs/gnupg/gnupg/kbx Tag: GNUPG-1-9-BRANCH Modified: ChangeLog keybox-init.c (keybox_release): Close the file pointer. ---------------+ ChangeLog | 4 ++++ keybox-init.c | 5 +++++ 2 files changed, 9 insertions(+) Index: gnupg/kbx/ChangeLog diff -u gnupg/kbx/ChangeLog:1.15.2.9 gnupg/kbx/ChangeLog:1.15.2.10 --- gnupg/kbx/ChangeLog:1.15.2.9 Thu Dec 2 08:48:08 2004 +++ gnupg/kbx/ChangeLog Tue Dec 7 19:07:30 2004 @@ -1,3 +1,7 @@ +2004-12-07 Werner Koch + + * keybox-init.c (keybox_release): Close the file pointer. + 2004-11-26 Werner Koch * Makefile.am (kbxutil_LDADD): Add ../common/libcommon.a Index: gnupg/kbx/keybox-init.c diff -u gnupg/kbx/keybox-init.c:1.4 gnupg/kbx/keybox-init.c:1.4.2.1 --- gnupg/kbx/keybox-init.c:1.4 Tue Jun 3 21:55:12 2003 +++ gnupg/kbx/keybox-init.c Tue Dec 7 19:07:30 2004 @@ -102,6 +102,11 @@ if (!hd) return; _keybox_release_blob (hd->found.blob); + if (hd->fp) + { + fclose (hd->fp); + hd->fp = NULL; + } xfree (hd->word_match.name); xfree (hd->word_match.pattern); xfree (hd); From cvs at cvs.gnupg.org Tue Dec 7 19:17:49 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:03 2004 Subject: gpgme (14 files) Message-ID: Date: Tuesday, December 7, 2004 @ 19:25:54 Author: marcus Path: /cvs/gpgme/gpgme Modified: NEWS gpgme/ChangeLog gpgme/context.h gpgme/engine-backend.h gpgme/engine-gpgsm.c gpgme/engine.c gpgme/engine.h gpgme/gpgme.c gpgme/gpgme.h gpgme/libgpgme.vers gpgme/op-support.c gpgme/ops.h gpgme/rungpg.c gpgme/version.c 2004-12-07 Marcus Brinkmann * libgpgme.vers (GPGME_1.1): New version. * engine-backend.h (struct engine_ops): Add argument FILE_NAME to member get_version(). Add arguments FILE_NAME and HOME_DIR to member new(). Change return type of get_file_name and get_version to char *. * engine-gpgsm.c (gpgsm_get_version): Change return type to char pointer. Do not cache result. (gpgsm_new): Add file_name and home_dir argument, and use them instead of the defaults, if set. * rungpg.c (struct engine_gpg): New member file_name. (gpg_get_version): Change return type to char pointer, and do not cache result. (gpg_release): Free gpg->file_name. (gpg_new): Take new arguments file_name and home_dir. Set the --homedir argument if HOME_DIR is not NULL. Set gpg->file_name. (start): Use gpg->file_name instead _gpgme_get_gpg_path, if set. * engine.h (_gpgme_engine_info_copy, _gpgme_engine_info_release): New prototypes. (_gpgme_engine_new): Change first argument to gpgme_engine_info_t info. * engine.c: Include . (gpgme_get_engine_info): Set *INFO within the lock. Move ENGINE_INFO and ENGINE_INFO_LOCK to .... (engine_info, engine_info_lock): ... here. New static variables. (engine_get_version): Add file_name argument to get_version invocation. Change return type to char pointer. (gpgme_engine_check_version): Rewritten to free() the return value of engine_get_version after using it. (_gpgme_engine_info_release): New function. (gpgme_get_engine_info): Rewritten. (_gpgme_engine_info_copy): New function. (_gpgme_set_engine_info): New function. (gpgme_set_engine_info): New function. (_gpgme_engine_new): Change first argument to gpgme_engine_info_t info, and use that. * gpgme.h (struct _gpgme_engine_info): Change type of file_name and version to char * (remove the const). New member home_dir. (gpgme_set_engine_info, gpgme_ctx_get_engine_info, gpgme_ctx_set_engine_info): New prototypes. * context.h (struct gpgme_context): New member engine_info. * gpgme.c (gpgme_new): Allocate CTX->engine_info. (gpgme_release): Deallocate CTX->engine_info. (gpgme_ctx_get_engine_info, gpgme_ctx_set_engine_info): New functions. * op-support.c (_gpgme_op_reset): Look for correct engine info and pass it to _gpgme_engine_new. * version.c (gpgme_check_version): Adjust to _gpgme_compare_versions returning an int. (_gpgme_compare_versions): Return an int value, not a const char pointer. * ops.h (_gpgme_compare_versions): Same for prototype. ------------------------+ NEWS | 13 ++ gpgme/ChangeLog | 54 +++++++++ gpgme/context.h | 3 gpgme/engine-backend.h | 15 ++ gpgme/engine-gpgsm.c | 36 +++--- gpgme/engine.c | 273 ++++++++++++++++++++++++++++++++++++++++------- gpgme/engine.h | 9 + gpgme/gpgme.c | 34 +++++ gpgme/gpgme.h | 33 ++++- gpgme/libgpgme.vers | 9 + gpgme/op-support.c | 15 ++ gpgme/ops.h | 6 - gpgme/rungpg.c | 47 +++++--- gpgme/version.c | 18 +-- 14 files changed, 478 insertions(+), 87 deletions(-) Index: gpgme/NEWS diff -u gpgme/NEWS:1.136 gpgme/NEWS:1.137 --- gpgme/NEWS:1.136 Fri Oct 22 20:11:33 2004 +++ gpgme/NEWS Tue Dec 7 19:25:54 2004 @@ -1,3 +1,16 @@ +Noteworthy changes in version 1.1.0 (unreleased) +------------------------------------------------ + + * You can now configure the backend engine file name and home + directory to be used, as default and per context. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +gpgme_set_engine_info NEW +gpgme_ctx_get_engine_info NEW +gpgme_ctx_set_engine_info NEW +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + Noteworthy changes in version 1.0.1 (2004-10-22) ------------------------------------------------ Index: gpgme/gpgme/ChangeLog diff -u gpgme/gpgme/ChangeLog:1.386 gpgme/gpgme/ChangeLog:1.387 --- gpgme/gpgme/ChangeLog:1.386 Fri Oct 22 19:57:56 2004 +++ gpgme/gpgme/ChangeLog Tue Dec 7 19:25:53 2004 @@ -1,3 +1,57 @@ +2004-12-07 Marcus Brinkmann + + * libgpgme.vers (GPGME_1.1): New version. + * engine-backend.h (struct engine_ops): Add argument FILE_NAME to + member get_version(). Add arguments FILE_NAME and HOME_DIR to + member new(). Change return type of get_file_name and get_version + to char *. + * engine-gpgsm.c (gpgsm_get_version): Change return type to char + pointer. Do not cache result. + (gpgsm_new): Add file_name and home_dir argument, and use them + instead of the defaults, if set. + * rungpg.c (struct engine_gpg): New member file_name. + (gpg_get_version): Change return type to char pointer, and do not + cache result. + (gpg_release): Free gpg->file_name. + (gpg_new): Take new arguments file_name and home_dir. Set the + --homedir argument if HOME_DIR is not NULL. Set gpg->file_name. + (start): Use gpg->file_name instead _gpgme_get_gpg_path, if set. + * engine.h (_gpgme_engine_info_copy, _gpgme_engine_info_release): + New prototypes. + (_gpgme_engine_new): Change first argument to gpgme_engine_info_t + info. + * engine.c: Include . + (gpgme_get_engine_info): Set *INFO within the lock. Move + ENGINE_INFO and ENGINE_INFO_LOCK to .... + (engine_info, engine_info_lock): ... here. New static variables. + (engine_get_version): Add file_name argument to + get_version invocation. Change return type to char pointer. + (gpgme_engine_check_version): Rewritten to free() the return value + of engine_get_version after using it. + (_gpgme_engine_info_release): New function. + (gpgme_get_engine_info): Rewritten. + (_gpgme_engine_info_copy): New function. + (_gpgme_set_engine_info): New function. + (gpgme_set_engine_info): New function. + (_gpgme_engine_new): Change first argument to gpgme_engine_info_t + info, and use that. + * gpgme.h (struct _gpgme_engine_info): Change type of file_name + and version to char * (remove the const). New member home_dir. + (gpgme_set_engine_info, gpgme_ctx_get_engine_info, + gpgme_ctx_set_engine_info): New prototypes. + * context.h (struct gpgme_context): New member engine_info. + * gpgme.c (gpgme_new): Allocate CTX->engine_info. + (gpgme_release): Deallocate CTX->engine_info. + (gpgme_ctx_get_engine_info, gpgme_ctx_set_engine_info): New + functions. + * op-support.c (_gpgme_op_reset): Look for correct engine info and + pass it to _gpgme_engine_new. + * version.c (gpgme_check_version): Adjust to + _gpgme_compare_versions returning an int. + (_gpgme_compare_versions): Return an int value, not a const char + pointer. + * ops.h (_gpgme_compare_versions): Same for prototype. + 2004-10-03 Marcus Brinkmann * verify.c (parse_trust): If no reason is provided, set Index: gpgme/gpgme/context.h diff -u gpgme/gpgme/context.h:1.56 gpgme/gpgme/context.h:1.57 --- gpgme/gpgme/context.h:1.56 Sun Sep 14 02:02:40 2003 +++ gpgme/gpgme/context.h Tue Dec 7 19:25:53 2004 @@ -62,6 +62,9 @@ be performed (sequentially). */ struct gpgme_context { + /* The engine info for this context. */ + gpgme_engine_info_t engine_info; + /* The protocol used by this context. */ gpgme_protocol_t protocol; Index: gpgme/gpgme/engine-backend.h diff -u gpgme/gpgme/engine-backend.h:1.15 gpgme/gpgme/engine-backend.h:1.16 --- gpgme/gpgme/engine-backend.h:1.15 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/engine-backend.h Tue Dec 7 19:25:53 2004 @@ -30,10 +30,21 @@ struct engine_ops { /* Static functions. */ - const char *(*get_file_name) (void); - const char *(*get_version) (void); + + /* Return the default file name for the binary of this engine. */ + char *(*get_file_name) (void); + + /* Returns a malloced string containing the version of the engine + with the given binary file name (or the default if FILE_NAME is + NULL. */ + char *(*get_version) (const char *file_name); + + /* Returns a statically allocated string containing the required + version. */ const char *(*get_req_version) (void); + gpgme_error_t (*new) (void **r_engine, + const char *file_name, const char *home_dir, const char *lc_ctype, const char *lc_messages); /* Member functions. */ Index: gpgme/gpgme/engine-gpgsm.c diff -u gpgme/gpgme/engine-gpgsm.c:1.100 gpgme/gpgme/engine-gpgsm.c:1.101 --- gpgme/gpgme/engine-gpgsm.c:1.100 Fri Oct 22 18:55:16 2004 +++ gpgme/gpgme/engine-gpgsm.c Tue Dec 7 19:25:53 2004 @@ -95,18 +95,11 @@ typedef struct engine_gpgsm *engine_gpgsm_t; -static const char * -gpgsm_get_version (void) +static char * +gpgsm_get_version (const char *file_name) { - static const char *gpgsm_version; - DEFINE_STATIC_LOCK (gpgsm_version_lock); - - LOCK (gpgsm_version_lock); - if (!gpgsm_version) - gpgsm_version = _gpgme_get_program_version (_gpgme_get_gpgsm_path ()); - UNLOCK (gpgsm_version_lock); - - return gpgsm_version; + return _gpgme_get_program_version (file_name ? file_name + : _gpgme_get_gpgsm_path ()); } @@ -319,11 +312,13 @@ static gpgme_error_t -gpgsm_new (void **engine, const char *lc_ctype, const char *lc_messages) +gpgsm_new (void **engine, const char *file_name, const char *home_dir, + const char *lc_ctype, const char *lc_messages) { gpgme_error_t err = 0; engine_gpgsm_t gpgsm; - char *argv[3]; + char *argv[5]; + int argc; int fds[2]; int child_fds[4]; char *dft_display = NULL; @@ -395,12 +390,19 @@ child_fds[2] = gpgsm->message_fd_server; child_fds[3] = -1; - argv[0] = "gpgsm"; - argv[1] = "--server"; - argv[2] = NULL; + argc = 0; + argv[argc++] = "gpgsm"; + if (home_dir) + { + argv[argc++] = "--homedir"; + argv[argc++] = home_dir; + } + argv[argc++] = "--server"; + argv[argc++] = NULL; err = assuan_pipe_connect (&gpgsm->assuan_ctx, - _gpgme_get_gpgsm_path (), argv, child_fds); + file_name ? file_name : _gpgme_get_gpgsm_path (), + argv, child_fds); /* FIXME: Check error. */ /* We need to know the fd used by assuan for reads. We do this by Index: gpgme/gpgme/engine.c diff -u gpgme/gpgme/engine.c:1.44 gpgme/gpgme/engine.c:1.45 --- gpgme/gpgme/engine.c:1.44 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/engine.c Tue Dec 7 19:25:53 2004 @@ -24,6 +24,7 @@ #include #include #include +#include #include "gpgme.h" #include "util.h" @@ -51,9 +52,14 @@ #endif }; + +/* The engine info. */ +static gpgme_engine_info_t engine_info; +DEFINE_STATIC_LOCK (engine_info_lock); + /* Get the file name of the engine for PROTOCOL. */ -static const char * +static char * engine_get_file_name (gpgme_protocol_t proto) { if (proto > DIM (engine_ops)) @@ -66,15 +72,16 @@ } -/* Get the version number of the engine for PROTOCOL. */ -static const char * -engine_get_version (gpgme_protocol_t proto) +/* Get a malloced string containing the version number of the engine + for PROTOCOL. */ +static char * +engine_get_version (gpgme_protocol_t proto, const char *file_name) { if (proto > DIM (engine_ops)) return NULL; if (engine_ops[proto] && engine_ops[proto]->get_version) - return (*engine_ops[proto]->get_version) (); + return (*engine_ops[proto]->get_version) (file_name); else return NULL; } @@ -98,21 +105,45 @@ gpgme_error_t gpgme_engine_check_version (gpgme_protocol_t proto) { - return _gpgme_compare_versions (engine_get_version (proto), - engine_get_req_version (proto)) - ? 0 : gpg_error (GPG_ERR_INV_ENGINE); + int result; + char *engine_version = engine_get_version (proto, NULL); + + result = _gpgme_compare_versions (engine_version, + engine_get_req_version (proto)); + if (engine_version) + free (engine_version); + + return result ? 0 : gpg_error (GPG_ERR_INV_ENGINE); +} + + +/* Release the engine info INFO. */ +void +_gpgme_engine_info_release (gpgme_engine_info_t info) +{ + while (info) + { + gpgme_engine_info_t next_info = info->next; + + assert (info->file_name); + free (info->file_name); + if (info->home_dir) + free (info->home_dir); + if (info->version) + free (info->version); + free (info); + info = next_info; + } } /* Get the information about the configured and installed engines. A pointer to the first engine in the statically allocated linked list - is returned in *INFO. If an error occurs, it is returned. */ + is returned in *INFO. If an error occurs, it is returned. The + returned data is valid until the next gpgme_set_engine_info. */ gpgme_error_t gpgme_get_engine_info (gpgme_engine_info_t *info) { - static gpgme_engine_info_t engine_info; - DEFINE_STATIC_LOCK (engine_info_lock); - LOCK (engine_info_lock); if (!engine_info) { @@ -123,70 +154,238 @@ for (proto = 0; proto < DIM (proto_list); proto++) { - const char *file_name = engine_get_file_name (proto_list[proto]); + char *file_name = engine_get_file_name (proto_list[proto]); if (!file_name) continue; + file_name = strdup (file_name); + *lastp = malloc (sizeof (*engine_info)); - if (!*lastp) + if (!*lastp || !file_name) { int saved_errno = errno; - while (engine_info) - { - gpgme_engine_info_t next_info = engine_info->next; - free (engine_info); - engine_info = next_info; - } + _gpgme_engine_info_release (engine_info); + engine_info = NULL; + + if (file_name) + free (file_name); + UNLOCK (engine_info_lock); return gpg_error_from_errno (saved_errno); } (*lastp)->protocol = proto_list[proto]; (*lastp)->file_name = file_name; - (*lastp)->version = engine_get_version (proto_list[proto]); + (*lastp)->home_dir = NULL; + (*lastp)->version = engine_get_version (proto_list[proto], NULL); (*lastp)->req_version = engine_get_req_version (proto_list[proto]); (*lastp)->next = NULL; lastp = &(*lastp)->next; } } - UNLOCK (engine_info_lock); + *info = engine_info; + UNLOCK (engine_info_lock); return 0; } - + +/* Get a deep copy of the engine info and return it in INFO. */ gpgme_error_t -_gpgme_engine_new (gpgme_protocol_t proto, engine_t *r_engine, - const char *lc_ctype, const char *lc_messages) +_gpgme_engine_info_copy (gpgme_engine_info_t *r_info) { - engine_t engine; + gpgme_error_t err = 0; + gpgme_engine_info_t info; + gpgme_engine_info_t new_info; + gpgme_engine_info_t *lastp; + + LOCK (engine_info_lock); + info = engine_info; + if (!info) + { + /* Make sure it is initialized. */ + UNLOCK (engine_info_lock); + err = gpgme_get_engine_info (&info); + if (err) + return err; + + LOCK (engine_info_lock); + } + + new_info = NULL; + lastp = &new_info; + + while (info) + { + char *file_name; + char *home_dir; + char *version; + + assert (info->file_name); + file_name = strdup (info->file_name); + + if (info->home_dir) + { + home_dir = strdup (info->home_dir); + if (!home_dir) + err = gpg_error_from_errno (errno); + } + else + home_dir = NULL; + + if (info->version) + { + version = strdup (info->version); + if (!version) + err = gpg_error_from_errno (errno); + } + else + version = NULL; + + *lastp = malloc (sizeof (*engine_info)); + if (!*lastp || !file_name || err) + { + int saved_errno = errno; + + _gpgme_engine_info_release (new_info); + + if (file_name) + free (file_name); + if (home_dir) + free (home_dir); + if (version) + free (version); + + UNLOCK (engine_info_lock); + return gpg_error_from_errno (saved_errno); + } + + (*lastp)->protocol = info->protocol; + (*lastp)->file_name = file_name; + (*lastp)->home_dir = home_dir; + (*lastp)->version = version; + (*lastp)->req_version = info->req_version; + (*lastp)->next = NULL; + lastp = &(*lastp)->next; + + info = info->next; + } + + *r_info = new_info; + UNLOCK (engine_info_lock); + return 0; +} + - const char *file_name; - const char *version; +/* Set the engine info for the info list INFO, protocol PROTO, to the + file name FILE_NAME and the home directory HOME_DIR. */ +gpgme_error_t +_gpgme_set_engine_info (gpgme_engine_info_t info, gpgme_protocol_t proto, + const char *file_name, const char *home_dir) +{ + char *new_file_name; + char *new_home_dir; + /* FIXME: Use some PROTO_MAX definition. */ if (proto > DIM (engine_ops)) return gpg_error (GPG_ERR_INV_VALUE); - if (!engine_ops[proto]) + while (info && info->protocol != proto) + info = info->next; + + if (!info) return gpg_error (GPG_ERR_INV_ENGINE); - file_name = engine_get_file_name (proto); - version = engine_get_version (proto); - if (!file_name || !version) + /* Prepare new members. */ + if (file_name) + new_file_name = strdup (file_name); + else + { + new_file_name = engine_get_file_name (proto); + assert (file_name); + new_file_name = strdup (new_file_name); + } + if (!new_file_name) + return gpg_error_from_errno (errno); + + if (home_dir) + { + new_home_dir = strdup (home_dir); + if (!new_home_dir) + { + free (new_file_name); + return gpg_error_from_errno (errno); + } + } + else + new_home_dir = NULL; + + /* Remove the old members. */ + assert (info->file_name); + free (info->file_name); + if (info->home_dir) + free (info->home_dir); + if (info->version) + free (info->version); + + /* Install the new members. */ + info->file_name = new_file_name; + info->home_dir = new_home_dir; + info->version = engine_get_version (proto, file_name); + + return 0; +} + + +/* Set the default engine info for the protocol PROTO to the file name + FILE_NAME and the home directory HOME_DIR. */ +gpgme_error_t +gpgme_set_engine_info (gpgme_protocol_t proto, + const char *file_name, const char *home_dir) +{ + gpgme_error_t err; + gpgme_engine_info_t info; + + LOCK (engine_info_lock); + info = engine_info; + if (!info) + { + /* Make sure it is initialized. */ + UNLOCK (engine_info_lock); + err = gpgme_get_engine_info (&info); + if (err) + return err; + + LOCK (engine_info_lock); + } + + err = _gpgme_set_engine_info (info, proto, file_name, home_dir); + UNLOCK (engine_info_lock); + return err; +} + + +gpgme_error_t +_gpgme_engine_new (gpgme_engine_info_t info, engine_t *r_engine, + const char *lc_ctype, const char *lc_messages) +{ + engine_t engine; + + if (!info->file_name || !info->version) return gpg_error (GPG_ERR_INV_ENGINE); engine = calloc (1, sizeof *engine); if (!engine) return gpg_error_from_errno (errno); - engine->ops = engine_ops[proto]; - if (engine_ops[proto]->new) + engine->ops = engine_ops[info->protocol]; + if (engine->ops->new) { - gpgme_error_t err = (*engine_ops[proto]->new) (&engine->engine, - lc_ctype, - lc_messages); + gpgme_error_t err = (*engine->ops->new) (&engine->engine, + info->file_name, info->home_dir, + lc_ctype, lc_messages); if (err) { free (engine); Index: gpgme/gpgme/engine.h diff -u gpgme/gpgme/engine.h:1.34 gpgme/gpgme/engine.h:1.35 --- gpgme/gpgme/engine.h:1.34 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/engine.h Tue Dec 7 19:25:53 2004 @@ -35,7 +35,14 @@ const char *keyword, int fd); -gpgme_error_t _gpgme_engine_new (gpgme_protocol_t proto, +/* Get a deep copy of the engine info and return it in INFO. */ +gpgme_error_t _gpgme_engine_info_copy (gpgme_engine_info_t *r_info); + +/* Release the engine info INFO. */ +void _gpgme_engine_info_release (gpgme_engine_info_t info); + + +gpgme_error_t _gpgme_engine_new (gpgme_engine_info_t info, engine_t *r_engine, const char *lc_ctype, const char *lc_messages); Index: gpgme/gpgme/gpgme.c diff -u gpgme/gpgme/gpgme.c:1.76 gpgme/gpgme/gpgme.c:1.77 --- gpgme/gpgme/gpgme.c:1.76 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/gpgme.c Tue Dec 7 19:25:53 2004 @@ -50,6 +50,14 @@ ctx = calloc (1, sizeof *ctx); if (!ctx) return gpg_error_from_errno (errno); + + _gpgme_engine_info_copy (&ctx->engine_info); + if (!ctx->engine_info) + { + free (ctx); + return gpg_error_from_errno (errno); + } + ctx->keylist_mode = GPGME_KEYLIST_MODE_LOCAL; ctx->include_certs = 1; ctx->protocol = GPGME_PROTOCOL_OpenPGP; @@ -62,6 +70,7 @@ if (!ctx->lc_ctype) { UNLOCK (def_lc_lock); + _gpgme_engine_info_release (ctx->engine_info); free (ctx); return gpg_error_from_errno (errno); } @@ -77,6 +86,7 @@ UNLOCK (def_lc_lock); if (ctx->lc_ctype) free (ctx->lc_ctype); + _gpgme_engine_info_release (ctx->engine_info); free (ctx); return gpg_error_from_errno (errno); } @@ -120,6 +130,7 @@ free (ctx->lc_ctype); if (ctx->lc_messages) free (ctx->lc_messages); + _gpgme_engine_info_release (ctx->engine_info); free (ctx); } @@ -390,6 +401,29 @@ } +/* Get the information about the configured engines. A pointer to the + first engine in the statically allocated linked list is returned. + The returned data is valid until the next gpgme_ctx_set_engine_info. */ +gpgme_engine_info_t +gpgme_ctx_get_engine_info (gpgme_ctx_t ctx) +{ + return ctx->engine_info; +} + + +/* Set the engine info for the context CTX, protocol PROTO, to the + file name FILE_NAME and the home directory HOME_DIR. */ +gpgme_error_t +gpgme_ctx_set_engine_info (gpgme_ctx_t ctx, gpgme_protocol_t proto, + const char *file_name, const char *home_dir) +{ + /* FIXME: Make sure to reset the context if we are running in daemon + mode. */ + return _gpgme_set_engine_info (ctx->engine_info, proto, + file_name, home_dir); +} + + const char * gpgme_pubkey_algo_name (gpgme_pubkey_algo_t algo) { Index: gpgme/gpgme/gpgme.h diff -u gpgme/gpgme/gpgme.h:1.149 gpgme/gpgme/gpgme.h:1.150 --- gpgme/gpgme/gpgme.h:1.149 Tue Dec 7 16:27:11 2004 +++ gpgme/gpgme/gpgme.h Tue Dec 7 19:25:53 2004 @@ -412,13 +412,16 @@ gpgme_protocol_t protocol; /* The file name of the engine binary. */ - const char *file_name; - + char *file_name; + /* The version string of the installed engine. */ - const char *version; + char *version; /* The minimum version required for GPGME. */ const char *req_version; + + /* The home directory used, or NULL if default. */ + char *home_dir; }; typedef struct _gpgme_engine_info *gpgme_engine_info_t; @@ -741,6 +744,19 @@ locale if CTX is a null pointer. */ gpgme_error_t gpgme_set_locale (gpgme_ctx_t ctx, int category, const char *value); + +/* Get the information about the configured engines. A pointer to the + first engine in the statically allocated linked list is returned. + The returned data is valid until the next gpgme_ctx_set_engine_info. */ +gpgme_engine_info_t gpgme_ctx_get_engine_info (gpgme_ctx_t ctx); + +/* Set the engine info for the context CTX, protocol PROTO, to the + file name FILE_NAME and the home directory HOME_DIR. */ +gpgme_error_t gpgme_ctx_set_engine_info (gpgme_ctx_t ctx, + gpgme_protocol_t proto, + const char *file_name, + const char *home_dir); + /* Return a statically allocated string with the name of the public key algorithm ALGO, or NULL if that name is not known. */ @@ -1501,9 +1517,18 @@ /* Check that the library fulfills the version requirement. */ const char *gpgme_check_version (const char *req_version); -/* Retrieve information about the backend engines. */ +/* Get the information about the configured and installed engines. A + pointer to the first engine in the statically allocated linked list + is returned in *INFO. If an error occurs, it is returned. The + returned data is valid until the next gpgme_set_engine_info. */ gpgme_error_t gpgme_get_engine_info (gpgme_engine_info_t *engine_info); +/* Set the default engine info for the protocol PROTO to the file name + FILE_NAME and the home directory HOME_DIR. */ +gpgme_error_t gpgme_set_engine_info (gpgme_protocol_t proto, + const char *file_name, + const char *home_dir); + /* Engine support functions. */ Index: gpgme/gpgme/libgpgme.vers diff -u gpgme/gpgme/libgpgme.vers:1.3 gpgme/gpgme/libgpgme.vers:1.4 --- gpgme/gpgme/libgpgme.vers:1.3 Wed Jun 2 16:18:03 2004 +++ gpgme/gpgme/libgpgme.vers Tue Dec 7 19:25:53 2004 @@ -18,6 +18,15 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +GPGME_1.1 { + global: + gpgme_set_engine_info; + + gpgme_ctx_get_engine_info; + gpgme_ctx_set_engine_info; +}; + + GPGME_1.0 { global: gpgme_check_version; Index: gpgme/gpgme/op-support.c diff -u gpgme/gpgme/op-support.c:1.15 gpgme/gpgme/op-support.c:1.16 --- gpgme/gpgme/op-support.c:1.15 Tue Oct 5 17:08:45 2004 +++ gpgme/gpgme/op-support.c Tue Dec 7 19:25:53 2004 @@ -66,17 +66,26 @@ _gpgme_op_reset (gpgme_ctx_t ctx, int type) { gpgme_error_t err = 0; + gpgme_engine_info_t info; struct gpgme_io_cbs io_cbs; + info = ctx->engine_info; + while (info && info->protocol != ctx->protocol) + info = info->next; + + if (!info) + return gpg_error (GPG_ERR_UNSUPPORTED_PROTOCOL); + _gpgme_release_result (ctx); - /* Create an engine object. */ - if (ctx->engine) + if (ctx->engine) { _gpgme_engine_release (ctx->engine); ctx->engine = NULL; } - err = _gpgme_engine_new (ctx->protocol, &ctx->engine, + + /* Create an engine object. */ + err = _gpgme_engine_new (info, &ctx->engine, ctx->lc_ctype, ctx->lc_messages); if (err) return err; Index: gpgme/gpgme/ops.h diff -u gpgme/gpgme/ops.h:1.55 gpgme/gpgme/ops.h:1.56 --- gpgme/gpgme/ops.h:1.55 Fri Jun 6 02:55:42 2003 +++ gpgme/gpgme/ops.h Tue Dec 7 19:25:53 2004 @@ -136,8 +136,10 @@ /*-- version.c --*/ -const char *_gpgme_compare_versions (const char *my_version, - const char *req_version); +/* Return true if MY_VERSION is at least REQ_VERSION, and false + otherwise. */ +int _gpgme_compare_versions (const char *my_version, + const char *req_version); char *_gpgme_get_program_version (const char *const path); #endif /* OPS_H */ Index: gpgme/gpgme/rungpg.c diff -u gpgme/gpgme/rungpg.c:1.101 gpgme/gpgme/rungpg.c:1.102 --- gpgme/gpgme/rungpg.c:1.101 Thu Sep 30 02:24:58 2004 +++ gpgme/gpgme/rungpg.c Tue Dec 7 19:25:53 2004 @@ -66,6 +66,8 @@ struct engine_gpg { + char *file_name; + struct arg_and_data_s *arglist; struct arg_and_data_s **argtail; @@ -224,17 +226,11 @@ } -static const char * -gpg_get_version (void) +static char * +gpg_get_version (const char *file_name) { - static const char *gpg_version; - DEFINE_STATIC_LOCK (gpg_version_lock); - - LOCK (gpg_version_lock); - if (!gpg_version) - gpg_version = _gpgme_get_program_version (_gpgme_get_gpg_path ()); - UNLOCK (gpg_version_lock); - return gpg_version; + return _gpgme_get_program_version (file_name ? file_name + : _gpgme_get_gpg_path ()); } @@ -313,6 +309,9 @@ gpg_cancel (engine); + if (gpg->file_name) + free (gpg->file_name); + while (gpg->arglist) { struct arg_and_data_s *next = gpg->arglist->next; @@ -336,7 +335,8 @@ static gpgme_error_t -gpg_new (void **engine, const char *lc_ctype, const char *lc_messages) +gpg_new (void **engine, const char *file_name, const char *home_dir, + const char *lc_ctype, const char *lc_messages) { engine_gpg_t gpg; gpgme_error_t rc = 0; @@ -345,6 +345,16 @@ if (!gpg) return gpg_error_from_errno (errno); + if (file_name) + { + gpg->file_name = strdup (file_name); + if (!gpg->file_name) + { + rc = gpg_error_from_errno (errno); + goto leave; + } + } + gpg->argtail = &gpg->arglist; gpg->status.fd[0] = -1; gpg->status.fd[1] = -1; @@ -380,6 +390,16 @@ goto leave; } gpg->status.eof = 0; + + if (home_dir) + { + rc = add_arg (gpg, "--homedir"); + if (!rc) + rc = add_arg (gpg, home_dir); + if (rc) + goto leave; + } + rc = add_arg (gpg, "--status-fd"); if (rc) goto leave; @@ -1043,7 +1063,7 @@ if (!gpg) return gpg_error (GPG_ERR_INV_VALUE); - if (! _gpgme_get_gpg_path ()) + if (!gpg->file_name && !_gpgme_get_gpg_path ()) return gpg_error (GPG_ERR_INV_ENGINE); rc = build_argv (gpg); @@ -1101,7 +1121,8 @@ fd_parent_list[n].fd = -1; fd_parent_list[n].dup_to = -1; - status = _gpgme_io_spawn (_gpgme_get_gpg_path (), + status = _gpgme_io_spawn (gpg->file_name ? gpg->file_name : + _gpgme_get_gpg_path (), gpg->argv, fd_child_list, fd_parent_list); saved_errno = errno; free (fd_child_list); Index: gpgme/gpgme/version.c diff -u gpgme/gpgme/version.c:1.25 gpgme/gpgme/version.c:1.26 --- gpgme/gpgme/version.c:1.25 Mon Oct 6 18:17:13 2003 +++ gpgme/gpgme/version.c Tue Dec 7 19:25:53 2004 @@ -103,7 +103,9 @@ } -const char * +/* Return true if MY_VERSION is at least REQ_VERSION, and false + otherwise. */ +int _gpgme_compare_versions (const char *my_version, const char *rq_version) { @@ -112,17 +114,17 @@ const char *my_plvl, *rq_plvl; if (!rq_version) - return my_version; + return 1; if (!my_version) - return NULL; + return 0; my_plvl = parse_version_string (my_version, &my_major, &my_minor, &my_micro); if (!my_plvl) - return NULL; + return 0; rq_plvl = parse_version_string (rq_version, &rq_major, &rq_minor, &rq_micro); if (!rq_plvl) - return NULL; + return 0; if (my_major > rq_major || (my_major == rq_major && my_minor > rq_minor) @@ -130,9 +132,9 @@ && my_micro > rq_micro) || (my_major == rq_major && my_minor == rq_minor && my_micro == rq_micro && strcmp (my_plvl, rq_plvl) >= 0)) - return my_version; + return 1; - return NULL; + return 0; } @@ -149,7 +151,7 @@ gpgme_check_version (const char *req_version) { do_subsystem_inits (); - return _gpgme_compare_versions (VERSION, req_version); + return _gpgme_compare_versions (VERSION, req_version) ? VERSION : NULL; } From cvs at cvs.gnupg.org Tue Dec 7 19:41:30 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:12 2004 Subject: gpgme (TODO) Message-ID: Date: Tuesday, December 7, 2004 @ 19:49:35 Author: marcus Path: /cvs/gpgme/gpgme Modified: TODO Update. ------+ TODO | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Index: gpgme/TODO diff -u gpgme/TODO:1.95 gpgme/TODO:1.96 --- gpgme/TODO:1.95 Thu Nov 4 14:58:06 2004 +++ gpgme/TODO Tue Dec 7 19:49:35 2004 @@ -5,6 +5,9 @@ ** Some gpg tests fail with gpg 1.3.4-cvs (gpg/t-keylist-sig) The test is currently disabled there and in gpg/t-import. ** Add notation data to key signatures. +** Document gpgme_set_engine_info, gpgme_ctx_get_engine_info, + gpgme_ctx_set_engine_info. + * ABI's to break: ** I/O and User Data could be made extensible. But this can be done @@ -28,6 +31,7 @@ *** gpgme_attr_t *** All Gpgme* typedefs. + * Thread support: ** When GNU Pth supports sendmsg/recvmsg, wrap them properly. ** Without timegm (3) support our ISO time parser is not thread safe. @@ -60,9 +64,6 @@ This allows us to handle years later than 2037 properly. With the time_t interface they are all mapped to 2037-12-31 -* Support -** gpgme.m4 should check --api-version of gpgme-config. - * Documentation ** Document validity and trust issues. From cvs at cvs.gnupg.org Tue Dec 7 19:52:10 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:35:21 2004 Subject: gnupg/scripts (ChangeLog autogen.sh) Message-ID: Date: Tuesday, December 7, 2004 @ 20:00:15 Author: wk Path: /cvs/gnupg/gnupg/scripts Modified: ChangeLog autogen.sh ------------+ ChangeLog | 4 ++++ autogen.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) Index: gnupg/scripts/ChangeLog diff -u gnupg/scripts/ChangeLog:1.57 gnupg/scripts/ChangeLog:1.58 --- gnupg/scripts/ChangeLog:1.57 Wed Oct 27 18:32:33 2004 +++ gnupg/scripts/ChangeLog Tue Dec 7 20:00:15 2004 @@ -1,3 +1,7 @@ +2004-11-26 Werner Koch + + * autogen.sh (gettext_vers_num): Fix aclocal test. + 2004-10-27 Werner Koch * mk-w32-dist: Use utf-8 encoding for all MO files. Index: gnupg/scripts/autogen.sh diff -u gnupg/scripts/autogen.sh:1.24 gnupg/scripts/autogen.sh:1.25 --- gnupg/scripts/autogen.sh:1.24 Tue Oct 26 21:32:44 2004 +++ gnupg/scripts/autogen.sh Tue Dec 7 20:00:15 2004 @@ -252,7 +252,7 @@ check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf fi if check_version $AUTOMAKE $automake_vers_num $automake_vers; then - check_version $ACLOCAL $automake_vers_num $autoconf_vers automake + check_version $ACLOCAL $automake_vers_num $automake_vers automake fi if check_version $GETTEXT $gettext_vers_num $gettext_vers; then check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext From cvs at cvs.gnupg.org Tue Dec 7 19:57:12 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:24 2004 Subject: gpgme/doc (ChangeLog gpgme.texi) Message-ID: Date: Tuesday, December 7, 2004 @ 20:05:18 Author: marcus Path: /cvs/gpgme/gpgme/doc Modified: ChangeLog gpgme.texi 2004-12-07 Marcus Brinkmann * gpgme.texi (Creating Contexts): Fix cut&paste error. Reported by Noel Torres . ------------+ ChangeLog | 5 +++++ gpgme.texi | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) Index: gpgme/doc/ChangeLog diff -u gpgme/doc/ChangeLog:1.131 gpgme/doc/ChangeLog:1.132 --- gpgme/doc/ChangeLog:1.131 Thu Sep 30 04:11:18 2004 +++ gpgme/doc/ChangeLog Tue Dec 7 20:05:18 2004 @@ -1,3 +1,8 @@ +2004-12-07 Marcus Brinkmann + + * gpgme.texi (Creating Contexts): Fix cut&paste error. Reported + by Noel Torres . + 2004-09-30 Marcus Brinkmann * Makefile.am (gpgme_TEXINFOS): Remove fdl.texi. Index: gpgme/doc/gpgme.texi diff -u gpgme/doc/gpgme.texi:1.133 gpgme/doc/gpgme.texi:1.134 --- gpgme/doc/gpgme.texi:1.133 Thu Sep 30 04:11:18 2004 +++ gpgme/doc/gpgme.texi Tue Dec 7 20:05:18 2004 @@ -1820,8 +1820,8 @@ @cindex context, creation @deftypefun gpgme_error_t gpgme_new (@w{gpgme_ctx_t *@var{ctx}}) -The function @code{gpgme_data_new} creates a new @code{gpgme_ctx_t} -object and returns a handle for it in @var{ctx}. +The function @code{gpgme_new} creates a new @code{gpgme_ctx_t} object +and returns a handle for it in @var{ctx}. The function returns the error code @code{GPG_ERR_NO_ERROR} if the context was successfully created, @code{GPG_ERR_INV_VALUE} if From cvs at cvs.gnupg.org Tue Dec 7 19:58:23 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:26 2004 Subject: gpgme (THANKS) Message-ID: Date: Tuesday, December 7, 2004 @ 20:06:29 Author: marcus Path: /cvs/gpgme/gpgme Modified: THANKS Add Noel Torres . --------+ THANKS | 6 ++++++ 1 files changed, 6 insertions(+) Index: gpgme/THANKS diff -u gpgme/THANKS:1.7 gpgme/THANKS:1.8 --- gpgme/THANKS:1.7 Thu Apr 29 23:19:09 2004 +++ gpgme/THANKS Tue Dec 7 20:06:29 2004 @@ -1,3 +1,8 @@ +For a list of the authors of the source code of GPGME, please see the +file AUTHORS. The following people supported GPGME development in +various ways (for example by finding bugs or giving advice), and we +want to thank them for their help. If we forgot you, please let us +know. Adriaan de Groot adridg@cs.kun.nl Albrecht Dreß albrecht.dress@arcor.de @@ -9,6 +14,7 @@ Jose C. García Sogo jose@jaimedelamo.eu.org Mark Mutz mutz@kde.org Miguel Coca mcoca@gnu.org +Noel Torres envite@rolamasao.org Stéphane Corthésy stephane@sente.ch Timo Schulz twoaday@freakmail.de Tommy Reynolds reynolds@redhat.com From cvs at cvs.gnupg.org Tue Dec 7 19:58:37 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:28 2004 Subject: gpgme-1-0-branch gpgme (THANKS) Message-ID: Date: Tuesday, December 7, 2004 @ 20:06:42 Author: marcus Path: /cvs/gpgme/gpgme Tag: gpgme-1-0-branch Modified: THANKS Add Noel Torres . --------+ THANKS | 6 ++++++ 1 files changed, 6 insertions(+) Index: gpgme/THANKS diff -u gpgme/THANKS:1.7 gpgme/THANKS:1.7.2.1 --- gpgme/THANKS:1.7 Thu Apr 29 23:19:09 2004 +++ gpgme/THANKS Tue Dec 7 20:06:42 2004 @@ -1,3 +1,8 @@ +For a list of the authors of the source code of GPGME, please see the +file AUTHORS. The following people supported GPGME development in +various ways (for example by finding bugs or giving advice), and we +want to thank them for their help. If we forgot you, please let us +know. Adriaan de Groot adridg@cs.kun.nl Albrecht Dreß albrecht.dress@arcor.de @@ -9,6 +14,7 @@ Jose C. García Sogo jose@jaimedelamo.eu.org Mark Mutz mutz@kde.org Miguel Coca mcoca@gnu.org +Noel Torres envite@rolamasao.org Stéphane Corthésy stephane@sente.ch Timo Schulz twoaday@freakmail.de Tommy Reynolds reynolds@redhat.com From cvs at cvs.gnupg.org Tue Dec 7 19:59:25 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:30 2004 Subject: gpgme-1-0-branch gpgme/doc (ChangeLog gpgme.texi) Message-ID: Date: Tuesday, December 7, 2004 @ 20:07:30 Author: marcus Path: /cvs/gpgme/gpgme/doc Tag: gpgme-1-0-branch Modified: ChangeLog gpgme.texi 2004-12-07 Marcus Brinkmann * gpgme.texi (Creating Contexts): Fix cut&paste error. Reported by Noel Torres . ------------+ ChangeLog | 5 +++++ gpgme.texi | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) Index: gpgme/doc/ChangeLog diff -u gpgme/doc/ChangeLog:1.131 gpgme/doc/ChangeLog:1.131.2.1 --- gpgme/doc/ChangeLog:1.131 Thu Sep 30 04:11:18 2004 +++ gpgme/doc/ChangeLog Tue Dec 7 20:07:30 2004 @@ -1,3 +1,8 @@ +2004-12-07 Marcus Brinkmann + + * gpgme.texi (Creating Contexts): Fix cut&paste error. Reported + by Noel Torres . + 2004-09-30 Marcus Brinkmann * Makefile.am (gpgme_TEXINFOS): Remove fdl.texi. Index: gpgme/doc/gpgme.texi diff -u gpgme/doc/gpgme.texi:1.133 gpgme/doc/gpgme.texi:1.133.2.1 --- gpgme/doc/gpgme.texi:1.133 Thu Sep 30 04:11:18 2004 +++ gpgme/doc/gpgme.texi Tue Dec 7 20:07:30 2004 @@ -1820,8 +1820,8 @@ @cindex context, creation @deftypefun gpgme_error_t gpgme_new (@w{gpgme_ctx_t *@var{ctx}}) -The function @code{gpgme_data_new} creates a new @code{gpgme_ctx_t} -object and returns a handle for it in @var{ctx}. +The function @code{gpgme_new} creates a new @code{gpgme_ctx_t} object +and returns a handle for it in @var{ctx}. The function returns the error code @code{GPG_ERR_NO_ERROR} if the context was successfully created, @code{GPG_ERR_INV_VALUE} if From cvs at cvs.gnupg.org Tue Dec 7 22:13:03 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:35 2004 Subject: gpgme-1-0-branch gpgme/doc (ChangeLog gpgme.texi lesser.texi) Message-ID: Date: Tuesday, December 7, 2004 @ 22:21:09 Author: marcus Path: /cvs/gpgme/gpgme/doc Tag: gpgme-1-0-branch Modified: ChangeLog gpgme.texi lesser.texi 2004-12-07 Marcus Brinkmann * lesser.texi (Library Copying): Change from @appendixsec to @appendix. * gpgme.texi (Features): Change reference to GPL to one to LGPL. -------------+ ChangeLog | 4 ++++ gpgme.texi | 2 +- lesser.texi | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) Index: gpgme/doc/ChangeLog diff -u gpgme/doc/ChangeLog:1.131.2.2 gpgme/doc/ChangeLog:1.131.2.3 --- gpgme/doc/ChangeLog:1.131.2.2 Tue Dec 7 22:11:52 2004 +++ gpgme/doc/ChangeLog Tue Dec 7 22:21:08 2004 @@ -1,5 +1,9 @@ 2004-12-07 Marcus Brinkmann + * lesser.texi (Library Copying): Change from @appendixsec to + @appendix. + * gpgme.texi (Features): Change reference to GPL to one to LGPL. + * Makefile.am: Change license to LGPL. (gpgme_TEXINFOS): Replace gpl.texi with lesser.texi. Index: gpgme/doc/gpgme.texi diff -u gpgme/doc/gpgme.texi:1.133.2.2 gpgme/doc/gpgme.texi:1.133.2.3 --- gpgme/doc/gpgme.texi:1.133.2.2 Tue Dec 7 22:11:52 2004 +++ gpgme/doc/gpgme.texi Tue Dec 7 22:21:08 2004 @@ -278,7 +278,7 @@ @table @asis @item it's free software Anybody can use, modify, and redistribute it under the terms of the GNU -General Public License (@pxref{Copying}). +Lesser General Public License (@pxref{Library Copying}). @item it's flexible @acronym{GPGME} provides transparent support for several cryptographic Index: gpgme/doc/lesser.texi diff -u gpgme/doc/lesser.texi:1.1.2.1 gpgme/doc/lesser.texi:1.1.2.2 --- gpgme/doc/lesser.texi:1.1.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/doc/lesser.texi Tue Dec 7 22:21:08 2004 @@ -1,5 +1,5 @@ @node Library Copying -@appendixsec GNU LESSER GENERAL PUBLIC LICENSE +@appendix GNU LESSER GENERAL PUBLIC LICENSE @cindex LGPL, Lesser General Public License @center Version 2.1, February 1999 From cvs at cvs.gnupg.org Tue Dec 7 22:13:36 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:38 2004 Subject: gpgme/doc (ChangeLog gpgme.texi lesser.texi) Message-ID: Date: Tuesday, December 7, 2004 @ 22:21:42 Author: marcus Path: /cvs/gpgme/gpgme/doc Modified: ChangeLog gpgme.texi lesser.texi 2004-12-07 Marcus Brinkmann * lesser.texi (Library Copying): Change from @appendixsec to @appendix. * gpgme.texi (Features): Change reference to GPL to one to LGPL. -------------+ ChangeLog | 4 ++++ gpgme.texi | 2 +- lesser.texi | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) Index: gpgme/doc/ChangeLog diff -u gpgme/doc/ChangeLog:1.133 gpgme/doc/ChangeLog:1.134 --- gpgme/doc/ChangeLog:1.133 Tue Dec 7 22:13:36 2004 +++ gpgme/doc/ChangeLog Tue Dec 7 22:21:41 2004 @@ -1,5 +1,9 @@ 2004-12-07 Marcus Brinkmann + * lesser.texi (Library Copying): Change from @appendixsec to + @appendix. + * gpgme.texi (Features): Change reference to GPL to one to LGPL. + * Makefile.am: Change license to LGPL. (gpgme_TEXINFOS): Replace gpl.texi with lesser.texi. Index: gpgme/doc/gpgme.texi diff -u gpgme/doc/gpgme.texi:1.135 gpgme/doc/gpgme.texi:1.136 --- gpgme/doc/gpgme.texi:1.135 Tue Dec 7 22:13:36 2004 +++ gpgme/doc/gpgme.texi Tue Dec 7 22:21:41 2004 @@ -278,7 +278,7 @@ @table @asis @item it's free software Anybody can use, modify, and redistribute it under the terms of the GNU -General Public License (@pxref{Copying}). +Lesser General Public License (@pxref{Library Copying}). @item it's flexible @acronym{GPGME} provides transparent support for several cryptographic Index: gpgme/doc/lesser.texi diff -u gpgme/doc/lesser.texi:1.2 gpgme/doc/lesser.texi:1.3 --- gpgme/doc/lesser.texi:1.2 Tue Dec 7 22:13:36 2004 +++ gpgme/doc/lesser.texi Tue Dec 7 22:21:41 2004 @@ -1,5 +1,5 @@ @node Library Copying -@appendixsec GNU LESSER GENERAL PUBLIC LICENSE +@appendix GNU LESSER GENERAL PUBLIC LICENSE @cindex LGPL, Lesser General Public License @center Version 2.1, February 1999 From cvs at cvs.gnupg.org Tue Dec 7 22:15:56 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:40 2004 Subject: gpgme (NEWS) Message-ID: Date: Tuesday, December 7, 2004 @ 22:24:03 Author: marcus Path: /cvs/gpgme/gpgme Modified: NEWS Add news entry for 0.3.16. ------+ NEWS | 5 +++++ 1 files changed, 5 insertions(+) Index: gpgme/NEWS diff -u gpgme/NEWS:1.137 gpgme/NEWS:1.138 --- gpgme/NEWS:1.137 Tue Dec 7 19:25:54 2004 +++ gpgme/NEWS Tue Dec 7 22:24:03 2004 @@ -696,6 +696,11 @@ GPGME_ATTR_SIG_CLASS NEW ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Noteworthy changes in version 0.3.16 (2003-11-19) +------------------------------------------------- + + * Compatibility fixes for GnuPG 1.9.x + Noteworthy changes in version 0.3.15 (2003-02-18) ------------------------------------------------- From cvs at cvs.gnupg.org Tue Dec 7 22:17:55 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:35:42 2004 Subject: gpgme-1-0-branch gpgme (NEWS) Message-ID: Date: Tuesday, December 7, 2004 @ 22:26:01 Author: marcus Path: /cvs/gpgme/gpgme Tag: gpgme-1-0-branch Modified: NEWS Add item for 0.3.16. ------+ NEWS | 12 ++++++++++++ 1 files changed, 12 insertions(+) Index: gpgme/NEWS diff -u gpgme/NEWS:1.136 gpgme/NEWS:1.136.2.1 --- gpgme/NEWS:1.136 Fri Oct 22 20:11:33 2004 +++ gpgme/NEWS Tue Dec 7 22:26:01 2004 @@ -1,3 +1,10 @@ +Noteworthy changes in version 1.0.2 (unreleased) +------------------------------------------------ + + * Changed the license of the library to the GNU Lesser General Public + License (LGPL), version 2.1 or later. + + Noteworthy changes in version 1.0.1 (2004-10-22) ------------------------------------------------ @@ -683,6 +690,11 @@ GPGME_ATTR_SIG_CLASS NEW ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Noteworthy changes in version 0.3.16 (2003-11-19) +------------------------------------------------- + + * Compatibility fixes for GnuPG 1.9.x + Noteworthy changes in version 0.3.15 (2003-02-18) ------------------------------------------------- From cvs at cvs.gnupg.org Thu Dec 9 14:09:38 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 13 16:36:50 2004 Subject: gnupg/doc (ChangeLog highlights-1.4.txt mksamplekeys samplekeys.asc) Message-ID: Date: Thursday, December 9, 2004 @ 14:17:48 Author: dshaw Path: /cvs/gnupg/gnupg/doc Added: highlights-1.4.txt Modified: ChangeLog mksamplekeys samplekeys.asc * highlights-1.4.txt: New. * mksamplekeys, samplekeys.asc: Add the PGP global directory key. --------------------+ ChangeLog | 6 + highlights-1.4.txt | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++ mksamplekeys | 2 samplekeys.asc | 105 +++++++++++++++++++++++++- 4 files changed, 311 insertions(+), 4 deletions(-) Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.86 gnupg/doc/ChangeLog:1.87 --- gnupg/doc/ChangeLog:1.86 Fri Nov 26 17:46:53 2004 +++ gnupg/doc/ChangeLog Thu Dec 9 14:17:48 2004 @@ -1,3 +1,9 @@ +2004-12-09 David Shaw + + * highlights-1.4.txt: New. + + * mksamplekeys, samplekeys.asc: Add the PGP global directory key. + 2004-11-26 David Shaw * gpg.sgml: Document export-minimal. Index: gnupg/doc/highlights-1.4.txt diff -u /dev/null gnupg/doc/highlights-1.4.txt:1.1 --- /dev/null Thu Dec 9 14:17:48 2004 +++ gnupg/doc/highlights-1.4.txt Thu Dec 9 14:17:48 2004 @@ -0,0 +1,202 @@ +GnuPG 1.4 Highlights +==================== + +This is a brief overview of the changes between the GnuPG 1.2 series +and the new GnuPG 1.4 series. To read the full list of highlights for +each revision that led up to 1.4, see the NEWS file in the GnuPG +distribution. This document is based on the NEWS file, and is thus +the highlights of the highlights. + +When upgrading, note that RFC-2440, the OpenPGP standard, is currently +being revised. Most of the revisions in the latest draft (2440bis-12) +have already been incorporated into GnuPG 1.4. + + +Algorithm Changes +----------------- + +OpenPGP supports many different algorithms for encryption, hashing, +and compression, and taking into account the OpenPGP revisions, GnuPG +1.4 supports a slightly different algorithm set than 1.2 did. + +The SHA256, SHA384, and SHA512 hashes are now supported for read and +write. + +The BZIP2 compression algorithm is now supported for read and write. + +Due to the recent successful attack on the MD5 hash algorithm +(discussed in , +among other places), MD5 is deprecated for OpenPGP use. It is still +allowed in GnuPG 1.4 for backwards compatibility, but a warning is +given when it is used. + +The TIGER/192 hash is no longer available. This should not be +interpreted as a statement as to the quality of TIGER/192 - rather, +the revised OpenPGP standard removes support for several unused or +mostly unused hashes, and TIGER/192 was one of them. + +Similarly, Elgamal signatures and the Elgamal signing key type have +been removed from the OpenPGP standard, and thus from GnuPG. Please +do not confuse Elgamal signatures with DSA or DSS signatures or with +Elgamal encryption. Elgamal signatures were very rarely used and were +not supported in any product other than GnuPG. Elgamal encryption was +and still is part of OpenPGP and GnuPG. + +Very old (pre-1.0) versions of GnuPG supported a nonstandard (contrary +to OpenPGP) Elgamal key type. While no recent version of GnuPG +permitted the generation of such keys, GnuPG 1.2 could still use them. +GnuPG 1.4 no longer allows the use of these keys or the (also +nonstandard) messages generated using them. + +At build time, it is possible to select which algorithms will be built +into GnuPG. This can be used to build a smaller program binary for +embedded uses where space is tight. + + +Keyserver Changes +----------------- + +GnuPG 1.4 does all keyserver operations via plugin or helper +applications. This allows the main GnuPG program to be smaller and +simpler. People who package GnuPG for various reasons have the +flexibility to include or leave out support for any keyserver type as +desired. + +Support for fetching keys via HTTP and finger has been added. This is +mainly useful for setting a preferred keyserver URL like +"http://www.jabberwocky.com/key.asc". or "finger:wk@g10code.com". + +The LDAP keyserver helper now supports storing, retrieving, and +searching for keys in both the old NAI "LDAP keyserver" as well as the +more recent method to store OpenPGP keys in standard LDAP servers. +This is compatible with the storage schema that PGP uses, so both +products can interoperate with the same LDAP server. + +The LDAP keyserver helper is compatible with the PGP company's new +"Global Directory" service. + +If the LDAP library you use supports LDAP-over-TLS and LDAPS, then +GnuPG detects this and supports them as well. Note that using TLS or +LDAPS does not improve the security of GnuPG itself, but may be useful +in certain key distribution scenarios. + +HTTP Basic authentication is now supported for all HKP and HTTP +keyserver functions, either through a proxy or via direct access. + +The HKP keyserver plugin supports the new machine-readable key +listing format for those keyservers that provide it. + +IPv6 is supported for HKP and HTTP keyserver access. + +When using a HKP keyserver with multiple DNS records (such as +subkeys.pgp.net which has the addresses of multiple servers around the +world), all DNS address records are tried until one succeeds. This +prevents a single down server in the rotation from stopping access. + +DNS SRV records are used in HKP keyserver lookups to allow +administrators to load balance and select keyserver ports +automatically. + +Timeout support has been added to the keyserver plugins. This allows +users to set an upper limit on how long to wait for the keyserver +before giving up. + + +Preferred Keyserver URL +----------------------- + +Preferred keyserver support has been added. Users may set a preferred +keyserver via the --edit-key command "keyserver". If the +--keyserver-option honor-keyserver-url is set (and it is by default), +then the preferred keyserver is used when refreshing that key with +--refresh-keys. + +The --sig-keyserver-url option can be used to inform signature +recipients where the signing key can be downloaded. When verifying +the signature, if the signing key is not present, and the keyserver +options honor-keyserver-url and auto-key-retrieve are set, this URL +will be used to retrieve the key. + + +Trust Signatures +---------------- + +GnuPG 1.4 supports OpenPGP trust signatures, which allow a user to +specify the trust level and distance from the user along with the +signature so users can delegate different levels of certification +ability to other users, possibly restricted by a regular expression on +the user ID. + + +Trust Models +------------ + +GnuPG 1.4 supports several ways of looking at trust: + +Classic - The classic PGP trust model, where people sign each others + keys and thus build up an assurance (called "validity") that + the key belongs to the right person. This was the default + trust model in GnuPG 1.2. + +Always - Bypass all trust checks, and make all keys fully valid. + +Direct - Users may set key validity directly. + +PGP - The PGP 7 and 8 behavior which combines Classic trust with trust + signatures overlaid on top. This is the default trust model in + GnuPG 1.4. + + +The OpenPGP Smartcard +--------------------- + +GnuPG 1.4 supports the OpenPGP smartcard +() + +Secret keys may be kept fully or partially on the smartcard. The +smartcard may be used for primary keys or subkeys. + + +Other Interesting New Features +------------------------------ + +For those using Security-Enhanced Linux , +the configure option --enable-selinux-support prevents GnuPG from +processing its own files (i.e. reading the secret keyring for +something other than getting a secret key from it). This simplifies +writing ACLs for the SELinux kernel. + +Readline support is now available at all prompts if the system +provides a readline library. + +GnuPG can now create messages that can be decrypted with either a +passphrase or a secret key. These messages may be generated with +--symmetric --encrypt or --symmetric --sign --encrypt. + +--list-options and --verify-options allow the user to customize +exactly what key listings or signature verifications look like, +enabling or disabling things such as photo display, preferred +keyserver URL, calculated validity for each user ID, etc. + +The --primary-keyring option designates the keyring that the user +wants new keys imported into. + +The --hidden-recipient (or -R) command encrypts to a user, but hides +the identity of that user. This is the same functionality as +--throw-keyid, but can be used on a per-user basis. + +Full algorithm names (e.g. "3DES", "SHA1", "ZIP") can now be used +interchangeably with the short algorithm names (e.g. "S2", "H2", "Z1") +anywhere algorithm names are used in GnuPG. + +The --keyid-format option selects short (99242560), long +(DB698D7199242560), 0xshort (0x99242560), or 0xlong +(0xDB698D7199242560) key ID displays. This lets users tune the +display to what they prefer. + +While it is not recommended for extended periods, it is possible to +run both GnuPG 1.2.x and GnuPG 1.4 during the transition. To aid in +this, GnuPG 1.4 tries to load a config file suffixed with its version +before it loads the default config file. For example, 1.4 will try +for gpg.conf-1.4 and gpg.conf-1 before falling back to the regular +gpg.conf file. Index: gnupg/doc/mksamplekeys diff -u gnupg/doc/mksamplekeys:1.1 gnupg/doc/mksamplekeys:1.2 --- gnupg/doc/mksamplekeys:1.1 Mon Dec 23 16:48:50 2002 +++ gnupg/doc/mksamplekeys Thu Dec 9 14:17:48 2004 @@ -1,7 +1,7 @@ #/bin/sh # Generate a samplekeys.asc -keys="5B0358A2 57548DCD 621CC013 99242560 B2D7795E" +keys="5B0358A2 57548DCD 621CC013 99242560 CA57AD7C B2D7795E" for i in $keys; do gpg --list-keys $i | awk ' { print " " $0 }' Index: gnupg/doc/samplekeys.asc diff -u gnupg/doc/samplekeys.asc:1.8 gnupg/doc/samplekeys.asc:1.9 --- gnupg/doc/samplekeys.asc:1.8 Tue Oct 19 05:04:14 2004 +++ gnupg/doc/samplekeys.asc Thu Dec 9 14:17:48 2004 @@ -15,6 +15,10 @@ sub 2048g/1643B926 2002-01-28 [expires: 2012-01-26] sub 1024D/49E1CBC9 2002-01-28 [expires: 2012-01-26] + pub 2048R/CA57AD7C 2004-12-06 + uid PGP Global Directory Verification Key + uid [jpeg image of size 3400] + pub 1024D/B2D7795E 2001-01-04 uid Philip R. Zimmermann uid Philip R. Zimmermann @@ -24,7 +28,7 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.3.91-cvs (GNU/Linux) +Version: GnuPG v1.3.93-cvs (GNU/Linux) mQILBDxUyXkBEACgg6vxNPigg9FQz14CkPtR/dEq3sCjK1r4+2oyeoRno+pqZ6Z7 ZfphgA/q5woweFAGOg17KD2WXegoQ5pXbFvP+w9j9zm3g59XzTRSzZgScelTibPn @@ -1172,6 +1176,101 @@ G7XEzuoUCt3Ouz2paCfZVR/P5h+y7qpDCwx+boJKc5nnf/EqK36lZGpJ3um+Jkck hQgV2lWaCpgx83B9qEkjITPXscoenc4tWxruiFQEGBECAAwFAjpU6CcFGwwAAAAA EgkQx0Y2ObLXeV4HZUdQRwABAeVtAKD4358jdvOoX358HnQnmwUdUczuFgCfT70B -8OXmdyevgPtF4wOVighnBFE= -=Pc1y +8OXmdyevgPtF4wOVighnBFGZAQ0EQbPS8gEIAMtvZJvlBs6FEjN86De70XffyArV +dlYkbwnBc/wNIZtASh/T5ihP/tsD7eHWWOHcsbSbwlQR2iWvEvP/wyC67ZMDZRCI +zBFpEKFJW8GCQJFiSv3v6QKU2CaL48u5Q3XPi2ymp0TvrWdFW9SXbHhe8tMnbWFT +l5cYawL6oU/gR97wHmQf4V7EB+cU8/Oi7caNsNti/gJiLSnKFPGZq7HInJCtD8xB +S3REVGQvyoLNYJHYGYfeMzczRa3SgqfwLz59Yi1SHlT1/O/8r0Z479JXz7N0vgyt +2oOy2Cpc2zbsf5Z4iBteVQYizSY40TpO0pnk9cbnMUzVvPW8N0Bhtjh5RYMAEQEA +AbQlUEdQIEdsb2JhbCBEaXJlY3RvcnkgVmVyaWZpY2F0aW9uIEtleYkBWwQQAQIA +RQUCQbPTrAcLCQgHAwIKAhkBHhhsZGFwOi8va2V5c2VydmVyLWJldGEucGdwLmNv +bQUbAwAAAAMWAgEFHgEAAAAEFQgCCgAKCRCXELibyletfJusB/41PL2YVOzdS4gT +SGAln8vWUn4I/+E5W1X4sPf2N3cH4PbZxN4+hZe2Vm+Ki0ZWRGsNUtYuOhfuQFhJ +STRCGKOL6DdEHe0ASs4uxHW4E6/IwZ/K81E315zFb682ywBRpesckmytQAmp3qJT +ZSrDeUQ+ZqoFLGY/jcsRc+ty9wfAphAwsDYtehSydnvTXhdb8U1voeCC41Vihvvz +i3Kl0GNy56m/WZ+Jf5pqTJCHFdjI5iCsDLVAGQhmw6EYsV7WywpqJ/uAQf/w/obW +IQXoKfNTkBLR1otiR9Ib01KkbW4lm9Rcs8WEsJ5C31TKEWdczsWWvyJyjFbXoTfr +Ti5szzutiEYEEBECAAYFAkGz1AkACgkQrLsWS89z7EzyCQCeLzc6VP+oiydjWeaV +Cgf4KvA6ZPwAoMPfa8/L7HbrycH2VafAYXz+SUERiEYEEBECAAYFAkG1Y/QACgkQ +00vJw2APoAGu7ACfeuRYvpX6m1+prhxlL4yzHvjeHukAn3AUME5pxT4tkhx3miT4 +AagryB7Y0cye/wAADVkBEAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQEAAAEA +AQAA/9sAQwAKBwcIBwYKCAgICwoKCw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3LyYp +NCkhIjBBMTQ5Oz4+PiUuRElDPEg3PT47/9sAQwEKCwsODQ4cEBAcOygiKDs7Ozs7 +Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7/8AA +EQgAkAB4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkK +C//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNC +scEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpj +ZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4 +ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMB +AQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwAB +AgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJico +KSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJ +ipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj +5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9moqtf30Gm2cl3cvtijGSa4a +++LNlGStlZvKR0ZuBWkKU6nwomU4x3PQqK8guPinrEzYhhihX86ns/Ffia/XzElJ +UHOV4/rW/wBUqJXlZEe2i9j1iivMP+Ex1q3+/KCw6gip4PiXdREC5tUkHcrwaTwl +VbK4e1iekUVzmheNdO1ycWyK8U5Gdrf410QOa55RcXaSNE09ULRRRUjCiiigAooo +oAKKKKAOY+IblfCN1g9cA/rXh1fQPiXT4dU0o2dwXEcrclCARgE8ZB9K4J/AGkKe +Jr38ZU/+Ir0MLiIUoNSOerTlJ3R54v3hXpfg3UdNGmrHPMsToOc9+KrQeBdAd2SS +7vkYdPnX/wCIqy3gfRoThb+9GP8AaQ/+yVdavRqxs2yYU5wdzH164t57+V7XHlZO +COh5rn5n5NdrJ4U0xBt/tC8x16p/8RTP+EK0uRQ32q9IPfzE/wDiKuGKpRSSYnSm +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 +zVL6bU5xJIioqjCIo4Uf1NUDEfStiXTLizuHtboL5qc7l6OvZhTTZ+1K4WMZoSe1 +NFuSelbP2M9xT47As2FXJp3FYqaUptJ2fZu3IVwSR1r0L4f6FHqmsf2w8bC3sjhA +2CGlx29duc/UisHQ/DlzreoiwtPl24NxPjKwL/Vj2H9K9m07T7bStPhsbOPy4IV2 +qO/uT6knkmoky4otUUUVBYUUUUAc54yP+hWv/XwB+hrntOTyNbSP+84rs9Z04aja +qu7a8bh0OMjI9a5O6gvob3zjZAuDwyOMfryKaegEHjZTYva6qV8yFf3MqKMsueQw +9uDmq+nPZahGJLSdHz2zyKsXEOpagyC4IWOM5WNOmfUnuaxtT8NOJPtFoGt5uu6P +jP4U0xNHSx2bjtmrC2p/u1xEOr+J9MO1sXCj++OavxeO9Tj4m0vJ9jTuI09c8Nrq +UavGfKuI/wDVyhc49iO4rnToV/A/lXCI5xkPGCFI/HvWhL491BhiLSufc1l6hrXi +TVZQIALaPGOFyfc0gHzadBZxGW9nSFBydxp+nafPrEii0RrOyP3rmRfncf7Cn+Z/ +Wo9K8NXEl0Lm+L3EgOQZTux9K7W0s5BgYNFwsbOg2tlpVilnYxCOMHJ7s7HqxPc1 +sqcjNZNnbsuM1qoMLUlD6KKKACiiigBCM1E9tG55UVNRQBWNlF2UVC+mxP8Aw1fo +oAx5NDgfqg/KoG8N2p/5ZL+Vb9FAHPjw1ag/6pfyqZNBt06IPyraooAzU0qJOiir +CWcadBVqigBixhegp1LRQAUUUUAf/9mJAVMEEAECAD0FAkGz06wHCwkIBwMCCh4Y +bGRhcDovL2tleXNlcnZlci1iZXRhLnBncC5jb20FGwMAAAADFgIBBR4BAAAAAAoJ +EJcQuJvKV618ERsH/020sz1xtDSLdUBRN8/eZN92BXMdUf38TOSb96cHVY1XU2X1 +dDU/BzdRZQp9AZkP9YgUtg2CMgyqeksaNsvSmB1C92dJD5VRzrX2Xy7ugeqkDnzI +nmMbULl6jDDXmO4UZDzEivhwM20ocwx8BF69W6Eav7LRoEN2rVAW8QqVHPoeDb8h +WnwhSJo1FyY7mjm+c4aZbGB6sEqZH0pew45JTlecKv1lo9uyN/CAREBkE9LVDsud +WxLX8u12HTDPvlE5qMXq/zNUFksz89Z25af3zzWA+AE+EJHKSic7oSprjiSx0txK +NkWnRRRFZce2DmVZSI8S+Oy3Qdc3SdbYIDVAD7o= +=f41D -----END PGP PUBLIC KEY BLOCK----- From cvs at cvs.gnupg.org Thu Dec 9 16:41:31 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 13 16:37:03 2004 Subject: gnupg/g10 (ChangeLog keygen.c) Message-ID: Date: Thursday, December 9, 2004 @ 16:49:47 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keygen.c * keygen.c (ask_algo): Add a choose-your-own-capabilities option for DSA. -----------+ ChangeLog | 5 +++++ keygen.c | 23 +++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.647 gnupg/g10/ChangeLog:1.648 --- gnupg/g10/ChangeLog:1.647 Tue Dec 7 18:58:35 2004 +++ gnupg/g10/ChangeLog Thu Dec 9 16:49:46 2004 @@ -1,3 +1,8 @@ +2004-12-09 David Shaw + + * keygen.c (ask_algo): Add a choose-your-own-capabilities option + for DSA. + 2004-12-07 David Shaw * keygen.c (ask_keysize): Change strings to always use %u instead Index: gnupg/g10/keygen.c diff -u gnupg/g10/keygen.c:1.136 gnupg/g10/keygen.c:1.137 --- gnupg/g10/keygen.c:1.136 Tue Dec 7 18:58:35 2004 +++ gnupg/g10/keygen.c Thu Dec 9 16:49:47 2004 @@ -1349,13 +1349,15 @@ if( !addmode ) tty_printf(_(" (%d) DSA and Elgamal (default)\n"), 1 ); tty_printf( _(" (%d) DSA (sign only)\n"), 2 ); + if (opt.expert) + tty_printf( _(" (%d) DSA (set your own capabilities)\n"), 3 ); if( addmode ) - tty_printf( _(" (%d) Elgamal (encrypt only)\n"), 3 ); - tty_printf( _(" (%d) RSA (sign only)\n"), 4 ); + tty_printf(_(" (%d) Elgamal (encrypt only)\n"), 4 ); + tty_printf( _(" (%d) RSA (sign only)\n"), 5 ); if (addmode) - tty_printf( _(" (%d) RSA (encrypt only)\n"), 5 ); + tty_printf(_(" (%d) RSA (encrypt only)\n"), 6 ); if (opt.expert) - tty_printf( _(" (%d) RSA (set your own capabilities)\n"), 6 ); + tty_printf( _(" (%d) RSA (set your own capabilities)\n"), 7 ); for(;;) { answer = cpr_get("keygen.algo",_("Your selection? ")); @@ -1366,26 +1368,31 @@ algo = 0; /* create both keys */ break; } - else if( algo == 6 && opt.expert ) { + else if( algo == 7 && opt.expert ) { algo = PUBKEY_ALGO_RSA; *r_usage=ask_key_flags(algo); break; } - else if( algo == 5 && addmode ) { + else if( algo == 6 && addmode ) { algo = PUBKEY_ALGO_RSA; *r_usage = PUBKEY_USAGE_ENC; break; } - else if( algo == 4 ) { + else if( algo == 5 ) { algo = PUBKEY_ALGO_RSA; *r_usage = PUBKEY_USAGE_SIG; break; } - else if( algo == 3 && addmode ) { + else if( algo == 4 && addmode ) { algo = PUBKEY_ALGO_ELGAMAL_E; *r_usage = PUBKEY_USAGE_ENC; break; } + else if( algo == 3 && opt.expert ) { + algo = PUBKEY_ALGO_DSA; + *r_usage=ask_key_flags(algo); + break; + } else if( algo == 2 ) { algo = PUBKEY_ALGO_DSA; *r_usage = PUBKEY_USAGE_SIG; From cvs at cvs.gnupg.org Thu Dec 9 16:43:44 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Mon Dec 13 16:37:06 2004 Subject: misc-scripts (ChangeLog scrutmime.c sha1sum.c) Message-ID: Date: Thursday, December 9, 2004 @ 16:43:44 Author: werner Path: /cvs/wk/misc-scripts Added: sha1sum.c Modified: ChangeLog scrutmime.c New based on SHA1- code from gnupg and out md5sum. High noon to switch from MD5 checksums to sha1. -------------+ ChangeLog | 5 scrutmime.c | 2 sha1sum.c | 363 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 369 insertions(+), 1 deletion(-) From cvs at cvs.gnupg.org Thu Dec 9 17:49:14 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:37:12 2004 Subject: gnupg/g10 (6 files) Message-ID: Date: Thursday, December 9, 2004 @ 17:57:30 Author: wk Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog app-openpgp.c card-util.c cardglue.c cardglue.h passphrase.c * passphrase.c (agent_get_passphrase): New args CUSTOM_PROMPT and CUSTOM_DESCRIPTION. Changed all callers. * app-openpgp.c (do_getattr, do_learn_status, do_setattr): Support the new private DOs. (do_change_pin): Add a "N" prefix to the strings so that the callback can act accordingly for a new PIN. Unfortunately this breaks existing translations but I see no wother way to overvome this. * cardglue.c (learn_status_cb): Ditto. (agent_release_card_info): Ditto. (struct pin_cb_info_s): Removed and changed all users. (pin_cb): Reworked. * card-util.c (card_status): Print them (card_edit): New command PRIVATEDO. (change_private_do): New. ---------------+ ChangeLog | 21 +++++++++++++ app-openpgp.c | 58 ++++++++++++++++++++++++++++-------- card-util.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- cardglue.c | 85 ++++++++++++++++++++++++++--------------------------- cardglue.h | 1 passphrase.c | 49 ++++++++++++++++++++++++------ 6 files changed, 236 insertions(+), 67 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.648 gnupg/g10/ChangeLog:1.649 --- gnupg/g10/ChangeLog:1.648 Thu Dec 9 16:49:46 2004 +++ gnupg/g10/ChangeLog Thu Dec 9 17:57:30 2004 @@ -1,3 +1,24 @@ +2004-12-09 Werner Koch + + * passphrase.c (agent_get_passphrase): New args CUSTOM_PROMPT and + CUSTOM_DESCRIPTION. Changed all callers. + + * app-openpgp.c (do_getattr, do_learn_status, do_setattr): Support + the new private DOs. + (do_change_pin): Add a "N" prefix to the strings so that the + callback can act accordingly for a new PIN. Unfortunately this + breaks existing translations but I see no wother way to overvome + this. + + * cardglue.c (learn_status_cb): Ditto. + (agent_release_card_info): Ditto. + (struct pin_cb_info_s): Removed and changed all users. + (pin_cb): Reworked. + + * card-util.c (card_status): Print them + (card_edit): New command PRIVATEDO. + (change_private_do): New. + 2004-12-09 David Shaw * keygen.c (ask_algo): Add a choose-your-own-capabilities option Index: gnupg/g10/app-openpgp.c diff -u gnupg/g10/app-openpgp.c:1.20 gnupg/g10/app-openpgp.c:1.21 --- gnupg/g10/app-openpgp.c:1.20 Wed Nov 17 17:04:21 2004 +++ gnupg/g10/app-openpgp.c Thu Dec 9 17:57:30 2004 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: app-openpgp.c,v 1.20 2004/11/17 16:04:21 wk Exp $ + * $Id: app-openpgp.c,v 1.21 2004/12/09 16:57:30 wk Exp $ */ #include @@ -81,6 +81,10 @@ { 0x00C6, 0, 0x6E, 1, 0, 0, 0, "CA Fingerprints" }, { 0x007A, 1, 0, 1, 0, 0, 0, "Security Support Template" }, { 0x0093, 0, 0x7A, 1, 1, 0, 0, "Digital Signature Counter" }, + { 0x0101, 0, 0, 0, 0, 0, 0, "Private DO 1"}, + { 0x0102, 0, 0, 0, 0, 0, 0, "Private DO 2"}, + { 0x0103, 0, 0, 0, 0, 0, 0, "Private DO 3"}, + { 0x0104, 0, 0, 0, 0, 0, 0, "Private DO 4"}, { 0 } }; @@ -613,6 +617,10 @@ { "SERIALNO", 0x004F, -1 }, { "AID", 0x004F }, { "EXTCAP", 0x0000, -2 }, + { "PRIVATE-DO-1", 0x0101 }, + { "PRIVATE-DO-2", 0x0102 }, + { "PRIVATE-DO-3", 0x0103 }, + { "PRIVATE-DO-4", 0x0104 }, { NULL, 0 } }; int idx, i; @@ -708,6 +716,15 @@ do_getattr (app, ctrl, "CA-FPR"); do_getattr (app, ctrl, "CHV-STATUS"); do_getattr (app, ctrl, "SIG-COUNTER"); + if (app->app_local->extcap.private_dos) + { + do_getattr (app, ctrl, "PRIVATE-DO-1"); + do_getattr (app, ctrl, "PRIVATE-DO-2"); + if (app->did_chv2) + do_getattr (app, ctrl, "PRIVATE-DO-3"); + if (app->did_chv3) + do_getattr (app, ctrl, "PRIVATE-DO-4"); + } return 0; } @@ -867,17 +884,22 @@ static struct { const char *name; int tag; + int need_chv; int special; } table[] = { - { "DISP-NAME", 0x005B }, - { "LOGIN-DATA", 0x005E, 2 }, - { "DISP-LANG", 0x5F2D }, - { "DISP-SEX", 0x5F35 }, - { "PUBKEY-URL", 0x5F50 }, - { "CHV-STATUS-1", 0x00C4, 1 }, - { "CA-FPR-1", 0x00CA }, - { "CA-FPR-2", 0x00CB }, - { "CA-FPR-3", 0x00CC }, + { "DISP-NAME", 0x005B, 3 }, + { "LOGIN-DATA", 0x005E, 3, 2 }, + { "DISP-LANG", 0x5F2D, 3 }, + { "DISP-SEX", 0x5F35, 3 }, + { "PUBKEY-URL", 0x5F50, 3 }, + { "CHV-STATUS-1", 0x00C4, 3, 1 }, + { "CA-FPR-1", 0x00CA, 3 }, + { "CA-FPR-2", 0x00CB, 3 }, + { "CA-FPR-3", 0x00CC, 3 }, + { "PRIVATE-DO-1", 0x0101, 2 }, + { "PRIVATE-DO-2", 0x0102, 3 }, + { "PRIVATE-DO-3", 0x0103, 2 }, + { "PRIVATE-DO-4", 0x0104, 3 }, { NULL, 0 } }; @@ -887,7 +909,17 @@ if (!table[idx].name) return gpg_error (GPG_ERR_INV_NAME); - rc = verify_chv3 (app, pincb, pincb_arg); + switch (table[idx].need_chv) + { + case 2: + rc = verify_chv2 (app, pincb, pincb_arg); + break; + case 3: + rc = verify_chv3 (app, pincb, pincb_arg); + break; + default: + rc = 0; + } if (rc) return rc; @@ -956,10 +988,10 @@ else app->did_chv1 = app->did_chv2 = 0; - /* Note to translators: Do not translate the "|A|" prefix but + /* Note to translators: Do not translate the "|*|" prefixes but keep it at the start of the string. We need this elsewhere to get some infos on the string. */ - rc = pincb (pincb_arg, chvno == 3? _("|A|New Admin PIN") : _("New PIN"), + rc = pincb (pincb_arg, chvno == 3? _("|AN|New Admin PIN") : _("|N|New PIN"), &pinvalue); if (rc) { Index: gnupg/g10/card-util.c diff -u gnupg/g10/card-util.c:1.21 gnupg/g10/card-util.c:1.22 --- gnupg/g10/card-util.c:1.21 Thu Oct 28 05:57:30 2004 +++ gnupg/g10/card-util.c Thu Dec 9 17:57:30 2004 @@ -377,6 +377,14 @@ info.disp_sex == 2? _("female") : _("unspecified")); print_name (fp, "URL of public key : ", info.pubkey_url); print_name (fp, "Login data .......: ", info.login_data); + if (info.private_do[0]) + print_name (fp, "Private DO 1 .....: ", info.private_do[0]); + if (info.private_do[1]) + print_name (fp, "Private DO 2 .....: ", info.private_do[1]); + if (info.private_do[2]) + print_name (fp, "Private DO 3 .....: ", info.private_do[2]); + if (info.private_do[3]) + print_name (fp, "Private DO 4 .....: ", info.private_do[3]); if (info.cafpr1valid) { tty_fprintf (fp, "CA fingerprint %d .:", 1); @@ -632,6 +640,75 @@ } static int +change_private_do (const char *args, int nr) +{ + char do_name[] = "PRIVATE-DO-X"; + char *data; + int n; + int rc; + + assert (nr >= 1 && nr <= 4); + do_name[11] = '0' + nr; + + if (args && (args = strchr (args, '<'))) /* Read it from a file */ + { + FILE *fp; + + /* Fixme: Factor this duplicated code out. */ + for (args++; spacep (args); args++) + ; + fp = fopen (args, "rb"); +#if GNUPG_MAJOR_VERSION == 1 + if (fp && is_secured_file (fileno (fp))) + { + fclose (fp); + fp = NULL; + errno = EPERM; + } +#endif + if (!fp) + { + tty_printf (_("can't open `%s': %s\n"), args, strerror (errno)); + return -1; + } + + data = xmalloc (254); + n = fread (data, 1, 254, fp); + fclose (fp); + if (n < 0) + { + tty_printf (_("error reading `%s': %s\n"), args, strerror (errno)); + xfree (data); + return -1; + } + } + else + { + data = cpr_get ("cardedit.change_private_do", + _("Private DO data: ")); + if (!data) + return -1; + trim_spaces (data); + cpr_kill_prompt (); + n = strlen (data); + } + + if (n > 254 ) + { + tty_printf (_("Error: Private DO too long " + "(limit is %d characters).\n"), 254); + xfree (data); + return -1; + } + + rc = agent_scd_setattr (do_name, data, n ); + if (rc) + log_error ("error setting private DO: %s\n", gpg_strerror (rc)); + xfree (data); + return rc; +} + +static int change_lang (void) { char *data, *p; @@ -1149,7 +1226,7 @@ cmdNOP = 0, cmdQUIT, cmdADMIN, cmdHELP, cmdLIST, cmdDEBUG, cmdNAME, cmdURL, cmdFETCH, cmdLOGIN, cmdLANG, cmdSEX, cmdCAFPR, - cmdFORCESIG, cmdGENERATE, cmdPASSWD, + cmdFORCESIG, cmdGENERATE, cmdPASSWD, cmdPRIVATEDO, cmdINVCMD }; @@ -1180,6 +1257,8 @@ { N_("generate"), cmdGENERATE, 1, N_("generate new keys") }, { N_("passwd"), cmdPASSWD, 0, N_("menu to change or unblock the PIN") }, + /* Note, that we do not announce this command yet. */ + { N_("privatedo"), cmdPRIVATEDO, 0, NULL }, { NULL, cmdINVCMD, 0, NULL } }; @@ -1335,6 +1414,14 @@ change_cafpr (arg_number); break; + case cmdPRIVATEDO: + if ( arg_number < 1 || arg_number > 4 ) + tty_printf ("usage: privatedo N\n" + " 1 <= N <= 4\n"); + else + change_private_do (arg_string, arg_number); + break; + case cmdFORCESIG: toggle_forcesig (); break; Index: gnupg/g10/cardglue.c diff -u gnupg/g10/cardglue.c:1.19 gnupg/g10/cardglue.c:1.20 --- gnupg/g10/cardglue.c:1.19 Wed Nov 17 17:04:21 2004 +++ gnupg/g10/cardglue.c Thu Dec 9 17:57:30 2004 @@ -49,12 +49,6 @@ }; -struct pin_cb_info_s -{ - int repeat; -}; - - static char *default_reader_port; static APP current_app; @@ -233,6 +227,8 @@ void agent_release_card_info (struct agent_card_info_s *info) { + int i; + if (!info) return; @@ -243,6 +239,11 @@ xfree (info->login_data); info->login_data = NULL; info->fpr1valid = info->fpr2valid = info->fpr3valid = 0; info->cafpr1valid = info->cafpr2valid = info->cafpr3valid = 0; + for (i=0; i < 4; i++) + { + xfree (info->private_do[i]); + info->private_do[i] = NULL; + } } @@ -471,6 +472,7 @@ int keywordlen; int i; +/* log_debug ("got status line `%s'\n", line); */ for (keywordlen=0; *line && !spacep (line); line++, keywordlen++) ; while (spacep (line)) @@ -570,7 +572,15 @@ else if (no == 3) parm->cafpr3valid = unhexify_fpr (line, parm->cafpr3); } - + else if (keywordlen == 12 && !memcmp (keyword, "PRIVATE-DO-", 11) + && strchr ("1234", keyword[11])) + { + int no = keyword[11] - '1'; + assert (no >= 0 && no <= 3); + xfree (parm->private_do[no]); + parm->private_do[no] = unescape_status_string (line); + } + return 0; } @@ -626,21 +636,28 @@ static int pin_cb (void *opaque, const char *info, char **retstr) { - struct pin_cb_info_s *parm = opaque; char *value; int canceled; int isadmin = 0; + int newpin = 0; const char *again_text = NULL; + const char *ends, *s; *retstr = NULL; log_debug ("asking for PIN '%s'\n", info); /* We use a special prefix to check whether the Admin PIN has been requested. */ - if (info && !strncmp (info, "|A|", 3)) + if (info && *info =='|' && (ends=strchr (info+1, '|'))) { - isadmin = 1; - info += 3; + for (s=info+1; s < ends; s++) + { + if (*s == 'A') + isadmin = 1; + else if (*s == 'N') + newpin = 1; + } + info = ends+1; } again: @@ -649,8 +666,12 @@ isadmin? "OPENPGP 3" : "OPENPGP 1"); value = ask_passphrase (info, again_text, - isadmin? "passphrase.adminpin.ask" - : "passphrase.pin.ask", + newpin && isadmin? "passphrase.adminpin.new.ask" : + newpin? "passphrase.pin.new.ask" : + isadmin? "passphrase.adminpin.ask" : + "passphrase.pin.ask", + newpin && isadmin? _("Enter New Admin PIN: ") : + newpin? _("Enter New PIN: ") : isadmin? _("Enter Admin PIN: ") : _("Enter PIN: "), &canceled); @@ -660,7 +681,7 @@ else if (!value) return G10ERR_GENERAL; - if (parm->repeat) + if (newpin) { char *value2; @@ -701,15 +722,12 @@ const unsigned char *value, size_t valuelen) { APP app; - struct pin_cb_info_s parm; - - memset (&parm, 0, sizeof parm); app = current_app? current_app : open_card (); if (!app) return gpg_error (GPG_ERR_CARD); - return app->fnc.setattr (app, name, pin_cb, &parm, value, valuelen); + return app->fnc.setattr (app, name, pin_cb, NULL, value, valuelen); } @@ -772,9 +790,6 @@ APP app; char keynostr[20]; struct ctrl_ctx_s ctrl; - struct pin_cb_info_s parm; - - memset (&parm, 0, sizeof parm); app = current_app? current_app : open_card (); if (!app) @@ -787,7 +802,7 @@ return app->fnc.genkey (app, &ctrl, keynostr, force? 1:0, - pin_cb, &parm); + pin_cb, NULL); } /* Send a PKSIGN command to the SCdaemon. */ @@ -798,9 +813,6 @@ { APP app; int rc; - struct pin_cb_info_s parm; - - memset (&parm, 0, sizeof parm); *r_buf = NULL; *r_buflen = 0; @@ -817,7 +829,7 @@ return rc; return app->fnc.sign (app, serialno, hashalgo, - pin_cb, &parm, + pin_cb, NULL, indata, indatalen, r_buf, r_buflen); } @@ -831,9 +843,6 @@ { APP app; int rc; - struct pin_cb_info_s parm; - - memset (&parm, 0, sizeof parm); *r_buf = NULL; *r_buflen = 0; @@ -850,7 +859,7 @@ return rc; return app->fnc.decipher (app, serialno, - pin_cb, &parm, + pin_cb, NULL, indata, indatalen, r_buf, r_buflen); } @@ -862,10 +871,6 @@ APP app; char chvnostr[20]; int reset = 0; - struct pin_cb_info_s parm; - - memset (&parm, 0, sizeof parm); - parm.repeat = 1; reset = (chvno >= 100); chvno %= 100; @@ -876,7 +881,7 @@ sprintf (chvnostr, "%d", chvno); return app->fnc.change_pin (app, NULL, chvnostr, reset, - pin_cb, &parm); + pin_cb, NULL); } /* Perform a CHECKPIN operation. SERIALNO should be the serial @@ -886,15 +891,12 @@ agent_scd_checkpin (const char *serialnobuf) { APP app; - struct pin_cb_info_s parm; - - memset (&parm, 0, sizeof parm); app = current_app? current_app : open_card (); if (!app) return gpg_error (GPG_ERR_CARD); - return app->fnc.check_pin (app, serialnobuf, pin_cb, &parm); + return app->fnc.check_pin (app, serialnobuf, pin_cb, NULL); } @@ -907,9 +909,6 @@ const unsigned char *e, size_t elen) { APP app; - struct pin_cb_info_s parm; - - memset (&parm, 0, sizeof parm); app = current_app? current_app : open_card (); if (!app) @@ -917,5 +916,5 @@ return app_openpgp_storekey (app, keyno, template, template_len, created_at, m, mlen, e, elen, - pin_cb, &parm); + pin_cb, NULL); } Index: gnupg/g10/cardglue.h diff -u gnupg/g10/cardglue.h:1.11 gnupg/g10/cardglue.h:1.12 --- gnupg/g10/cardglue.h:1.11 Thu Sep 23 15:32:30 2004 +++ gnupg/g10/cardglue.h Thu Dec 9 17:57:30 2004 @@ -37,6 +37,7 @@ int disp_sex; /* 0 = unspecified, 1 = male, 2 = female */ char *pubkey_url; /* malloced. */ char *login_data; /* malloced. */ + char *private_do[4]; /* malloced. */ char cafpr1valid; char cafpr2valid; char cafpr3valid; Index: gnupg/g10/passphrase.c diff -u gnupg/g10/passphrase.c:1.69 gnupg/g10/passphrase.c:1.70 --- gnupg/g10/passphrase.c:1.69 Wed Nov 17 17:04:21 2004 +++ gnupg/g10/passphrase.c Thu Dec 9 17:57:30 2004 @@ -630,7 +630,8 @@ */ static char * agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text, - int *canceled) + const char *custom_description, + const char *custom_prompt, int *canceled) { #if defined(__riscos__) return NULL; @@ -648,6 +649,7 @@ int prot; char *orig_codeset = NULL; + log_debug ("agent_get_passphrase tryagin='%s' prompt='%s'\n", tryagain_text, custom_prompt); if (canceled) *canceled = 0; @@ -663,7 +665,7 @@ } #ifdef ENABLE_NLS - /* The Assuan agent protol requires us to trasnmit utf-8 strings */ + /* The Assuan agent protol requires us to transmit utf-8 strings */ orig_codeset = bind_textdomain_codeset (PACKAGE, NULL); #ifdef HAVE_LANGINFO_CODESET if (!orig_codeset) @@ -680,7 +682,9 @@ if ( (fd = agent_open (&prot)) == -1 ) goto failure; - if ( !mode && pk && keyid ) + if (custom_description) + atext = native_to_utf8 (custom_description); + else if ( !mode && pk && keyid ) { char *uid; size_t uidlen; @@ -818,9 +822,12 @@ tryagain_text = _(tryagain_text); /* We allocate 2 time the needed space for atext so that there - is nenough space for escaping */ + is enough space for escaping */ line = m_alloc (15 + 46 - + 3*strlen (tryagain_text) + 3*strlen (atext) + 2); + + 3*strlen (tryagain_text) + + 3*strlen (atext) + + 3*strlen (custom_prompt? custom_prompt:"") + + 2); strcpy (line, "GET_PASSPHRASE "); p = line+15; if (!mode && have_fpr) @@ -844,7 +851,28 @@ *p++ = *s; } *p++ = ' '; - *p++ = 'X'; /* Use the standard prompt */ + + /* The prompt. */ + if (custom_prompt) + { + char *tmp = native_to_utf8 (custom_prompt); + for (i=0, s=tmp; *s; s++) + { + if (*s < ' ' || *s == '+') + { + sprintf (p, "%%%02X", *s); + p += 3; + } + else if (*s == ' ') + *p++ = '+'; + else + *p++ = *s; + } + xfree (tmp); + } + else + *p++ = 'X'; /* Use the standard prompt */ + *p++ = ' '; /* copy description */ for (i=0, s= atext; *s; s++) @@ -1047,7 +1075,7 @@ if ( opt.use_agent ) { pw = agent_get_passphrase (NULL, 0, - tryagain_text? tryagain_text :description, + tryagain_text, description, prompt, canceled ); if (!pw) { @@ -1188,9 +1216,9 @@ next_pw = NULL; } else if ( opt.use_agent ) { - /* Divert to teh gpg-agent. */ + /* Divert to the gpg-agent. */ pw = agent_get_passphrase ( keyid, mode == 2? 1: 0, - tryagain_text, canceled ); + tryagain_text, NULL, NULL, canceled ); if (!pw) { if (!opt.use_agent) @@ -1198,7 +1226,8 @@ pw = m_strdup (""); } if( *pw && mode == 2 ) { - char *pw2 = agent_get_passphrase ( keyid, 2, NULL, canceled ); + char *pw2 = agent_get_passphrase ( keyid, 2, NULL, NULL, + NULL, canceled ); if (!pw2) { if (!opt.use_agent) From cvs at cvs.gnupg.org Thu Dec 9 17:56:00 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:37:22 2004 Subject: LIBGCRYPT-1-2-BRANCH libgcrypt/cipher (ChangeLog serpent.c) Message-ID: Date: Thursday, December 9, 2004 @ 18:04:17 Author: wk Path: /cvs/libgcrypt/libgcrypt/cipher Tag: LIBGCRYPT-1-2-BRANCH Modified: ChangeLog serpent.c (serpent_test): Moved prototype out of a fucntion. -----------+ ChangeLog | 4 ++++ serpent.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) Index: libgcrypt/cipher/ChangeLog diff -u libgcrypt/cipher/ChangeLog:1.211.2.6 libgcrypt/cipher/ChangeLog:1.211.2.7 --- libgcrypt/cipher/ChangeLog:1.211.2.6 Wed Sep 15 20:46:34 2004 +++ libgcrypt/cipher/ChangeLog Thu Dec 9 18:04:16 2004 @@ -1,3 +1,7 @@ +2004-12-09 Werner Koch + + * serpent.c (serpent_test): Moved prototype out of a fucntion. + 2004-09-17 Moritz Schulte * serpent.c: Use "u32_t" instead of "unsigned long", do not Index: libgcrypt/cipher/serpent.c diff -u libgcrypt/cipher/serpent.c:1.4.2.1 libgcrypt/cipher/serpent.c:1.4.2.2 --- libgcrypt/cipher/serpent.c:1.4.2.1 Wed Sep 15 20:46:34 2004 +++ libgcrypt/cipher/serpent.c Thu Dec 9 18:04:16 2004 @@ -55,6 +55,11 @@ serpent_subkeys_t keys; /* Generated subkeys. */ } serpent_context_t; + +/* A prototype. */ +static const char *serpent_test (void); + + #define byte_swap_32(x) \ (0 \ | (((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) \ @@ -687,8 +692,6 @@ if (! serpent_init_done) { /* Execute a self-test the first time, Serpent is used. */ - static const char *serpent_test (void); - serpent_test_ret = serpent_test (); if (serpent_test_ret) log_error ("Serpent test failure: %s\n", serpent_test_ret); From cvs at cvs.gnupg.org Thu Dec 9 17:56:30 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:37:24 2004 Subject: libgcrypt/cipher (ChangeLog serpent.c) Message-ID: Date: Thursday, December 9, 2004 @ 18:04:47 Author: wk Path: /cvs/libgcrypt/libgcrypt/cipher Modified: ChangeLog serpent.c (serpent_setkey): Moved prototype of serpent_test to outer scope. -----------+ ChangeLog | 5 +++++ serpent.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) Index: libgcrypt/cipher/ChangeLog diff -u libgcrypt/cipher/ChangeLog:1.221 libgcrypt/cipher/ChangeLog:1.222 --- libgcrypt/cipher/ChangeLog:1.221 Wed Sep 15 21:01:18 2004 +++ libgcrypt/cipher/ChangeLog Thu Dec 9 18:04:47 2004 @@ -1,3 +1,8 @@ +2004-12-09 Werner Koch + + * serpent.c (serpent_setkey): Moved prototype of serpent_test to + outer scope. + 2004-09-11 Moritz Schulte * pubkey.c (pubkey_table): Added an alias entry for GCRY_PK_ELG_E. Index: libgcrypt/cipher/serpent.c diff -u libgcrypt/cipher/serpent.c:1.5 libgcrypt/cipher/serpent.c:1.6 --- libgcrypt/cipher/serpent.c:1.5 Sun Jul 4 18:40:08 2004 +++ libgcrypt/cipher/serpent.c Thu Dec 9 18:04:47 2004 @@ -55,6 +55,10 @@ serpent_subkeys_t keys; /* Generated subkeys. */ } serpent_context_t; +/* A prototype. */ +static const char *serpent_test (void); + + #define byte_swap_32(x) \ (0 \ | (((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) \ @@ -687,8 +691,6 @@ if (! serpent_init_done) { /* Execute a self-test the first time, Serpent is used. */ - static const char *serpent_test (void); - serpent_test_ret = serpent_test (); if (serpent_test_ret) log_error ("Serpent test failure: %s\n", serpent_test_ret); From cvs at cvs.gnupg.org Thu Dec 9 20:07:32 2004 From: cvs at cvs.gnupg.org (cvs user mo) Date: Mon Dec 13 16:37:28 2004 Subject: GNUPG-1-9-BRANCH-MO gnupg/agent (command-ssh.c) Message-ID: Date: Thursday, December 9, 2004 @ 20:15:50 Author: mo Path: /cvs/gnupg/gnupg/agent Tag: GNUPG-1-9-BRANCH-MO Modified: command-ssh.c command-ssh.c: Fix saving of RSA keys (meaning of p/q/u was borked); correctly use secure memory for message requests. ---------------+ command-ssh.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) Index: gnupg/agent/command-ssh.c diff -u gnupg/agent/command-ssh.c:1.1.2.10 gnupg/agent/command-ssh.c:1.1.2.11 --- gnupg/agent/command-ssh.c:1.1.2.10 Sat Oct 2 12:46:28 2004 +++ gnupg/agent/command-ssh.c Thu Dec 9 20:15:50 2004 @@ -96,6 +96,21 @@ static uint32_t lifetime_default; +/* General utility functions. */ + +static void * +realloc_secure (void *a, size_t n) +{ + void *p; + + if (a) + p = gcry_realloc (a, n); + else + p = gcry_malloc_secure (n); + + return p; +} + /* Primitive I/O functions. */ static gpg_error_t @@ -532,14 +547,14 @@ /* Modifying only necessary for secret keys. */ goto out; + u = mpis[3]; p = mpis[4]; q = mpis[5]; - u = mpis[3]; - if (gcry_mpi_cmp (p, q)) + if (gcry_mpi_cmp (p, q) > 0) { /* P shall be smaller then Q! Swap primes. iqmp becomes u. */ - gcry_mpi_t tmp = NULL; + gcry_mpi_t tmp; tmp = mpis[4]; mpis[4] = mpis[5]; @@ -656,6 +671,7 @@ const char *elems; size_t elems_n; unsigned int i; + unsigned int j; void **arg_list; err = 0; @@ -687,7 +703,15 @@ for (i = 0; i < elems_n; i++) { sprintf (strchr (sexp_template, 0), "(%c %%m)", elems[i]); - arg_list[i] = &mpis[i]; + if (secret) + { + for (j = 0; j < elems_n; j++) + if (key_spec.elems_key_secret[j] == elems[i]) + break; + } + else + j = i; + arg_list[i] = &mpis[j]; } arg_list[i] = &comment; sprintf (strchr (sexp_template, 0), ") (comment %%s))"); @@ -2230,7 +2254,8 @@ log_debug ("[ssh-agent] Received request of length: %u\n", request_size); - stream_request = es_mopen (NULL, 0, 0, 1, NULL, NULL, "r+"); + stream_request = es_mopen (NULL, 0, 0, 1, + realloc_secure, gcry_free, "r+"); if (! stream_request) { err = gpg_error_from_errno (errno); From cvs at cvs.gnupg.org Fri Dec 10 06:27:38 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 13 16:37:38 2004 Subject: gnupg/g10 (ChangeLog g10.c options.h textfilter.c) Message-ID: Date: Friday, December 10, 2004 @ 06:35:54 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog g10.c options.h textfilter.c * options.h, g10.c (main), textfilter.c (len_without_trailing_ws): Removed (not used). (standard): 2440 says that textmode hashes should canonicalize line endings to CRLF and remove spaces and tabs. 2440bis-12 says to just canonicalize to CRLF. So, we default to the 2440bis-12 behavior, but revert to the strict 2440 behavior if the user specifies --rfc2440. In practical terms this makes no difference to any signatures in the real world except for a textmode detached signature. --------------+ ChangeLog | 12 ++++++++++++ g10.c | 2 ++ options.h | 1 + textfilter.c | 31 ++++++++++++++++++++----------- 4 files changed, 35 insertions(+), 11 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.649 gnupg/g10/ChangeLog:1.650 --- gnupg/g10/ChangeLog:1.649 Thu Dec 9 17:57:30 2004 +++ gnupg/g10/ChangeLog Fri Dec 10 06:35:54 2004 @@ -1,3 +1,15 @@ +2004-12-09 David Shaw + + * options.h, g10.c (main), textfilter.c (len_without_trailing_ws): + Removed (not used). + (standard): 2440 says that textmode hashes should canonicalize + line endings to CRLF and remove spaces and tabs. 2440bis-12 says + to just canonicalize to CRLF. So, we default to the 2440bis-12 + behavior, but revert to the strict 2440 behavior if the user + specifies --rfc2440. In practical terms this makes no difference + to any signatures in the real world except for a textmode detached + signature. + 2004-12-09 Werner Koch * passphrase.c (agent_get_passphrase): New args CUSTOM_PROMPT and Index: gnupg/g10/g10.c diff -u gnupg/g10/g10.c:1.290 gnupg/g10/g10.c:1.291 --- gnupg/g10/g10.c:1.290 Fri Nov 26 16:51:37 2004 +++ gnupg/g10/g10.c Fri Dec 10 06:35:54 2004 @@ -2092,6 +2092,8 @@ opt.escape_from = 1; break; case oRFC2440: + opt.strict_2440_line_endings=1; + /* fall through */ case oOpenPGP: /* TODO: When 2440bis becomes a RFC, these may need changing. */ Index: gnupg/g10/options.h diff -u gnupg/g10/options.h:1.128 gnupg/g10/options.h:1.129 --- gnupg/g10/options.h:1.128 Fri Nov 26 16:51:37 2004 +++ gnupg/g10/options.h Fri Dec 10 06:35:54 2004 @@ -192,6 +192,7 @@ unsigned int screen_columns; unsigned int screen_lines; byte *show_subpackets; + int strict_2440_line_endings; #ifdef ENABLE_CARD_SUPPORT const char *ctapi_driver; /* Library to access the ctAPI. */ Index: gnupg/g10/textfilter.c diff -u gnupg/g10/textfilter.c:1.15 gnupg/g10/textfilter.c:1.16 --- gnupg/g10/textfilter.c:1.15 Sat May 24 23:50:33 2003 +++ gnupg/g10/textfilter.c Fri Dec 10 06:35:54 2004 @@ -1,5 +1,5 @@ /* textfilter.c - * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -61,15 +61,6 @@ return mark? (mark - line) : len; } -unsigned -len_without_trailing_ws( byte *line, unsigned len ) -{ - return len_without_trailing_chars( line, len, " \t\r\n" ); -} - - - - static int standard( text_filter_context_t *tfx, IOBUF a, byte *buf, size_t size, size_t *ret_len) @@ -101,7 +92,25 @@ break; } lf_seen = tfx->buffer[tfx->buffer_len-1] == '\n'; - tfx->buffer_len = trim_trailing_ws( tfx->buffer, tfx->buffer_len ); + + /* The story behind this is that 2440 says that textmode + hashes should canonicalize line endings to CRLF and remove + spaces and tabs. 2440bis-12 says to just canonicalize to + CRLF. So, we default to the 2440bis-12 behavior, but + revert to the strict 2440 behavior if the user specifies + --rfc2440. In practical terms this makes no difference to + any signatures in the real world except for a textmode + detached signature. PGP always used the 2440bis-12 (1991) + behavior (ignoring 2440 itself), so this actually makes us + compatible with PGP textmode detached signatures for the + first time. */ + if(opt.strict_2440_line_endings) + tfx->buffer_len=trim_trailing_chars(tfx->buffer,tfx->buffer_len, + " \t\r\n"); + else + tfx->buffer_len=trim_trailing_chars(tfx->buffer,tfx->buffer_len, + "\r\n"); + if( lf_seen ) { tfx->buffer[tfx->buffer_len++] = '\r'; tfx->buffer[tfx->buffer_len++] = '\n'; From cvs at cvs.gnupg.org Fri Dec 10 11:40:53 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:37:40 2004 Subject: gnupg/g10 (ChangeLog app-openpgp.c card-util.c cardglue.c cardglue.h) Message-ID: Date: Friday, December 10, 2004 @ 11:49:14 Author: wk Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog app-openpgp.c card-util.c cardglue.c cardglue.h * app-openpgp.c (send_fprtime_if_not_null): New. (do_getattr): Add KEY_TIME. (do_learn_status): Print KEY_TIME. * cardglue.c (learn_status_cb): Parse KEY-TIME. * card-util.c (card_status): Print creation time if available. ---------------+ ChangeLog | 8 ++++++++ app-openpgp.c | 31 +++++++++++++++++++++++++++++-- card-util.c | 13 ++++++++++++- cardglue.c | 14 ++++++++++++++ cardglue.h | 3 +++ 5 files changed, 66 insertions(+), 3 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.650 gnupg/g10/ChangeLog:1.651 --- gnupg/g10/ChangeLog:1.650 Fri Dec 10 06:35:54 2004 +++ gnupg/g10/ChangeLog Fri Dec 10 11:49:14 2004 @@ -1,3 +1,11 @@ +2004-12-10 Werner Koch + + * app-openpgp.c (send_fprtime_if_not_null): New. + (do_getattr): Add KEY_TIME. + (do_learn_status): Print KEY_TIME. + * cardglue.c (learn_status_cb): Parse KEY-TIME. + * card-util.c (card_status): Print creation time if available. + 2004-12-09 David Shaw * options.h, g10.c (main), textfilter.c (len_without_trailing_ws): Index: gnupg/g10/app-openpgp.c diff -u gnupg/g10/app-openpgp.c:1.21 gnupg/g10/app-openpgp.c:1.22 --- gnupg/g10/app-openpgp.c:1.21 Thu Dec 9 17:57:30 2004 +++ gnupg/g10/app-openpgp.c Fri Dec 10 11:49:14 2004 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: app-openpgp.c,v 1.21 2004/12/09 16:57:30 wk Exp $ + * $Id: app-openpgp.c,v 1.22 2004/12/10 10:49:14 wk Exp $ */ #include @@ -79,6 +79,7 @@ { 0x00C4, 0, 0x6E, 1, 0, 1, 1, "CHV Status Bytes" }, { 0x00C5, 0, 0x6E, 1, 0, 0, 0, "Fingerprints" }, { 0x00C6, 0, 0x6E, 1, 0, 0, 0, "CA Fingerprints" }, + { 0x00CD, 0, 0x6E, 1, 0, 0, 0, "Generation time" }, { 0x007A, 1, 0, 1, 0, 0, 0, "Security Support Template" }, { 0x0093, 0, 0x7A, 1, 1, 0, 0, "Digital Signature Counter" }, { 0x0101, 0, 0, 0, 0, 0, 0, "Private DO 1"}, @@ -580,6 +581,23 @@ } static void +send_fprtime_if_not_null (ctrl_t ctrl, const char *keyword, + int number, const unsigned char *stamp) +{ + char numbuf1[50], numbuf2[50]; + unsigned long value; + + value = (stamp[0] << 24) | (stamp[1]<<16) | (stamp[2]<<8) | stamp[3]; + if (!value) + return; + sprintf (numbuf1, "%d", number); + sprintf (numbuf2, "%lu", value); + send_status_info (ctrl, keyword, + numbuf1, (size_t)strlen(numbuf1), + numbuf2, (size_t)strlen(numbuf2), NULL, 0); +} + +static void send_key_data (ctrl_t ctrl, const char *name, const unsigned char *a, size_t alen) { @@ -611,8 +629,9 @@ { "DISP-SEX", 0x5F35 }, { "PUBKEY-URL", 0x5F50 }, { "KEY-FPR", 0x00C5, 3 }, + { "KEY-TIME", 0x00CD, 4 }, { "CA-FPR", 0x00C6, 3 }, - { "CHV-STATUS", 0x00C4, 1 }, + { "CHV-STATUS", 0x00C4, 1 }, { "SIG-COUNTER", 0x0093, 2 }, { "SERIALNO", 0x004F, -1 }, { "AID", 0x004F }, @@ -694,6 +713,12 @@ for (i=0; i < 3; i++) send_fpr_if_not_null (ctrl, table[idx].name, i+1, value+i*20); } + else if (table[idx].special == 4) + { + if (valuelen >= 12) + for (i=0; i < 3; i++) + send_fprtime_if_not_null (ctrl, table[idx].name, i+1, value+i*4); + } else send_status_info (ctrl, table[idx].name, value, valuelen, NULL, 0); @@ -713,6 +738,8 @@ do_getattr (app, ctrl, "PUBKEY-URL"); do_getattr (app, ctrl, "LOGIN-DATA"); do_getattr (app, ctrl, "KEY-FPR"); + if (app->card_version > 0x0100) + do_getattr (app, ctrl, "KEY-TIME"); do_getattr (app, ctrl, "CA-FPR"); do_getattr (app, ctrl, "CHV-STATUS"); do_getattr (app, ctrl, "SIG-COUNTER"); Index: gnupg/g10/card-util.c diff -u gnupg/g10/card-util.c:1.22 gnupg/g10/card-util.c:1.23 --- gnupg/g10/card-util.c:1.22 Thu Dec 9 17:57:30 2004 +++ gnupg/g10/card-util.c Fri Dec 10 11:49:14 2004 @@ -356,7 +356,9 @@ print_sha1_fpr_colon (fp, info.fpr2valid? info.fpr2:NULL); print_sha1_fpr_colon (fp, info.fpr3valid? info.fpr3:NULL); putc ('\n', fp); - + fprintf (fp, "fprtime:%lu:%lu:%lu:\n", + (unsigned long)info.fpr1time, (unsigned long)info.fpr2time, + (unsigned long)info.fpr3time); } else { @@ -409,10 +411,19 @@ tty_fprintf (fp, "Signature counter : %lu\n", info.sig_counter); tty_fprintf (fp, "Signature key ....:"); print_sha1_fpr (fp, info.fpr1valid? info.fpr1:NULL); + if (info.fpr1valid && info.fpr1time) + tty_fprintf (fp, " created ....: %s\n", + asctimestamp (info.fpr1time)); tty_fprintf (fp, "Encryption key....:"); print_sha1_fpr (fp, info.fpr2valid? info.fpr2:NULL); + if (info.fpr2valid && info.fpr2time) + tty_fprintf (fp, " created ....: %s\n", + asctimestamp (info.fpr2time)); tty_fprintf (fp, "Authentication key:"); print_sha1_fpr (fp, info.fpr3valid? info.fpr3:NULL); + if (info.fpr3valid && info.fpr3time) + tty_fprintf (fp, " created ....: %s\n", + asctimestamp (info.fpr3time)); tty_fprintf (fp, "General key info..: "); if (info.fpr1valid && !get_pubkey_byfprint (pk, info.fpr1, 20)) print_pubkey_info (fp, pk); Index: gnupg/g10/cardglue.c diff -u gnupg/g10/cardglue.c:1.20 gnupg/g10/cardglue.c:1.21 --- gnupg/g10/cardglue.c:1.20 Thu Dec 9 17:57:30 2004 +++ gnupg/g10/cardglue.c Fri Dec 10 11:49:14 2004 @@ -558,6 +558,20 @@ else if (no == 3) parm->fpr3valid = unhexify_fpr (line, parm->fpr3); } + else if (keywordlen == 8 && !memcmp (keyword, "KEY-TIME", keywordlen)) + { + int no = atoi (line); + while (* line && !spacep (line)) + line++; + while (spacep (line)) + line++; + if (no == 1) + parm->fpr1time = strtoul (line, NULL, 10); + else if (no == 2) + parm->fpr2time = strtoul (line, NULL, 10); + else if (no == 3) + parm->fpr3time = strtoul (line, NULL, 10); + } else if (keywordlen == 6 && !memcmp (keyword, "CA-FPR", keywordlen)) { int no = atoi (line); Index: gnupg/g10/cardglue.h diff -u gnupg/g10/cardglue.h:1.12 gnupg/g10/cardglue.h:1.13 --- gnupg/g10/cardglue.h:1.12 Thu Dec 9 17:57:30 2004 +++ gnupg/g10/cardglue.h Fri Dec 10 11:49:14 2004 @@ -50,6 +50,9 @@ char fpr1[20]; char fpr2[20]; char fpr3[20]; + u32 fpr1time; + u32 fpr2time; + u32 fpr3time; unsigned long sig_counter; int chv1_cached; /* True if a PIN is not required for each signing. Note that the gpg-agent might cache From cvs at cvs.gnupg.org Fri Dec 10 15:04:15 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:37:46 2004 Subject: gpgme/gpgme (6 files) Message-ID: Date: Friday, December 10, 2004 @ 15:04:15 Author: marcus Path: /cvs/gnupg/gpgme/gpgme Modified: ChangeLog ath-compat.c ath-pth.c ath-pthread.c ath.c ath.h 2004-12-10 Marcus Brinkmann * ath.h (ath_waitpid): Change return type of prototype to pid_t. (struct ath_ops): Change return type of member waitpid to pid_t. * ath.c (ath_waitpid): Change return type to pid_t. * ath-compat.c (ath_waitpid): Likewise. * ath-pthread.c (ath_waitpid): Likewise. * ath-pth.c (ath_waitpid): Likewise. ---------------+ ChangeLog | 9 +++++++++ ath-compat.c | 2 +- ath-pth.c | 2 +- ath-pthread.c | 2 +- ath.c | 2 +- ath.h | 4 ++-- 6 files changed, 15 insertions(+), 6 deletions(-) From cvs at cvs.gnupg.org Fri Dec 10 16:07:23 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:37:49 2004 Subject: dirmngr/src (ChangeLog ldap.c misc.c) Message-ID: Date: Friday, December 10, 2004 @ 16:15:45 Author: wk Path: /cvs/dirmngr/dirmngr/src Modified: ChangeLog ldap.c misc.c * ldap.c (url_fetch_ldap): Use TMP and not a HOST which is always NULL. * misc.c (host_and_port_from_url): Fixed bad encoding detection. -----------+ ChangeLog | 6 ++++++ ldap.c | 9 ++++++--- misc.c | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.32 dirmngr/src/ChangeLog:1.33 --- dirmngr/src/ChangeLog:1.32 Fri Dec 3 15:42:36 2004 +++ dirmngr/src/ChangeLog Fri Dec 10 16:15:45 2004 @@ -1,3 +1,9 @@ +2004-12-10 Werner Koch + + * ldap.c (url_fetch_ldap): Use TMP and not a HOST which is always + NULL. + * misc.c (host_and_port_from_url): Fixed bad encoding detection. + 2004-12-03 Werner Koch * crlcache.c (crl_cache_load): Re-implement it. Index: dirmngr/src/ldap.c diff -u dirmngr/src/ldap.c:1.40 dirmngr/src/ldap.c:1.41 --- dirmngr/src/ldap.c:1.40 Wed Dec 1 17:11:14 2004 +++ dirmngr/src/ldap.c Fri Dec 10 16:15:45 2004 @@ -582,7 +582,7 @@ /* Create command line argument array. */ for (i=0; argv[i]; i++) ; - arg_list = xcalloc (i+2, sizeof *arg_list); + arg_list = xcalloc (i+3, sizeof *arg_list); arg_list[0] = strrchr (pgmname, '/'); if (arg_list[0]) arg_list[0]++; @@ -786,8 +786,11 @@ else if (url) { char *tmp = host_and_port_from_url (url, &port); - add_server_to_servers (host, port); - xfree (tmp); + if (tmp) + { + add_server_to_servers (tmp, port); + xfree (tmp); + } } } Index: dirmngr/src/misc.c diff -u dirmngr/src/misc.c:1.10 dirmngr/src/misc.c:1.11 --- dirmngr/src/misc.c:1.10 Fri Dec 3 15:42:36 2004 +++ dirmngr/src/misc.c Fri Dec 10 16:15:45 2004 @@ -698,7 +698,7 @@ /* Remove quotes and make sure that no Nul has been encoded. */ if ((n = remove_percent_escapes (buf)) < 0 - || n != strlen (p) ) + || n != strlen (buf) ) { log_error (_("bad URL encoding detected\n")); xfree (buf); From cvs at cvs.gnupg.org Sat Dec 11 05:43:39 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 13 16:37:56 2004 Subject: gnupg/g10 (ChangeLog g10.c options.h textfilter.c trustdb.c) Message-ID: Date: Saturday, December 11, 2004 @ 05:47:34 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog g10.c options.h textfilter.c trustdb.c * options.h, g10.c (main), textfilter.c (standard): Use --rfc2440 or --openpgp directly to determine the end of line hashing rule. * trustdb.c (uid_trust_string_fixed): Show uids as expired if the key is expired. --------------+ ChangeLog | 8 ++++++++ g10.c | 2 -- options.h | 1 - textfilter.c | 5 ++--- trustdb.c | 1 + 5 files changed, 11 insertions(+), 6 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.651 gnupg/g10/ChangeLog:1.652 --- gnupg/g10/ChangeLog:1.651 Fri Dec 10 11:49:14 2004 +++ gnupg/g10/ChangeLog Sat Dec 11 05:47:33 2004 @@ -1,3 +1,11 @@ +2004-12-10 David Shaw + + * options.h, g10.c (main), textfilter.c (standard): Use --rfc2440 + or --openpgp directly to determine the end of line hashing rule. + + * trustdb.c (uid_trust_string_fixed): Show uids as expired if the + key is expired. + 2004-12-10 Werner Koch * app-openpgp.c (send_fprtime_if_not_null): New. Index: gnupg/g10/g10.c diff -u gnupg/g10/g10.c:1.291 gnupg/g10/g10.c:1.292 --- gnupg/g10/g10.c:1.291 Fri Dec 10 06:35:54 2004 +++ gnupg/g10/g10.c Sat Dec 11 05:47:33 2004 @@ -2092,8 +2092,6 @@ opt.escape_from = 1; break; case oRFC2440: - opt.strict_2440_line_endings=1; - /* fall through */ case oOpenPGP: /* TODO: When 2440bis becomes a RFC, these may need changing. */ Index: gnupg/g10/options.h diff -u gnupg/g10/options.h:1.129 gnupg/g10/options.h:1.130 --- gnupg/g10/options.h:1.129 Fri Dec 10 06:35:54 2004 +++ gnupg/g10/options.h Sat Dec 11 05:47:33 2004 @@ -192,7 +192,6 @@ unsigned int screen_columns; unsigned int screen_lines; byte *show_subpackets; - int strict_2440_line_endings; #ifdef ENABLE_CARD_SUPPORT const char *ctapi_driver; /* Library to access the ctAPI. */ Index: gnupg/g10/textfilter.c diff -u gnupg/g10/textfilter.c:1.16 gnupg/g10/textfilter.c:1.17 --- gnupg/g10/textfilter.c:1.16 Fri Dec 10 06:35:54 2004 +++ gnupg/g10/textfilter.c Sat Dec 11 05:47:33 2004 @@ -61,6 +61,7 @@ return mark? (mark - line) : len; } + static int standard( text_filter_context_t *tfx, IOBUF a, byte *buf, size_t size, size_t *ret_len) @@ -104,7 +105,7 @@ behavior (ignoring 2440 itself), so this actually makes us compatible with PGP textmode detached signatures for the first time. */ - if(opt.strict_2440_line_endings) + if(RFC2440) tfx->buffer_len=trim_trailing_chars(tfx->buffer,tfx->buffer_len, " \t\r\n"); else @@ -121,8 +122,6 @@ } - - /**************** * The filter is used to make canonical text: Lines are terminated by * CR, LF, trailing white spaces are removed. Index: gnupg/g10/trustdb.c diff -u gnupg/g10/trustdb.c:1.133 gnupg/g10/trustdb.c:1.134 --- gnupg/g10/trustdb.c:1.133 Thu Nov 25 04:48:34 2004 +++ gnupg/g10/trustdb.c Sat Dec 11 05:47:33 2004 @@ -509,6 +509,7 @@ switch(get_validity(key,uid)&TRUST_MASK) { case TRUST_UNKNOWN: return _("[ unknown]"); + case TRUST_EXPIRED: return _("[ expired]"); case TRUST_UNDEFINED: return _("[ undef ]"); case TRUST_MARGINAL: return _("[marginal]"); case TRUST_FULLY: return _("[ full ]"); From cvs at cvs.gnupg.org Sat Dec 11 16:44:08 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:38:07 2004 Subject: gpgme (5 files) Message-ID: Date: Saturday, December 11, 2004 @ 16:48:01 Author: marcus Path: /cvs/gpgme/gpgme Added: gpgme/ttyname_r.c Modified: ChangeLog configure.ac gpgme/ChangeLog gpgme/util.h 2004-12-11 Marcus Brinkmann * configure.ac: Replace ttyname_r if it doesn't exist (and warn in that case). gpgme/ 2004-12-11 Marcus Brinkmann * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define prototype. * ttyname_r.c: New file. -------------------+ ChangeLog | 5 +++++ configure.ac | 11 ++++++++++- gpgme/ChangeLog | 6 ++++++ gpgme/ttyname_r.c | 43 +++++++++++++++++++++++++++++++++++++++++++ gpgme/util.h | 4 ++++ 5 files changed, 68 insertions(+), 1 deletion(-) Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.109 gpgme/ChangeLog:1.110 --- gpgme/ChangeLog:1.109 Tue Dec 7 22:13:36 2004 +++ gpgme/ChangeLog Sat Dec 11 16:48:00 2004 @@ -1,3 +1,8 @@ +2004-12-11 Marcus Brinkmann + + * configure.ac: Replace ttyname_r if it doesn't exist (and warn in + that case). + 2004-12-07 Marcus Brinkmann * README: Refer to COPYING.LESSER and "each file" instead of Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.94 gpgme/configure.ac:1.95 --- gpgme/configure.ac:1.94 Tue Dec 7 22:13:36 2004 +++ gpgme/configure.ac Sat Dec 11 16:48:00 2004 @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.94 $) +AC_REVISION($Revision: 1.95 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -171,6 +171,15 @@ GNUPG_CHECK_VA_COPY fi +# Try to find a thread-safe version of ttyname(). +AC_REPLACE_FUNCS(ttyname_r) +if test "$ac_cv_func_ttyname_r" != yes; then + AC_MSG_WARN([ +*** +*** ttyname() is not thread-safe and ttyname_r() does not exist +***]) +fi + # Try to find a thread-safe version of getenv(). have_thread_safe_getenv=no jm_GLIBC21 Index: gpgme/gpgme/ChangeLog diff -u gpgme/gpgme/ChangeLog:1.388 gpgme/gpgme/ChangeLog:1.389 --- gpgme/gpgme/ChangeLog:1.388 Tue Dec 7 22:13:36 2004 +++ gpgme/gpgme/ChangeLog Sat Dec 11 16:48:00 2004 @@ -1,3 +1,9 @@ +2004-12-11 Marcus Brinkmann + + * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define + prototype. + * ttyname_r.c: New file. + 2004-12-07 Marcus Brinkmann * putc_unlocked.c, funopen.c: I just claim copyright on these Index: gpgme/gpgme/ttyname_r.c diff -u /dev/null gpgme/gpgme/ttyname_r.c:1.1 --- /dev/null Sat Dec 11 16:48:01 2004 +++ gpgme/gpgme/ttyname_r.c Sat Dec 11 16:48:00 2004 @@ -0,0 +1,43 @@ +/* ttyname_r.c - A ttyname_r() replacement. + Copyright (C) 2003, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +#if HAVE_CONFIG_H +#include +#endif +#include +#include +#include +#include + + +#warning ttyname is not thread-safe, and ttyname_r is missing + +int ttyname_r(int fd, char *buf, size_t buflen) +{ + char *tty; + + tty = ttyname (fd); + if (!tty) + return errno; + + strncpy (buf, tty, buflen); + buf[buflen - 1] = '\0'; + return (strlen (tty) >= buflen) ? ERANGE : 0; +} Index: gpgme/gpgme/util.h diff -u gpgme/gpgme/util.h:1.28 gpgme/gpgme/util.h:1.29 --- gpgme/gpgme/util.h:1.28 Tue Dec 7 22:13:36 2004 +++ gpgme/gpgme/util.h Sat Dec 11 16:48:00 2004 @@ -44,6 +44,10 @@ int vasprintf (char **result, const char *format, va_list args); int asprintf (char **result, const char *format, ...); #endif + +#ifndef HAVE_TTYNAME_R +int ttyname_r (int fd, char *buf, size_t buflen); +#endif #endif From cvs at cvs.gnupg.org Sat Dec 11 16:44:36 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:38:08 2004 Subject: gpgme/gpgme (ttyname_r.c) Message-ID: Date: Saturday, December 11, 2004 @ 16:48:34 Author: marcus Path: /cvs/gpgme/gpgme/gpgme Modified: ttyname_r.c Small beautification. -------------+ ttyname_r.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) Index: gpgme/gpgme/ttyname_r.c diff -u gpgme/gpgme/ttyname_r.c:1.1 gpgme/gpgme/ttyname_r.c:1.2 --- gpgme/gpgme/ttyname_r.c:1.1 Sat Dec 11 16:48:00 2004 +++ gpgme/gpgme/ttyname_r.c Sat Dec 11 16:48:34 2004 @@ -29,7 +29,8 @@ #warning ttyname is not thread-safe, and ttyname_r is missing -int ttyname_r(int fd, char *buf, size_t buflen) +int +ttyname_r (int fd, char *buf, size_t buflen) { char *tty; From cvs at cvs.gnupg.org Sat Dec 11 16:46:14 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:38:10 2004 Subject: gpgme-1-0-branch gpgme (5 files) Message-ID: Date: Saturday, December 11, 2004 @ 16:50:12 Author: marcus Path: /cvs/gpgme/gpgme Tag: gpgme-1-0-branch Added: gpgme/ttyname_r.c Modified: ChangeLog configure.ac gpgme/ChangeLog gpgme/util.h 2004-12-11 Marcus Brinkmann * configure.ac: Replace ttyname_r if it doesn't exist (and warn in that case). gpgme/ 2004-12-11 Marcus Brinkmann * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define prototype. * ttyname_r.c: New file. -------------------+ ChangeLog | 5 +++++ configure.ac | 11 ++++++++++- gpgme/ChangeLog | 6 ++++++ gpgme/ttyname_r.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ gpgme/util.h | 4 ++++ 5 files changed, 69 insertions(+), 1 deletion(-) Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.108.2.1 gpgme/ChangeLog:1.108.2.2 --- gpgme/ChangeLog:1.108.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/ChangeLog Sat Dec 11 16:50:12 2004 @@ -1,3 +1,8 @@ +2004-12-11 Marcus Brinkmann + + * configure.ac: Replace ttyname_r if it doesn't exist (and warn in + that case). + 2004-12-07 Marcus Brinkmann * README: Refer to COPYING.LESSER and "each file" instead of Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.93.2.1 gpgme/configure.ac:1.93.2.2 --- gpgme/configure.ac:1.93.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/configure.ac Sat Dec 11 16:50:12 2004 @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.93.2.1 $) +AC_REVISION($Revision: 1.93.2.2 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION @@ -171,6 +171,15 @@ GNUPG_CHECK_VA_COPY fi +# Try to find a thread-safe version of ttyname(). +AC_REPLACE_FUNCS(ttyname_r) +if test "$ac_cv_func_ttyname_r" != yes; then + AC_MSG_WARN([ +*** +*** ttyname() is not thread-safe and ttyname_r() does not exist +***]) +fi + # Try to find a thread-safe version of getenv(). have_thread_safe_getenv=no jm_GLIBC21 Index: gpgme/gpgme/ChangeLog diff -u gpgme/gpgme/ChangeLog:1.386.2.1 gpgme/gpgme/ChangeLog:1.386.2.2 --- gpgme/gpgme/ChangeLog:1.386.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/gpgme/ChangeLog Sat Dec 11 16:50:12 2004 @@ -1,3 +1,9 @@ +2004-12-11 Marcus Brinkmann + + * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define + prototype. + * ttyname_r.c: New file. + 2004-12-07 Marcus Brinkmann * putc_unlocked.c, funopen.c: I just claim copyright on these Index: gpgme/gpgme/ttyname_r.c diff -u /dev/null gpgme/gpgme/ttyname_r.c:1.2.2.1 --- /dev/null Sat Dec 11 16:50:12 2004 +++ gpgme/gpgme/ttyname_r.c Sat Dec 11 16:50:12 2004 @@ -0,0 +1,44 @@ +/* ttyname_r.c - A ttyname_r() replacement. + Copyright (C) 2003, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +#if HAVE_CONFIG_H +#include +#endif +#include +#include +#include +#include + + +#warning ttyname is not thread-safe, and ttyname_r is missing + +int +ttyname_r (int fd, char *buf, size_t buflen) +{ + char *tty; + + tty = ttyname (fd); + if (!tty) + return errno; + + strncpy (buf, tty, buflen); + buf[buflen - 1] = '\0'; + return (strlen (tty) >= buflen) ? ERANGE : 0; +} Index: gpgme/gpgme/util.h diff -u gpgme/gpgme/util.h:1.27.2.1 gpgme/gpgme/util.h:1.27.2.2 --- gpgme/gpgme/util.h:1.27.2.1 Tue Dec 7 22:11:53 2004 +++ gpgme/gpgme/util.h Sat Dec 11 16:50:12 2004 @@ -44,6 +44,10 @@ int vasprintf (char **result, const char *format, va_list args); int asprintf (char **result, const char *format, ...); #endif + +#ifndef HAVE_TTYNAME_R +int ttyname_r (int fd, char *buf, size_t buflen); +#endif #endif From cvs at cvs.gnupg.org Sun Dec 12 06:06:24 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 13 16:38:26 2004 Subject: gnupg/g10 (ChangeLog keyserver.c) Message-ID: Date: Sunday, December 12, 2004 @ 06:10:23 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyserver.c * keyserver.c (parse_preferred_keyserver): Force preferred keyserver subpackets to have a URI scheme specified. -------------+ ChangeLog | 5 +++++ keyserver.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.652 gnupg/g10/ChangeLog:1.653 --- gnupg/g10/ChangeLog:1.652 Sat Dec 11 05:47:33 2004 +++ gnupg/g10/ChangeLog Sun Dec 12 06:10:22 2004 @@ -1,3 +1,8 @@ +2004-12-11 David Shaw + + * keyserver.c (parse_preferred_keyserver): Force preferred + keyserver subpackets to have a URI scheme specified. + 2004-12-10 David Shaw * options.h, g10.c (main), textfilter.c (standard): Use --rfc2440 Index: gnupg/g10/keyserver.c diff -u gnupg/g10/keyserver.c:1.71 gnupg/g10/keyserver.c:1.72 --- gnupg/g10/keyserver.c:1.71 Wed Oct 13 20:40:13 2004 +++ gnupg/g10/keyserver.c Sun Dec 12 06:10:22 2004 @@ -296,7 +296,7 @@ memcpy(dupe,p,plen); dupe[plen]='\0'; - spec=parse_keyserver_uri(dupe,0,NULL,0); + spec=parse_keyserver_uri(dupe,1,NULL,0); m_free(dupe); } From cvs at cvs.gnupg.org Sun Dec 12 15:54:08 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Mon Dec 13 16:38:33 2004 Subject: gpgme/gpgme (ChangeLog engine.c) Message-ID: Date: Sunday, December 12, 2004 @ 15:58:12 Author: marcus Path: /cvs/gpgme/gpgme/gpgme Modified: ChangeLog engine.c 2004-12-12 Marcus Brinkmann * engine.c (_gpgme_set_engine_info): Fix assertion. -----------+ ChangeLog | 4 ++++ engine.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) Index: gpgme/gpgme/ChangeLog diff -u gpgme/gpgme/ChangeLog:1.389 gpgme/gpgme/ChangeLog:1.390 --- gpgme/gpgme/ChangeLog:1.389 Sat Dec 11 16:48:00 2004 +++ gpgme/gpgme/ChangeLog Sun Dec 12 15:58:12 2004 @@ -1,3 +1,7 @@ +2004-12-12 Marcus Brinkmann + + * engine.c (_gpgme_set_engine_info): Fix assertion. + 2004-12-11 Marcus Brinkmann * util.h [HAVE_CONFIG_H && HAVE_TTYNAME_R] (ttyname_r): Define Index: gpgme/gpgme/engine.c diff -u gpgme/gpgme/engine.c:1.46 gpgme/gpgme/engine.c:1.47 --- gpgme/gpgme/engine.c:1.46 Tue Dec 7 22:13:36 2004 +++ gpgme/gpgme/engine.c Sun Dec 12 15:58:12 2004 @@ -305,7 +305,7 @@ else { new_file_name = engine_get_file_name (proto); - assert (file_name); + assert (new_file_name); new_file_name = strdup (new_file_name); } if (!new_file_name) From cvs at cvs.gnupg.org Mon Dec 13 09:00:47 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:38:59 2004 Subject: gnupg/g10 (ChangeLog passphrase.c) Message-ID: Date: Monday, December 13, 2004 @ 09:04:52 Author: wk Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog passphrase.c (read_passphrase_from_fd): Fixed memory leak. Noted by Andrei Darashenka. --------------+ ChangeLog | 5 +++++ passphrase.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.653 gnupg/g10/ChangeLog:1.654 --- gnupg/g10/ChangeLog:1.653 Sun Dec 12 06:10:22 2004 +++ gnupg/g10/ChangeLog Mon Dec 13 09:04:52 2004 @@ -1,3 +1,8 @@ +2004-12-13 Werner Koch + + * passphrase.c (read_passphrase_from_fd): Fixed memory leak. + Noted by Andrei Darashenka. + 2004-12-11 David Shaw * keyserver.c (parse_preferred_keyserver): Force preferred Index: gnupg/g10/passphrase.c diff -u gnupg/g10/passphrase.c:1.70 gnupg/g10/passphrase.c:1.71 --- gnupg/g10/passphrase.c:1.70 Thu Dec 9 17:57:30 2004 +++ gnupg/g10/passphrase.c Mon Dec 13 09:04:52 2004 @@ -173,7 +173,10 @@ len += 100; pw = m_alloc_secure( len ); if( pw2 ) - memcpy(pw, pw2, i ); + { + memcpy(pw, pw2, i ); + m_free (pw2); + } else i=0; } From cvs at cvs.gnupg.org Mon Dec 13 10:01:22 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:39:01 2004 Subject: GNUPG-1-9-BRANCH gnupg/jnlib (ChangeLog w32-pth.c w32-pth.h) Message-ID: Date: Monday, December 13, 2004 @ 10:05:31 Author: wk Path: /cvs/gnupg/gnupg/jnlib Tag: GNUPG-1-9-BRANCH Modified: ChangeLog w32-pth.c w32-pth.h Added real code written by Timo Schulz. Not finished, though. -----------+ ChangeLog | 5 w32-pth.c | 1053 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- w32-pth.h | 219 ++++++++++++ 3 files changed, 1270 insertions(+), 7 deletions(-) Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.20 gnupg/jnlib/ChangeLog:1.3.2.21 --- gnupg/jnlib/ChangeLog:1.3.2.20 Tue Dec 7 12:21:40 2004 +++ gnupg/jnlib/ChangeLog Mon Dec 13 10:05:31 2004 @@ -1,3 +1,8 @@ +2004-12-13 Werner Koch + + * w32-pth.c, w32-pth.h: Added real code written by Timo Schulz. + Not finished, though. + 2004-12-07 Werner Koch * w32-pth.c, w32-pth.h: New. Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.1 gnupg/jnlib/w32-pth.c:1.1.2.2 --- gnupg/jnlib/w32-pth.c:1.1.2.1 Tue Dec 7 12:21:40 2004 +++ gnupg/jnlib/w32-pth.c Mon Dec 13 10:05:31 2004 @@ -1,4 +1,5 @@ /* w32-pth.c - GNU Pth emulation for W32 (MS Windows). + * Copyright (c) 1999-2003 Ralf S. Engelschall * Copyright (C) 2004 g10 Code GmbH * * This file is part of GnuPG. @@ -16,6 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * ------------------------------------------------------------------ + * This code is based on Ralf Engelschall's GNU Pth, a non-preemptive + * thread scheduling library which can be found at + * http://www.gnu.org/software/pth/. MS Windows (W32) specific code + * written by Timo Schulz, g10 Code. */ #include @@ -23,20 +30,1054 @@ #include #include #include +#include +/* We don't want to have any Windows specific code in the header, thus + we use a macro which defaults to a compatible type in w32-pth.h. */ +#define W32_PTH_HANDLE_INTERNAL HANDLE #include "w32-pth.h" -ssize_t -pth_read (int fd, void *buffer, size_t size) + +static int pth_signo = 0; +static HANDLE pth_signo_ev = NULL; +static int pth_initialized = 0; + + + +#define implicit_init() do { if (!pth_initialized) pth_init(); } while (0) + + + +struct pth_event_s +{ + struct pth_event_s * next; + struct pth_event_s * prev; + HANDLE hd; + union { + struct sigset_s * sig; + int fd; + struct timeval tv; + pth_mutex_t * mx; + } u; + int * val; + int u_type; + int flags; +}; + + +struct pth_attr_s +{ + unsigned int flags; + unsigned int stack_size; + char * name; +}; + + + +int +pth_init (void) +{ + SECURITY_ATTRIBUTES sa; + WSADATA wsadat; + + printf ("pth_init: called.\n"); + pth_initialized = 1; + if (WSAStartup (0x202, &wsadat)) + return -1; + pth_signo = 0; + if (pth_signo_ev) + CloseHandle (pth_signo_ev); + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + pth_signo_ev = CreateEvent (&sa, TRUE, FALSE, NULL); + + return 0; +} + + +int +pth_kill (void) +{ + pth_signo = 0; + if (pth_signo_ev) + CloseHandle (pth_signo_ev); + WSACleanup (); + pth_initialized = 0; + return 0; +} + + +long +pth_ctrl (unsigned long query, ...) +{ + implicit_init (); + + switch (query) { + case PTH_CTRL_GETAVLOAD: + case PTH_CTRL_GETPRIO: + case PTH_CTRL_GETNAME: + case PTH_CTRL_GETTHREADS_NEW: + case PTH_CTRL_GETTHREADS_READY: + case PTH_CTRL_GETTHREADS_RUNNING: + case PTH_CTRL_GETTHREADS_WAITING: + case PTH_CTRL_GETTHREADS_SUSPENDED: + case PTH_CTRL_GETTHREADS_DEAD: + /*case PTH_CTRL_GETTHREADS:*/ + default: + return -1; + } + return 0; +} + + + +pth_time_t +pth_timeout (long sec, long usec) +{ + pth_time_t tvd; + + tvd.tv_sec = sec; + tvd.tv_usec = usec; + return tvd; +} + + +int +pth_read_ev (int fd, void *buffer, size_t size, pth_event_t ev) +{ + implicit_init (); + return 0; +} + + +int +pth_read (int fd, void * buffer, size_t size) +{ + int n; + + implicit_init (); + n = recv (fd, buffer, size, 0); + if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { + DWORD nread = 0; + n = ReadFile ((HANDLE)fd, buffer, size, &nread, NULL); + if (!n) + return -1; + return (int)nread; + } + return n; +} + + +int +pth_write_ev (int fd, const void *buffer, size_t size, pth_event_t ev) +{ + implicit_init (); + return 0; +} + + +int +pth_write (int fd, const void * buffer, size_t size) +{ + int n; + + implicit_init (); + n = send (fd, buffer, size, 0); + if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { + DWORD nwrite; + n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); + if (!n) + return -1; + return (int)nwrite; + } + return n; +} + + +int +pth_select (int nfds, fd_set * rfds, fd_set * wfds, fd_set * efds, + const struct timeval * timeout) { - return read (fd, buffer, size); + implicit_init (); + return select (nfds, rfds, wfds, efds, timeout); } -ssize_t -pth_write (int fd, const void *buffer, size_t size) + +int +pth_fdmode (int fd, int mode) { - return write (fd, buffer, size); + unsigned long val; + + implicit_init (); + /* XXX: figure out original fd mode */ + switch (mode) { + case PTH_FDMODE_NONBLOCK: + val = 1; + if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) + return PTH_FDMODE_ERROR; + break; + + case PTH_FDMODE_BLOCK: + val = 0; + if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) + return PTH_FDMODE_ERROR; + break; + } + return PTH_FDMODE_BLOCK; +} + + +int +pth_accept (int fd, struct sockaddr *addr, int *addrlen) +{ + implicit_init (); + return accept (fd, addr, addrlen); +} + + +int +pth_accept_ev (int fd, struct sockaddr *addr, int *addrlen, pth_event_t ev_extra) +{ + pth_key_t ev_key; + pth_event_t ev; + int rv; + int fdmode; + + implicit_init (); + + fdmode = pth_fdmode (fd, PTH_FDMODE_NONBLOCK); + if (fdmode == PTH_FDMODE_ERROR) + return -1; + + ev = NULL; + while ((rv = accept (fd, addr, addrlen)) == -1 && + (WSAGetLastError () == WSAEINPROGRESS || + WSAGetLastError () == WSAEWOULDBLOCK)) { + if (ev == NULL) { + ev = pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, &ev_key, fd); + if (ev == NULL) + return -1; + if (ev_extra != NULL) + pth_event_concat (ev, ev_extra, NULL); + } + /* wait until accept has a chance */ + pth_wait (ev); + if (ev_extra != NULL) { + pth_event_isolate (ev); + if (pth_event_status (ev) != PTH_STATUS_OCCURRED) { + pth_fdmode (fd, fdmode); + return -1; + } + } + } + + pth_fdmode (fd, fdmode); + return rv; +} + + +int +pth_connect (int fd, struct sockaddr *name, int namelen) +{ + implicit_init (); + return connect (fd, name, namelen); +} + + +int +pth_mutex_release (pth_mutex_t *hd) +{ + if (!hd) + return -1; + implicit_init (); + if (hd->mx) { + CloseHandle (hd->mx); + hd->mx = NULL; + } + free (hd); + return 0; +} + + +int +pth_mutex_acquire (pth_mutex_t *hd, int tryonly, pth_event_t ev_extra) +{ + implicit_init (); + + if (!hd) + return -1; + if (!hd->mx) + return -1; + +#if 0 + /* still not locked, so simply acquire mutex? */ + if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) { + mutex->mx_state |= PTH_MUTEX_LOCKED; + mutex->mx_count = 1; + pth_ring_append(&(pth_current->mutexring), &(mutex->mx_node)); + pth_debug1("pth_mutex_acquire: immediately locking mutex"); + return 0; + } + + /* already locked by caller? */ + if (mutex->mx_count >= 1 && mutex->mx_owner == pth_current) { + /* recursive lock */ + mutex->mx_count++; + pth_debug1("pth_mutex_acquire: recursive locking"); + return 0; + } + + if (tryonly) + return return -1; + + for (;;) { + ev = pth_event(PTH_EVENT_MUTEX|PTH_MODE_STATIC, &ev_key, mutex); + if (ev_extra != NULL) + pth_event_concat (ev, ev_extra, NULL); + pth_wait (ev); + if (ev_extra != NULL) { + pth_event_isolate (ev); + if (pth_event_status(ev) == PTH_STATUS_PENDING) + return return -1; + } + if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) + break; + } +#endif + + hd->mx_state |= PTH_MUTEX_LOCKED; + return 0; +} + + +int +pth_mutex_init (pth_mutex_t *hd) +{ + SECURITY_ATTRIBUTES sa; + implicit_init (); + if (hd->mx) { + ReleaseMutex (hd->mx); + CloseHandle (hd->mx); + } + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + hd->mx = CreateMutex (&sa, FALSE, NULL); + hd->mx_state = PTH_MUTEX_INITIALIZED; + return 0; +} + + +pth_attr_t +pth_attr_new (void) +{ + pth_attr_t hd; + + implicit_init (); + hd = calloc (1, sizeof *hd); + if (!hd) + return NULL; + return hd; +} + + +int +pth_attr_destroy (pth_attr_t hd) +{ + if (!hd) + return -1; + implicit_init (); + if (hd->name) + free (hd->name); + free (hd); + return 0; +} + + +int +pth_attr_set (pth_attr_t hd, int field, ...) +{ + va_list args; + char * str; + int val; + int rc = 0; + + implicit_init (); + va_start (args, field); + switch (field) { + case PTH_ATTR_JOINABLE: + val = va_arg (args, int); + if (val) { + hd->flags |= PTH_ATTR_JOINABLE; + printf ("pth_attr_set: PTH_ATTR_JOINABLE\n"); + } + break; + + case PTH_ATTR_STACK_SIZE: + val = va_arg (args, int); + if (val) { + hd->flags |= PTH_ATTR_STACK_SIZE; + hd->stack_size = val; + printf ("pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", val); + } + break; + + case PTH_ATTR_NAME: + str = va_arg (args, char*); + if (hd->name) + free (hd->name); + if (str) { + hd->name = strdup (str); + if (!hd->name) + return -1; + hd->flags |= PTH_ATTR_NAME; + printf ("pth_attr_set: PTH_ATTR_NAME %s\n", hd->name); + } + break; + + default: + rc = -1; + break; + } + va_end (args); + return rc; +} + + +pth_t +pth_spawn (pth_attr_t hd, void *(*func)(void *), void *arg) +{ + SECURITY_ATTRIBUTES sa; + DWORD tid; + HANDLE th; + + if (!hd) + return NULL; + + implicit_init (); + + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + + th = CreateThread (&sa, hd->stack_size, (LPTHREAD_START_ROUTINE)func, arg, 0, &tid); + return th; +} + + +int +pth_join (pth_t hd, void **value) +{ + return 0; +} + + +/* friendly */ +int +pth_cancel (pth_t hd) +{ + if (!hd) + return -1; + implicit_init (); + WaitForSingleObject (hd, 1000); + TerminateThread (hd, 0); + return 0; +} + + +/* cruel */ +int +pth_abort (pth_t hd) +{ + if (!hd) + return -1; + implicit_init (); + TerminateThread (hd, 0); + return 0; +} + + +void +pth_exit (void *value) +{ + implicit_init (); + pth_kill (); + exit ((int)(long)value); +} + + +unsigned +pth_waitpid (unsigned pid, int * status, int options) +{ + implicit_init (); +#if 0 + pth_event_t ev; + static pth_key_t ev_key = PTH_KEY_INIT; + pid_t pid; + + pth_debug2("pth_waitpid: called from thread \"%s\"", pth_current->name); + + for (;;) { + /* do a non-blocking poll for the pid */ + while ( (pid = pth_sc(waitpid)(wpid, status, options|WNOHANG)) < 0 + && errno == EINTR) ; + + /* if pid was found or caller requested a polling return immediately */ + if (pid == -1 || pid > 0 || (pid == 0 && (options & WNOHANG))) + break; + + /* else wait a little bit */ + ev = pth_event(PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, pth_timeout(0,250000)); + pth_wait(ev); + } + + pth_debug2("pth_waitpid: leave to thread \"%s\"", pth_current->name); +#endif + return 0; } +static BOOL WINAPI +sig_handler (DWORD signo) +{ + switch (signo) { + case CTRL_C_EVENT: pth_signo = SIGINT; break; + case CTRL_BREAK_EVENT: pth_signo = SIGTERM; break; + } + SetEvent (pth_signo_ev); + printf ("sig_handler=%d\n", pth_signo); + return TRUE; +} + + +pth_event_t +pth_event (unsigned long spec, ...) +{ + va_list arg; + SECURITY_ATTRIBUTES sa; + pth_event_t ev; + int rc; + + implicit_init (); + printf ("pth_event spec=%lu\n", spec); + va_start (arg, spec); + ev = calloc (1, sizeof *ev); + if (!ev) + return NULL; + if (spec == 0) + ; + else if (spec & PTH_EVENT_SIGS) { + ev->u.sig = va_arg (arg, struct sigset_s *); + ev->u_type = PTH_EVENT_SIGS; + ev->val = va_arg (arg, int *); + rc = SetConsoleCtrlHandler (sig_handler, TRUE); + printf ("pth_event: sigs rc=%d\n", rc); + } + else if (spec & PTH_EVENT_FD) { + if (spec & PTH_UNTIL_FD_READABLE) + ev->flags |= PTH_UNTIL_FD_READABLE; + if (spec & PTH_MODE_STATIC) + ev->flags |= PTH_MODE_STATIC; + ev->u_type = PTH_EVENT_FD; + va_arg (arg, pth_key_t); + ev->u.fd = va_arg (arg, int); + printf ("pth_event: fd=%d\n", ev->u.fd); + } + else if (spec & PTH_EVENT_TIME) { + pth_time_t t; + if (spec & PTH_MODE_STATIC) + ev->flags |= PTH_MODE_STATIC; + va_arg (arg, pth_key_t); + t = va_arg (arg, pth_time_t); + ev->u_type = PTH_EVENT_TIME; + ev->u.tv.tv_sec = t.tv_sec; + ev->u.tv.tv_usec = t.tv_usec; + } + else if (spec & PTH_EVENT_MUTEX) { + va_arg (arg, pth_key_t); + ev->u_type = PTH_EVENT_MUTEX; + ev->u.mx = va_arg (arg, pth_mutex_t*); + } + va_end (arg); + + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + ev->hd = CreateEvent (&sa, FALSE, FALSE, NULL); + if (!ev->hd) { + free (ev); + return NULL; + } + + return ev; +} + + +static void +pth_event_add (pth_event_t root, pth_event_t node) +{ + pth_event_t n; + + for (n=root; n->next; n = n->next) + ; + n->next = node; +} + + +pth_event_t +pth_event_concat (pth_event_t evf, ...) +{ + pth_event_t evn; + va_list ap; + + if (!evf) + return NULL; + + implicit_init (); + va_start (ap, evf); + while ((evn = va_arg(ap, pth_event_t)) != NULL) + pth_event_add (evf, evn); + va_end (ap); + + return evf; +} + + +static int +wait_for_fd (int fd, int is_read, int nwait) +{ + struct timeval tv; + fd_set r; + fd_set w; + int n; + + FD_ZERO (&r); + FD_ZERO (&w); + FD_SET (fd, is_read ? &r : &w); + + tv.tv_sec = nwait; + tv.tv_usec = 0; + + while (1) { + n = select (fd+1, &r, &w, NULL, &tv); + printf ("wait_for_fd=%d fd %d (ec=%d)\n", n, fd, (int)WSAGetLastError ()); + if (n == -1) + break; + if (!n) + continue; + if (n == 1) { + if (is_read && FD_ISSET (fd, &r)) + break; + else if (FD_ISSET (fd, &w)) + break; + } + } + return 0; +} + + +static void * +wait_fd_thread (void * ctx) +{ + pth_event_t ev = ctx; + + wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); + printf ("wait_fd_thread: exit.\n"); + SetEvent (ev->hd); + ExitThread (0); + return NULL; +} + + +static void * +wait_timer_thread (void * ctx) +{ + pth_event_t ev = ctx; + int n = ev->u.tv.tv_sec*1000; + Sleep (n); + SetEvent (ev->hd); + printf ("wait_timer_thread: exit.\n"); + ExitThread (0); + return NULL; +} + + +/* void */ +/* sigemptyset (struct sigset_s * ss) */ +/* { */ +/* if (ss) { */ +/* memset (ss->sigs, 0, sizeof ss->sigs); */ +/* ss->idx = 0; */ +/* } */ +/* } */ + + +/* int */ +/* sigaddset (struct sigset_s * ss, int signo) */ +/* { */ +/* if (!ss) */ +/* return -1; */ +/* if (ss->idx + 1 > 64) */ +/* return -1; */ +/* ss->sigs[ss->idx] = signo; */ +/* ss->idx++; */ +/* return 0; */ +/* } */ + + +static int +sigpresent (struct sigset_s * ss, int signo) +{ +/* int i; */ +/* for (i=0; i < ss->idx; i++) { */ +/* if (ss->sigs[i] == signo) */ +/* return 1; */ +/* } */ +/* FIXME: See how to implement it. */ + return 0; +} + + +int +pth_event_occured (pth_event_t ev) +{ + if (!ev) + return 0; + implicit_init (); + switch (ev->u_type) { + case 0: + if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) + return 1; + break; + + case PTH_EVENT_SIGS: + if (sigpresent (ev->u.sig, pth_signo) && + WaitForSingleObject (pth_signo_ev, 0) == WAIT_OBJECT_0) { + printf ("pth_event_occured: sig signaled.\n"); + (*ev->val) = pth_signo; + return 1; + } + break; + + case PTH_EVENT_FD: + if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) + return 1; + break; + } + + return 0; +} + + +int +pth_event_status (pth_event_t ev) +{ + if (!ev) + return 0; + implicit_init (); + if (pth_event_occured (ev)) + return PTH_STATUS_OCCURRED; + return 0; +} + + +int +pth_event_free (pth_event_t ev, int mode) +{ + pth_event_t n; + + implicit_init (); + if (mode == PTH_FREE_ALL) { + while (ev) { + n = ev->next; + CloseHandle (ev->hd); ev->hd = NULL; + free (ev); + ev = n; + } + } + else if (mode == PTH_FREE_THIS) { + ev->prev->next = ev->next; + ev->next->prev = ev->prev; + CloseHandle (ev->hd); ev->hd = NULL; + free (ev); + + } + return 0; +} + + +pth_event_t +pth_event_isolate (pth_event_t ev) +{ + pth_event_t ring = NULL; + + if (!ev) + return NULL; + implicit_init (); + return ring; + +} + + +static void +free_threads (HANDLE *waitbuf, int *hdidx, int n) +{ + int i; + + for (i=0; i < n; i++) + CloseHandle (waitbuf[hdidx[i]]); +} + + +static int +pth_event_count (pth_event_t ev) +{ + pth_event_t p; + int cnt=0; + + if (!ev) + return 0; + for (p=ev; p; p = p->next) + cnt++; + return cnt; +} + + +int +pth_wait (pth_event_t ev) +{ + HANDLE waitbuf[MAXIMUM_WAIT_OBJECTS/2]; + int hdidx[MAXIMUM_WAIT_OBJECTS/2]; + DWORD n = 0; + pth_attr_t attr; + pth_event_t tmp; + int pos=0, i=0; + + if (!ev) + return 0; + + implicit_init (); + attr = pth_attr_new (); + pth_attr_set (attr, PTH_ATTR_JOINABLE, 1); + pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 4096); + + printf ("pth_wait: cnt %d\n", pth_event_count (ev)); + for (tmp = ev; tmp; tmp = tmp->next) { + if (pos+1 > MAXIMUM_WAIT_OBJECTS/2) { + free_threads (waitbuf, hdidx, i); + pth_attr_destroy (attr); + return -1; + } + switch (tmp->u_type) { + case 0: + waitbuf[pos++] = tmp->hd; + break; + + case PTH_EVENT_SIGS: + waitbuf[pos++] = pth_signo_ev; + printf ("pth_wait: add signal event.\n"); + break; + + case PTH_EVENT_FD: + printf ("pth_wait: spawn event wait thread.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = pth_spawn (attr, wait_fd_thread, tmp); + break; + + case PTH_EVENT_TIME: + printf ("pth_wait: spawn event timer thread.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = pth_spawn (attr, wait_timer_thread, tmp); + break; + + case PTH_EVENT_MUTEX: + printf ("pth_wait: add mutex event.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = tmp->u.mx->mx; + /* XXX: Use SetEvent(hd->ev) */ + break; + } + } + printf ("pth_wait: set %d\n", pos); + n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); + free_threads (waitbuf, hdidx, i); + pth_attr_destroy (attr); + printf ("pth_wait: n %ld\n", n); + if (n != WAIT_TIMEOUT) + return 1; + + /* + switch (ev->u_type) { + case 0: + n = WaitForSingleObject (ev->hd, INFINITE); + if (n != WAIT_OBJECT_0) + return 1; + break; + + case PTH_EVENT_SIGS: + n = WaitForSingleObject (pth_signo_ev, INFINITE); + if (n != WAIT_OBJECT_0) + return 1; + break; + + case PTH_EVENT_FD: + if (wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE)) { + SetEvent (ev->hd); + return 1; + } + break; + + default: + return -1; + } + */ + return 0; +} + + +int +pth_sleep (int sec) +{ + static pth_key_t ev_key = PTH_KEY_INIT; + pth_event_t ev; + + implicit_init (); + if (sec == 0) + return 0; + + ev = pth_event (PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, pth_timeout (sec, 0)); + if (ev == NULL) + return -1; + pth_wait (ev); + pth_event_free (ev, PTH_FREE_ALL); + return 0; +} + + + + + +/* + Some simple tests. + */ +#ifdef TEST +#include + +void * thread (void * c) +{ + + Sleep (2000); + SetEvent (((pth_event_t)c)->hd); + printf ("\n\nhallo!.\n"); + pth_exit (NULL); + return NULL; +} + + +int main_1 (int argc, char ** argv) +{ + pth_attr_t t; + pth_t hd; + pth_event_t ev; + + pth_init (); + ev = pth_event (0, NULL); + t = pth_attr_new (); + pth_attr_set (t, PTH_ATTR_JOINABLE, 1); + pth_attr_set (t, PTH_ATTR_STACK_SIZE, 4096); + pth_attr_set (t, PTH_ATTR_NAME, "hello"); + hd = pth_spawn (t, thread, ev); + + pth_wait (ev); + pth_attr_destroy (t); + pth_event_free (ev, 0); + pth_kill (); + + return 0; +} + + +static pth_event_t +setup_signals (struct sigset_s *sigs, int *signo) +{ + pth_event_t ev; + + sigemptyset (sigs); + sigaddset (sigs, SIGINT); + sigaddset (sigs, SIGTERM); + + ev = pth_event (PTH_EVENT_SIGS, sigs, signo); + return ev; +} + +int +main_2 (int argc, char ** argv) +{ + pth_event_t ev; + struct sigset_s sigs; + int signo = 0; + + pth_init (); + ev = setup_signals (&sigs, &signo); + pth_wait (ev); + if (pth_event_occured (ev) && signo) + printf ("signal caught! signo %d\n", signo); + + pth_event_free (ev, PTH_FREE_ALL); + pth_kill (); + return 0; +} + +int +main_3 (int argc, char ** argv) +{ + struct sockaddr_in addr, rem; + int fd, n = 0, infd; + int signo = 0; + struct sigset_s sigs; + pth_event_t ev; + + pth_init (); + fd = socket (AF_INET, SOCK_STREAM, 0); + + memset (&addr, 0, sizeof addr); + addr.sin_addr.s_addr = INADDR_ANY; + addr.sin_port = htons (5050); + addr.sin_family = AF_INET; + bind (fd, (struct sockaddr*)&addr, sizeof addr); + listen (fd, 5); + + ev = setup_signals (&sigs, &signo); + n = sizeof addr; + infd = pth_accept_ev (fd, (struct sockaddr *)&rem, &n, ev); + printf ("infd %d: %s:%d\n", infd, inet_ntoa (rem.sin_addr), htons (rem.sin_port)); + + closesocket (infd); + pth_event_free (ev, PTH_FREE_ALL); + pth_kill (); + return 0; +} + +int +main (int argc, char ** argv) +{ + pth_event_t ev; + pth_key_t ev_key; + + pth_init (); + /*ev = pth_event (PTH_EVENT_TIME, &ev_key, pth_timeout (5, 0)); + pth_wait (ev); + pth_event_free (ev, PTH_FREE_ALL);*/ + pth_sleep (5); + pth_kill (); + return 0; +} +#endif + #endif /*HAVE_W32_SYSTEM*/ + Index: gnupg/jnlib/w32-pth.h diff -u gnupg/jnlib/w32-pth.h:1.1.2.2 gnupg/jnlib/w32-pth.h:1.1.2.3 --- gnupg/jnlib/w32-pth.h:1.1.2.2 Tue Dec 7 12:21:40 2004 +++ gnupg/jnlib/w32-pth.h Mon Dec 13 10:05:31 2004 @@ -1,5 +1,6 @@ /* w32-pth.h - GNU Pth emulation for W32 (MS Windows). - * Copyright (C) 2004 g10 Code GmbH + * Copyright (c) 1999-2003 Ralf S. Engelschall + * Copyright (C) 2004 g10 Code GmbH * * This file is part of GnuPG. * @@ -16,6 +17,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * ------------------------------------------------------------------ + * This code is based on Ralf Engelschall's GNU Pth, a non-preemptive + * thread scheduling library which can be found at + * http://www.gnu.org/software/pth/. */ /* Note that this header is usually used through a symlinked pth.h @@ -24,6 +30,217 @@ #ifndef W32_PTH_H #define W32_PTH_H +#include /* We need this for sockaddr et al. FIXME: too + heavyweight - may be we should factor such + code out to a second header and adjust all + user files to include it only if required. */ + +#ifndef W32_PTH_HANDLE_INTERNAL +#define W32_PTH_HANDLE_INTERNAL int +#endif + + +/* Filedescriptor blocking modes. */ +enum + { + PTH_FDMODE_ERROR = -1, + PTH_FDMODE_POLL = 0, + PTH_FDMODE_BLOCK, + PTH_FDMODE_NONBLOCK + }; + + +/* Mutex values. */ +#define PTH_MUTEX_INITIALIZED (1<<0) +#define PTH_MUTEX_LOCKED (1<<1) +#define PTH_MUTEX_INIT {{NULL, NULL}, PTH_MUTEX_INITIALIZED, NULL, 0} + + +#define PTH_KEY_INIT (1<<0) + + +/* Event subject classes. */ +#define PTH_EVENT_FD (1<<1) +#define PTH_EVENT_SELECT (1<<2) +#define PTH_EVENT_SIGS (1<<3) +#define PTH_EVENT_TIME (1<<4) +#define PTH_EVENT_MSG (1<<5) +#define PTH_EVENT_MUTEX (1<<6) +#define PTH_EVENT_COND (1<<7) +#define PTH_EVENT_TID (1<<8) +#define PTH_EVENT_FUNC (1<<9) + + + +/* Event occurrence restrictions. */ +#define PTH_UNTIL_OCCURRED (1<<11) +#define PTH_UNTIL_FD_READABLE (1<<12) +#define PTH_UNTIL_FD_WRITEABLE (1<<13) +#define PTH_UNTIL_FD_EXCEPTION (1<<14) +#define PTH_UNTIL_TID_NEW (1<<15) +#define PTH_UNTIL_TID_READY (1<<16) +#define PTH_UNTIL_TID_WAITING (1<<17) +#define PTH_UNTIL_TID_DEAD (1<<18) + + +/* Event structure handling modes. */ +#define PTH_MODE_REUSE (1<<20) +#define PTH_MODE_CHAIN (1<<21) +#define PTH_MODE_STATIC (1<<22) + + +/* Attribute commands for pth_attr_get and pth_attr_set(). */ +enum + { + PTH_ATTR_PRIO, /* RW [int] Priority of thread. */ + PTH_ATTR_NAME, /* RW [char *] Name of thread. */ + PTH_ATTR_JOINABLE, /* RW [int] Thread detachment type. */ + PTH_ATTR_CANCEL_STATE, /* RW [unsigned int] Thread cancellation state.*/ + PTH_ATTR_STACK_SIZE, /* RW [unsigned int] Stack size. */ + PTH_ATTR_STACK_ADDR, /* RW [char *] Stack lower address. */ + PTH_ATTR_DISPATCHES, /* RO [int] Total number of + thread dispatches. */ + PTH_ATTR_TIME_SPAWN, /* RO [pth_time_t] Time thread was spawned. */ + PTH_ATTR_TIME_LAST, /* RO [pth_time_t] Time thread was + last dispatched. */ + PTH_ATTR_TIME_RAN, /* RO [pth_time_t] Time thread was running. */ + PTH_ATTR_START_FUNC, /* RO [void *(*)(void *)] Thread start function.*/ + PTH_ATTR_START_ARG, /* RO [void *] Thread start argument. */ + PTH_ATTR_STATE, /* RO [pth_state_t] Scheduling state. */ + PTH_ATTR_EVENTS, /* RO [pth_event_t] Events the thread + is waiting for. */ + PTH_ATTR_BOUND /* RO [int] Whether object is + bound to thread. */ + }; + + + +/* Queries for pth_ctrl(). */ +#define PTH_CTRL_GETAVLOAD (1<<1) +#define PTH_CTRL_GETPRIO (1<<2) +#define PTH_CTRL_GETNAME (1<<3) +#define PTH_CTRL_GETTHREADS_NEW (1<<4) +#define PTH_CTRL_GETTHREADS_READY (1<<5) +#define PTH_CTRL_GETTHREADS_RUNNING (1<<6) +#define PTH_CTRL_GETTHREADS_WAITING (1<<7) +#define PTH_CTRL_GETTHREADS_SUSPENDED (1<<8) +#define PTH_CTRL_GETTHREADS_DEAD (1<<9) +#define PTH_CTRL_DUMPSTATE (1<<10) + +#define PTH_CTRL_GETTHREADS ( PTH_CTRL_GETTHREADS_NEW \ + | PTH_CTRL_GETTHREADS_READY \ + | PTH_CTRL_GETTHREADS_RUNNING \ + | PTH_CTRL_GETTHREADS_WAITING \ + | PTH_CTRL_GETTHREADS_SUSPENDED \ + | PTH_CTRL_GETTHREADS_DEAD ) + + +/* Event status codes. */ +typedef enum + { + PTH_STATUS_PENDING, + PTH_STATUS_OCCURRED, + PTH_STATUS_FAILED + } +pth_status_t; + + +/* Event deallocation types. */ +enum + { + PTH_FREE_THIS, + PTH_FREE_ALL + }; + + +/* The Pth thread handle object. */ +typedef void *pth_t; + + +/* The Mutex object. */ +struct pth_mutex_s +{ + unsigned mx_state; + W32_PTH_HANDLE_INTERNAL mx; +}; +typedef struct pth_mutex_s pth_mutex_t; + + +/* The Event object. */ +struct pth_event_s; +typedef struct pth_event_s *pth_event_t; + + +/* The Attribute object. */ +struct pth_attr_s; +typedef struct pth_attr_s *pth_attr_t; + + +/* The Key object. */ +typedef int pth_key_t; + + +/* The Pth time object. */ +typedef struct timeval pth_time_t; + + +/* Function prototypes. */ +int pth_init (void); +int pth_kill (void); +long pth_ctrl (unsigned long query, ...); + +int pth_read_ev (int fd, void *buffer, size_t size, pth_event_t ev); +int pth_read (int fd, void *buffer, size_t size); +int pth_write_ev (int fd, const void *buffer, size_t size, pth_event_t ev); +int pth_write (int fd, const void *buffer, size_t size); + +int pth_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, + const struct timeval *timeout); + +int pth_accept (int fd, struct sockaddr *addr, int *addrlen); +int pth_accept_ev (int fd, struct sockaddr *addr, int *addrlen, + pth_event_t hd); + +int pth_connect (int fd, struct sockaddr *name, int namelen); + + +int pth_mutex_release (pth_mutex_t *hd); +int pth_mutex_acquire(pth_mutex_t *hd, int try_only, pth_event_t ev_extra); +int pth_mutex_init (pth_mutex_t *hd); + + +pth_attr_t pth_attr_new (void); +int pth_attr_destroy (pth_attr_t hd); +int pth_attr_set (pth_attr_t hd, int field, ...); + +pth_t pth_spawn (pth_attr_t hd, void *(*func)(void *), void *arg); +int pth_join (pth_t hd, void **value); +int pth_abort (pth_t hd); +void pth_exit (void *value); + +unsigned int pth_waitpid (unsigned int, int *status, int options); +int pth_wait (pth_event_t hd); + +int pth_sleep (int n); +pth_time_t pth_timeout (long sec, long usec); + + + +pth_event_t pth_event_isolate (pth_event_t hd); +int pth_event_free (pth_event_t hd, int mode); +int pth_event_status (pth_event_t hd); +int pth_event_occured (pth_event_t hd); +pth_event_t pth_event_concat (pth_event_t ev, ...); +pth_event_t pth_event (unsigned long spec, ...); + + + +/*-- pth_util.c --*/ + +/* void sigemptyset (struct sigset_s * ss); */ + +/* int sigaddset (struct sigset_s * ss, int signo); */ + #endif /*W32_PTH_H*/ From cvs at cvs.gnupg.org Mon Dec 13 12:38:56 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:39:02 2004 Subject: dirmngr/src (ChangeLog dirmngr.c) Message-ID: Date: Monday, December 13, 2004 @ 12:43:06 Author: wk Path: /cvs/dirmngr/dirmngr/src Modified: ChangeLog dirmngr.c Workaround a typo in gpgconf for ignore-ocsp-servic-url. -----------+ ChangeLog | 5 +++++ dirmngr.c | 7 +++++++ 2 files changed, 12 insertions(+) Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.33 dirmngr/src/ChangeLog:1.34 --- dirmngr/src/ChangeLog:1.33 Fri Dec 10 16:15:45 2004 +++ dirmngr/src/ChangeLog Mon Dec 13 12:43:05 2004 @@ -1,3 +1,8 @@ +2004-12-13 Werner Koch + + * dirmngr.c: Workaround a typo in gpgconf for + ignore-ocsp-servic-url. + 2004-12-10 Werner Koch * ldap.c (url_fetch_ldap): Use TMP and not a HOST which is always Index: dirmngr/src/dirmngr.c diff -u dirmngr/src/dirmngr.c:1.50 dirmngr/src/dirmngr.c:1.51 --- dirmngr/src/dirmngr.c:1.50 Fri Dec 3 15:42:36 2004 +++ dirmngr/src/dirmngr.c Mon Dec 13 12:43:05 2004 @@ -136,6 +136,10 @@ N_("ignore LDAP CRL distribution points")}, { oIgnoreOCSPSvcUrl, "ignore-ocsp-service-url", 0, N_("ignore certificate contained OCSP service URLs")}, + /* Note: The next one is to fix a typo in gpgconf - should be + removed eventually. */ + { oIgnoreOCSPSvcUrl, "ignore-ocsp-servic-url", 0, "@"}, + { oHTTPProxy, "http-proxy", 2, N_("|URL|redirect all HTTP requests to URL")}, { oLDAPProxy, "ldap-proxy", 2, @@ -1033,6 +1037,9 @@ printf ("ignore-ldap-dp:%lu:\n", GC_OPT_FLAG_NONE); printf ("ignore-http-dp:%lu:\n", GC_OPT_FLAG_NONE); printf ("ignore-ocsp-service-url:%lu:\n", GC_OPT_FLAG_NONE); + /* Note: The next one is to fix a typo in gpgconf - should be + removed eventually. */ + printf ("ignore-ocsp-servic-url:%lu:\n", GC_OPT_FLAG_NONE); } cleanup (); return !!rc; From cvs at cvs.gnupg.org Mon Dec 13 16:12:25 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 13 16:39:03 2004 Subject: dirmngr (8 files) Message-ID: Date: Monday, December 13, 2004 @ 16:16:35 Author: wk Path: /cvs/dirmngr/dirmngr Modified: ChangeLog configure.ac doc/dirmngr.texi src/ChangeLog src/dirmngr.c src/dirmngr.h src/dirmngr_ldap.c src/ldap.c * configure.ac (AC_CHECK_TYPES): Check for sigset_t. * dirmngr_ldap.c (catch_alarm, set_timeout): new. (main): Install alarm handler. Add new option --only-search-timeout. (print_ldap_entries, fetch_ldap): Use set_timeout (); * dirmngr.h: Make LDAPTIMEOUT a simple unsigned int. Change all initializations. * ldap.c (start_cert_fetch_ldap, run_ldap_wrapper): Pass timeout option to the wrapper. (INACTIVITY_TIMEOUT): Depend on LDAPTIMEOUT. (run_ldap_wrapper): Add arg IGNORE_TIMEOUT. (ldap_wrapper_thread): Check for special timeout exit code. * dirmngr.c: Workaround a typo in gpgconf for ignore-ocsp-service-url. --------------------+ ChangeLog | 4 +++ configure.ac | 4 +-- doc/dirmngr.texi | 7 +++++- src/ChangeLog | 13 +++++++++++- src/dirmngr.c | 7 +----- src/dirmngr.h | 2 - src/dirmngr_ldap.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++---- src/ldap.c | 32 ++++++++++++++++++++++++++----- 8 files changed, 102 insertions(+), 19 deletions(-) Index: dirmngr/ChangeLog diff -u dirmngr/ChangeLog:1.79 dirmngr/ChangeLog:1.80 --- dirmngr/ChangeLog:1.79 Fri Dec 3 15:42:36 2004 +++ dirmngr/ChangeLog Mon Dec 13 16:16:35 2004 @@ -1,3 +1,7 @@ +2004-12-13 Werner Koch + + * configure.ac (AC_CHECK_TYPES): Check for sigset_t. + 2004-12-03 Werner Koch * configure.ac (canonicalize_file_name): Check for it. Index: dirmngr/configure.ac diff -u dirmngr/configure.ac:1.64 dirmngr/configure.ac:1.65 --- dirmngr/configure.ac:1.64 Fri Dec 3 15:42:36 2004 +++ dirmngr/configure.ac Mon Dec 13 16:16:35 2004 @@ -345,6 +345,8 @@ GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF) +AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include ]) + # Checks for library functions. @@ -376,14 +378,12 @@ fi fi - # We use jnlib, so tell other modules about it AC_DEFINE(HAVE_JNLIB_LOGGING, 1, [Defined if jnlib style logging fucntions are available]) - # # Print errors here so that they are visible all # together and the user can acquire them all together. Index: dirmngr/doc/dirmngr.texi diff -u dirmngr/doc/dirmngr.texi:1.18 dirmngr/doc/dirmngr.texi:1.19 --- dirmngr/doc/dirmngr.texi:1.18 Thu Nov 25 12:37:38 2004 +++ dirmngr/doc/dirmngr.texi Mon Dec 13 16:16:35 2004 @@ -447,7 +447,7 @@ @item --ldaptimeout @var{secs} @opindex ldaptimeout Specify the number of seconds to wait for an LDAP query before timing -out. The default is currently 100 seconds. +out. The default is currently 100 seconds. 0 will never timeout. @item --add-servers @@ -838,6 +838,11 @@ Validate the given certificate using dirmngr's internal validation code. This is mainly useful for debugging. +@item --load-crl +@opindex load-crl +This command expects a list of filenames with DER encoded CRL files. +All CRL will be vfalidated and then loaded into dirmngr's cache. + @item --lookup @opindex lookup Take the remaining arguments and run a lookup command on each of them. Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.34 dirmngr/src/ChangeLog:1.35 --- dirmngr/src/ChangeLog:1.34 Mon Dec 13 12:43:05 2004 +++ dirmngr/src/ChangeLog Mon Dec 13 16:16:35 2004 @@ -1,7 +1,18 @@ 2004-12-13 Werner Koch + * dirmngr_ldap.c (catch_alarm, set_timeout): new. + (main): Install alarm handler. Add new option --only-search-timeout. + (print_ldap_entries, fetch_ldap): Use set_timeout (); + * dirmngr.h: Make LDAPTIMEOUT a simple unsigned int. Change all + initializations. + * ldap.c (start_cert_fetch_ldap, run_ldap_wrapper): Pass timeout + option to the wrapper. + (INACTIVITY_TIMEOUT): Depend on LDAPTIMEOUT. + (run_ldap_wrapper): Add arg IGNORE_TIMEOUT. + (ldap_wrapper_thread): Check for special timeout exit code. + * dirmngr.c: Workaround a typo in gpgconf for - ignore-ocsp-servic-url. + ignore-ocsp-service-url. 2004-12-10 Werner Koch Index: dirmngr/src/dirmngr.c diff -u dirmngr/src/dirmngr.c:1.51 dirmngr/src/dirmngr.c:1.52 --- dirmngr/src/dirmngr.c:1.51 Mon Dec 13 12:43:05 2004 +++ dirmngr/src/dirmngr.c Mon Dec 13 16:16:35 2004 @@ -533,9 +533,7 @@ /* LDAP defaults */ opt.add_new_ldapservers = 0; - opt.ldaptimeout.tv_sec = DEFAULT_LDAP_TIMEOUT; - opt.ldaptimeout.tv_usec = 0; - + opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT; /* Other defaults. */ socket_name = DEFAULT_SOCKET_NAME; @@ -659,8 +657,7 @@ case oLDAPFile: ldapfile = pargs.r.ret_str; break; case oLDAPAddServers: opt.add_new_ldapservers = 1; break; case oLDAPTimeout: - opt.ldaptimeout.tv_sec = pargs.r.ret_int; - opt.ldaptimeout.tv_usec = 0; + opt.ldaptimeout = pargs.r.ret_int; break; case oFakedSystemTime: Index: dirmngr/src/dirmngr.h diff -u dirmngr/src/dirmngr.h:1.24 dirmngr/src/dirmngr.h:1.25 --- dirmngr/src/dirmngr.h:1.24 Wed Dec 1 17:11:14 2004 +++ dirmngr/src/dirmngr.h Mon Dec 13 16:16:35 2004 @@ -95,7 +95,7 @@ int allow_ocsp; /* Allow using OCSP. */ int max_replies; - struct timeval ldaptimeout; + unsigned int ldaptimeout; ldap_server_t ldapservers; int add_new_ldapservers; Index: dirmngr/src/dirmngr_ldap.c diff -u dirmngr/src/dirmngr_ldap.c:1.6 dirmngr/src/dirmngr_ldap.c:1.7 --- dirmngr/src/dirmngr_ldap.c:1.6 Wed Dec 1 17:11:14 2004 +++ dirmngr/src/dirmngr_ldap.c Mon Dec 13 16:16:35 2004 @@ -25,9 +25,11 @@ #include #include #include +#include #include #include #include +#include #include @@ -64,6 +66,7 @@ oFilter, oAttr, + oOnlySearchTimeout, oLogWithPID }; @@ -86,6 +89,7 @@ { oDN, "dn", 2, N_("|STRING|query DN STRING")}, { oFilter, "filter", 2, N_("|STRING|use STRING as filter expression")}, { oAttr, "attr", 2, N_("|STRING|return the attribute STRING")}, + { oOnlySearchTimeout, "only-search-timeout", 0, "@"}, { oLogWithPID,"log-with-pid", 0, "@"}, {0} }; @@ -96,7 +100,8 @@ { int quiet; int verbose; - struct timeval timeout; + struct timeval timeout; /* Timeout for the LDAP search functions. */ + unsigned int alarm_timeout; /* And for the alarm based timeout. */ int multi; /* Note that we can't use const for the strings because ldap_* are @@ -112,8 +117,8 @@ } opt; - /* Prototypes. */ +static void catch_alarm (int dummy); static int process_url (const char *url); @@ -171,6 +176,7 @@ ARGPARSE_ARGS pargs; int any_err = 0; char *p; + int only_search_timeout = 0; set_strusage (my_strusage); log_set_prefix ("dirmngr_ldap", JNLIB_LOG_WITH_PREFIX); @@ -181,7 +187,7 @@ /* LDAP defaults */ opt.timeout.tv_sec = DEFAULT_LDAP_TIMEOUT; opt.timeout.tv_usec = 0; - + opt.alarm_timeout = 0; /* Parse the command line. */ pargs.argc = &argc; @@ -196,7 +202,9 @@ case oTimeout: opt.timeout.tv_sec = pargs.r.ret_int; opt.timeout.tv_usec = 0; + opt.alarm_timeout = pargs.r.ret_int; break; + case oOnlySearchTimeout: only_search_timeout = 1; break; case oMulti: opt.multi = 1; break; case oUser: opt.user = pargs.r.ret_str; break; case oPass: opt.pass = pargs.r.ret_str; break; @@ -221,6 +229,9 @@ } } + if (only_search_timeout) + opt.alarm_timeout = 0; + if (opt.proxy) { opt.host = xstrdup (opt.proxy); @@ -243,6 +254,20 @@ if (argc < 1) usage (1); + if (opt.alarm_timeout) + { +#if defined(HAVE_SIGACTION) && defined(HAVE_STRUCT_SIGACTION) + struct sigaction act; + + act.sa_handler = catch_alarm; + sigemptyset (&act.sa_mask); + act.sa_flags = 0; + if (sigaction (SIGALRM,&act,NULL)) +#else + if (signal (SIGALRM, catch_alarm) == SIG_ERR) +#endif + log_fatal ("unable to register timeout handler\n"); + } for (; argc; argc--, argv++) if (process_url (*argv)) @@ -252,6 +277,22 @@ } +static void +catch_alarm (int dummy) +{ + _exit (10); +} + + +static void +set_timeout (void) +{ + if (opt.alarm_timeout) + alarm (opt.alarm_timeout); +} + + + /* Helper for fetch_ldap(). */ static int print_ldap_entries (LDAP *ld, LDAPMessage *msg, char *want_attr) @@ -289,6 +330,8 @@ if (opt.verbose > 1) log_info (_(" available attribute `%s'\n"), attr); + set_timeout (); + /* I case we want only one attribute we do a case insensitive compare without the optional extension (i.e. ";binary"). case insensive is not really correct @@ -454,6 +497,7 @@ log_info (_("WARNING: using first attribute only\n")); + set_timeout (); ld = ldap_init (host, port); if (!ld) { @@ -469,6 +513,7 @@ return -1; } + set_timeout (); rc = ldap_search_st (ld, dn, ludp->lud_scope, filter, opt.multi && !opt.attr && ludp->lud_attrs? ludp->lud_attrs:attrs, @@ -526,7 +571,6 @@ return -1; } - rc = fetch_ldap (url, ludp); ldap_free_urldesc (ludp); Index: dirmngr/src/ldap.c diff -u dirmngr/src/ldap.c:1.41 dirmngr/src/ldap.c:1.42 --- dirmngr/src/ldap.c:1.41 Fri Dec 10 16:15:45 2004 +++ dirmngr/src/ldap.c Mon Dec 13 16:16:35 2004 @@ -43,7 +43,7 @@ #define MAX_OPEN_FDS 20 #endif -#define INACTIVITY_TIMEOUT (60*5) /* seconds */ +#define INACTIVITY_TIMEOUT (opt.ldaptimeout + 60*5) /* seconds */ #define UNENCODED_URL_CHARS "abcdefghijklmnopqrstuvwxyz" \ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ @@ -94,7 +94,6 @@ static struct wrapper_context_s *wrapper_list; - /* Add HOST and PORT to our list of LDAP servers. Fixme: We should better use an extra list of servers. */ static void @@ -310,6 +309,9 @@ if (!WIFEXITED (status)) log_info (_("ldap wrapper %d ready: terminated\n"), (int)ctx->pid); + else if (WEXITSTATUS (status) == 10 ) + log_info (_("ldap wrapper %d ready: timeout\n"), + (int)ctx->pid); else log_info (_("ldap wrapper %d ready: exit status %d\n"), (int)ctx->pid, WEXITSTATUS (status)); @@ -692,6 +694,7 @@ The function returns a new stream at R_FP. */ static gpg_error_t run_ldap_wrapper (ctrl_t ctrl, + int ignore_timeout, const char *proxy, const char *host, int port, const char *user, const char *pass, @@ -699,9 +702,10 @@ const char *url, ksba_reader_t *reader) { - const char *argv[20]; + const char *argv[30]; int argc; - char portbuf[30]; + char portbuf[30], timeoutbuf[30]; + *reader = NULL; @@ -714,6 +718,14 @@ if (opt.verbose) argv[argc++] = "-vv"; argv[argc++] = "--log-with-pid"; + if (opt.ldaptimeout) + { + sprintf (timeoutbuf, "%u", opt.ldaptimeout); + argv[argc++] = "--timeout"; + argv[argc++] = timeoutbuf; + if (ignore_timeout) + argv[argc++] = "--only-search-timeout"; + } if (proxy) { argv[argc++] = "--proxy"; @@ -769,6 +781,8 @@ gpg_error_t err; err = run_ldap_wrapper (ctrl, + 1, /* Ignore explicit timeout because CRLS + might be very large. */ opt.ldap_proxy, host, port, NULL, NULL, @@ -807,6 +821,7 @@ for (server = opt.ldapservers; err && server; server = server->next) { err = run_ldap_wrapper (ctrl, + 0, NULL, server->host, server->port, NULL, NULL, @@ -838,6 +853,7 @@ for (server = opt.ldapservers; server; server = server->next) { err = run_ldap_wrapper (ctrl, + 0, opt.ldap_proxy, server->host, server->port, server->user, server->pass, @@ -1036,7 +1052,7 @@ const char *base; const char *argv[50]; int argc; - char portbuf[30]; + char portbuf[30], timeoutbuf[30]; *context = NULL; @@ -1064,6 +1080,12 @@ argv[argc++] = "-vv"; argv[argc++] = "--log-with-pid"; argv[argc++] = "--multi"; + if (opt.ldaptimeout) + { + sprintf (timeoutbuf, "%u", opt.ldaptimeout); + argv[argc++] = "--timeout"; + argv[argc++] = timeoutbuf; + } if (opt.ldap_proxy) { argv[argc++] = "--proxy"; From cvs at cvs.gnupg.org Mon Dec 13 16:45:46 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 14 07:54:14 2004 Subject: GNUPG-1-9-BRANCH gnupg (12 files) Message-ID: Date: Monday, December 13, 2004 @ 16:49:56 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: agent/call-scd.c agent/findkey.c agent/gpg-agent.c common/simple-pwquery.c jnlib/ChangeLog jnlib/stringhelp.c jnlib/stringhelp.h jnlib/w32-afunix.h jnlib/w32-pth.h sm/call-agent.c tools/ChangeLog tools/gpgconf-comp.c VArious hacks to make it at least build under W32. * stringhelp.c (w32_strerror) [W32]: New. * w32-pth.c, w32-pth.h: Added real code written by Timo Schulz. Not finished, though. * gpgconf-comp.c : Fixed typo. -------------------------+ agent/call-scd.c | 6 +++++ agent/findkey.c | 6 ++++- agent/gpg-agent.c | 48 +++++++++++++++++++++++++++++++++++++--------- common/simple-pwquery.c | 2 + jnlib/ChangeLog | 2 + jnlib/stringhelp.c | 46 +++++++++++++++++++++++++++++++++++--------- jnlib/stringhelp.h | 5 ++++ jnlib/w32-afunix.h | 1 jnlib/w32-pth.h | 8 ++++++- sm/call-agent.c | 2 - tools/ChangeLog | 4 +++ tools/gpgconf-comp.c | 2 - 12 files changed, 110 insertions(+), 22 deletions(-) Index: gnupg/agent/call-scd.c diff -u gnupg/agent/call-scd.c:1.13.2.4 gnupg/agent/call-scd.c:1.13.2.5 --- gnupg/agent/call-scd.c:1.13.2.4 Mon Apr 26 20:26:41 2004 +++ gnupg/agent/call-scd.c Mon Dec 13 16:49:56 2004 @@ -34,7 +34,9 @@ #include #include #include +#ifndef HAVE_W32_SYSTEM #include +#endif #ifdef USE_GNU_PTH # include #endif @@ -213,6 +215,7 @@ /* We better do a sanity check now to see whether it has accidently died. */ +#ifndef HAVE_W32_SYSTEM /* fixme */ pid = assuan_get_pid (scd_ctx); if (pid != (pid_t)(-1) && pid && ((rc=waitpid (pid, NULL, WNOHANG))==-1 || (rc == pid)) ) @@ -221,6 +224,7 @@ scd_ctx = NULL; } else +#endif return 0; } @@ -275,10 +279,12 @@ simply as a pipe server. */ if (ctrl->connection_fd != -1) { +#ifndef HAVE_W32_SYSTEM char buf[100]; sprintf (buf, "OPTION event-signal=%d", SIGUSR2); assuan_transact (scd_ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL); +#endif } return 0; Index: gnupg/agent/findkey.c diff -u gnupg/agent/findkey.c:1.17.2.4 gnupg/agent/findkey.c:1.17.2.5 --- gnupg/agent/findkey.c:1.17.2.4 Sat Feb 21 14:05:22 2004 +++ gnupg/agent/findkey.c Mon Dec 13 16:49:56 2004 @@ -76,7 +76,11 @@ The mode parameter to open is what fopen uses. It will be combined with the process' umask automatically. */ fd = open (fname, O_CREAT | O_EXCL | O_RDWR, - S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + S_IRUSR | S_IWUSR +#ifndef HAVE_W32_SYSTEM + | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH +#endif + ); if (fd < 0) fp = 0; else Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.20 gnupg/agent/gpg-agent.c:1.31.2.21 --- gnupg/agent/gpg-agent.c:1.31.2.20 Thu Dec 2 08:48:09 2004 +++ gnupg/agent/gpg-agent.c Mon Dec 13 16:49:56 2004 @@ -29,9 +29,11 @@ #include #include #include -#include #include +#ifndef HAVE_W32_SYSTEM +#include #include +#endif #include #include #ifdef USE_GNU_PTH @@ -40,11 +42,13 @@ #define JNLIB_NEED_LOG_LOGV #include "agent.h" -#include /* malloc hooks */ +#include /* Malloc hooks */ #include "i18n.h" #include "sysutils.h" - +#ifdef HAVE_W32_SYSTEM +#include "../jnlib/w32-afunix.h" +#endif enum cmd_and_opt_values { aNull = 0, @@ -175,7 +179,9 @@ static void handle_connections (int listen_fd); /* Pth wrapper function definitions. */ +#ifndef HAVE_W32_SYSTEM GCRY_THREAD_OPTION_PTH_IMPL; +#endif #endif /*USE_GNU_PTH*/ static void check_for_running_agent (void); @@ -432,14 +438,14 @@ /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ -#ifdef USE_GNU_PTH +#if defined(USE_GNU_PTH) && !defined(HAVE_W32_SYSTEM) err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } -#endif /*USE_GNU_PTH*/ +#endif /*USE_GNU_PTH && !HAVE_W32_SYSTEM*/ /* Check that the libraries are suitable. Do it here because the option parsing may need services of the library. */ @@ -707,10 +713,12 @@ } /* Make sure that we have a default ttyname. */ +#ifndef HAVE_W32_SYSTEM if (!default_ttyname && ttyname (1)) default_ttyname = xstrdup (ttyname (1)); if (!default_ttytype && getenv ("TERM")) default_ttytype = xstrdup (getenv ("TERM")); +#endif if (pipe_server) { /* this is the simple pipe based server */ @@ -720,6 +728,7 @@ ; /* NOTREACHED */ else { /* Regular server mode */ +#ifndef HAVE_W32_SYSTEM int fd; pid_t pid; int len; @@ -888,18 +897,21 @@ #ifdef USE_GNU_PTH if (!disable_pth) { +#ifndef HAVE_W32_SYSTEM /* FIXME */ struct sigaction sa; sa.sa_handler = SIG_IGN; sigemptyset (&sa.sa_mask); sa.sa_flags = 0; sigaction (SIGPIPE, &sa, NULL); +#endif handle_connections (fd); } else #endif /*!USE_GNU_PTH*/ /* setup signals */ { +#ifndef HAVE_W32_SYSTEM /* FIXME */ struct sigaction oact, nact; nact.sa_handler = cleanup_sh; @@ -915,10 +927,11 @@ nact.sa_handler = SIG_IGN; sigaction (SIGPIPE, &nact, NULL); sigaction (SIGINT, &nact, NULL); - +#endif start_command_handler (fd, -1); } close (fd); +#endif } return 0; @@ -1029,9 +1042,15 @@ fname = make_filename (home, GNUPG_PRIVATE_KEYS_DIR, NULL); if (stat (fname, &statbuf) && errno == ENOENT) { +#ifdef HAVE_W32_SYSTEM /*FIXME: Setup proper permissions. */ + if (!CreateDirectory (fname, NULL)) + log_error (_("can't create directory `%s': %s\n"), + fname, w32_strerror (-1) ); +#else if (mkdir (fname, S_IRUSR|S_IWUSR|S_IXUSR )) log_error (_("can't create directory `%s': %s\n"), - fname, strerror(errno) ); + fname, strerror (errno) ); +#endif else if (!opt.quiet) log_info (_("directory `%s' created\n"), fname); } @@ -1063,9 +1082,15 @@ || (*defhome != '~' && !strcmp (home, defhome) ) ) { +#ifdef HAVE_W32_SYSTEM + if (!CreateDirectory (home, NULL)) + log_error (_("can't create directory `%s': %s\n"), + home, w32_strerror (-1) ); +#else if (mkdir (home, S_IRUSR|S_IWUSR|S_IXUSR )) log_error (_("can't create directory `%s': %s\n"), - home, strerror(errno) ); + home, strerror (errno) ); +#endif else { if (!opt.quiet) @@ -1096,6 +1121,7 @@ { switch (signo) { +#ifndef HAVE_W32_SYSTEM case SIGHUP: log_info ("SIGHUP received - " "re-reading configuration and flushing cache\n"); @@ -1134,7 +1160,7 @@ cleanup (); agent_exit (0); break; - +#endif default: log_info ("signal %d received - no action defined\n", signo); } @@ -1178,6 +1204,7 @@ pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 256*1024); pth_attr_set (tattr, PTH_ATTR_NAME, "gpg-agent"); +#ifndef HAVE_W32_SYSTEM /* fixme */ sigemptyset (&sigs ); sigaddset (&sigs, SIGHUP); sigaddset (&sigs, SIGUSR1); @@ -1185,6 +1212,9 @@ sigaddset (&sigs, SIGINT); sigaddset (&sigs, SIGTERM); ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo); +#else + ev = NULL; +#endif for (;;) { Index: gnupg/common/simple-pwquery.c diff -u gnupg/common/simple-pwquery.c:1.1.2.5 gnupg/common/simple-pwquery.c:1.1.2.6 --- gnupg/common/simple-pwquery.c:1.1.2.5 Thu Dec 2 08:48:09 2004 +++ gnupg/common/simple-pwquery.c Mon Dec 13 16:49:56 2004 @@ -182,8 +182,10 @@ } dft_ttyname = getenv ("GPG_TTY"); +#ifndef HAVE_W32_SYSTEM if ((!dft_ttyname || !*dft_ttyname) && ttyname (0)) dft_ttyname = ttyname (0); +#endif if (dft_ttyname && *dft_ttyname) { if ((rc=agent_send_option (fd, "ttyname", dft_ttyname))) Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.21 gnupg/jnlib/ChangeLog:1.3.2.22 --- gnupg/jnlib/ChangeLog:1.3.2.21 Mon Dec 13 10:05:31 2004 +++ gnupg/jnlib/ChangeLog Mon Dec 13 16:49:56 2004 @@ -1,5 +1,7 @@ 2004-12-13 Werner Koch + * stringhelp.c (w32_strerror) [W32]: New. + * w32-pth.c, w32-pth.h: Added real code written by Timo Schulz. Not finished, though. Index: gnupg/jnlib/stringhelp.c diff -u gnupg/jnlib/stringhelp.c:1.2.2.4 gnupg/jnlib/stringhelp.c:1.2.2.5 --- gnupg/jnlib/stringhelp.c:1.2.2.4 Wed Aug 18 15:21:56 2004 +++ gnupg/jnlib/stringhelp.c Mon Dec 13 16:49:56 2004 @@ -1,5 +1,6 @@ /* stringhelp.c - standard string helper functions - * Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2003, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -23,14 +24,17 @@ #include #include #include +#ifdef HAVE_W32_SYSTEM +#include +#endif #include "libjnlib-config.h" #include "utf8conv.h" #include "stringhelp.h" -/**************** - * look for the substring SUB in buffer and return a pointer to that +/* + * Look for the substring SUB in buffer and return a pointer to that * substring in BUF or NULL if not found. * Comparison is case-insensitive. */ @@ -72,11 +76,12 @@ return NULL ; } -/**************** - * Wie strncpy(), aber es werden maximal n-1 zeichen kopiert und ein - * '\0' angehängt. Ist n = 0, so geschieht nichts, ist Destination - * gleich NULL, so wird via jnlib_xmalloc Speicher besorgt, ist dann nicht - * genügend Speicher vorhanden, so bricht die funktion ab. +/* This function is similar to strncpy(). However it won't copy more + than N - 1 characters and makes sure that a '\0' is appended. With + N given as 0, nothing will happen. With DEST given as NULL, memory + will be allocated using jnlib_xmalloc (i.e. if it runs out of core + the function terminates). Returns DES or a pointer to the + allocated memory. */ char * mem2str( char *dest , const void *src , size_t n ) @@ -452,8 +457,29 @@ return buffer; } + /**************************************************** - ******** locale insensitive ctype functions ******** + ********** W32 specific functions **************** + ****************************************************/ + +#ifdef HAVE_W32_SYSTEM +const char * +w32_strerror (int ec) +{ + static char strerr[256]; + + if (ec == -1) + ec = (int)GetLastError (); + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, ec, + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + strerr, DIM (strerr)-1, NULL); + return strerr; +} +#endif /*HAVE_W32_SYSTEM*/ + + +/**************************************************** + ******** Locale insensitive ctype functions ******** ****************************************************/ /* FIXME: replace them by a table lookup and macros */ int @@ -626,3 +652,5 @@ return 0; } #endif + + Index: gnupg/jnlib/stringhelp.h diff -u gnupg/jnlib/stringhelp.h:1.2.2.2 gnupg/jnlib/stringhelp.h:1.2.2.3 --- gnupg/jnlib/stringhelp.h:1.2.2.2 Wed Jun 18 21:56:10 2003 +++ gnupg/jnlib/stringhelp.h Mon Dec 13 16:49:56 2004 @@ -49,6 +49,11 @@ char *sanitize_buffer (const unsigned char *p, size_t n, int delim); +#ifdef HAVE_W32_SYSTEM +const char *w32_strerror (int ec); +#endif + + const char *ascii_memistr( const char *buf, size_t buflen, const char *sub ); int ascii_isupper (int c); int ascii_islower (int c); Index: gnupg/jnlib/w32-afunix.h diff -u gnupg/jnlib/w32-afunix.h:1.1.2.1 gnupg/jnlib/w32-afunix.h:1.1.2.2 --- gnupg/jnlib/w32-afunix.h:1.1.2.1 Tue Nov 30 10:48:37 2004 +++ gnupg/jnlib/w32-afunix.h Mon Dec 13 16:49:56 2004 @@ -23,6 +23,7 @@ #include #include +#include #include #define DIRSEP_C '\\' Index: gnupg/jnlib/w32-pth.h diff -u gnupg/jnlib/w32-pth.h:1.1.2.3 gnupg/jnlib/w32-pth.h:1.1.2.4 --- gnupg/jnlib/w32-pth.h:1.1.2.3 Mon Dec 13 10:05:31 2004 +++ gnupg/jnlib/w32-pth.h Mon Dec 13 16:49:56 2004 @@ -53,7 +53,7 @@ /* Mutex values. */ #define PTH_MUTEX_INITIALIZED (1<<0) #define PTH_MUTEX_LOCKED (1<<1) -#define PTH_MUTEX_INIT {{NULL, NULL}, PTH_MUTEX_INITIALIZED, NULL, 0} +#define PTH_MUTEX_INIT {PTH_MUTEX_INITIALIZED} #define PTH_KEY_INIT (1<<0) @@ -235,6 +235,12 @@ +/* Backward compatibility (Pth < 1.5.0). */ +#define pth_event_occurred(ev) \ + ( pth_event_status(ev) == PTH_STATUS_OCCURRED \ + || pth_event_status(ev) == PTH_STATUS_FAILED ) + + /*-- pth_util.c --*/ /* void sigemptyset (struct sigset_s * ss); */ Index: gnupg/sm/call-agent.c diff -u gnupg/sm/call-agent.c:1.35.2.7 gnupg/sm/call-agent.c:1.35.2.8 --- gnupg/sm/call-agent.c:1.35.2.7 Mon Apr 26 15:28:08 2004 +++ gnupg/sm/call-agent.c Mon Dec 13 16:49:56 2004 @@ -113,7 +113,7 @@ no_close_list[i++] = fileno (stderr); no_close_list[i] = -1; - /* connect to the agent and perform initial handshaking */ + /* Connect to the agent and perform initial handshaking. */ rc = assuan_pipe_connect (&ctx, opt.agent_program, (char**)argv, no_close_list); } Index: gnupg/tools/ChangeLog diff -u gnupg/tools/ChangeLog:1.25.2.58 gnupg/tools/ChangeLog:1.25.2.59 --- gnupg/tools/ChangeLog:1.25.2.58 Wed Nov 24 15:50:20 2004 +++ gnupg/tools/ChangeLog Mon Dec 13 16:49:56 2004 @@ -1,3 +1,7 @@ +2004-12-13 Werner Koch + + * gpgconf-comp.c : Fixed typo. + 2004-11-24 Werner Koch * gpgconf-comp.c : Add --ignore-http-dp, --ignore-ldap-dp Index: gnupg/tools/gpgconf-comp.c diff -u gnupg/tools/gpgconf-comp.c:1.1.2.46 gnupg/tools/gpgconf-comp.c:1.1.2.47 --- gnupg/tools/gpgconf-comp.c:1.1.2.46 Wed Nov 24 15:50:20 2004 +++ gnupg/tools/gpgconf-comp.c Mon Dec 13 16:49:56 2004 @@ -790,7 +790,7 @@ { "allow-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC, "dirmngr", "allow sending OCSP requests", GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR }, - { "ignore-ocsp-servic-url", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, + { "ignore-ocsp-service-url", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, "dirmngr", "ignore certificate contained OCSP service URLs", GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR }, { "ocsp-responder", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, From cvs at cvs.gnupg.org Mon Dec 13 18:56:25 2004 From: cvs at cvs.gnupg.org (cvs user twoaday) Date: Tue Dec 14 07:54:22 2004 Subject: GNUPG-1-9-BRANCH gnupg/jnlib (ChangeLog w32-pth.c) Message-ID: Date: Monday, December 13, 2004 @ 19:00:35 Author: twoaday Path: /cvs/gnupg/gnupg/jnlib Tag: GNUPG-1-9-BRANCH Modified: ChangeLog w32-pth.c 2004-12-13 Timo Schulz * w32-pth.c (enter_pth, leave_pth): New. (pth_init): Initialize global mutex section. (pth_kill): Release global mutex section. (helper_thread): New. (pth_spawn): Make sure only one thread is running. -----------+ ChangeLog | 8 w32-pth.c | 1305 +++++++++++++++++++++++++++++++----------------------------- 2 files changed, 697 insertions(+), 616 deletions(-) Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.22 gnupg/jnlib/ChangeLog:1.3.2.23 --- gnupg/jnlib/ChangeLog:1.3.2.22 Mon Dec 13 16:49:56 2004 +++ gnupg/jnlib/ChangeLog Mon Dec 13 19:00:35 2004 @@ -1,3 +1,11 @@ +2004-12-13 Timo Schulz + + * w32-pth.c (enter_pth, leave_pth): New. + (pth_init): Initialize global mutex section. + (pth_kill): Release global mutex section. + (helper_thread): New. + (pth_spawn): Make sure only one thread is running. + 2004-12-13 Werner Koch * stringhelp.c (w32_strerror) [W32]: New. Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.2 gnupg/jnlib/w32-pth.c:1.1.2.3 --- gnupg/jnlib/w32-pth.c:1.1.2.2 Mon Dec 13 10:05:31 2004 +++ gnupg/jnlib/w32-pth.c Mon Dec 13 19:00:35 2004 @@ -27,8 +27,9 @@ #include #ifdef HAVE_W32_SYSTEM -#include #include +#include +#include #include #include @@ -38,38 +39,51 @@ #include "w32-pth.h" +static int pth_initialized = 0; + +/* Variables to support event handling. */ static int pth_signo = 0; static HANDLE pth_signo_ev = NULL; -static int pth_initialized = 0; +/* Mutex to make sure only one thread is running. */ +static CRITICAL_SECTION pth_shd; #define implicit_init() do { if (!pth_initialized) pth_init(); } while (0) +static void * helper_thread (void * ctx); -struct pth_event_s +struct pth_event_s { - struct pth_event_s * next; - struct pth_event_s * prev; - HANDLE hd; - union { - struct sigset_s * sig; - int fd; - struct timeval tv; - pth_mutex_t * mx; - } u; - int * val; - int u_type; - int flags; + struct pth_event_s * next; + struct pth_event_s * prev; + HANDLE hd; + union + { + struct sigset_s * sig; + int fd; + struct timeval tv; + pth_mutex_t * mx; + } u; + int * val; + int u_type; + int flags; }; struct pth_attr_s { - unsigned int flags; - unsigned int stack_size; - char * name; + unsigned int flags; + unsigned int stack_size; + char * name; +}; + + +struct _pth_priv_hd_s +{ + void *(*thread)(void *); + void * arg; }; @@ -77,44 +91,65 @@ int pth_init (void) { - SECURITY_ATTRIBUTES sa; - WSADATA wsadat; + SECURITY_ATTRIBUTES sa; + WSADATA wsadat; - printf ("pth_init: called.\n"); - pth_initialized = 1; - if (WSAStartup (0x202, &wsadat)) - return -1; - pth_signo = 0; - if (pth_signo_ev) - CloseHandle (pth_signo_ev); - memset (&sa, 0, sizeof sa); - sa.bInheritHandle = TRUE; - sa.lpSecurityDescriptor = NULL; - sa.nLength = sizeof sa; - pth_signo_ev = CreateEvent (&sa, TRUE, FALSE, NULL); - - return 0; + printf ("pth_init: called.\n"); + pth_initialized = 1; + if (WSAStartup (0x202, &wsadat)) + abort (); + pth_signo = 0; + InitializeCriticalSection (&pth_shd); + if (pth_signo_ev) + CloseHandle (pth_signo_ev); + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + pth_signo_ev = CreateEvent (&sa, TRUE, FALSE, NULL); + if (!pth_signo_ev) + abort (); + EnterCriticalSection (&pth_shd); + return 0; } int pth_kill (void) { - pth_signo = 0; - if (pth_signo_ev) - CloseHandle (pth_signo_ev); - WSACleanup (); - pth_initialized = 0; - return 0; + pth_signo = 0; + if (pth_signo_ev) + CloseHandle (pth_signo_ev); + DeleteCriticalSection (&pth_shd); + WSACleanup (); + pth_initialized = 0; + return 0; +} + + +static void +enter_pth (void) +{ + EnterCriticalSection (&pth_shd); + /*LeaveCriticalSection (&pth_shd);*/ +} + + +static void +leave_pth (void) +{ + LeaveCriticalSection (&pth_shd); + /*EnterCriticalSection (&pth_shd);*/ } long pth_ctrl (unsigned long query, ...) { - implicit_init (); + implicit_init (); - switch (query) { + switch (query) + { case PTH_CTRL_GETAVLOAD: case PTH_CTRL_GETPRIO: case PTH_CTRL_GETNAME: @@ -124,11 +159,11 @@ case PTH_CTRL_GETTHREADS_WAITING: case PTH_CTRL_GETTHREADS_SUSPENDED: case PTH_CTRL_GETTHREADS_DEAD: - /*case PTH_CTRL_GETTHREADS:*/ + case PTH_CTRL_GETTHREADS: default: - return -1; + return -1; } - return 0; + return 0; } @@ -136,63 +171,65 @@ pth_time_t pth_timeout (long sec, long usec) { - pth_time_t tvd; + pth_time_t tvd; - tvd.tv_sec = sec; - tvd.tv_usec = usec; - return tvd; + tvd.tv_sec = sec; + tvd.tv_usec = usec; + return tvd; } int pth_read_ev (int fd, void *buffer, size_t size, pth_event_t ev) { - implicit_init (); - return 0; + implicit_init (); + return 0; } int pth_read (int fd, void * buffer, size_t size) { - int n; + int n; - implicit_init (); - n = recv (fd, buffer, size, 0); - if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { - DWORD nread = 0; - n = ReadFile ((HANDLE)fd, buffer, size, &nread, NULL); - if (!n) - return -1; - return (int)nread; + implicit_init (); + n = recv (fd, buffer, size, 0); + if (n == -1 && WSAGetLastError () == WSAENOTSOCK) + { + DWORD nread = 0; + n = ReadFile ((HANDLE)fd, buffer, size, &nread, NULL); + if (!n) + return -1; + return (int)nread; } - return n; + return n; } int pth_write_ev (int fd, const void *buffer, size_t size, pth_event_t ev) { - implicit_init (); - return 0; + implicit_init (); + return 0; } int pth_write (int fd, const void * buffer, size_t size) { - int n; + int n; - implicit_init (); - n = send (fd, buffer, size, 0); - if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { - DWORD nwrite; - n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); - if (!n) - return -1; - return (int)nwrite; + implicit_init (); + n = send (fd, buffer, size, 0); + if (n == -1 && WSAGetLastError () == WSAENOTSOCK) + { + DWORD nwrite; + n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); + if (!n) + return -1; + return (int)nwrite; } - return n; + return n; } @@ -200,279 +237,306 @@ pth_select (int nfds, fd_set * rfds, fd_set * wfds, fd_set * efds, const struct timeval * timeout) { - implicit_init (); - return select (nfds, rfds, wfds, efds, timeout); + implicit_init (); + return select (nfds, rfds, wfds, efds, timeout); } int pth_fdmode (int fd, int mode) { - unsigned long val; + unsigned long val; - implicit_init (); - /* XXX: figure out original fd mode */ - switch (mode) { + implicit_init (); + /* XXX: figure out original fd mode */ + switch (mode) + { case PTH_FDMODE_NONBLOCK: - val = 1; - if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) - return PTH_FDMODE_ERROR; - break; + val = 1; + if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) + return PTH_FDMODE_ERROR; + break; case PTH_FDMODE_BLOCK: - val = 0; - if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) - return PTH_FDMODE_ERROR; - break; + val = 0; + if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) + return PTH_FDMODE_ERROR; + break; } - return PTH_FDMODE_BLOCK; + return PTH_FDMODE_BLOCK; } int pth_accept (int fd, struct sockaddr *addr, int *addrlen) { - implicit_init (); - return accept (fd, addr, addrlen); + implicit_init (); + return accept (fd, addr, addrlen); } int -pth_accept_ev (int fd, struct sockaddr *addr, int *addrlen, pth_event_t ev_extra) +pth_accept_ev (int fd, struct sockaddr *addr, int *addrlen, + pth_event_t ev_extra) { - pth_key_t ev_key; - pth_event_t ev; - int rv; - int fdmode; + pth_key_t ev_key; + pth_event_t ev; + int rv; + int fdmode; - implicit_init (); + implicit_init (); - fdmode = pth_fdmode (fd, PTH_FDMODE_NONBLOCK); - if (fdmode == PTH_FDMODE_ERROR) - return -1; + fdmode = pth_fdmode (fd, PTH_FDMODE_NONBLOCK); + if (fdmode == PTH_FDMODE_ERROR) + return -1; - ev = NULL; - while ((rv = accept (fd, addr, addrlen)) == -1 && - (WSAGetLastError () == WSAEINPROGRESS || - WSAGetLastError () == WSAEWOULDBLOCK)) { - if (ev == NULL) { - ev = pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, &ev_key, fd); - if (ev == NULL) - return -1; - if (ev_extra != NULL) - pth_event_concat (ev, ev_extra, NULL); - } - /* wait until accept has a chance */ - pth_wait (ev); - if (ev_extra != NULL) { - pth_event_isolate (ev); - if (pth_event_status (ev) != PTH_STATUS_OCCURRED) { - pth_fdmode (fd, fdmode); - return -1; + ev = NULL; + while ((rv = accept (fd, addr, addrlen)) == -1 && + (WSAGetLastError () == WSAEINPROGRESS || + WSAGetLastError () == WSAEWOULDBLOCK)) + { + if (ev == NULL) { + ev = pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, + &ev_key, fd); + if (ev == NULL) + return -1; + if (ev_extra != NULL) + pth_event_concat (ev, ev_extra, NULL); + } + /* wait until accept has a chance */ + pth_wait (ev); + if (ev_extra != NULL) + { + pth_event_isolate (ev); + if (pth_event_status (ev) != PTH_STATUS_OCCURRED) + { + pth_fdmode (fd, fdmode); + return -1; } } } - pth_fdmode (fd, fdmode); - return rv; + pth_fdmode (fd, fdmode); + return rv; } int pth_connect (int fd, struct sockaddr *name, int namelen) { - implicit_init (); - return connect (fd, name, namelen); + implicit_init (); + return connect (fd, name, namelen); } int pth_mutex_release (pth_mutex_t *hd) { - if (!hd) - return -1; - implicit_init (); - if (hd->mx) { - CloseHandle (hd->mx); - hd->mx = NULL; + if (!hd) + return -1; + implicit_init (); + if (hd->mx) + { + CloseHandle (hd->mx); + hd->mx = NULL; } - free (hd); - return 0; + free (hd); + return 0; } int pth_mutex_acquire (pth_mutex_t *hd, int tryonly, pth_event_t ev_extra) { - implicit_init (); + implicit_init (); - if (!hd) - return -1; - if (!hd->mx) - return -1; + if (!hd) + return -1; + if (!hd->mx) + return -1; #if 0 - /* still not locked, so simply acquire mutex? */ - if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) { - mutex->mx_state |= PTH_MUTEX_LOCKED; - mutex->mx_count = 1; - pth_ring_append(&(pth_current->mutexring), &(mutex->mx_node)); - pth_debug1("pth_mutex_acquire: immediately locking mutex"); - return 0; - } - - /* already locked by caller? */ - if (mutex->mx_count >= 1 && mutex->mx_owner == pth_current) { - /* recursive lock */ - mutex->mx_count++; - pth_debug1("pth_mutex_acquire: recursive locking"); - return 0; - } - - if (tryonly) - return return -1; - - for (;;) { - ev = pth_event(PTH_EVENT_MUTEX|PTH_MODE_STATIC, &ev_key, mutex); - if (ev_extra != NULL) - pth_event_concat (ev, ev_extra, NULL); - pth_wait (ev); - if (ev_extra != NULL) { - pth_event_isolate (ev); - if (pth_event_status(ev) == PTH_STATUS_PENDING) - return return -1; - } - if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) - break; + /* still not locked, so simply acquire mutex? */ + if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) + { + mutex->mx_state |= PTH_MUTEX_LOCKED; + mutex->mx_count = 1; + pth_ring_append(&(pth_current->mutexring), &(mutex->mx_node)); + pth_debug1("pth_mutex_acquire: immediately locking mutex"); + return 0; + } + + /* already locked by caller? */ + if (mutex->mx_count >= 1 && mutex->mx_owner == pth_current) + { + /* recursive lock */ + mutex->mx_count++; + pth_debug1("pth_mutex_acquire: recursive locking"); + return 0; + } + + if (tryonly) + return return -1; + + for (;;) + { + ev = pth_event(PTH_EVENT_MUTEX|PTH_MODE_STATIC, &ev_key, mutex); + if (ev_extra != NULL) + pth_event_concat (ev, ev_extra, NULL); + pth_wait (ev); + if (ev_extra != NULL) { + pth_event_isolate (ev); + if (pth_event_status(ev) == PTH_STATUS_PENDING) + return return -1; + } + if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) + break; } #endif - hd->mx_state |= PTH_MUTEX_LOCKED; - return 0; + hd->mx_state |= PTH_MUTEX_LOCKED; + return 0; } int pth_mutex_init (pth_mutex_t *hd) { - SECURITY_ATTRIBUTES sa; - implicit_init (); - if (hd->mx) { - ReleaseMutex (hd->mx); - CloseHandle (hd->mx); - } - memset (&sa, 0, sizeof sa); - sa.bInheritHandle = TRUE; - sa.lpSecurityDescriptor = NULL; - sa.nLength = sizeof sa; - hd->mx = CreateMutex (&sa, FALSE, NULL); - hd->mx_state = PTH_MUTEX_INITIALIZED; - return 0; + SECURITY_ATTRIBUTES sa; + + implicit_init (); + if (hd->mx) + { + ReleaseMutex (hd->mx); + CloseHandle (hd->mx); + } + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + hd->mx = CreateMutex (&sa, FALSE, NULL); + hd->mx_state = PTH_MUTEX_INITIALIZED; + return 0; } pth_attr_t pth_attr_new (void) { - pth_attr_t hd; + pth_attr_t hd; - implicit_init (); - hd = calloc (1, sizeof *hd); - if (!hd) - return NULL; - return hd; + implicit_init (); + hd = calloc (1, sizeof *hd); + if (!hd) + return NULL; + return hd; } int pth_attr_destroy (pth_attr_t hd) { - if (!hd) - return -1; - implicit_init (); - if (hd->name) - free (hd->name); - free (hd); - return 0; + if (!hd) + return -1; + implicit_init (); + if (hd->name) + free (hd->name); + free (hd); + return 0; } int pth_attr_set (pth_attr_t hd, int field, ...) { - va_list args; - char * str; - int val; - int rc = 0; - - implicit_init (); - va_start (args, field); - switch (field) { + va_list args; + char * str; + int val; + int rc = 0; + + implicit_init (); + va_start (args, field); + switch (field) + { case PTH_ATTR_JOINABLE: - val = va_arg (args, int); - if (val) { - hd->flags |= PTH_ATTR_JOINABLE; - printf ("pth_attr_set: PTH_ATTR_JOINABLE\n"); - } - break; + val = va_arg (args, int); + if (val) + { + hd->flags |= PTH_ATTR_JOINABLE; + printf ("pth_attr_set: PTH_ATTR_JOINABLE\n"); + } + break; case PTH_ATTR_STACK_SIZE: - val = va_arg (args, int); - if (val) { - hd->flags |= PTH_ATTR_STACK_SIZE; - hd->stack_size = val; - printf ("pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", val); - } - break; + val = va_arg (args, int); + if (val) + { + hd->flags |= PTH_ATTR_STACK_SIZE; + hd->stack_size = val; + printf ("pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", val); + } + break; case PTH_ATTR_NAME: - str = va_arg (args, char*); - if (hd->name) - free (hd->name); - if (str) { - hd->name = strdup (str); - if (!hd->name) - return -1; - hd->flags |= PTH_ATTR_NAME; - printf ("pth_attr_set: PTH_ATTR_NAME %s\n", hd->name); - } - break; + str = va_arg (args, char*); + if (hd->name) + free (hd->name); + if (str) + { + hd->name = strdup (str); + if (!hd->name) + return -1; + hd->flags |= PTH_ATTR_NAME; + printf ("pth_attr_set: PTH_ATTR_NAME %s\n", hd->name); + } + break; default: - rc = -1; - break; + rc = -1; + break; } - va_end (args); - return rc; + va_end (args); + return rc; } pth_t pth_spawn (pth_attr_t hd, void *(*func)(void *), void *arg) { - SECURITY_ATTRIBUTES sa; - DWORD tid; - HANDLE th; - - if (!hd) - return NULL; - - implicit_init (); - - memset (&sa, 0, sizeof sa); - sa.bInheritHandle = TRUE; - sa.lpSecurityDescriptor = NULL; - sa.nLength = sizeof sa; - - th = CreateThread (&sa, hd->stack_size, (LPTHREAD_START_ROUTINE)func, arg, 0, &tid); - return th; + SECURITY_ATTRIBUTES sa; + DWORD tid; + HANDLE th; + struct _pth_priv_hd_s * ctx; + + if (!hd) + return NULL; + + implicit_init (); + + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + + ctx = calloc (1, sizeof * ctx); + ctx->thread = func; + ctx->arg = arg; + + /* XXX: we don't use all thread attributes. */ + enter_pth (); + th = CreateThread (&sa, hd->stack_size, + (LPTHREAD_START_ROUTINE)helper_thread, + ctx, 0, &tid); + leave_pth (); + + return th; } int pth_join (pth_t hd, void **value) { - return 0; + return 0; } @@ -480,12 +544,12 @@ int pth_cancel (pth_t hd) { - if (!hd) - return -1; - implicit_init (); - WaitForSingleObject (hd, 1000); - TerminateThread (hd, 0); - return 0; + if (!hd) + return -1; + implicit_init (); + WaitForSingleObject (hd, 1000); + TerminateThread (hd, 0); + return 0; } @@ -493,217 +557,242 @@ int pth_abort (pth_t hd) { - if (!hd) - return -1; - implicit_init (); - TerminateThread (hd, 0); - return 0; + if (!hd) + return -1; + implicit_init (); + TerminateThread (hd, 0); + return 0; } void pth_exit (void *value) { - implicit_init (); - pth_kill (); - exit ((int)(long)value); + implicit_init (); + pth_kill (); + exit ((int)(long)value); } unsigned pth_waitpid (unsigned pid, int * status, int options) { - implicit_init (); + implicit_init (); #if 0 - pth_event_t ev; - static pth_key_t ev_key = PTH_KEY_INIT; - pid_t pid; - - pth_debug2("pth_waitpid: called from thread \"%s\"", pth_current->name); - - for (;;) { - /* do a non-blocking poll for the pid */ - while ( (pid = pth_sc(waitpid)(wpid, status, options|WNOHANG)) < 0 - && errno == EINTR) ; - - /* if pid was found or caller requested a polling return immediately */ - if (pid == -1 || pid > 0 || (pid == 0 && (options & WNOHANG))) - break; - - /* else wait a little bit */ - ev = pth_event(PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, pth_timeout(0,250000)); - pth_wait(ev); + pth_event_t ev; + static pth_key_t ev_key = PTH_KEY_INIT; + pid_t pid; + + pth_debug2("pth_waitpid: called from thread \"%s\"", pth_current->name); + + for (;;) + { + /* do a non-blocking poll for the pid */ + while ( (pid = pth_sc(waitpid)(wpid, status, options|WNOHANG)) < 0 + && errno == EINTR) + ; + + /* if pid was found or caller requested a polling return immediately */ + if (pid == -1 || pid > 0 || (pid == 0 && (options & WNOHANG))) + break; + + /* else wait a little bit */ + ev = pth_event(PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, + pth_timeout (0,250000)); + pth_wait(ev); } - pth_debug2("pth_waitpid: leave to thread \"%s\"", pth_current->name); + pth_debug2("pth_waitpid: leave to thread \"%s\"", pth_current->name); #endif - return 0; + return 0; } static BOOL WINAPI sig_handler (DWORD signo) { - switch (signo) { + switch (signo) + { case CTRL_C_EVENT: pth_signo = SIGINT; break; case CTRL_BREAK_EVENT: pth_signo = SIGTERM; break; } - SetEvent (pth_signo_ev); - printf ("sig_handler=%d\n", pth_signo); - return TRUE; + SetEvent (pth_signo_ev); + printf ("sig_handler=%d\n", pth_signo); + return TRUE; } pth_event_t pth_event (unsigned long spec, ...) { - va_list arg; - SECURITY_ATTRIBUTES sa; - pth_event_t ev; - int rc; - - implicit_init (); - printf ("pth_event spec=%lu\n", spec); - va_start (arg, spec); - ev = calloc (1, sizeof *ev); - if (!ev) - return NULL; - if (spec == 0) - ; - else if (spec & PTH_EVENT_SIGS) { - ev->u.sig = va_arg (arg, struct sigset_s *); - ev->u_type = PTH_EVENT_SIGS; - ev->val = va_arg (arg, int *); - rc = SetConsoleCtrlHandler (sig_handler, TRUE); - printf ("pth_event: sigs rc=%d\n", rc); - } - else if (spec & PTH_EVENT_FD) { - if (spec & PTH_UNTIL_FD_READABLE) - ev->flags |= PTH_UNTIL_FD_READABLE; - if (spec & PTH_MODE_STATIC) - ev->flags |= PTH_MODE_STATIC; - ev->u_type = PTH_EVENT_FD; - va_arg (arg, pth_key_t); - ev->u.fd = va_arg (arg, int); - printf ("pth_event: fd=%d\n", ev->u.fd); - } - else if (spec & PTH_EVENT_TIME) { - pth_time_t t; - if (spec & PTH_MODE_STATIC) - ev->flags |= PTH_MODE_STATIC; - va_arg (arg, pth_key_t); - t = va_arg (arg, pth_time_t); - ev->u_type = PTH_EVENT_TIME; - ev->u.tv.tv_sec = t.tv_sec; - ev->u.tv.tv_usec = t.tv_usec; - } - else if (spec & PTH_EVENT_MUTEX) { - va_arg (arg, pth_key_t); - ev->u_type = PTH_EVENT_MUTEX; - ev->u.mx = va_arg (arg, pth_mutex_t*); + va_list arg; + SECURITY_ATTRIBUTES sa; + pth_event_t ev; + int rc; + + implicit_init (); + printf ("pth_event spec=%lu\n", spec); + va_start (arg, spec); + ev = calloc (1, sizeof *ev); + if (!ev) + return NULL; + if (spec == 0) + ; + else if (spec & PTH_EVENT_SIGS) + { + ev->u.sig = va_arg (arg, struct sigset_s *); + ev->u_type = PTH_EVENT_SIGS; + ev->val = va_arg (arg, int *); + rc = SetConsoleCtrlHandler (sig_handler, TRUE); + printf ("pth_event: sigs rc=%d\n", rc); + } + else if (spec & PTH_EVENT_FD) + { + if (spec & PTH_UNTIL_FD_READABLE) + ev->flags |= PTH_UNTIL_FD_READABLE; + if (spec & PTH_MODE_STATIC) + ev->flags |= PTH_MODE_STATIC; + ev->u_type = PTH_EVENT_FD; + va_arg (arg, pth_key_t); + ev->u.fd = va_arg (arg, int); + printf ("pth_event: fd=%d\n", ev->u.fd); + } + else if (spec & PTH_EVENT_TIME) + { + pth_time_t t; + if (spec & PTH_MODE_STATIC) + ev->flags |= PTH_MODE_STATIC; + va_arg (arg, pth_key_t); + t = va_arg (arg, pth_time_t); + ev->u_type = PTH_EVENT_TIME; + ev->u.tv.tv_sec = t.tv_sec; + ev->u.tv.tv_usec = t.tv_usec; + } + else if (spec & PTH_EVENT_MUTEX) + { + va_arg (arg, pth_key_t); + ev->u_type = PTH_EVENT_MUTEX; + ev->u.mx = va_arg (arg, pth_mutex_t*); } - va_end (arg); + va_end (arg); - memset (&sa, 0, sizeof sa); - sa.bInheritHandle = TRUE; - sa.lpSecurityDescriptor = NULL; - sa.nLength = sizeof sa; - ev->hd = CreateEvent (&sa, FALSE, FALSE, NULL); - if (!ev->hd) { - free (ev); - return NULL; + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + ev->hd = CreateEvent (&sa, FALSE, FALSE, NULL); + if (!ev->hd) + { + free (ev); + return NULL; } - return ev; + return ev; } static void pth_event_add (pth_event_t root, pth_event_t node) { - pth_event_t n; + pth_event_t n; - for (n=root; n->next; n = n->next) - ; - n->next = node; + for (n=root; n->next; n = n->next) + ; + n->next = node; } pth_event_t pth_event_concat (pth_event_t evf, ...) { - pth_event_t evn; - va_list ap; + pth_event_t evn; + va_list ap; - if (!evf) - return NULL; + if (!evf) + return NULL; - implicit_init (); - va_start (ap, evf); - while ((evn = va_arg(ap, pth_event_t)) != NULL) - pth_event_add (evf, evn); - va_end (ap); + implicit_init (); + va_start (ap, evf); + while ((evn = va_arg(ap, pth_event_t)) != NULL) + pth_event_add (evf, evn); + va_end (ap); - return evf; + return evf; } static int wait_for_fd (int fd, int is_read, int nwait) { - struct timeval tv; - fd_set r; - fd_set w; - int n; - - FD_ZERO (&r); - FD_ZERO (&w); - FD_SET (fd, is_read ? &r : &w); - - tv.tv_sec = nwait; - tv.tv_usec = 0; - - while (1) { - n = select (fd+1, &r, &w, NULL, &tv); - printf ("wait_for_fd=%d fd %d (ec=%d)\n", n, fd, (int)WSAGetLastError ()); - if (n == -1) - break; - if (!n) - continue; - if (n == 1) { - if (is_read && FD_ISSET (fd, &r)) - break; - else if (FD_ISSET (fd, &w)) - break; - } + struct timeval tv; + fd_set r; + fd_set w; + int n; + + FD_ZERO (&r); + FD_ZERO (&w); + FD_SET (fd, is_read ? &r : &w); + + tv.tv_sec = nwait; + tv.tv_usec = 0; + + while (1) + { + n = select (fd+1, &r, &w, NULL, &tv); + printf ("wait_for_fd=%d fd %d (ec=%d)\n", n, fd,(int)WSAGetLastError ()); + if (n == -1) + break; + if (!n) + continue; + if (n == 1) + { + if (is_read && FD_ISSET (fd, &r)) + break; + else if (FD_ISSET (fd, &w)) + break; + } } - return 0; + return 0; +} + + +static void * +helper_thread (void * ctx) +{ + struct _pth_priv_hd_s * c = ctx; + + leave_pth (); + c->thread (c->arg); + enter_pth (); + free (c); + ExitThread (0); + return NULL; } static void * wait_fd_thread (void * ctx) { - pth_event_t ev = ctx; + pth_event_t ev = ctx; - wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); - printf ("wait_fd_thread: exit.\n"); - SetEvent (ev->hd); - ExitThread (0); - return NULL; + wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); + printf ("wait_fd_thread: exit.\n"); + SetEvent (ev->hd); + ExitThread (0); + return NULL; } static void * wait_timer_thread (void * ctx) { - pth_event_t ev = ctx; - int n = ev->u.tv.tv_sec*1000; - Sleep (n); - SetEvent (ev->hd); - printf ("wait_timer_thread: exit.\n"); - ExitThread (0); - return NULL; + pth_event_t ev = ctx; + int n = ev->u.tv.tv_sec*1000; + Sleep (n); + SetEvent (ev->hd); + printf ("wait_timer_thread: exit.\n"); + ExitThread (0); + return NULL; } @@ -746,216 +835,199 @@ int pth_event_occured (pth_event_t ev) { - if (!ev) - return 0; - implicit_init (); - switch (ev->u_type) { + if (!ev) + return 0; + implicit_init (); + switch (ev->u_type) + { case 0: - if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) - return 1; - break; + if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) + return 1; + break; case PTH_EVENT_SIGS: - if (sigpresent (ev->u.sig, pth_signo) && - WaitForSingleObject (pth_signo_ev, 0) == WAIT_OBJECT_0) { - printf ("pth_event_occured: sig signaled.\n"); - (*ev->val) = pth_signo; - return 1; - } - break; + if (sigpresent (ev->u.sig, pth_signo) && + WaitForSingleObject (pth_signo_ev, 0) == WAIT_OBJECT_0) + { + printf ("pth_event_occured: sig signaled.\n"); + (*ev->val) = pth_signo; + return 1; + } + break; case PTH_EVENT_FD: - if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) - return 1; - break; + if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) + return 1; + break; } - return 0; + return 0; } int pth_event_status (pth_event_t ev) { - if (!ev) - return 0; - implicit_init (); - if (pth_event_occured (ev)) - return PTH_STATUS_OCCURRED; + if (!ev) return 0; + implicit_init (); + if (pth_event_occured (ev)) + return PTH_STATUS_OCCURRED; + return 0; } int pth_event_free (pth_event_t ev, int mode) { - pth_event_t n; + pth_event_t n; - implicit_init (); - if (mode == PTH_FREE_ALL) { - while (ev) { - n = ev->next; - CloseHandle (ev->hd); ev->hd = NULL; - free (ev); - ev = n; - } - } - else if (mode == PTH_FREE_THIS) { - ev->prev->next = ev->next; - ev->next->prev = ev->prev; - CloseHandle (ev->hd); ev->hd = NULL; - free (ev); + implicit_init (); + if (mode == PTH_FREE_ALL) + { + while (ev) + { + n = ev->next; + CloseHandle (ev->hd); ev->hd = NULL; + free (ev); + ev = n; + } + } + else if (mode == PTH_FREE_THIS) + { + ev->prev->next = ev->next; + ev->next->prev = ev->prev; + CloseHandle (ev->hd); ev->hd = NULL; + free (ev); } - return 0; + return 0; } pth_event_t pth_event_isolate (pth_event_t ev) { - pth_event_t ring = NULL; + pth_event_t ring = NULL; - if (!ev) - return NULL; - implicit_init (); - return ring; - + if (!ev) + return NULL; + implicit_init (); + return ring; } static void free_threads (HANDLE *waitbuf, int *hdidx, int n) { - int i; + int i; - for (i=0; i < n; i++) - CloseHandle (waitbuf[hdidx[i]]); + for (i=0; i < n; i++) + CloseHandle (waitbuf[hdidx[i]]); } static int pth_event_count (pth_event_t ev) { - pth_event_t p; - int cnt=0; + pth_event_t p; + int cnt=0; - if (!ev) - return 0; - for (p=ev; p; p = p->next) - cnt++; - return cnt; + if (!ev) + return 0; + for (p=ev; p; p = p->next) + cnt++; + return cnt; } int pth_wait (pth_event_t ev) { - HANDLE waitbuf[MAXIMUM_WAIT_OBJECTS/2]; - int hdidx[MAXIMUM_WAIT_OBJECTS/2]; - DWORD n = 0; - pth_attr_t attr; - pth_event_t tmp; - int pos=0, i=0; - - if (!ev) - return 0; - - implicit_init (); - attr = pth_attr_new (); - pth_attr_set (attr, PTH_ATTR_JOINABLE, 1); - pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 4096); - - printf ("pth_wait: cnt %d\n", pth_event_count (ev)); - for (tmp = ev; tmp; tmp = tmp->next) { - if (pos+1 > MAXIMUM_WAIT_OBJECTS/2) { - free_threads (waitbuf, hdidx, i); - pth_attr_destroy (attr); - return -1; - } - switch (tmp->u_type) { - case 0: - waitbuf[pos++] = tmp->hd; - break; - - case PTH_EVENT_SIGS: - waitbuf[pos++] = pth_signo_ev; - printf ("pth_wait: add signal event.\n"); - break; - - case PTH_EVENT_FD: - printf ("pth_wait: spawn event wait thread.\n"); - hdidx[i++] = pos; - waitbuf[pos++] = pth_spawn (attr, wait_fd_thread, tmp); - break; - - case PTH_EVENT_TIME: - printf ("pth_wait: spawn event timer thread.\n"); - hdidx[i++] = pos; - waitbuf[pos++] = pth_spawn (attr, wait_timer_thread, tmp); - break; - - case PTH_EVENT_MUTEX: - printf ("pth_wait: add mutex event.\n"); - hdidx[i++] = pos; - waitbuf[pos++] = tmp->u.mx->mx; - /* XXX: Use SetEvent(hd->ev) */ - break; - } - } - printf ("pth_wait: set %d\n", pos); - n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); - free_threads (waitbuf, hdidx, i); - pth_attr_destroy (attr); - printf ("pth_wait: n %ld\n", n); - if (n != WAIT_TIMEOUT) - return 1; - - /* - switch (ev->u_type) { - case 0: - n = WaitForSingleObject (ev->hd, INFINITE); - if (n != WAIT_OBJECT_0) - return 1; - break; - - case PTH_EVENT_SIGS: - n = WaitForSingleObject (pth_signo_ev, INFINITE); - if (n != WAIT_OBJECT_0) - return 1; - break; - - case PTH_EVENT_FD: - if (wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE)) { - SetEvent (ev->hd); - return 1; - } - break; + HANDLE waitbuf[MAXIMUM_WAIT_OBJECTS/2]; + int hdidx[MAXIMUM_WAIT_OBJECTS/2]; + DWORD n = 0; + pth_attr_t attr; + pth_event_t tmp; + int pos=0, i=0; + + if (!ev) + return 0; - default: - return -1; + implicit_init (); + attr = pth_attr_new (); + pth_attr_set (attr, PTH_ATTR_JOINABLE, 1); + pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 4096); + + printf ("pth_wait: cnt %d\n", pth_event_count (ev)); + for (tmp = ev; tmp; tmp = tmp->next) + { + if (pos+1 > MAXIMUM_WAIT_OBJECTS/2) + { + free_threads (waitbuf, hdidx, i); + pth_attr_destroy (attr); + return -1; + } + switch (tmp->u_type) + { + case 0: + waitbuf[pos++] = tmp->hd; + break; + + case PTH_EVENT_SIGS: + waitbuf[pos++] = pth_signo_ev; + printf ("pth_wait: add signal event.\n"); + break; + + case PTH_EVENT_FD: + printf ("pth_wait: spawn event wait thread.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = pth_spawn (attr, wait_fd_thread, tmp); + break; + + case PTH_EVENT_TIME: + printf ("pth_wait: spawn event timer thread.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = pth_spawn (attr, wait_timer_thread, tmp); + break; + + case PTH_EVENT_MUTEX: + printf ("pth_wait: add mutex event.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = tmp->u.mx->mx; + /* XXX: Use SetEvent(hd->ev) */ + break; + } } - */ - return 0; + printf ("pth_wait: set %d\n", pos); + n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); + free_threads (waitbuf, hdidx, i); + pth_attr_destroy (attr); + printf ("pth_wait: n %ld\n", n); + if (n != WAIT_TIMEOUT) + return 1; + + return 0; } int pth_sleep (int sec) { - static pth_key_t ev_key = PTH_KEY_INIT; - pth_event_t ev; + static pth_key_t ev_key = PTH_KEY_INIT; + pth_event_t ev; - implicit_init (); - if (sec == 0) - return 0; - - ev = pth_event (PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, pth_timeout (sec, 0)); - if (ev == NULL) - return -1; - pth_wait (ev); - pth_event_free (ev, PTH_FREE_ALL); + implicit_init (); + if (sec == 0) return 0; + + ev = pth_event (PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, + pth_timeout (sec, 0)); + if (ev == NULL) + return -1; + pth_wait (ev); + pth_event_free (ev, PTH_FREE_ALL); + return 0; } @@ -971,111 +1043,112 @@ void * thread (void * c) { - Sleep (2000); - SetEvent (((pth_event_t)c)->hd); - printf ("\n\nhallo!.\n"); - pth_exit (NULL); - return NULL; + Sleep (2000); + SetEvent (((pth_event_t)c)->hd); + printf ("\n\nhallo!.\n"); + pth_exit (NULL); + return NULL; } int main_1 (int argc, char ** argv) { - pth_attr_t t; - pth_t hd; - pth_event_t ev; - - pth_init (); - ev = pth_event (0, NULL); - t = pth_attr_new (); - pth_attr_set (t, PTH_ATTR_JOINABLE, 1); - pth_attr_set (t, PTH_ATTR_STACK_SIZE, 4096); - pth_attr_set (t, PTH_ATTR_NAME, "hello"); - hd = pth_spawn (t, thread, ev); + pth_attr_t t; + pth_t hd; + pth_event_t ev; + + pth_init (); + ev = pth_event (0, NULL); + t = pth_attr_new (); + pth_attr_set (t, PTH_ATTR_JOINABLE, 1); + pth_attr_set (t, PTH_ATTR_STACK_SIZE, 4096); + pth_attr_set (t, PTH_ATTR_NAME, "hello"); + hd = pth_spawn (t, thread, ev); + + pth_wait (ev); + pth_attr_destroy (t); + pth_event_free (ev, 0); + pth_kill (); - pth_wait (ev); - pth_attr_destroy (t); - pth_event_free (ev, 0); - pth_kill (); - - return 0; + return 0; } static pth_event_t setup_signals (struct sigset_s *sigs, int *signo) { - pth_event_t ev; + pth_event_t ev; - sigemptyset (sigs); - sigaddset (sigs, SIGINT); - sigaddset (sigs, SIGTERM); + sigemptyset (sigs); + sigaddset (sigs, SIGINT); + sigaddset (sigs, SIGTERM); - ev = pth_event (PTH_EVENT_SIGS, sigs, signo); - return ev; + ev = pth_event (PTH_EVENT_SIGS, sigs, signo); + return ev; } int main_2 (int argc, char ** argv) { - pth_event_t ev; - struct sigset_s sigs; - int signo = 0; - - pth_init (); - ev = setup_signals (&sigs, &signo); - pth_wait (ev); - if (pth_event_occured (ev) && signo) - printf ("signal caught! signo %d\n", signo); - - pth_event_free (ev, PTH_FREE_ALL); - pth_kill (); - return 0; + pth_event_t ev; + struct sigset_s sigs; + int signo = 0; + + pth_init (); + ev = setup_signals (&sigs, &signo); + pth_wait (ev); + if (pth_event_occured (ev) && signo) + printf ("signal caught! signo %d\n", signo); + + pth_event_free (ev, PTH_FREE_ALL); + pth_kill (); + return 0; } int main_3 (int argc, char ** argv) { - struct sockaddr_in addr, rem; - int fd, n = 0, infd; - int signo = 0; - struct sigset_s sigs; - pth_event_t ev; - - pth_init (); - fd = socket (AF_INET, SOCK_STREAM, 0); - - memset (&addr, 0, sizeof addr); - addr.sin_addr.s_addr = INADDR_ANY; - addr.sin_port = htons (5050); - addr.sin_family = AF_INET; - bind (fd, (struct sockaddr*)&addr, sizeof addr); - listen (fd, 5); - - ev = setup_signals (&sigs, &signo); - n = sizeof addr; - infd = pth_accept_ev (fd, (struct sockaddr *)&rem, &n, ev); - printf ("infd %d: %s:%d\n", infd, inet_ntoa (rem.sin_addr), htons (rem.sin_port)); - - closesocket (infd); - pth_event_free (ev, PTH_FREE_ALL); - pth_kill (); - return 0; + struct sockaddr_in addr, rem; + int fd, n = 0, infd; + int signo = 0; + struct sigset_s sigs; + pth_event_t ev; + + pth_init (); + fd = socket (AF_INET, SOCK_STREAM, 0); + + memset (&addr, 0, sizeof addr); + addr.sin_addr.s_addr = INADDR_ANY; + addr.sin_port = htons (5050); + addr.sin_family = AF_INET; + bind (fd, (struct sockaddr*)&addr, sizeof addr); + listen (fd, 5); + + ev = setup_signals (&sigs, &signo); + n = sizeof addr; + infd = pth_accept_ev (fd, (struct sockaddr *)&rem, &n, ev); + printf ("infd %d: %s:%d\n", infd, inet_ntoa (rem.sin_addr), + htons (rem.sin_port)); + + closesocket (infd); + pth_event_free (ev, PTH_FREE_ALL); + pth_kill (); + return 0; } int main (int argc, char ** argv) { - pth_event_t ev; - pth_key_t ev_key; + pth_event_t ev; + pth_key_t ev_key; - pth_init (); - /*ev = pth_event (PTH_EVENT_TIME, &ev_key, pth_timeout (5, 0)); + pth_init (); + /*ev = pth_event (PTH_EVENT_TIME, &ev_key, pth_timeout (5, 0)); pth_wait (ev); pth_event_free (ev, PTH_FREE_ALL);*/ - pth_sleep (5); - pth_kill (); - return 0; + pth_sleep (5); + pth_kill (); + return 0; } #endif From cvs at cvs.gnupg.org Tue Dec 14 08:59:41 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 14 09:15:04 2004 Subject: gnupg/g10 (ChangeLog passphrase.c) Message-ID: Date: Tuesday, December 14, 2004 @ 09:03:56 Author: wk Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog passphrase.c automake updates, removed one debug output --------------+ ChangeLog | 2 ++ passphrase.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.655 gnupg/g10/ChangeLog:1.656 --- gnupg/g10/ChangeLog:1.655 Tue Dec 14 08:49:26 2004 +++ gnupg/g10/ChangeLog Tue Dec 14 09:03:56 2004 @@ -1,5 +1,7 @@ 2004-12-14 Werner Koch + * passphrase.c (agent_get_passphrase): Removed debug output + * keyserver.c (keyserver_work, keyserver_spawn): Map ldaps to ldap. * keyedit.c (keyedit_menu): Removed the N_() markers from the Index: gnupg/g10/passphrase.c diff -u gnupg/g10/passphrase.c:1.71 gnupg/g10/passphrase.c:1.72 --- gnupg/g10/passphrase.c:1.71 Mon Dec 13 09:04:52 2004 +++ gnupg/g10/passphrase.c Tue Dec 14 09:03:56 2004 @@ -652,7 +652,6 @@ int prot; char *orig_codeset = NULL; - log_debug ("agent_get_passphrase tryagin='%s' prompt='%s'\n", tryagain_text, custom_prompt); if (canceled) *canceled = 0; From cvs at cvs.gnupg.org Tue Dec 14 09:28:46 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 14 09:28:48 2004 Subject: gnupg (NEWS configure.ac) Message-ID: Date: Tuesday, December 14, 2004 @ 09:33:01 Author: wk Path: /cvs/gnupg/gnupg Modified: NEWS configure.ac post release updates --------------+ NEWS | 7 +++++++ configure.ac | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) Index: gnupg/NEWS diff -u gnupg/NEWS:1.223 gnupg/NEWS:1.224 --- gnupg/NEWS:1.223 Tue Dec 14 08:49:26 2004 +++ gnupg/NEWS Tue Dec 14 09:33:01 2004 @@ -1,3 +1,10 @@ +Noteworthy changes in version 1.4.0 +------------------------------------------------- + + * See the file doc/highlights-1.4.txt for an overview of all + changes in respect to the 1.2 series. + + Noteworthy changes in version 1.3.93 (2004-12-14) ------------------------------------------------- Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.113 gnupg/configure.ac:1.114 --- gnupg/configure.ac:1.113 Tue Dec 14 08:49:26 2004 +++ gnupg/configure.ac Tue Dec 14 09:33:01 2004 @@ -19,14 +19,14 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.113 $)dnl +dnlAC_REVISION($Revision: 1.114 $)dnl AC_PREREQ(2.59) -min_automake_version="1.7.9" +min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.3.93, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.4.0-cvs, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. From cvs at cvs.gnupg.org Tue Dec 14 12:20:48 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 14 12:35:08 2004 Subject: GNUPG-1-9-BRANCH gnupg/jnlib (ChangeLog w32-pth.c w32-pth.h) Message-ID: Date: Tuesday, December 14, 2004 @ 12:25:04 Author: wk Path: /cvs/gnupg/gnupg/jnlib Tag: GNUPG-1-9-BRANCH Modified: ChangeLog w32-pth.c w32-pth.h * w32-pth.h (pth_event_occured): Removed macro. * w32-pth.c: Fixed license statement; its under the LGPL. (enter_pth, leave_pth): Use them to bracket almost all public functions. -----------+ ChangeLog | 7 + w32-pth.c | 392 ++++++++++++++++++++++++++++++++++++++++++++---------------- w32-pth.h | 8 - 3 files changed, 296 insertions(+), 111 deletions(-) Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.23 gnupg/jnlib/ChangeLog:1.3.2.24 --- gnupg/jnlib/ChangeLog:1.3.2.23 Mon Dec 13 19:00:35 2004 +++ gnupg/jnlib/ChangeLog Tue Dec 14 12:25:04 2004 @@ -1,3 +1,10 @@ +2004-12-14 Werner Koch + + * w32-pth.h (pth_event_occured): Removed macro. + * w32-pth.c: Fixed license statement; its under the LGPL. + (enter_pth, leave_pth): Use them to bracket almost all public + functions. + 2004-12-13 Timo Schulz * w32-pth.c (enter_pth, leave_pth): New. Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.3 gnupg/jnlib/w32-pth.c:1.1.2.4 --- gnupg/jnlib/w32-pth.c:1.1.2.3 Mon Dec 13 19:00:35 2004 +++ gnupg/jnlib/w32-pth.c Tue Dec 14 12:25:04 2004 @@ -4,19 +4,19 @@ * * This file is part of GnuPG. * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * GnuPG 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. * - * GnuPG 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 General Public License for more details. + * GnuPG 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 General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * * ------------------------------------------------------------------ * This code is based on Ralf Engelschall's GNU Pth, a non-preemptive @@ -51,7 +51,6 @@ #define implicit_init() do { if (!pth_initialized) pth_init(); } while (0) -static void * helper_thread (void * ctx); struct pth_event_s @@ -87,14 +86,23 @@ }; +/* Prototypes. */ +static pth_event_t do_pth_event (unsigned long spec, ...); +static unsigned int do_pth_waitpid (unsigned pid, int * status, int options); +static int do_pth_wait (pth_event_t ev); +static int do_pth_event_status (pth_event_t ev); +static void * helper_thread (void * ctx); + + + int pth_init (void) { SECURITY_ATTRIBUTES sa; WSADATA wsadat; - - printf ("pth_init: called.\n"); + + fprintf (stderr, "pth_init: called.\n"); pth_initialized = 1; if (WSAStartup (0x202, &wsadat)) abort (); @@ -128,18 +136,20 @@ static void -enter_pth (void) +enter_pth (const char *function) { - EnterCriticalSection (&pth_shd); - /*LeaveCriticalSection (&pth_shd);*/ + /* Fixme: I am not sure whether the same thread my enter a critical + section twice. */ + fprintf (stderr, "enter_pth (%s)\n", function? function:""); + LeaveCriticalSection (&pth_shd); } static void -leave_pth (void) +leave_pth (const char *function) { - LeaveCriticalSection (&pth_shd); - /*EnterCriticalSection (&pth_shd);*/ + EnterCriticalSection (&pth_shd); + fprintf (stderr, "leave_pth (%s)\n", function? function:""); } @@ -193,15 +203,19 @@ int n; implicit_init (); + enter_pth (__FUNCTION__); + n = recv (fd, buffer, size, 0); if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { DWORD nread = 0; n = ReadFile ((HANDLE)fd, buffer, size, &nread, NULL); if (!n) - return -1; - return (int)nread; + n = -1; + else + n = (int)nread; } + leave_pth (__FUNCTION__); return n; } @@ -220,15 +234,32 @@ int n; implicit_init (); + enter_pth (__FUNCTION__); n = send (fd, buffer, size, 0); if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { + char strerr[256]; + + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, (int)GetLastError (), + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + strerr, sizeof (strerr)-1, NULL); + fprintf (stderr, "pth_write(%d) failed in send: %s\n", fd, strerr); + + DWORD nwrite; n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); if (!n) - return -1; - return (int)nwrite; + { + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL,(int)GetLastError (), + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + strerr, sizeof (strerr)-1, NULL); + fprintf (stderr, "pth_write(%d) failed in write: %s\n", fd, strerr); + n = -1; + } + else + n = (int)nwrite; } + leave_pth (__FUNCTION__); return n; } @@ -237,8 +268,13 @@ pth_select (int nfds, fd_set * rfds, fd_set * wfds, fd_set * efds, const struct timeval * timeout) { + int n; + implicit_init (); - return select (nfds, rfds, wfds, efds, timeout); + enter_pth (__FUNCTION__); + n = select (nfds, rfds, wfds, efds, timeout); + leave_pth (__FUNCTION__); + return n; } @@ -246,32 +282,41 @@ pth_fdmode (int fd, int mode) { unsigned long val; + int ret = PTH_FDMODE_BLOCK; implicit_init (); + /* Note: we don't do the eter/leave pth here because this is for one + a fast fucntion and secondly already called from inside such a + block. */ /* XXX: figure out original fd mode */ switch (mode) { case PTH_FDMODE_NONBLOCK: val = 1; if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) - return PTH_FDMODE_ERROR; + ret = PTH_FDMODE_ERROR; break; case PTH_FDMODE_BLOCK: val = 0; if (ioctlsocket (fd, FIONBIO, &val) == SOCKET_ERROR) - return PTH_FDMODE_ERROR; + ret = PTH_FDMODE_ERROR; break; } - return PTH_FDMODE_BLOCK; + return ret; } int pth_accept (int fd, struct sockaddr *addr, int *addrlen) { + int rc; + implicit_init (); - return accept (fd, addr, addrlen); + enter_pth (__FUNCTION__); + rc = accept (fd, addr, addrlen); + leave_pth (__FUNCTION__); + return rc; } @@ -285,10 +330,14 @@ int fdmode; implicit_init (); + enter_pth (__FUNCTION__); fdmode = pth_fdmode (fd, PTH_FDMODE_NONBLOCK); if (fdmode == PTH_FDMODE_ERROR) - return -1; + { + leave_pth (__FUNCTION__); + return -1; + } ev = NULL; while ((rv = accept (fd, addr, addrlen)) == -1 && @@ -296,27 +345,32 @@ WSAGetLastError () == WSAEWOULDBLOCK)) { if (ev == NULL) { - ev = pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, - &ev_key, fd); + ev = do_pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, + &ev_key, fd); if (ev == NULL) - return -1; + { + leave_pth (__FUNCTION__); + return -1; + } if (ev_extra != NULL) pth_event_concat (ev, ev_extra, NULL); } - /* wait until accept has a chance */ - pth_wait (ev); + /* Wait until accept has a chance. */ + do_pth_wait (ev); if (ev_extra != NULL) { pth_event_isolate (ev); - if (pth_event_status (ev) != PTH_STATUS_OCCURRED) + if (do_pth_event_status (ev) != PTH_STATUS_OCCURRED) { pth_fdmode (fd, fdmode); + leave_pth (__FUNCTION__); return -1; } } } pth_fdmode (fd, fdmode); + leave_pth (__FUNCTION__); return rv; } @@ -324,8 +378,13 @@ int pth_connect (int fd, struct sockaddr *name, int namelen) { + int rc; + implicit_init (); - return connect (fd, name, namelen); + enter_pth (__FUNCTION__); + rc = connect (fd, name, namelen); + leave_pth (__FUNCTION__); + return rc; } @@ -335,12 +394,14 @@ if (!hd) return -1; implicit_init (); + enter_pth (__FUNCTION__); if (hd->mx) { CloseHandle (hd->mx); hd->mx = NULL; } free (hd); + leave_pth (__FUNCTION__); return 0; } @@ -349,11 +410,13 @@ pth_mutex_acquire (pth_mutex_t *hd, int tryonly, pth_event_t ev_extra) { implicit_init (); + enter_pth (__FUNCTION__); - if (!hd) - return -1; - if (!hd->mx) - return -1; + if (!hd || !hd->mx) + { + leave_pth (__FUNCTION__); + return -1; + } #if 0 /* still not locked, so simply acquire mutex? */ @@ -376,7 +439,10 @@ } if (tryonly) - return return -1; + { + leave_pth (__FUNCTION__); + return -1; + } for (;;) { @@ -386,8 +452,11 @@ pth_wait (ev); if (ev_extra != NULL) { pth_event_isolate (ev); - if (pth_event_status(ev) == PTH_STATUS_PENDING) - return return -1; + if (do_pth_event_status(ev) == PTH_STATUS_PENDING) + { + leave_pth (__FUNCTION__); + return -1; + } } if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) break; @@ -395,6 +464,7 @@ #endif hd->mx_state |= PTH_MUTEX_LOCKED; + leave_pth (__FUNCTION__); return 0; } @@ -405,6 +475,8 @@ SECURITY_ATTRIBUTES sa; implicit_init (); + enter_pth (__FUNCTION__); + if (hd->mx) { ReleaseMutex (hd->mx); @@ -416,6 +488,8 @@ sa.nLength = sizeof sa; hd->mx = CreateMutex (&sa, FALSE, NULL); hd->mx_state = PTH_MUTEX_INITIALIZED; + + leave_pth (__FUNCTION__); return 0; } @@ -427,8 +501,6 @@ implicit_init (); hd = calloc (1, sizeof *hd); - if (!hd) - return NULL; return hd; } @@ -455,6 +527,7 @@ int rc = 0; implicit_init (); + va_start (args, field); switch (field) { @@ -463,7 +536,7 @@ if (val) { hd->flags |= PTH_ATTR_JOINABLE; - printf ("pth_attr_set: PTH_ATTR_JOINABLE\n"); + fprintf (stderr, "pth_attr_set: PTH_ATTR_JOINABLE\n"); } break; @@ -473,7 +546,7 @@ { hd->flags |= PTH_ATTR_STACK_SIZE; hd->stack_size = val; - printf ("pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", val); + fprintf (stderr, "pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", val); } break; @@ -487,7 +560,7 @@ if (!hd->name) return -1; hd->flags |= PTH_ATTR_NAME; - printf ("pth_attr_set: PTH_ATTR_NAME %s\n", hd->name); + fprintf (stderr, "pth_attr_set: PTH_ATTR_NAME %s\n", hd->name); } break; @@ -512,6 +585,7 @@ return NULL; implicit_init (); + enter_pth (__FUNCTION__); memset (&sa, 0, sizeof sa); sa.bInheritHandle = TRUE; @@ -519,16 +593,23 @@ sa.nLength = sizeof sa; ctx = calloc (1, sizeof * ctx); + if (!ctx) + { + leave_pth (__FUNCTION__); + return NULL; + } ctx->thread = func; ctx->arg = arg; /* XXX: we don't use all thread attributes. */ - enter_pth (); + + fprintf (stderr, "pth_spawn creating thread ...\n"); th = CreateThread (&sa, hd->stack_size, (LPTHREAD_START_ROUTINE)helper_thread, ctx, 0, &tid); - leave_pth (); - + fprintf (stderr, "pth_spawn created thread %p\n", th); + + leave_pth (__FUNCTION__); return th; } @@ -547,8 +628,10 @@ if (!hd) return -1; implicit_init (); + enter_pth (__FUNCTION__); WaitForSingleObject (hd, 1000); TerminateThread (hd, 0); + leave_pth (__FUNCTION__); return 0; } @@ -560,7 +643,9 @@ if (!hd) return -1; implicit_init (); + enter_pth (__FUNCTION__); TerminateThread (hd, 0); + leave_pth (__FUNCTION__); return 0; } @@ -569,15 +654,16 @@ pth_exit (void *value) { implicit_init (); + enter_pth (__FUNCTION__); pth_kill (); + leave_pth (__FUNCTION__); exit ((int)(long)value); } -unsigned -pth_waitpid (unsigned pid, int * status, int options) +static unsigned int +do_pth_waitpid (unsigned pid, int * status, int options) { - implicit_init (); #if 0 pth_event_t ev; static pth_key_t ev_key = PTH_KEY_INIT; @@ -608,6 +694,19 @@ } +unsigned int +pth_waitpid (unsigned pid, int * status, int options) +{ + unsigned int n; + + implicit_init (); + enter_pth (__FUNCTION__); + n = do_pth_waitpid (pid, status, options); + leave_pth (__FUNCTION__); + return n; +} + + static BOOL WINAPI sig_handler (DWORD signo) { @@ -617,22 +716,19 @@ case CTRL_BREAK_EVENT: pth_signo = SIGTERM; break; } SetEvent (pth_signo_ev); - printf ("sig_handler=%d\n", pth_signo); + fprintf (stderr, "sig_handler=%d\n", pth_signo); return TRUE; } -pth_event_t -pth_event (unsigned long spec, ...) +static pth_event_t +do_pth_event_body (unsigned long spec, va_list arg) { - va_list arg; SECURITY_ATTRIBUTES sa; pth_event_t ev; int rc; - implicit_init (); - printf ("pth_event spec=%lu\n", spec); - va_start (arg, spec); + fprintf (stderr, "pth_event spec=%lu\n", spec); ev = calloc (1, sizeof *ev); if (!ev) return NULL; @@ -644,7 +740,7 @@ ev->u_type = PTH_EVENT_SIGS; ev->val = va_arg (arg, int *); rc = SetConsoleCtrlHandler (sig_handler, TRUE); - printf ("pth_event: sigs rc=%d\n", rc); + fprintf (stderr, "pth_event: sigs rc=%d\n", rc); } else if (spec & PTH_EVENT_FD) { @@ -655,7 +751,7 @@ ev->u_type = PTH_EVENT_FD; va_arg (arg, pth_key_t); ev->u.fd = va_arg (arg, int); - printf ("pth_event: fd=%d\n", ev->u.fd); + fprintf (stderr, "pth_event: fd=%d\n", ev->u.fd); } else if (spec & PTH_EVENT_TIME) { @@ -674,7 +770,6 @@ ev->u_type = PTH_EVENT_MUTEX; ev->u.mx = va_arg (arg, pth_mutex_t*); } - va_end (arg); memset (&sa, 0, sizeof sa); sa.bInheritHandle = TRUE; @@ -690,6 +785,36 @@ return ev; } +static pth_event_t +do_pth_event (unsigned long spec, ...) +{ + va_list arg; + pth_event_t ev; + + va_start (arg, spec); + ev = do_pth_event_body (spec, arg); + va_end (arg); + + return ev; +} + +pth_event_t +pth_event (unsigned long spec, ...) +{ + va_list arg; + pth_event_t ev; + + implicit_init (); + enter_pth (__FUNCTION__); + + va_start (arg, spec); + ev = do_pth_event_body (spec, arg); + va_end (arg); + + leave_pth (__FUNCTION__); + return ev; +} + static void pth_event_add (pth_event_t root, pth_event_t node) @@ -712,6 +837,7 @@ return NULL; implicit_init (); + va_start (ap, evf); while ((evn = va_arg(ap, pth_event_t)) != NULL) pth_event_add (evf, evn); @@ -739,7 +865,7 @@ while (1) { n = select (fd+1, &r, &w, NULL, &tv); - printf ("wait_for_fd=%d fd %d (ec=%d)\n", n, fd,(int)WSAGetLastError ()); + fprintf (stderr, "wait_for_fd=%d fd %d (ec=%d)\n", n, fd,(int)WSAGetLastError ()); if (n == -1) break; if (!n) @@ -761,9 +887,9 @@ { struct _pth_priv_hd_s * c = ctx; - leave_pth (); + leave_pth (__FUNCTION__); c->thread (c->arg); - enter_pth (); + enter_pth (__FUNCTION__); free (c); ExitThread (0); return NULL; @@ -776,7 +902,7 @@ pth_event_t ev = ctx; wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); - printf ("wait_fd_thread: exit.\n"); + fprintf (stderr, "wait_fd_thread: exit.\n"); SetEvent (ev->hd); ExitThread (0); return NULL; @@ -790,7 +916,7 @@ int n = ev->u.tv.tv_sec*1000; Sleep (n); SetEvent (ev->hd); - printf ("wait_timer_thread: exit.\n"); + fprintf (stderr, "wait_timer_thread: exit.\n"); ExitThread (0); return NULL; } @@ -832,57 +958,81 @@ } -int -pth_event_occured (pth_event_t ev) +static int +do_pth_event_occurred (pth_event_t ev) { + int ret; + if (!ev) return 0; - implicit_init (); + + ret = 0; switch (ev->u_type) { case 0: if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) - return 1; + ret = 1; break; case PTH_EVENT_SIGS: if (sigpresent (ev->u.sig, pth_signo) && WaitForSingleObject (pth_signo_ev, 0) == WAIT_OBJECT_0) { - printf ("pth_event_occured: sig signaled.\n"); + fprintf (stderr, "pth_event_occurred: sig signaled.\n"); (*ev->val) = pth_signo; - return 1; + ret = 1; } break; case PTH_EVENT_FD: if (WaitForSingleObject (ev->hd, 0) == WAIT_OBJECT_0) - return 1; + ret = 1; break; } - return 0; + return ret; } int +pth_event_occurred (pth_event_t ev) +{ + int ret; + + implicit_init (); + enter_pth (__FUNCTION__); + ret = do_pth_event_occurred (ev); + leave_pth (__FUNCTION__); + return ret; +} + + +static int +do_pth_event_status (pth_event_t ev) +{ + if (!ev) + return 0; + if (do_pth_event_occurred (ev)) + return PTH_STATUS_OCCURRED; + return 0; +} + +int pth_event_status (pth_event_t ev) { if (!ev) return 0; - implicit_init (); - if (pth_event_occured (ev)) + if (pth_event_occurred (ev)) return PTH_STATUS_OCCURRED; return 0; } -int -pth_event_free (pth_event_t ev, int mode) +static int +do_pth_event_free (pth_event_t ev, int mode) { pth_event_t n; - implicit_init (); if (mode == PTH_FREE_ALL) { while (ev) @@ -901,9 +1051,22 @@ free (ev); } + return 0; } +int +pth_event_free (pth_event_t ev, int mode) +{ + int rc; + + implicit_init (); + enter_pth (__FUNCTION__); + rc = do_pth_event_free (ev, mode); + leave_pth (__FUNCTION__); + return rc; +} + pth_event_t pth_event_isolate (pth_event_t ev) @@ -912,7 +1075,6 @@ if (!ev) return NULL; - implicit_init (); return ring; } @@ -941,8 +1103,8 @@ } -int -pth_wait (pth_event_t ev) +static int +do_pth_wait (pth_event_t ev) { HANDLE waitbuf[MAXIMUM_WAIT_OBJECTS/2]; int hdidx[MAXIMUM_WAIT_OBJECTS/2]; @@ -954,12 +1116,11 @@ if (!ev) return 0; - implicit_init (); attr = pth_attr_new (); pth_attr_set (attr, PTH_ATTR_JOINABLE, 1); pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 4096); - printf ("pth_wait: cnt %d\n", pth_event_count (ev)); + fprintf (stderr, "pth_wait: cnt %d\n", pth_event_count (ev)); for (tmp = ev; tmp; tmp = tmp->next) { if (pos+1 > MAXIMUM_WAIT_OBJECTS/2) @@ -976,40 +1137,53 @@ case PTH_EVENT_SIGS: waitbuf[pos++] = pth_signo_ev; - printf ("pth_wait: add signal event.\n"); + fprintf (stderr, "pth_wait: add signal event.\n"); break; case PTH_EVENT_FD: - printf ("pth_wait: spawn event wait thread.\n"); + fprintf (stderr, "pth_wait: spawn event wait thread.\n"); hdidx[i++] = pos; waitbuf[pos++] = pth_spawn (attr, wait_fd_thread, tmp); break; case PTH_EVENT_TIME: - printf ("pth_wait: spawn event timer thread.\n"); + fprintf (stderr, "pth_wait: spawn event timer thread.\n"); hdidx[i++] = pos; waitbuf[pos++] = pth_spawn (attr, wait_timer_thread, tmp); break; case PTH_EVENT_MUTEX: - printf ("pth_wait: add mutex event.\n"); + fprintf (stderr, "pth_wait: add mutex event.\n"); hdidx[i++] = pos; waitbuf[pos++] = tmp->u.mx->mx; /* XXX: Use SetEvent(hd->ev) */ break; } } - printf ("pth_wait: set %d\n", pos); + fprintf (stderr, "pth_wait: set %d\n", pos); n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); free_threads (waitbuf, hdidx, i); pth_attr_destroy (attr); - printf ("pth_wait: n %ld\n", n); + fprintf (stderr, "pth_wait: n %ld\n", n); + if (n != WAIT_TIMEOUT) return 1; return 0; } +int +pth_wait (pth_event_t ev) +{ + int rc; + + implicit_init (); + enter_pth (__FUNCTION__); + rc = do_pth_wait (ev); + leave_pth (__FUNCTION__); + return rc; +} + int pth_sleep (int sec) @@ -1018,15 +1192,25 @@ pth_event_t ev; implicit_init (); + enter_pth (__FUNCTION__); + if (sec == 0) - return 0; - - ev = pth_event (PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, - pth_timeout (sec, 0)); + { + leave_pth (__FUNCTION__); + return 0; + } + + ev = do_pth_event (PTH_EVENT_TIME|PTH_MODE_STATIC, &ev_key, + pth_timeout (sec, 0)); if (ev == NULL) - return -1; - pth_wait (ev); - pth_event_free (ev, PTH_FREE_ALL); + { + leave_pth (__FUNCTION__); + return -1; + } + do_pth_wait (ev); + do_pth_event_free (ev, PTH_FREE_ALL); + + leave_pth (__FUNCTION__); return 0; } @@ -1045,7 +1229,7 @@ Sleep (2000); SetEvent (((pth_event_t)c)->hd); - printf ("\n\nhallo!.\n"); + fprintf (stderr, "\n\nhallo!.\n"); pth_exit (NULL); return NULL; } @@ -1098,7 +1282,7 @@ ev = setup_signals (&sigs, &signo); pth_wait (ev); if (pth_event_occured (ev) && signo) - printf ("signal caught! signo %d\n", signo); + fprintf (stderr, "signal caught! signo %d\n", signo); pth_event_free (ev, PTH_FREE_ALL); pth_kill (); @@ -1127,7 +1311,7 @@ ev = setup_signals (&sigs, &signo); n = sizeof addr; infd = pth_accept_ev (fd, (struct sockaddr *)&rem, &n, ev); - printf ("infd %d: %s:%d\n", infd, inet_ntoa (rem.sin_addr), + fprintf (stderr, "infd %d: %s:%d\n", infd, inet_ntoa (rem.sin_addr), htons (rem.sin_port)); closesocket (infd); Index: gnupg/jnlib/w32-pth.h diff -u gnupg/jnlib/w32-pth.h:1.1.2.4 gnupg/jnlib/w32-pth.h:1.1.2.5 --- gnupg/jnlib/w32-pth.h:1.1.2.4 Mon Dec 13 16:49:56 2004 +++ gnupg/jnlib/w32-pth.h Tue Dec 14 12:25:04 2004 @@ -229,18 +229,12 @@ pth_event_t pth_event_isolate (pth_event_t hd); int pth_event_free (pth_event_t hd, int mode); int pth_event_status (pth_event_t hd); -int pth_event_occured (pth_event_t hd); +int pth_event_occurred (pth_event_t hd); pth_event_t pth_event_concat (pth_event_t ev, ...); pth_event_t pth_event (unsigned long spec, ...); -/* Backward compatibility (Pth < 1.5.0). */ -#define pth_event_occurred(ev) \ - ( pth_event_status(ev) == PTH_STATUS_OCCURRED \ - || pth_event_status(ev) == PTH_STATUS_FAILED ) - - /*-- pth_util.c --*/ /* void sigemptyset (struct sigset_s * ss); */ From cvs at cvs.gnupg.org Tue Dec 14 15:38:26 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Tue Dec 14 15:38:29 2004 Subject: gnupg/g10 (ChangeLog keyedit.c trustdb.c) Message-ID: Date: Tuesday, December 14, 2004 @ 15:42:42 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyedit.c trustdb.c * trustdb.c (uid_trust_string_fixed): Show uids as revoked if the key is revoked. * keyedit.c (show_key_with_all_names): Don't show validity for secret key UIDs. * keyedit.c (parse_sign_type): New. Figure out the flags (local, nonrevoke, trust) for a signature. (keyedit_menu): Call it here so we can mix and match flags, and don't need "nrltsign", "ltsign", "tnrsign", etc, etc, etc. -----------+ ChangeLog | 13 ++ keyedit.c | 295 ++++++++++++++++++++++++++++++++++++------------------------ trustdb.c | 7 - 3 files changed, 196 insertions(+), 119 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.656 gnupg/g10/ChangeLog:1.657 --- gnupg/g10/ChangeLog:1.656 Tue Dec 14 09:03:56 2004 +++ gnupg/g10/ChangeLog Tue Dec 14 15:42:41 2004 @@ -1,3 +1,16 @@ +2004-12-14 David Shaw + + * trustdb.c (uid_trust_string_fixed): Show uids as revoked if the + key is revoked. + + * keyedit.c (show_key_with_all_names): Don't show validity for + secret key UIDs. + + * keyedit.c (parse_sign_type): New. Figure out the flags (local, + nonrevoke, trust) for a signature. + (keyedit_menu): Call it here so we can mix and match flags, and + don't need "nrltsign", "ltsign", "tnrsign", etc, etc, etc. + 2004-12-14 Werner Koch * passphrase.c (agent_get_passphrase): Removed debug output Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.158 gnupg/g10/keyedit.c:1.159 --- gnupg/g10/keyedit.c:1.158 Tue Dec 14 08:49:26 2004 +++ gnupg/g10/keyedit.c Tue Dec 14 15:42:41 2004 @@ -1214,6 +1214,35 @@ return fixed; } +static int +parse_sign_type(const char *str,int *localsig,int *nonrevokesig,int *trustsig) +{ + const char *p=str; + + while(*p) + { + if(ascii_strncasecmp(p,"l",1)==0) + { + *localsig=1; + p++; + } + else if(ascii_strncasecmp(p,"nr",2)==0) + { + *nonrevokesig=1; + p+=2; + } + else if(ascii_strncasecmp(p,"t",1)==0) + { + *trustsig=1; + p++; + } + else + return 0; + } + + return 1; +} + /**************** * Menu driven key editor. If seckey_check is true, then a secret key * that matches username will be looked for. If it is false, not all @@ -1222,78 +1251,87 @@ * Note: to keep track of some selection we use node->mark MARKBIT_xxxx. */ +/* Need an SK for this command */ +#define KEYEDIT_NEED_SK 1 +/* Cannot be viewing the SK for this command */ +#define KEYEDIT_NOT_SK 2 +/* Must be viewing the SK for this command */ +#define KEYEDIT_ONLY_SK 4 +/* Match the tail of the string */ +#define KEYEDIT_TAIL_MATCH 8 + void keyedit_menu( const char *username, STRLIST locusr, STRLIST commands, int quiet, int seckey_check ) { - enum cmdids { cmdNONE = 0, - cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN, - cmdTSIGN, cmdLSIGN, cmdNRSIGN, cmdNRLSIGN, cmdREVSIG, cmdREVKEY, - cmdREVUID, cmdDELSIG, cmdPRIMARY, cmdDEBUG, cmdSAVE, cmdADDUID, - cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY, cmdADDREVOKER, - cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, cmdEXPIRE, - cmdENABLEKEY, cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF, cmdUPDPREF, - cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST, cmdCHKTRUST, - cmdADDCARDKEY, cmdKEYTOCARD, - cmdNOP }; - static struct { const char *name; - enum cmdids id; - int need_sk; - int not_with_sk; /* but 2 == must use SK */ - const char *desc; - } cmds[] = { - { "quit" , cmdQUIT , 0,0, N_("quit this menu") }, - { "q" , cmdQUIT , 0,0, NULL }, - { "save" , cmdSAVE , 0,0, N_("save and quit") }, - { "help" , cmdHELP , 0,0, N_("show this help") }, - { "?" , cmdHELP , 0,0, NULL }, - { "fpr" , cmdFPR , 0,0, N_("show fingerprint") }, - { "list" , cmdLIST , 0,0, N_("list key and user IDs") }, - { "l" , cmdLIST , 0,0, NULL }, - { "uid" , cmdSELUID , 0,0, N_("select user ID N") }, - { "key" , cmdSELKEY , 0,0, N_("select secondary key N") }, - { "check" , cmdCHECK , 0,0, N_("list signatures") }, - { "c" , cmdCHECK , 0,0, NULL }, - { "sign" , cmdSIGN , 0,1, N_("sign the key") }, - { "s" , cmdSIGN , 0,1, NULL }, - { "tsign" , cmdTSIGN , 0,1, N_("make a trust signature")}, - { "lsign" , cmdLSIGN , 0,1, N_("sign the key locally") }, - { "nrsign" , cmdNRSIGN , 0,1, N_("sign the key non-revocably") }, - { "nrlsign" , cmdNRLSIGN , 0,1, N_("sign the key locally " - "and non-revocably") }, - { "debug" , cmdDEBUG , 0,0, NULL }, - { "adduid" , cmdADDUID , 1,1, N_("add a user ID") }, - { "addphoto" , cmdADDPHOTO , 1,1, N_("add a photo ID") }, - { "deluid" , cmdDELUID , 0,1, N_("delete user ID") }, - /* delphoto is really deluid in disguise */ - { "delphoto" , cmdDELUID , 0,1, NULL }, - { "addkey" , cmdADDKEY , 1,1, N_("add a secondary key") }, + enum cmdids + { cmdNONE = 0, + cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN, + cmdREVSIG, cmdREVKEY, cmdREVUID, cmdDELSIG, cmdPRIMARY, cmdDEBUG, + cmdSAVE, cmdADDUID, cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY, + cmdADDREVOKER, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, + cmdEXPIRE, cmdENABLEKEY, cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF, + cmdUPDPREF, cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST, + cmdCHKTRUST, cmdADDCARDKEY, cmdKEYTOCARD, + cmdNOP }; + static struct + { + const char *name; + enum cmdids id; + int flags; + const char *desc; + } cmds[] = + { + { N_("quit") , cmdQUIT , 0, N_("quit this menu") }, + { N_("q") , cmdQUIT , 0, NULL }, + { N_("save") , cmdSAVE , 0, N_("save and quit") }, + { N_("help") , cmdHELP , 0, N_("show this help") }, + { "?" , cmdHELP , 0, NULL }, + { N_("fpr") , cmdFPR , 0, N_("show fingerprint") }, + { N_("list") , cmdLIST , 0, N_("list key and user IDs") }, + { N_("l") , cmdLIST , 0, NULL }, + { N_("uid") , cmdSELUID , 0, N_("select user ID N") }, + { N_("key") , cmdSELKEY , 0, N_("select secondary key N") }, + { N_("check") , cmdCHECK , 0, N_("list signatures") }, + { N_("c") , cmdCHECK , 0, NULL }, + { N_("sign") , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") }, + { N_("s") , cmdSIGN , KEYEDIT_NOT_SK, NULL }, + /* "lsign" will never match since "sign" comes first and it is a + tail match. It is here so it shows up in the help menu. */ + { N_("lsign") , cmdNOP , 0, N_("sign the key locally") }, + { N_("debug") , cmdDEBUG , 0, NULL }, + { N_("adduid") , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") }, + { N_("addphoto"), cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") }, + { N_("deluid") , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") }, + /* delphoto is really deluid in disguise */ + { N_("delphoto"), cmdDELUID , KEYEDIT_NOT_SK, NULL }, + { N_("addkey") , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a secondary key") }, #ifdef ENABLE_CARD_SUPPORT - { "addcardkey", cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") }, - { "keytocard", cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")}, + { N_("addcardkey"), cmdADDCARDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a key to a smartcard") }, + { N_("keytocard"), cmdKEYTOCARD , KEYEDIT_NEED_SK|KEYEDIT_ONLY_SK, N_("move a key to a smartcard")}, #endif /*ENABLE_CARD_SUPPORT*/ - { "delkey" , cmdDELKEY , 0,1, N_("delete a secondary key") }, - { "addrevoker",cmdADDREVOKER,1,1, N_("add a revocation key") }, - { "delsig" , cmdDELSIG , 0,1, N_("delete signatures") }, - { "expire" , cmdEXPIRE , 1,1, N_("change the expire date") }, - { "primary" , cmdPRIMARY , 1,1, N_("flag user ID as primary")}, - { "toggle" , cmdTOGGLE , 1,0, N_("toggle between secret " - "and public key listing") }, - { "t" , cmdTOGGLE , 1,0, NULL }, - { "pref" , cmdPREF , 0,1, N_("list preferences (expert)")}, - { "showpref" , cmdSHOWPREF , 0,1, N_("list preferences (verbose)") }, - { "setpref" , cmdSETPREF , 1,1, N_("set preference list") }, - { "updpref" , cmdUPDPREF , 1,1, N_("updated preferences") }, - { "keyserver",cmdPREFKS , 1,1, N_("set preferred keyserver URL")}, - { "passwd" , cmdPASSWD , 1,1, N_("change the passphrase") }, - { "trust" , cmdTRUST , 0,1, N_("change the ownertrust") }, - { "revsig" , cmdREVSIG , 0,1, N_("revoke signatures") }, - { "revuid" , cmdREVUID , 1,1, N_("revoke a user ID") }, - { "revkey" , cmdREVKEY , 1,1, N_("revoke a secondary key") }, - { "disable" , cmdDISABLEKEY, 0,1, N_("disable a key") }, - { "enable" , cmdENABLEKEY , 0,1, N_("enable a key") }, - { "showphoto",cmdSHOWPHOTO , 0,0, N_("show photo ID") }, - { NULL, cmdNONE, 0, 0, NULL } }; + { N_("delkey") , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete a secondary key") }, + { N_("addrevoker"),cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") }, + { N_("delsig") , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") }, + { N_("expire") , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expire date") }, + { N_("primary") , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag user ID as primary")}, + { N_("toggle") , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") }, + { N_("t" ) , cmdTOGGLE , KEYEDIT_NEED_SK, NULL }, + { N_("pref") , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")}, + { N_("showpref"), cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") }, + { N_("setpref") , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") }, + { N_("updpref") , cmdUPDPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("updated preferences") }, + { N_("keyserver"),cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")}, + { N_("passwd") , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") }, + { N_("trust") , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") }, + { N_("revsig") , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") }, + { N_("revuid") , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") }, + { N_("revkey") , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") }, + { N_("disable") , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") }, + { N_("enable") , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") }, + { N_("showphoto"),cmdSHOWPHOTO , 0, N_("show photo ID") }, + { NULL, cmdNONE, 0, NULL } + }; enum cmdids cmd = 0; int rc = 0; KBNODE keyblock = NULL; @@ -1420,30 +1458,49 @@ arg_string = p; } - for(i=0; cmds[i].name; i++ ) { - if( !ascii_strcasecmp( answer, cmds[i].name ) ) - break; - } - if( cmds[i].need_sk && !sec_keyblock ) { + for(i=0; cmds[i].name; i++ ) + { + if(cmds[i].flags & KEYEDIT_TAIL_MATCH) + { + size_t l=strlen(cmds[i].name); + size_t a=strlen(answer); + if(a>=l) + { + if(ascii_strcasecmp(&answer[a-l],cmds[i].name)==0) + { + answer[a-l]='\0'; + break; + } + } + } + else if( !ascii_strcasecmp( answer, cmds[i].name ) ) + break; + } + if((cmds[i].flags & KEYEDIT_NEED_SK) && !sec_keyblock ) + { tty_printf(_("Need the secret key to do this.\n")); cmd = cmdNOP; - } - else if( (cmds[i].not_with_sk == 1 && sec_keyblock && toggle) - ||(cmds[i].not_with_sk == 2 && sec_keyblock && !toggle)) { + } + else if(((cmds[i].flags & KEYEDIT_NOT_SK) && sec_keyblock + && toggle) + ||((cmds[i].flags & KEYEDIT_ONLY_SK) && sec_keyblock + && !toggle)) + { tty_printf(_("Please use the command \"toggle\" first.\n")); cmd = cmdNOP; - } + } else - cmd = cmds[i].id; + cmd = cmds[i].id; } switch( cmd ) { case cmdHELP: - for(i=0; cmds[i].name; i++ ) { - if( cmds[i].need_sk && !sec_keyblock ) - ; /* skip if we do not have the secret key */ - else if( cmds[i].desc ) - tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) ); - } + for(i=0; cmds[i].name; i++ ) + { + if((cmds[i].flags & KEYEDIT_NEED_SK) && !sec_keyblock ) + ; /* skip if we do not have the secret key */ + else if( cmds[i].desc ) + tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) ); + } break; case cmdLIST: @@ -1472,43 +1529,49 @@ break; case cmdSIGN: /* sign (only the public key) */ - case cmdLSIGN: /* sign (only the public key) */ - case cmdNRSIGN: /* sign (only the public key) */ - case cmdNRLSIGN: /* sign (only the public key) */ - case cmdTSIGN: - if( pk->is_revoked ) - { - tty_printf(_("Key is revoked.")); + { + int localsig=0,nonrevokesig=0,trustsig=0; - if(opt.expert) - { - tty_printf(" "); - if(!cpr_get_answer_is_yes("keyedit.sign_revoked.okay", - _("Are you sure you still want " - "to sign it? (y/N) "))) + if( pk->is_revoked ) + { + tty_printf(_("Key is revoked.")); + + if(opt.expert) + { + tty_printf(" "); + if(!cpr_get_answer_is_yes("keyedit.sign_revoked.okay", + _("Are you sure you still want" + " to sign it? (y/N) "))) + break; + } + else + { + tty_printf(_(" Unable to sign.\n")); break; - } - else - { - tty_printf(_(" Unable to sign.\n")); - break; - } - } + } + } - if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock) ) - { - if( !cpr_get_answer_is_yes("keyedit.sign_all.okay", - _("Really sign all user IDs? (y/N) "))) - { - tty_printf(_("Hint: Select the user IDs to sign\n")); - break; - } - } + if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock) ) + { + if( !cpr_get_answer_is_yes("keyedit.sign_all.okay", + _("Really sign all user IDs?" + " (y/N) "))) + { + tty_printf(_("Hint: Select the user IDs to sign\n")); + break; + } + } + + /* What sort of signing are we doing? */ + if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig)) + { + tty_printf(_("Unknown signature type `%s'\n"),answer); + break; + } - sign_uids( keyblock, locusr, &modified, - (cmd == cmdLSIGN) || (cmd == cmdNRLSIGN), - (cmd == cmdNRSIGN) || (cmd==cmdNRLSIGN), - (cmd == cmdTSIGN)); + sign_uids(keyblock, locusr, &modified, + localsig, nonrevokesig, trustsig); + } break; case cmdDEBUG: @@ -2360,7 +2423,7 @@ ++i; if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A))) { - if(!only_marked) + if(!only_marked && primary) tty_printf("%s ",uid_trust_string_fixed(primary,uid)); if( only_marked ) Index: gnupg/g10/trustdb.c diff -u gnupg/g10/trustdb.c:1.134 gnupg/g10/trustdb.c:1.135 --- gnupg/g10/trustdb.c:1.134 Sat Dec 11 05:47:33 2004 +++ gnupg/g10/trustdb.c Tue Dec 14 15:42:41 2004 @@ -495,17 +495,18 @@ properly. The value "10" should be the length of the strings you choose to translate to. This is the length in printable columns. It gets passed to atoi() so everything after the number is - essentially a comment and need not be translated. */ + essentially a comment and need not be translated. Either key and + uid are both NULL, or neither are NULL. */ const char * uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid) { if(!key && !uid) return _("10 translator see trustdb.c:uid_trust_string_fixed"); - else if(uid->is_revoked) + else if(uid->is_revoked || key->is_revoked) return _("[ revoked]"); else if(uid->is_expired) return _("[ expired]"); - else if(key) + else switch(get_validity(key,uid)&TRUST_MASK) { case TRUST_UNKNOWN: return _("[ unknown]"); From cvs at cvs.gnupg.org Tue Dec 14 15:44:40 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 14 15:44:43 2004 Subject: GNUPG-1-9-BRANCH gnupg/jnlib (w32-pth.c) Message-ID: Date: Tuesday, December 14, 2004 @ 15:48:57 Author: wk Path: /cvs/gnupg/gnupg/jnlib Tag: GNUPG-1-9-BRANCH Modified: w32-pth.c More fixes. First successful use; leaks threads, though. -----------+ w32-pth.c | 134 ++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 52 deletions(-) Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.4 gnupg/jnlib/w32-pth.c:1.1.2.5 --- gnupg/jnlib/w32-pth.c:1.1.2.4 Tue Dec 14 12:25:04 2004 +++ gnupg/jnlib/w32-pth.c Tue Dec 14 15:48:57 2004 @@ -573,8 +573,8 @@ } -pth_t -pth_spawn (pth_attr_t hd, void *(*func)(void *), void *arg) +static pth_t +do_pth_spawn (pth_attr_t hd, void *(*func)(void *), void *arg) { SECURITY_ATTRIBUTES sa; DWORD tid; @@ -584,9 +584,6 @@ if (!hd) return NULL; - implicit_init (); - enter_pth (__FUNCTION__); - memset (&sa, 0, sizeof sa); sa.bInheritHandle = TRUE; sa.lpSecurityDescriptor = NULL; @@ -594,21 +591,32 @@ ctx = calloc (1, sizeof * ctx); if (!ctx) - { - leave_pth (__FUNCTION__); - return NULL; - } + return NULL; ctx->thread = func; ctx->arg = arg; /* XXX: we don't use all thread attributes. */ - fprintf (stderr, "pth_spawn creating thread ...\n"); + fprintf (stderr, "do_pth_spawn creating thread ...\n"); th = CreateThread (&sa, hd->stack_size, (LPTHREAD_START_ROUTINE)helper_thread, ctx, 0, &tid); - fprintf (stderr, "pth_spawn created thread %p\n", th); + fprintf (stderr, "do_pth_spawn created thread %p\n", th); + + return th; +} + +pth_t +pth_spawn (pth_attr_t hd, void *(*func)(void *), void *arg) +{ + HANDLE th; + + if (!hd) + return NULL; + implicit_init (); + enter_pth (__FUNCTION__); + th = do_pth_spawn (hd, func, arg); leave_pth (__FUNCTION__); return th; } @@ -895,33 +903,6 @@ return NULL; } - -static void * -wait_fd_thread (void * ctx) -{ - pth_event_t ev = ctx; - - wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); - fprintf (stderr, "wait_fd_thread: exit.\n"); - SetEvent (ev->hd); - ExitThread (0); - return NULL; -} - - -static void * -wait_timer_thread (void * ctx) -{ - pth_event_t ev = ctx; - int n = ev->u.tv.tv_sec*1000; - Sleep (n); - SetEvent (ev->hd); - fprintf (stderr, "wait_timer_thread: exit.\n"); - ExitThread (0); - return NULL; -} - - /* void */ /* sigemptyset (struct sigset_s * ss) */ /* { */ @@ -1079,16 +1060,6 @@ } -static void -free_threads (HANDLE *waitbuf, int *hdidx, int n) -{ - int i; - - for (i=0; i < n; i++) - CloseHandle (waitbuf[hdidx[i]]); -} - - static int pth_event_count (pth_event_t ev) { @@ -1103,6 +1074,65 @@ } + +static pth_t +spawn_helper_thread (pth_attr_t hd, void *(*func)(void *), void *arg) +{ + SECURITY_ATTRIBUTES sa; + DWORD tid; + HANDLE th; + + memset (&sa, 0, sizeof sa); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + sa.nLength = sizeof sa; + + fprintf (stderr, "spawn_helper_thread creating thread ...\n"); + th = CreateThread (&sa, hd->stack_size, + (LPTHREAD_START_ROUTINE)func, + arg, 0, &tid); + fprintf (stderr, "spawn_helper_thread created thread %p\n", th); + + return th; +} + + +static void +free_helper_threads (HANDLE *waitbuf, int *hdidx, int n) +{ + int i; + + for (i=0; i < n; i++) + CloseHandle (waitbuf[hdidx[i]]); +} + + +static void * +wait_fd_thread (void * ctx) +{ + pth_event_t ev = ctx; + + wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); + fprintf (stderr, "wait_fd_thread: exit.\n"); + SetEvent (ev->hd); + ExitThread (0); + return NULL; +} + + +static void * +wait_timer_thread (void * ctx) +{ + pth_event_t ev = ctx; + int n = ev->u.tv.tv_sec*1000; + Sleep (n); + SetEvent (ev->hd); + fprintf (stderr, "wait_timer_thread: exit.\n"); + ExitThread (0); + return NULL; +} + + static int do_pth_wait (pth_event_t ev) { @@ -1125,7 +1155,7 @@ { if (pos+1 > MAXIMUM_WAIT_OBJECTS/2) { - free_threads (waitbuf, hdidx, i); + free_helper_threads (waitbuf, hdidx, i); pth_attr_destroy (attr); return -1; } @@ -1143,13 +1173,13 @@ case PTH_EVENT_FD: fprintf (stderr, "pth_wait: spawn event wait thread.\n"); hdidx[i++] = pos; - waitbuf[pos++] = pth_spawn (attr, wait_fd_thread, tmp); + waitbuf[pos++] = spawn_helper_thread (attr, wait_fd_thread, tmp); break; case PTH_EVENT_TIME: fprintf (stderr, "pth_wait: spawn event timer thread.\n"); hdidx[i++] = pos; - waitbuf[pos++] = pth_spawn (attr, wait_timer_thread, tmp); + waitbuf[pos++] = spawn_helper_thread (attr, wait_timer_thread, tmp); break; case PTH_EVENT_MUTEX: @@ -1162,7 +1192,7 @@ } fprintf (stderr, "pth_wait: set %d\n", pos); n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); - free_threads (waitbuf, hdidx, i); + free_helper_threads (waitbuf, hdidx, i); pth_attr_destroy (attr); fprintf (stderr, "pth_wait: n %ld\n", n); From cvs at cvs.gnupg.org Tue Dec 14 15:45:05 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 14 15:45:08 2004 Subject: GNUPG-1-9-BRANCH gnupg/agent (gpg-agent.c) Message-ID: Date: Tuesday, December 14, 2004 @ 15:49:22 Author: wk Path: /cvs/gnupg/gnupg/agent Tag: GNUPG-1-9-BRANCH Modified: gpg-agent.c More fixes. First successful use; leaks threads, though. -------------+ gpg-agent.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.21 gnupg/agent/gpg-agent.c:1.31.2.22 --- gnupg/agent/gpg-agent.c:1.31.2.21 Mon Dec 13 16:49:56 2004 +++ gnupg/agent/gpg-agent.c Tue Dec 14 15:49:21 2004 @@ -446,6 +446,9 @@ gpg_strerror (err)); } #endif /*USE_GNU_PTH && !HAVE_W32_SYSTEM*/ +#ifdef HAVE_W32_SYSTEM + pth_init (); +#endif /* Check that the libraries are suitable. Do it here because the option parsing may need services of the library. */ @@ -728,7 +731,6 @@ ; /* NOTREACHED */ else { /* Regular server mode */ -#ifndef HAVE_W32_SYSTEM int fd; pid_t pid; int len; @@ -739,8 +741,10 @@ default to a specific display. There is still a default display when gpg-agent weas started using --display or a client requested this using an OPTION command. */ +#ifndef HAVE_W32_SYSTEM if (!opt.keep_display) unsetenv ("DISPLAY"); +#endif *socket_name = 0; snprintf (socket_name, DIM(socket_name)-1, @@ -750,12 +754,15 @@ if (!p) BUG (); *p = 0;; + +#ifndef HAVE_W32_SYSTEM if (!mkdtemp(socket_name)) { log_error ("can't create directory `%s': %s\n", socket_name, strerror(errno) ); exit (1); } +#endif *p = '/'; if (strchr (socket_name, ':') ) @@ -769,8 +776,11 @@ exit (1); } - +#ifdef HAVE_W32_SYSTEM + fd = _w32_sock_new (AF_UNIX, SOCK_STREAM, 0); +#else fd = socket (AF_UNIX, SOCK_STREAM, 0); +#endif if (fd == -1) { log_error ("can't create socket: %s\n", strerror(errno) ); @@ -783,7 +793,13 @@ len = (offsetof (struct sockaddr_un, sun_path) + strlen(serv_addr.sun_path) + 1); - if (bind (fd, (struct sockaddr*)&serv_addr, len) == -1) + if ( +#ifdef HAVE_W32_SYSTEM + _w32_sock_bind +#else + bind +#endif + (fd, (struct sockaddr*)&serv_addr, len) == -1) { log_error ("error binding socket to `%s': %s\n", serv_addr.sun_path, strerror (errno) ); @@ -803,6 +819,7 @@ fflush (NULL); +#ifndef HAVE_W32_SYSTEM pid = fork (); if (pid == (pid_t)-1) { @@ -857,7 +874,6 @@ } /*NEVER REACHED*/ } /* end parent */ - /* This is the child @@ -893,6 +909,8 @@ exit (1); } +#endif /*!HAVE_W32_SYSTEM*/ + #ifdef USE_GNU_PTH if (!disable_pth) @@ -931,7 +949,6 @@ start_command_handler (fd, -1); } close (fd); -#endif } return 0; From cvs at cvs.gnupg.org Tue Dec 14 15:45:59 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Tue Dec 14 15:46:03 2004 Subject: gnupg/g10 (ChangeLog keyedit.c) Message-ID: Date: Tuesday, December 14, 2004 @ 15:50:15 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyedit.c * keyedit.c (keyedit_menu): Re-remove the N_() markers. -----------+ ChangeLog | 2 + keyedit.c | 86 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 45 insertions(+), 43 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.657 gnupg/g10/ChangeLog:1.658 --- gnupg/g10/ChangeLog:1.657 Tue Dec 14 15:42:41 2004 +++ gnupg/g10/ChangeLog Tue Dec 14 15:50:15 2004 @@ -1,5 +1,7 @@ 2004-12-14 David Shaw + * keyedit.c (keyedit_menu): Re-remove the N_() markers. + * trustdb.c (uid_trust_string_fixed): Show uids as revoked if the key is revoked. Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.159 gnupg/g10/keyedit.c:1.160 --- gnupg/g10/keyedit.c:1.159 Tue Dec 14 15:42:41 2004 +++ gnupg/g10/keyedit.c Tue Dec 14 15:50:15 2004 @@ -1282,54 +1282,54 @@ const char *desc; } cmds[] = { - { N_("quit") , cmdQUIT , 0, N_("quit this menu") }, - { N_("q") , cmdQUIT , 0, NULL }, - { N_("save") , cmdSAVE , 0, N_("save and quit") }, - { N_("help") , cmdHELP , 0, N_("show this help") }, - { "?" , cmdHELP , 0, NULL }, - { N_("fpr") , cmdFPR , 0, N_("show fingerprint") }, - { N_("list") , cmdLIST , 0, N_("list key and user IDs") }, - { N_("l") , cmdLIST , 0, NULL }, - { N_("uid") , cmdSELUID , 0, N_("select user ID N") }, - { N_("key") , cmdSELKEY , 0, N_("select secondary key N") }, - { N_("check") , cmdCHECK , 0, N_("list signatures") }, - { N_("c") , cmdCHECK , 0, NULL }, - { N_("sign") , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") }, - { N_("s") , cmdSIGN , KEYEDIT_NOT_SK, NULL }, + { "quit" , cmdQUIT , 0, N_("quit this menu") }, + { "q" , cmdQUIT , 0, NULL }, + { "save" , cmdSAVE , 0, N_("save and quit") }, + { "help" , cmdHELP , 0, N_("show this help") }, + { "?" , cmdHELP , 0, NULL }, + { "fpr" , cmdFPR , 0, N_("show fingerprint") }, + { "list" , cmdLIST , 0, N_("list key and user IDs") }, + { "l" , cmdLIST , 0, NULL }, + { "uid" , cmdSELUID , 0, N_("select user ID N") }, + { "key" , cmdSELKEY , 0, N_("select secondary key N") }, + { "check" , cmdCHECK , 0, N_("list signatures") }, + { "c" , cmdCHECK , 0, NULL }, + { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") }, + { "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL }, /* "lsign" will never match since "sign" comes first and it is a tail match. It is here so it shows up in the help menu. */ - { N_("lsign") , cmdNOP , 0, N_("sign the key locally") }, - { N_("debug") , cmdDEBUG , 0, NULL }, - { N_("adduid") , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") }, - { N_("addphoto"), cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") }, - { N_("deluid") , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") }, + { "lsign" , cmdNOP , 0, N_("sign the key locally") }, + { "debug" , cmdDEBUG , 0, NULL }, + { "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") }, + { "addphoto", cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") }, + { "deluid" , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") }, /* delphoto is really deluid in disguise */ - { N_("delphoto"), cmdDELUID , KEYEDIT_NOT_SK, NULL }, - { N_("addkey") , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a secondary key") }, + { "delphoto", cmdDELUID , KEYEDIT_NOT_SK, NULL }, + { "addkey" , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a secondary key") }, #ifdef ENABLE_CARD_SUPPORT - { N_("addcardkey"), cmdADDCARDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a key to a smartcard") }, - { N_("keytocard"), cmdKEYTOCARD , KEYEDIT_NEED_SK|KEYEDIT_ONLY_SK, N_("move a key to a smartcard")}, + { "addcardkey", cmdADDCARDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a key to a smartcard") }, + { "keytocard", cmdKEYTOCARD , KEYEDIT_NEED_SK|KEYEDIT_ONLY_SK, N_("move a key to a smartcard")}, #endif /*ENABLE_CARD_SUPPORT*/ - { N_("delkey") , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete a secondary key") }, - { N_("addrevoker"),cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") }, - { N_("delsig") , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") }, - { N_("expire") , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expire date") }, - { N_("primary") , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag user ID as primary")}, - { N_("toggle") , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") }, - { N_("t" ) , cmdTOGGLE , KEYEDIT_NEED_SK, NULL }, - { N_("pref") , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")}, - { N_("showpref"), cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") }, - { N_("setpref") , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") }, - { N_("updpref") , cmdUPDPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("updated preferences") }, - { N_("keyserver"),cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")}, - { N_("passwd") , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") }, - { N_("trust") , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") }, - { N_("revsig") , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") }, - { N_("revuid") , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") }, - { N_("revkey") , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") }, - { N_("disable") , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") }, - { N_("enable") , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") }, - { N_("showphoto"),cmdSHOWPHOTO , 0, N_("show photo ID") }, + { "delkey" , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete a secondary key") }, + { "addrevoker",cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") }, + { "delsig" , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") }, + { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expire date") }, + { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag user ID as primary")}, + { "toggle" , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") }, + { "t" , cmdTOGGLE , KEYEDIT_NEED_SK, NULL }, + { "pref" , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")}, + { "showpref", cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") }, + { "setpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") }, + { "updpref" , cmdUPDPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("updated preferences") }, + { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")}, + { "passwd" , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") }, + { "trust" , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") }, + { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") }, + { "revuid" , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") }, + { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") }, + { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") }, + { "enable" , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") }, + { "showphoto",cmdSHOWPHOTO , 0, N_("show photo ID") }, { NULL, cmdNONE, 0, NULL } }; enum cmdids cmd = 0; From cvs at cvs.gnupg.org Tue Dec 14 18:42:55 2004 From: cvs at cvs.gnupg.org (cvs user twoaday) Date: Tue Dec 14 18:42:58 2004 Subject: GNUPG-1-9-BRANCH gnupg/jnlib (ChangeLog w32-pth.c) Message-ID: Date: Tuesday, December 14, 2004 @ 18:47:12 Author: twoaday Path: /cvs/gnupg/gnupg/jnlib Tag: GNUPG-1-9-BRANCH Modified: ChangeLog w32-pth.c 2004-12-14 Timo Schulz * w32-pth.c (pth_kill): Just release the crit section if pth_init was really called. And set all handles to NULL. (_pth_strerror): New. (do_pth_wait): Before we enter the loop we check if there are too much events in the ring. -----------+ ChangeLog | 8 +++ w32-pth.c | 127 +++++++++++++++++++++++++++++++++++------------------------- 2 files changed, 83 insertions(+), 52 deletions(-) Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.24 gnupg/jnlib/ChangeLog:1.3.2.25 --- gnupg/jnlib/ChangeLog:1.3.2.24 Tue Dec 14 12:25:04 2004 +++ gnupg/jnlib/ChangeLog Tue Dec 14 18:47:12 2004 @@ -1,3 +1,11 @@ +2004-12-14 Timo Schulz + + * w32-pth.c (pth_kill): Just release the crit section if + pth_init was really called. And set all handles to NULL. + (_pth_strerror): New. + (do_pth_wait): Before we enter the loop we check if there + are too much events in the ring. + 2004-12-14 Werner Koch * w32-pth.h (pth_event_occured): Removed macro. Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.5 gnupg/jnlib/w32-pth.c:1.1.2.6 --- gnupg/jnlib/w32-pth.c:1.1.2.5 Tue Dec 14 15:48:57 2004 +++ gnupg/jnlib/w32-pth.c Tue Dec 14 18:47:12 2004 @@ -127,14 +127,30 @@ { pth_signo = 0; if (pth_signo_ev) - CloseHandle (pth_signo_ev); - DeleteCriticalSection (&pth_shd); + { + CloseHandle (pth_signo_ev); + pth_signo_ev = NULL; + } + if (pth_initialized) + DeleteCriticalSection (&pth_shd); WSACleanup (); pth_initialized = 0; return 0; } +static const char * +_pth_strerror (void) +{ + static char strerr[256]; + + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, (int)GetLastError (), + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + strerr, sizeof (strerr)-1, NULL); + return strerr; +} + + static void enter_pth (const char *function) { @@ -211,7 +227,11 @@ DWORD nread = 0; n = ReadFile ((HANDLE)fd, buffer, size, &nread, NULL); if (!n) - n = -1; + { + fprintf (stderr, "pth_read(%d) failed read from: %s.\n", fd, + _pth_strerror ()); + n = -1; + } else n = (int)nread; } @@ -238,22 +258,18 @@ n = send (fd, buffer, size, 0); if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { - char strerr[256]; - - FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, (int)GetLastError (), - MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - strerr, sizeof (strerr)-1, NULL); - fprintf (stderr, "pth_write(%d) failed in send: %s\n", fd, strerr); - - DWORD nwrite; + + /* this is no real error because we first need to figure out if + we have a handle or a socket. */ + /*fprintf (stderr, "pth_write(%d) failed in send: %s\n", fd, + _pth_strerror ());*/ + n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); if (!n) { - FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL,(int)GetLastError (), - MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - strerr, sizeof (strerr)-1, NULL); - fprintf (stderr, "pth_write(%d) failed in write: %s\n", fd, strerr); + fprintf (stderr, "pth_write(%d) failed in write: %s\n", fd, + _pth_strerror ()); n = -1; } else @@ -344,17 +360,18 @@ (WSAGetLastError () == WSAEINPROGRESS || WSAGetLastError () == WSAEWOULDBLOCK)) { - if (ev == NULL) { - ev = do_pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE|PTH_MODE_STATIC, - &ev_key, fd); - if (ev == NULL) - { - leave_pth (__FUNCTION__); - return -1; - } - if (ev_extra != NULL) - pth_event_concat (ev, ev_extra, NULL); - } + if (ev == NULL) + { + ev = do_pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE| + PTH_MODE_STATIC, &ev_key, fd); + if (ev == NULL) + { + leave_pth (__FUNCTION__); + return -1; + } + if (ev_extra != NULL) + pth_event_concat (ev, ev_extra, NULL); + } /* Wait until accept has a chance. */ do_pth_wait (ev); if (ev_extra != NULL) @@ -450,14 +467,15 @@ if (ev_extra != NULL) pth_event_concat (ev, ev_extra, NULL); pth_wait (ev); - if (ev_extra != NULL) { - pth_event_isolate (ev); - if (do_pth_event_status(ev) == PTH_STATUS_PENDING) - { - leave_pth (__FUNCTION__); - return -1; - } - } + if (ev_extra != NULL) + { + pth_event_isolate (ev); + if (do_pth_event_status(ev) == PTH_STATUS_PENDING) + { + leave_pth (__FUNCTION__); + return -1; + } + } if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) break; } @@ -894,11 +912,14 @@ helper_thread (void * ctx) { struct _pth_priv_hd_s * c = ctx; - - leave_pth (__FUNCTION__); - c->thread (c->arg); - enter_pth (__FUNCTION__); - free (c); + + if (c) + { + leave_pth (__FUNCTION__); + c->thread (c->arg); + enter_pth (__FUNCTION__); + free (c); + } ExitThread (0); return NULL; } @@ -1019,7 +1040,8 @@ while (ev) { n = ev->next; - CloseHandle (ev->hd); ev->hd = NULL; + CloseHandle (ev->hd); + ev->hd = NULL; free (ev); ev = n; } @@ -1028,9 +1050,9 @@ { ev->prev->next = ev->next; ev->next->prev = ev->prev; - CloseHandle (ev->hd); ev->hd = NULL; + CloseHandle (ev->hd); + ev->hd = NULL; free (ev); - } return 0; @@ -1061,14 +1083,14 @@ static int -pth_event_count (pth_event_t ev) +_pth_event_count (pth_event_t ev) { pth_event_t p; int cnt=0; if (!ev) return 0; - for (p=ev; p; p = p->next) + for (p = ev; p; p = p->next) cnt++; return cnt; } @@ -1103,7 +1125,10 @@ int i; for (i=0; i < n; i++) - CloseHandle (waitbuf[hdidx[i]]); + { + CloseHandle (waitbuf[hdidx[i]]); + waitbuf[hdidx[i]] = NULL; + } } @@ -1146,19 +1171,17 @@ if (!ev) return 0; + n =_pth_event_count (ev); + if (n > MAXIMUM_WAIT_OBJECTS/2) + return -1; + attr = pth_attr_new (); pth_attr_set (attr, PTH_ATTR_JOINABLE, 1); pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 4096); - fprintf (stderr, "pth_wait: cnt %d\n", pth_event_count (ev)); + fprintf (stderr, "pth_wait: cnt %lu\n", n); for (tmp = ev; tmp; tmp = tmp->next) { - if (pos+1 > MAXIMUM_WAIT_OBJECTS/2) - { - free_helper_threads (waitbuf, hdidx, i); - pth_attr_destroy (attr); - return -1; - } switch (tmp->u_type) { case 0: From cvs at cvs.gnupg.org Tue Dec 14 20:16:19 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 14 20:16:22 2004 Subject: GNUPG-1-9-BRANCH gnupg (agent/gpg-agent.c jnlib/ChangeLog jnlib/w32-pth.c) Message-ID: Date: Tuesday, December 14, 2004 @ 20:20:36 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: agent/gpg-agent.c jnlib/ChangeLog jnlib/w32-pth.c Yep. No lost threads anymore. (_pth_strerror): Renamed to ... (w32_strerror): .. this. And let callers provide a buffer. (spawn_helper_thread): Removed HD arg and hardwire the stack size to 32k. (do_pth_wait): Removed use of ATTR; not needed for the helper threads. (helper_thread): Renamed to .. (launch_thread): .. this. Release handle if not joinable. (struct pth_priv_hd_s): Renamed to ... (struct thread_info_s): .. this. Add member JOINABLE and TH. -------------------+ agent/gpg-agent.c | 2 - jnlib/ChangeLog | 13 ++++++ jnlib/w32-pth.c | 97 +++++++++++++++++++++++++++++++--------------------- 3 files changed, 72 insertions(+), 40 deletions(-) Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.22 gnupg/agent/gpg-agent.c:1.31.2.23 --- gnupg/agent/gpg-agent.c:1.31.2.22 Tue Dec 14 15:49:21 2004 +++ gnupg/agent/gpg-agent.c Tue Dec 14 20:20:36 2004 @@ -1194,7 +1194,7 @@ /* FIXME: Move this housekeeping into a ticker function. Calling it for each connection should work but won't work anymore if our - cleints start to keep connections. */ + clients start to keep connections. */ agent_trustlist_housekeeping (); start_command_handler (-1, fd); Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.25 gnupg/jnlib/ChangeLog:1.3.2.26 --- gnupg/jnlib/ChangeLog:1.3.2.25 Tue Dec 14 18:47:12 2004 +++ gnupg/jnlib/ChangeLog Tue Dec 14 20:20:36 2004 @@ -1,3 +1,16 @@ +2004-12-14 Werner Koch + + * w32-pth.c (_pth_strerror): Renamed to ... + (w32_strerror): .. this. And let callers provide a buffer. + (spawn_helper_thread): Removed HD arg and hardwire the stack size + to 32k. + (do_pth_wait): Removed use of ATTR; not needed for the helper + threads. + (helper_thread): Renamed to .. + (launch_thread): .. this. Release handle if not joinable. + (struct pth_priv_hd_s): Renamed to ... + (struct thread_info_s): .. this. Add member JOINABLE and TH. + 2004-12-14 Timo Schulz * w32-pth.c (pth_kill): Just release the crit section if Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.6 gnupg/jnlib/w32-pth.c:1.1.2.7 --- gnupg/jnlib/w32-pth.c:1.1.2.6 Tue Dec 14 18:47:12 2004 +++ gnupg/jnlib/w32-pth.c Tue Dec 14 20:20:36 2004 @@ -49,9 +49,6 @@ static CRITICAL_SECTION pth_shd; -#define implicit_init() do { if (!pth_initialized) pth_init(); } while (0) - - struct pth_event_s { @@ -79,19 +76,27 @@ }; -struct _pth_priv_hd_s -{ - void *(*thread)(void *); - void * arg; +/* Object to keep information about a thread. This may eventually be + used to implement a scheduler queue. */ +struct thread_info_s +{ + void *(*thread)(void *); /* The actual thread fucntion. */ + void * arg; /* The argument passed to that fucntion. */ + int joinable; /* True if this Thread is joinable. */ + HANDLE th; /* Handle of this thread. Used by non-joinable + threads to close the handle. */ }; +/* Convenience macro to startup the system. */ +#define implicit_init() do { if (!pth_initialized) pth_init(); } while (0) + /* Prototypes. */ static pth_event_t do_pth_event (unsigned long spec, ...); static unsigned int do_pth_waitpid (unsigned pid, int * status, int options); static int do_pth_wait (pth_event_t ev); static int do_pth_event_status (pth_event_t ev); -static void * helper_thread (void * ctx); +static void *launch_thread (void * ctx); @@ -139,14 +144,13 @@ } -static const char * -_pth_strerror (void) +static char * +w32_strerror (char *strerr, size_t strerrsize) { - static char strerr[256]; - - FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, (int)GetLastError (), - MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - strerr, sizeof (strerr)-1, NULL); + if (strerrsize > 1) + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, (int)GetLastError (), + MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + strerr, strerrsize, NULL); return strerr; } @@ -228,8 +232,10 @@ n = ReadFile ((HANDLE)fd, buffer, size, &nread, NULL); if (!n) { - fprintf (stderr, "pth_read(%d) failed read from: %s.\n", fd, - _pth_strerror ()); + char strerr[256]; + + fprintf (stderr, "pth_read(%d) failed read from file: %s\n", fd, + w32_strerror (strerr, sizeof strerr)); n = -1; } else @@ -259,17 +265,16 @@ if (n == -1 && WSAGetLastError () == WSAENOTSOCK) { DWORD nwrite; + char strerr[256]; - /* this is no real error because we first need to figure out if - we have a handle or a socket. */ - /*fprintf (stderr, "pth_write(%d) failed in send: %s\n", fd, - _pth_strerror ());*/ + /* This is no real error because we first need to figure out if + we have a handle or a socket. */ n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); if (!n) { fprintf (stderr, "pth_write(%d) failed in write: %s\n", fd, - _pth_strerror ()); + w32_strerror (strerr, sizeof strerr)); n = -1; } else @@ -597,7 +602,7 @@ SECURITY_ATTRIBUTES sa; DWORD tid; HANDLE th; - struct _pth_priv_hd_s * ctx; + struct thread_info_s *ctx; if (!hd) return NULL; @@ -607,20 +612,32 @@ sa.lpSecurityDescriptor = NULL; sa.nLength = sizeof sa; - ctx = calloc (1, sizeof * ctx); + ctx = calloc (1, sizeof *ctx); if (!ctx) return NULL; ctx->thread = func; ctx->arg = arg; + ctx->joinable = (hd->flags & PTH_ATTR_JOINABLE); /* XXX: we don't use all thread attributes. */ + /* Note that we create the thread suspended so that we are able to + store the thread's handle in the context structure. We need to + do this to be able to close the handle from the launch helper. + + FIXME: We should no use th W32's Thread handle directly but keep + our own thread control structure. CTX may be used for that. */ fprintf (stderr, "do_pth_spawn creating thread ...\n"); th = CreateThread (&sa, hd->stack_size, - (LPTHREAD_START_ROUTINE)helper_thread, - ctx, 0, &tid); + (LPTHREAD_START_ROUTINE)launch_thread, + ctx, CREATE_SUSPENDED, &tid); + ctx->th = th; fprintf (stderr, "do_pth_spawn created thread %p\n", th); - + if (!th) + free (ctx); + else + ResumeThread (th); + return th; } @@ -909,14 +926,22 @@ static void * -helper_thread (void * ctx) +launch_thread (void *arg) { - struct _pth_priv_hd_s * c = ctx; + struct thread_info_s *c = arg; if (c) { leave_pth (__FUNCTION__); c->thread (c->arg); + if (!c->joinable && c->th) + { + CloseHandle (c->th); + c->th = NULL; + } + /* FIXME: We would badly fail if someone accesses the now + deallocated handle. Don't use it directly but setup proper + scheduling queues. */ enter_pth (__FUNCTION__); free (c); } @@ -1098,7 +1123,7 @@ static pth_t -spawn_helper_thread (pth_attr_t hd, void *(*func)(void *), void *arg) +spawn_helper_thread (void *(*func)(void *), void *arg) { SECURITY_ATTRIBUTES sa; DWORD tid; @@ -1110,7 +1135,7 @@ sa.nLength = sizeof sa; fprintf (stderr, "spawn_helper_thread creating thread ...\n"); - th = CreateThread (&sa, hd->stack_size, + th = CreateThread (&sa, 32*1024, (LPTHREAD_START_ROUTINE)func, arg, 0, &tid); fprintf (stderr, "spawn_helper_thread created thread %p\n", th); @@ -1164,7 +1189,6 @@ HANDLE waitbuf[MAXIMUM_WAIT_OBJECTS/2]; int hdidx[MAXIMUM_WAIT_OBJECTS/2]; DWORD n = 0; - pth_attr_t attr; pth_event_t tmp; int pos=0, i=0; @@ -1175,10 +1199,6 @@ if (n > MAXIMUM_WAIT_OBJECTS/2) return -1; - attr = pth_attr_new (); - pth_attr_set (attr, PTH_ATTR_JOINABLE, 1); - pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 4096); - fprintf (stderr, "pth_wait: cnt %lu\n", n); for (tmp = ev; tmp; tmp = tmp->next) { @@ -1196,13 +1216,13 @@ case PTH_EVENT_FD: fprintf (stderr, "pth_wait: spawn event wait thread.\n"); hdidx[i++] = pos; - waitbuf[pos++] = spawn_helper_thread (attr, wait_fd_thread, tmp); + waitbuf[pos++] = spawn_helper_thread (wait_fd_thread, tmp); break; case PTH_EVENT_TIME: fprintf (stderr, "pth_wait: spawn event timer thread.\n"); hdidx[i++] = pos; - waitbuf[pos++] = spawn_helper_thread (attr, wait_timer_thread, tmp); + waitbuf[pos++] = spawn_helper_thread (wait_timer_thread, tmp); break; case PTH_EVENT_MUTEX: @@ -1216,7 +1236,6 @@ fprintf (stderr, "pth_wait: set %d\n", pos); n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); free_helper_threads (waitbuf, hdidx, i); - pth_attr_destroy (attr); fprintf (stderr, "pth_wait: n %ld\n", n); if (n != WAIT_TIMEOUT) From cvs at cvs.gnupg.org Wed Dec 15 06:12:34 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 15 06:12:40 2004 Subject: gnupg/g10 (ChangeLog apdu.c g10.c keylist.c trustdb.c) Message-ID: Date: Wednesday, December 15, 2004 @ 06:16:53 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog apdu.c g10.c keylist.c trustdb.c * apdu.c (apdu_send_le, apdu_send_direct), keylist.c (status_one_subpacket, print_one_subpacket): Fix some compiler warnings. * g10.c (main): Fix --compression-algo to take a string argument like --compress-algo. * trustdb.c (uid_trust_string_fixed): For safety, check for a pk. -----------+ ChangeLog | 11 +++++++++++ apdu.c | 14 +++++++++----- g10.c | 2 +- keylist.c | 4 ++-- trustdb.c | 4 ++-- 5 files changed, 25 insertions(+), 10 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.658 gnupg/g10/ChangeLog:1.659 --- gnupg/g10/ChangeLog:1.658 Tue Dec 14 15:50:15 2004 +++ gnupg/g10/ChangeLog Wed Dec 15 06:16:53 2004 @@ -1,3 +1,14 @@ +2004-12-15 David Shaw + + * apdu.c (apdu_send_le, apdu_send_direct), keylist.c + (status_one_subpacket, print_one_subpacket): Fix some compiler + warnings. + + * g10.c (main): Fix --compression-algo to take a string argument + like --compress-algo. + + * trustdb.c (uid_trust_string_fixed): For safety, check for a pk. + 2004-12-14 David Shaw * keyedit.c (keyedit_menu): Re-remove the N_() markers. Index: gnupg/g10/apdu.c diff -u gnupg/g10/apdu.c:1.17 gnupg/g10/apdu.c:1.18 --- gnupg/g10/apdu.c:1.17 Thu Oct 28 11:06:50 2004 +++ gnupg/g10/apdu.c Wed Dec 15 06:16:53 2004 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: apdu.c,v 1.17 2004/10/28 09:06:50 wk Exp $ + * $Id: apdu.c,v 1.18 2004/12/15 05:16:53 dshaw Exp $ */ #include @@ -2717,7 +2717,8 @@ resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" response: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" response: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } @@ -2783,7 +2784,8 @@ resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" more: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" more: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } @@ -2916,7 +2918,8 @@ resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" response: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" response: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if ( !retbuf && (sw == SW_SUCCESS || (sw & 0xff00) == SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } @@ -2968,7 +2971,8 @@ resultlen -= 2; if (DBG_CARD_IO) { - log_debug (" more: sw=%04X datalen=%d\n", sw, resultlen); + log_debug (" more: sw=%04X datalen=%u\n", + sw, (unsigned int)resultlen); if (!retbuf && (sw==SW_SUCCESS || (sw&0xff00)==SW_MORE_DATA)) log_printhex (" dump: ", result, resultlen); } Index: gnupg/g10/g10.c diff -u gnupg/g10/g10.c:1.292 gnupg/g10/g10.c:1.293 --- gnupg/g10/g10.c:1.292 Sat Dec 11 05:47:33 2004 +++ gnupg/g10/g10.c Wed Dec 15 06:16:53 2004 @@ -517,6 +517,7 @@ { oDigestAlgo, "digest-algo", 2, "@"}, { oCertDigestAlgo, "cert-digest-algo", 2 , "@" }, { oCompressAlgo,"compress-algo", 2, "@"}, + { oCompressAlgo, "compression-algo", 2, "@"}, /* Alias */ { oThrowKeyids, "throw-keyid", 0, "@"}, { oThrowKeyids, "throw-keyids", 0, "@"}, { oNoThrowKeyids, "no-throw-keyid", 0, "@" }, @@ -542,7 +543,6 @@ /* hidden options */ { aListOwnerTrust, "list-ownertrust", 256, "@"}, /* deprecated */ - { oCompressAlgo, "compression-algo", 1, "@"}, /* alias */ { aPrintMDs, "print-mds" , 256, "@"}, /* old */ { aListTrustDB, "list-trustdb",0 , "@"}, /* Not yet used */ Index: gnupg/g10/keylist.c diff -u gnupg/g10/keylist.c:1.90 gnupg/g10/keylist.c:1.91 --- gnupg/g10/keylist.c:1.90 Wed Nov 24 06:25:03 2004 +++ gnupg/g10/keylist.c Wed Dec 15 06:16:53 2004 @@ -168,7 +168,7 @@ if(len>256) return; - sprintf(status,"%d %u %u ",type,flags,len); + sprintf(status,"%d %u %u ",type,flags,(unsigned int)len); write_status_text_and_buffer(STATUS_SIG_SUBPACKET,status,buf,len,0); } @@ -580,7 +580,7 @@ { size_t i; - printf("spk:%d:%u:%u:",type,flags,len); + printf("spk:%d:%u:%u:",type,flags,(unsigned int)len); for(i=0;iis_revoked || key->is_revoked) + else if(uid->is_revoked || (key && key->is_revoked)) return _("[ revoked]"); else if(uid->is_expired) return _("[ expired]"); - else + else if(key) switch(get_validity(key,uid)&TRUST_MASK) { case TRUST_UNKNOWN: return _("[ unknown]"); From cvs at cvs.gnupg.org Wed Dec 15 15:11:32 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 15 15:11:36 2004 Subject: GNUPG-1-9-BRANCH gnupg/sm (ChangeLog) Message-ID: Date: Wednesday, December 15, 2004 @ 15:15:55 Author: wk Path: /cvs/gnupg/gnupg/sm Tag: GNUPG-1-9-BRANCH Modified: ChangeLog A whole bunch of changes to allow building for W32. -----------+ ChangeLog | 10 ++++++++++ 1 files changed, 10 insertions(+) Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.79 gnupg/sm/ChangeLog:1.101.2.80 --- gnupg/sm/ChangeLog:1.101.2.79 Tue Dec 7 12:21:40 2004 +++ gnupg/sm/ChangeLog Wed Dec 15 15:15:54 2004 @@ -1,3 +1,13 @@ +2004-12-15 Werner Koch + + * misc.c (setup_pinentry_env) [W32]: Don't use it. + + * gpgsm.c (main) [W32]: Init Pth because we need it for the socket + operations and to resolve libassuan symbols. + (run_protect_tool) [W32]: Disable it. + + * Makefile.am (gpgsm_LDADD): Move LIBASSUAN_LIBS more to the end. + 2004-12-07 Werner Koch * Makefile.am (gpgsm_LDADD): Put libassuan before jnlib because From cvs at cvs.gnupg.org Wed Dec 15 15:34:14 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 15 15:34:16 2004 Subject: GNUPG-1-9-BRANCH gnupg/sm (ChangeLog call-dirmngr.c) Message-ID: Date: Wednesday, December 15, 2004 @ 15:38:37 Author: wk Path: /cvs/gnupg/gnupg/sm Tag: GNUPG-1-9-BRANCH Modified: ChangeLog call-dirmngr.c (lookup_status_cb): Send progress messages upstream. (isvalid_status_cb): Ditto. (gpgsm_dirmngr_isvalid): Put CTRL into status CB parameters. (gpgsm_dirmngr_run_command, run_command_status_cb): Pass CTRL to status callback and handle PROGRESS. ----------------+ ChangeLog | 7 +++++++ call-dirmngr.c | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 3 deletions(-) Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.80 gnupg/sm/ChangeLog:1.101.2.81 --- gnupg/sm/ChangeLog:1.101.2.80 Wed Dec 15 15:15:54 2004 +++ gnupg/sm/ChangeLog Wed Dec 15 15:38:37 2004 @@ -1,5 +1,12 @@ 2004-12-15 Werner Koch + * call-dirmngr.c (lookup_status_cb): Send progress messages + upstream. + (isvalid_status_cb): Ditto. + (gpgsm_dirmngr_isvalid): Put CTRL into status CB parameters. + (gpgsm_dirmngr_run_command, run_command_status_cb): Pass CTRL to + status callback and handle PROGRESS. + * misc.c (setup_pinentry_env) [W32]: Don't use it. * gpgsm.c (main) [W32]: Init Pth because we need it for the socket Index: gnupg/sm/call-dirmngr.c diff -u gnupg/sm/call-dirmngr.c:1.16.2.9 gnupg/sm/call-dirmngr.c:1.16.2.10 --- gnupg/sm/call-dirmngr.c:1.16.2.9 Tue Nov 23 18:09:51 2004 +++ gnupg/sm/call-dirmngr.c Wed Dec 15 15:38:37 2004 @@ -57,6 +57,7 @@ }; struct isvalid_status_parm_s { + CTRL ctrl; int seen; unsigned char fpr[20]; }; @@ -348,7 +349,16 @@ { struct isvalid_status_parm_s *parm = opaque; - if (!strncmp (line, "ONLY_VALID_IF_CERT_VALID", 24) + if (!strncmp (line, "PROGRESS", 8) && (line[8]==' ' || !line[8])) + { + if (parm->ctrl) + { + for (line += 8; *line == ' '; line++) + ; + gpgsm_status (parm->ctrl, STATUS_PROGRESS, line); + } + } + else if (!strncmp (line, "ONLY_VALID_IF_CERT_VALID", 24) && (line[24]==' ' || !line[24])) { parm->seen++; @@ -413,6 +423,7 @@ parm.cert = cert; parm.issuer_cert = issuer_cert; + stparm.ctrl = ctrl; stparm.seen = 0; memset (stparm.fpr, 0, 20); @@ -608,7 +619,16 @@ { struct lookup_parm_s *parm = opaque; - if (!strncmp (line, "TRUNCATED", 9) && (line[9]==' ' || !line[9])) + if (!strncmp (line, "PROGRESS", 8) && (line[8]==' ' || !line[8])) + { + if (parm->ctrl) + { + for (line += 8; *line == ' '; line++) + ; + gpgsm_status (parm->ctrl, STATUS_PROGRESS, line); + } + } + else if (!strncmp (line, "TRUNCATED", 9) && (line[9]==' ' || !line[9])) { if (parm->ctrl) { @@ -728,10 +748,21 @@ static AssuanError run_command_status_cb (void *opaque, const char *line) { + ctrl_t ctrl = opaque; + if (opt.verbose) { log_info ("dirmngr status: %s\n", line); } + if (!strncmp (line, "PROGRESS", 8) && (line[8]==' ' || !line[8])) + { + if (ctrl) + { + for (line += 8; *line == ' '; line++) + ; + gpgsm_status (ctrl, STATUS_PROGRESS, line); + } + } return 0; } @@ -790,7 +821,7 @@ rc = assuan_transact (dirmngr_ctx, line, run_command_cb, NULL, run_command_inq_cb, &parm, - run_command_status_cb, NULL); + run_command_status_cb, ctrl); xfree (line); log_info ("response of dirmngr: %s\n", rc? assuan_strerror (rc): "okay"); return map_assuan_err (rc); From cvs at cvs.gnupg.org Tue Dec 7 22:03:52 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Thu Dec 16 14:52:24 2004 Subject: gpgme-1-0-branch gpgme (121 files) Message-ID: Date: Tuesday, December 7, 2004 @ 22:11:53 Author: marcus Path: /cvs/gpgme/gpgme Tag: gpgme-1-0-branch Added: COPYING.LESSER doc/lesser.texi Modified: ChangeLog Makefile.am README README.CVS TODO acinclude.m4 assuan/ChangeLog assuan/README.1st configure.ac doc/ChangeLog doc/Makefile.am doc/gpgme.texi gpgme.spec.in gpgme/ChangeLog gpgme/Makefile.am gpgme/ath-compat.c gpgme/ath-pth-compat.c gpgme/ath-pth.c gpgme/ath-pthread-compat.c gpgme/ath-pthread.c gpgme/ath.c gpgme/ath.h gpgme/context.h gpgme/conversion.c gpgme/data-compat.c gpgme/data-fd.c gpgme/data-mem.c gpgme/data-stream.c gpgme/data-user.c gpgme/data.c gpgme/data.h gpgme/debug.c gpgme/debug.h gpgme/decrypt-verify.c gpgme/decrypt.c gpgme/delete.c gpgme/edit.c gpgme/encrypt-sign.c gpgme/encrypt.c gpgme/engine-backend.h gpgme/engine-gpgsm.c gpgme/engine.c gpgme/engine.h gpgme/error.c gpgme/export.c gpgme/funopen.c gpgme/genkey.c gpgme/get-env.c gpgme/gpgme.c gpgme/gpgme.h gpgme/import.c gpgme/io.h gpgme/isascii.c gpgme/key.c gpgme/keylist.c gpgme/memrchr.c gpgme/mkstatus gpgme/op-support.c gpgme/ops.h gpgme/passphrase.c gpgme/posix-io.c gpgme/posix-sema.c gpgme/posix-util.c gpgme/progress.c gpgme/putc_unlocked.c gpgme/rungpg.c gpgme/sema.h gpgme/sign.c gpgme/signers.c gpgme/stpcpy.c gpgme/trust-item.c gpgme/trustlist.c gpgme/util.h gpgme/verify.c gpgme/version.c gpgme/w32-io.c gpgme/w32-sema.c gpgme/w32-util.c gpgme/wait-global.c gpgme/wait-private.c gpgme/wait-user.c gpgme/wait.c gpgme/wait.h tests/ChangeLog tests/Makefile.am tests/gpg/Makefile.am tests/gpg/mkdemodirs tests/gpg/t-decrypt-verify.c tests/gpg/t-decrypt.c tests/gpg/t-edit.c tests/gpg/t-encrypt-sign.c tests/gpg/t-encrypt-sym.c tests/gpg/t-encrypt.c tests/gpg/t-eventloop.c tests/gpg/t-export.c tests/gpg/t-genkey.c tests/gpg/t-import.c tests/gpg/t-keylist-sig.c tests/gpg/t-keylist.c tests/gpg/t-sign.c tests/gpg/t-signers.c tests/gpg/t-support.h tests/gpg/t-thread1.c tests/gpg/t-trustlist.c tests/gpg/t-verify.c tests/gpgsm/Makefile.am tests/gpgsm/t-decrypt.c tests/gpgsm/t-encrypt.c tests/gpgsm/t-export.c tests/gpgsm/t-genkey.c tests/gpgsm/t-import.c tests/gpgsm/t-keylist.c tests/gpgsm/t-sign.c tests/gpgsm/t-support.h tests/gpgsm/t-verify.c tests/t-data.c tests/t-engine-info.c tests/t-version.c Removed: doc/gpl.texi 2004-12-07 Marcus Brinkmann * README: Refer to COPYING.LESSER and "each file" instead of COPYING. * COPYING.LESSER: New file. * gpgme.spec.in (%doc): Add COPYING.LESSER. * acinclude.m4, configure.ac, Makefile.am: Change license to LGPL 2.1 or later. * TODO: Add copyright notice. * README.CVS: Likewise. assuan/ 2004-12-07 Marcus Brinkmann * README.1st: Add copyright notice. doc/ 2004-12-07 Marcus Brinkmann * Makefile.am: Change license to LGPL. (gpgme_TEXINFOS): Replace gpl.texi with lesser.texi. * gpgme.texi: Change license to LGPL (also for documentation of GPGME's license). * lesser.texi: New file. * gpl.texi: File removed. gpgme/ 2004-12-07 Marcus Brinkmann * putc_unlocked.c, funopen.c: I just claim copyright on these files and change their license to LGPL, because they are totally trivial wrapper functions. * isascii.c: Change copyright notice to the one from ctype/ctype.h in the GNU C Library (CVS Head 2004-10-10), where isascii is defined as a macro doing exactly the same as the function in this file. * memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06). * stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10). * ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c, ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c, data.c, data-compat.c, data-fd.c, data.h, data-mem.c, data-stream.c, data-user.c, debug.c, debug.h, decrypt.c, decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c, engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c, export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h, key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c, passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c, rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c, util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c, wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change license to LGPL. tests/ 2004-12-07 Marcus Brinkmann * gpg/mkdemodirs: Add copyright notice. * gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c, gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c, gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c, gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c, gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c, gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c, gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c, gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c, gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c, gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c, t-version.c: Change license to LGPL. ------------------------------+ COPYING.LESSER | 510 +++++++++++++++++++++++++++++++++++++ ChangeLog | 9 Makefile.am | 23 - README | 3 README.CVS | 8 TODO | 12 acinclude.m4 | 20 - assuan/ChangeLog | 6 assuan/README.1st | 11 configure.ac | 24 - doc/ChangeLog | 8 doc/Makefile.am | 24 - doc/gpgme.texi | 35 +- doc/gpl.texi | 397 ---------------------------- doc/lesser.texi | 565 +++++++++++++++++++++++++++++++++++++++++ gpgme.spec.in | 2 gpgme/ChangeLog | 25 + gpgme/Makefile.am | 22 - gpgme/ath-compat.c | 36 +- gpgme/ath-pth-compat.c | 36 +- gpgme/ath-pth.c | 21 - gpgme/ath-pthread-compat.c | 36 +- gpgme/ath-pthread.c | 22 - gpgme/ath.c | 21 - gpgme/ath.h | 21 - gpgme/context.h | 21 - gpgme/conversion.c | 21 - gpgme/data-compat.c | 19 - gpgme/data-fd.c | 21 - gpgme/data-mem.c | 21 - gpgme/data-stream.c | 19 - gpgme/data-user.c | 21 - gpgme/data.c | 21 - gpgme/data.h | 21 - gpgme/debug.c | 21 - gpgme/debug.h | 36 +- gpgme/decrypt-verify.c | 21 - gpgme/decrypt.c | 19 - gpgme/delete.c | 21 - gpgme/edit.c | 21 - gpgme/encrypt-sign.c | 21 - gpgme/encrypt.c | 21 - gpgme/engine-backend.h | 23 - gpgme/engine-gpgsm.c | 19 - gpgme/engine.c | 21 - gpgme/engine.h | 23 - gpgme/error.c | 21 - gpgme/export.c | 21 - gpgme/funopen.c | 43 +-- gpgme/genkey.c | 21 - gpgme/get-env.c | 21 - gpgme/gpgme.c | 21 - gpgme/gpgme.h | 19 - gpgme/import.c | 21 - gpgme/io.h | 21 - gpgme/isascii.c | 37 +- gpgme/key.c | 21 - gpgme/keylist.c | 21 - gpgme/memrchr.c | 229 ++++++++++++++-- gpgme/mkstatus | 24 - gpgme/op-support.c | 21 - gpgme/ops.h | 21 - gpgme/passphrase.c | 21 - gpgme/posix-io.c | 21 - gpgme/posix-sema.c | 21 - gpgme/posix-util.c | 21 - gpgme/progress.c | 21 - gpgme/putc_unlocked.c | 36 +- gpgme/rungpg.c | 21 - gpgme/sema.h | 21 - gpgme/sign.c | 21 - gpgme/signers.c | 21 - gpgme/stpcpy.c | 39 +- gpgme/trust-item.c | 21 - gpgme/trustlist.c | 21 - gpgme/util.h | 21 - gpgme/verify.c | 19 - gpgme/version.c | 21 - gpgme/w32-io.c | 21 - gpgme/w32-sema.c | 21 - gpgme/w32-util.c | 21 - gpgme/wait-global.c | 21 - gpgme/wait-private.c | 21 - gpgme/wait-user.c | 23 - gpgme/wait.c | 21 - gpgme/wait.h | 21 - tests/ChangeLog | 26 + tests/Makefile.am | 23 - tests/gpg/Makefile.am | 22 - tests/gpg/mkdemodirs | 23 + tests/gpg/t-decrypt-verify.c | 21 - tests/gpg/t-decrypt.c | 21 - tests/gpg/t-edit.c | 21 - tests/gpg/t-encrypt-sign.c | 23 - tests/gpg/t-encrypt-sym.c | 21 - tests/gpg/t-encrypt.c | 21 - tests/gpg/t-eventloop.c | 23 - tests/gpg/t-export.c | 21 - tests/gpg/t-genkey.c | 23 - tests/gpg/t-import.c | 23 - tests/gpg/t-keylist-sig.c | 21 - tests/gpg/t-keylist.c | 21 - tests/gpg/t-sign.c | 21 - tests/gpg/t-signers.c | 21 - tests/gpg/t-support.h | 21 - tests/gpg/t-thread1.c | 21 - tests/gpg/t-trustlist.c | 21 - tests/gpg/t-verify.c | 21 - tests/gpgsm/Makefile.am | 20 - tests/gpgsm/t-decrypt.c | 22 - tests/gpgsm/t-encrypt.c | 21 - tests/gpgsm/t-export.c | 21 - tests/gpgsm/t-genkey.c | 23 - tests/gpgsm/t-import.c | 21 - tests/gpgsm/t-keylist.c | 21 - tests/gpgsm/t-sign.c | 21 - tests/gpgsm/t-support.h | 21 - tests/gpgsm/t-verify.c | 21 - tests/t-data.c | 36 +- tests/t-engine-info.c | 21 - tests/t-version.c | 38 +- 121 files changed, 2646 insertions(+), 1610 deletions(-) Index: gpgme/COPYING.LESSER diff -u /dev/null gpgme/COPYING.LESSER:1.1.2.1 --- /dev/null Tue Dec 7 22:11:54 2004 +++ gpgme/COPYING.LESSER Tue Dec 7 22:11:52 2004 @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. +^L + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. +^L + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. +^L + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. +^L + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. +^L + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. +^L + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. +^L + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS +^L + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library 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 library 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 library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.108 gpgme/ChangeLog:1.108.2.1 --- gpgme/ChangeLog:1.108 Tue Dec 7 16:30:36 2004 +++ gpgme/ChangeLog Tue Dec 7 22:11:52 2004 @@ -1,5 +1,14 @@ 2004-12-07 Marcus Brinkmann + * README: Refer to COPYING.LESSER and "each file" instead of + COPYING. + * COPYING.LESSER: New file. + * gpgme.spec.in (%doc): Add COPYING.LESSER. + * acinclude.m4, configure.ac, Makefile.am: Change license to LGPL + 2.1 or later. + * TODO: Add copyright notice. + * README.CVS: Likewise. + * configure.ac (GPGSM_VERSION): Fix filter to get it. 2004-10-22 Marcus Brinkmann Index: gpgme/Makefile.am diff -u gpgme/Makefile.am:1.17 gpgme/Makefile.am:1.17.2.1 --- gpgme/Makefile.am:1.17 Thu Sep 30 03:30:10 2004 +++ gpgme/Makefile.am Tue Dec 7 22:11:52 2004 @@ -1,20 +1,21 @@ +# Makefile.am - Top level Makefile for GPGME. # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002 g10 Code GmbH +# Copyright (C) 2001, 2002, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/README diff -u gpgme/README:1.29 gpgme/README:1.29.2.1 --- gpgme/README:1.29 Thu Sep 30 04:37:13 2004 +++ gpgme/README Tue Dec 7 22:11:52 2004 @@ -28,7 +28,8 @@ GPGME runs best on GNU/Linux or *BSD systems. Other Unices may require small portability fixes, send us your patches. -See the file COPYING for copyright and warranty information. +See the file COPYING.LESSER and each file for copyright and warranty +information. Installation Index: gpgme/README.CVS diff -u gpgme/README.CVS:1.1 gpgme/README.CVS:1.1.2.1 --- gpgme/README.CVS:1.1 Mon Jan 12 14:41:20 2004 +++ gpgme/README.CVS Tue Dec 7 22:11:52 2004 @@ -47,5 +47,13 @@ to copy the files and not merely use symlinks. +Copyright 2004 g10 Code GmbH +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. +This file is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. Index: gpgme/TODO diff -u gpgme/TODO:1.95 gpgme/TODO:1.95.2.1 --- gpgme/TODO:1.95 Thu Nov 4 14:58:06 2004 +++ gpgme/TODO Tue Dec 7 22:11:52 2004 @@ -151,3 +151,15 @@ * Error checking ** engine-gpgsm, with-validation Add error checking some time after releasing a new gpgsm. + + +Copyright 2004 g10 Code GmbH + +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. + +This file is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. Index: gpgme/acinclude.m4 diff -u gpgme/acinclude.m4:1.12 gpgme/acinclude.m4:1.12.2.1 --- gpgme/acinclude.m4:1.12 Tue Sep 14 20:30:23 2004 +++ gpgme/acinclude.m4 Tue Dec 7 22:11:52 2004 @@ -3,18 +3,18 @@ dnl dnl This file is part of GPGME. dnl -dnl GPGME is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. +dnl GPGME is free software; you can redistribute it and/or modify it +dnl under the terms of the GNU Lesser General Public License as +dnl published by the Free Software Foundation; either version 2.1 of the +dnl License, or (at your option) any later version. dnl -dnl GPGME is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. +dnl GPGME is distributed in the hope that it will be useful, but WITHOUT +dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +dnl or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +dnl Public License for more details. dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl GNUPG_FIX_HDR_VERSION(FILE, NAME) Index: gpgme/assuan/ChangeLog diff -u gpgme/assuan/ChangeLog:1.22 gpgme/assuan/ChangeLog:1.22.2.1 --- gpgme/assuan/ChangeLog:1.22 Wed Jun 23 16:11:46 2004 +++ gpgme/assuan/ChangeLog Tue Dec 7 22:11:52 2004 @@ -1,3 +1,7 @@ +2004-12-07 Marcus Brinkmann + + * README.1st: Add copyright notice. + 2004-06-23 Marcus Brinkmann * assuan-domain-connect.c [HAVE_SYS_UIO_H]: Include . @@ -499,7 +503,7 @@ * assuan-defs.h: Add space in the context for this. - Copyright 2001, 2002 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without Index: gpgme/assuan/README.1st diff -u gpgme/assuan/README.1st:1.4 gpgme/assuan/README.1st:1.4.2.1 --- gpgme/assuan/README.1st:1.4 Mon Oct 6 18:17:12 2003 +++ gpgme/assuan/README.1st Tue Dec 7 22:11:52 2004 @@ -23,3 +23,14 @@ * assuan-pipe-connect.c ** Do not install SIGPIPE signal handler here. + + + Copyright 2004 g10 Code GmbH + + This file is free software; as a special exception the author gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.93 gpgme/configure.ac:1.93.2.1 --- gpgme/configure.ac:1.93 Tue Dec 7 16:30:36 2004 +++ gpgme/configure.ac Tue Dec 7 22:11:52 2004 @@ -1,21 +1,21 @@ -# configure.in for GPGME +# configure.ac for GPGME # Copyright (C) 2000 Werner Koch (dd9jn) # Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # (Process this file with autoconf to produce a configure script.) @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.93 $) +AC_REVISION($Revision: 1.93.2.1 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION Index: gpgme/doc/ChangeLog diff -u gpgme/doc/ChangeLog:1.131.2.1 gpgme/doc/ChangeLog:1.131.2.2 --- gpgme/doc/ChangeLog:1.131.2.1 Tue Dec 7 20:07:30 2004 +++ gpgme/doc/ChangeLog Tue Dec 7 22:11:52 2004 @@ -1,5 +1,13 @@ 2004-12-07 Marcus Brinkmann + * Makefile.am: Change license to LGPL. + (gpgme_TEXINFOS): Replace gpl.texi with lesser.texi. + + * gpgme.texi: Change license to LGPL (also for documentation of + GPGME's license). + * lesser.texi: New file. + * gpl.texi: File removed. + * gpgme.texi (Creating Contexts): Fix cut&paste error. Reported by Noel Torres . Index: gpgme/doc/Makefile.am diff -u gpgme/doc/Makefile.am:1.5 gpgme/doc/Makefile.am:1.5.2.1 --- gpgme/doc/Makefile.am:1.5 Thu Sep 30 04:11:18 2004 +++ gpgme/doc/Makefile.am Tue Dec 7 22:11:52 2004 @@ -1,20 +1,20 @@ # doc - Automake template -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in @@ -22,4 +22,4 @@ DISTCLEANFILES = gpgme.tmp info_TEXINFOS = gpgme.texi -gpgme_TEXINFOS = gpl.texi +gpgme_TEXINFOS = lesser.texi Index: gpgme/doc/gpgme.texi diff -u gpgme/doc/gpgme.texi:1.133.2.1 gpgme/doc/gpgme.texi:1.133.2.2 --- gpgme/doc/gpgme.texi:1.133.2.1 Tue Dec 7 20:07:30 2004 +++ gpgme/doc/gpgme.texi Tue Dec 7 22:11:52 2004 @@ -24,18 +24,18 @@ Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH. The GPGME reference manual is free software; you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. +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. The GPGME reference manual 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 -General Public License for more details. +Lesser General Public License for more details. -You should have received a copy of the GNU General Public License -along with this manual; if not, write to the Free Software Foundation, -Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +You should have received a copy of the GNU Lesser General Public +License along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA @end ifinfo @@ -56,19 +56,20 @@ @vskip 0pt plus 1filll Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH. + The GPGME reference manual is free software; you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. +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. The GPGME reference manual 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 -General Public License for more details. +Lesser General Public License for more details. -You should have received a copy of the GNU General Public License -along with this manual; if not, write to the Free Software Foundation, -Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +You should have received a copy of the GNU Lesser General Public +License along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA @end titlepage @page @@ -91,8 +92,8 @@ Appendices -* Copying:: The GNU General Public License says how you - can copy and share `GnuPG Made Easy'. +* Library Copying:: The GNU Lesser General Public License says + how you can copy and share `GnuPG Made Easy'. Indices @@ -5050,7 +5051,7 @@ @end deftypefun -@include gpl.texi +@include lesser.texi @node Concept Index Index: gpgme/doc/gpl.texi diff -u gpgme/doc/gpl.texi:1.1 gpgme/doc/gpl.texi:removed --- gpgme/doc/gpl.texi:1.1 Wed Jan 16 01:41:10 2002 +++ gpgme/doc/gpl.texi Tue Dec 7 22:11:54 2004 @@ -1,397 +0,0 @@ -@node Copying -@appendix GNU GENERAL PUBLIC LICENSE - -@cindex GPL, GNU General Public License -@center Version 2, June 1991 - -@display -Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc. -59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -@end display - -@appendixsubsec Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software---to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - -@iftex -@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end iftex -@ifinfo -@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end ifinfo - -@enumerate -@item -This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The ``Program'', below, -refers to any such program or work, and a ``work based on the Program'' -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term ``modification''.) Each licensee is addressed as ``you''. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - -@item -You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - -@item -You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - -@enumerate a -@item -You must cause the modified files to carry prominent notices -stating that you changed the files and the date of any change. - -@item -You must cause any work that you distribute or publish, that in -whole or in part contains or is derived from the Program or any -part thereof, to be licensed as a whole at no charge to all third -parties under the terms of this License. - -@item -If the modified program normally reads commands interactively -when run, you must cause it, when started running for such -interactive use in the most ordinary way, to print or display an -announcement including an appropriate copyright notice and a -notice that there is no warranty (or else, saying that you provide -a warranty) and that users may redistribute the program under -these conditions, and telling the user how to view a copy of this -License. (Exception: if the Program itself is interactive but -does not normally print such an announcement, your work based on -the Program is not required to print an announcement.) -@end enumerate - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -@item -You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - -@enumerate a -@item -Accompany it with the complete corresponding machine-readable -source code, which must be distributed under the terms of Sections -1 and 2 above on a medium customarily used for software interchange; or, - -@item -Accompany it with a written offer, valid for at least three -years, to give any third party, for a charge no more than your -cost of physically performing source distribution, a complete -machine-readable copy of the corresponding source code, to be -distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - -@item -Accompany it with the information you received as to the offer -to distribute corresponding source code. (This alternative is -allowed only for noncommercial distribution and only if you -received the program in object code or executable form with such -an offer, in accord with Subsection b above.) -@end enumerate - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - -@item -You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - -@item -You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -@item -Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - -@item -If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - -@item -If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - -@item -The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and ``any -later version'', you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - -@item -If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - -@iftex -@heading NO WARRANTY -@end iftex -@ifinfo -@center NO WARRANTY -@end ifinfo - -@item -BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - -@item -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. -@end enumerate - -@iftex -@heading END OF TERMS AND CONDITIONS -@end iftex -@ifinfo -@center END OF TERMS AND CONDITIONS -@end ifinfo - -@page -@unnumberedsec How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the ``copyright'' line and a pointer to where the full notice is found. - -@smallexample -@var{one line to give the program's name and an idea of what it does.} -Copyright (C) 19@var{yy} @var{name of author} - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -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 General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -@end smallexample - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - -@smallexample -Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author} -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details -type `show w'. This is free software, and you are welcome -to redistribute it under certain conditions; type `show c' -for details. -@end smallexample - -The hypothetical commands @samp{show w} and @samp{show c} should show -the appropriate parts of the General Public License. Of course, the -commands you use may be called something other than @samp{show w} and -@samp{show c}; they could even be mouse-clicks or menu items---whatever -suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a ``copyright disclaimer'' for the program, if -necessary. Here is a sample; alter the names: - -@smallexample -@group -Yoyodyne, Inc., hereby disclaims all copyright -interest in the program `Gnomovision' -(which makes passes at compilers) written -by James Hacker. - -@var{signature of Ty Coon}, 1 April 1989 -Ty Coon, President of Vice -@end group -@end smallexample - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Index: gpgme/doc/lesser.texi diff -u /dev/null gpgme/doc/lesser.texi:1.1.2.1 --- /dev/null Tue Dec 7 22:11:54 2004 +++ gpgme/doc/lesser.texi Tue Dec 7 22:11:52 2004 @@ -0,0 +1,565 @@ +@node Library Copying +@appendixsec GNU LESSER GENERAL PUBLIC LICENSE + +@cindex LGPL, Lesser General Public License +@center Version 2.1, February 1999 + +@display +Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc. +59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts +as the successor of the GNU Library Public License, version 2, hence the +version number 2.1.] +@end display + +@appendixsubsec Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software---to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software---typically libraries---of the Free +Software Foundation and other authors who decide to use it. You can use +it too, but we suggest you first think carefully about whether this +license or the ordinary General Public License is the better strategy to +use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of it +in new free programs; and that you are informed that you can do these +things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the @dfn{Lesser} General Public License because it +does @emph{Less} to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +``work based on the library'' and a ``work that uses the library''. The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + +@iftex +@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +@end iftex +@ifinfo +@center GNU LESSER GENERAL PUBLIC LICENSE +@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +@end ifinfo + +@enumerate 0 +@item +This License Agreement applies to any software library or other program +which contains a notice placed by the copyright holder or other +authorized party saying it may be distributed under the terms of this +Lesser General Public License (also called ``this License''). Each +licensee is addressed as ``you''. + + A ``library'' means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The ``Library'', below, refers to any such software library or work +which has been distributed under these terms. A ``work based on the +Library'' means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term ``modification''.) + + ``Source code'' for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + +@item +You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + +@item +You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +@enumerate a +@item +The modified work must itself be a software library. + +@item +You must cause the files modified to carry prominent notices +stating that you changed the files and the date of any change. + +@item +You must cause the whole of the work to be licensed at no +charge to all third parties under the terms of this License. + +@item +If a facility in the modified Library refers to a function or a +table of data to be supplied by an application program that uses +the facility, other than as an argument passed when the facility +is invoked, then you must make a good faith effort to ensure that, +in the event an application does not supply such function or +table, the facility still operates, and performs whatever part of +its purpose remains meaningful. + +(For example, a function in a library to compute square roots has +a purpose that is entirely well-defined independent of the +application. Therefore, Subsection 2d requires that any +application-supplied function or table used by this function must +be optional: if the application does not supply it, the square +root function must still compute square roots.) +@end enumerate + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +@item +You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + +@item +You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + +@item +A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a ``work that uses the Library''. Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a ``work that uses the Library'' with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a ``work that uses the +library''. The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a ``work that uses the Library'' uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +@item +As an exception to the Sections above, you may also combine or +link a ``work that uses the Library'' with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + +@enumerate a +@item +Accompany the work with the complete corresponding +machine-readable source code for the Library including whatever +changes were used in the work (which must be distributed under +Sections 1 and 2 above); and, if the work is an executable linked +with the Library, with the complete machine-readable ``work that +uses the Library'', as object code and/or source code, so that the +user can modify the Library and then relink to produce a modified +executable containing the modified Library. (It is understood +that the user who changes the contents of definitions files in the +Library will not necessarily be able to recompile the application +to use the modified definitions.) + +@item +Use a suitable shared library mechanism for linking with the Library. A +suitable mechanism is one that (1) uses at run time a copy of the +library already present on the user's computer system, rather than +copying library functions into the executable, and (2) will operate +properly with a modified version of the library, if the user installs +one, as long as the modified version is interface-compatible with the +version that the work was made with. + +@item +Accompany the work with a written offer, valid for at +least three years, to give the same user the materials +specified in Subsection 6a, above, for a charge no more +than the cost of performing this distribution. + +@item +If distribution of the work is made by offering access to copy +from a designated place, offer equivalent access to copy the above +specified materials from the same place. + +@item +Verify that the user has already received a copy of these +materials or that you have already sent this user a copy. +@end enumerate + + For an executable, the required form of the ``work that uses the +Library'' must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the +executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +@item +You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + +@enumerate a +@item +Accompany the combined library with a copy of the same work +based on the Library, uncombined with any other library +facilities. This must be distributed under the terms of the +Sections above. + +@item +Give prominent notice with the combined library of the fact +that part of it is a work based on the Library, and explaining +where to find the accompanying uncombined form of the same work. +@end enumerate + +@item +You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +@item +You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +@item +Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + +@item +If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +@item +If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + +@item +The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +``any later version'', you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +@item +If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + +@iftex +@heading NO WARRANTY +@end iftex +@ifinfo +@center NO WARRANTY +@end ifinfo + +@item +BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +@item +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. +@end enumerate + +@iftex +@heading END OF TERMS AND CONDITIONS +@end iftex +@ifinfo +@center END OF TERMS AND CONDITIONS +@end ifinfo + +@page +@appendixsubsec How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +``copyright'' line and a pointer to where the full notice is found. + +@smallexample +@var{one line to give the library's name and an idea of what it does.} +Copyright (C) @var{year} @var{name of author} + +This library 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 library 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 library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, +USA. +@end smallexample + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a ``copyright disclaimer'' for the library, if +necessary. Here is a sample; alter the names: + +@smallexample +Yoyodyne, Inc., hereby disclaims all copyright interest in the library +`Frob' (a library for tweaking knobs) written by James Random Hacker. + +@var{signature of Ty Coon}, 1 April 1990 +Ty Coon, President of Vice +@end smallexample + +That's all there is to it! Index: gpgme/gpgme.spec.in diff -u gpgme/gpgme.spec.in:1.3 gpgme/gpgme.spec.in:1.3.2.1 --- gpgme/gpgme.spec.in:1.3 Tue Sep 2 20:04:22 2003 +++ gpgme/gpgme.spec.in Tue Dec 7 22:11:52 2004 @@ -49,7 +49,7 @@ %files %defattr(-,root,root) -%doc COPYING AUTHORS README INSTALL NEWS ChangeLog TODO THANKS +%doc COPYING COPYING.LESSER AUTHORS README INSTALL NEWS ChangeLog TODO THANKS %attr(0755,root,root) %{_bindir}/gpgme-config %attr(0755,root,root) %{_libdir}/*gpgme.so* %attr(0755,root,root) %{_libdir}/*gpgme.la Index: gpgme/gpgme/ChangeLog diff -u gpgme/gpgme/ChangeLog:1.386 gpgme/gpgme/ChangeLog:1.386.2.1 --- gpgme/gpgme/ChangeLog:1.386 Fri Oct 22 19:57:56 2004 +++ gpgme/gpgme/ChangeLog Tue Dec 7 22:11:52 2004 @@ -1,3 +1,28 @@ +2004-12-07 Marcus Brinkmann + + * putc_unlocked.c, funopen.c: I just claim copyright on these + files and change their license to LGPL, because they are totally + trivial wrapper functions. + * isascii.c: Change copyright notice to the one from ctype/ctype.h + in the GNU C Library (CVS Head 2004-10-10), where isascii is + defined as a macro doing exactly the same as the function in this + file. + * memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06). + * stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10). + * ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c, + ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c, + data.c, data-compat.c, data-fd.c, data.h, data-mem.c, + data-stream.c, data-user.c, debug.c, debug.h, decrypt.c, + decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c, + engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c, + export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h, + key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c, + passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c, + rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c, + util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c, + wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change + license to LGPL. + 2004-10-03 Marcus Brinkmann * verify.c (parse_trust): If no reason is provided, set Index: gpgme/gpgme/Makefile.am diff -u gpgme/gpgme/Makefile.am:1.54 gpgme/gpgme/Makefile.am:1.54.2.1 --- gpgme/gpgme/Makefile.am:1.54 Sat Sep 13 19:45:04 2003 +++ gpgme/gpgme/Makefile.am Tue Dec 7 22:11:52 2004 @@ -1,20 +1,20 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002, 2003 g10 Code GmbH +# Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/gpgme/ath-compat.c diff -u gpgme/gpgme/ath-compat.c:1.3 gpgme/gpgme/ath-compat.c:1.3.2.1 --- gpgme/gpgme/ath-compat.c:1.3 Mon Apr 5 13:53:55 2004 +++ gpgme/gpgme/ath-compat.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,22 @@ /* ath.c - self-adapting thread-safeness library - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/ath-pth-compat.c diff -u gpgme/gpgme/ath-pth-compat.c:1.1 gpgme/gpgme/ath-pth-compat.c:1.1.2.1 --- gpgme/gpgme/ath-pth-compat.c:1.1 Wed Aug 20 22:20:46 2003 +++ gpgme/gpgme/ath-pth-compat.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,22 @@ /* ath-pth.c - Pth module for self-adapting thread-safeness library - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/gpgme/ath-pth.c diff -u gpgme/gpgme/ath-pth.c:1.4 gpgme/gpgme/ath-pth.c:1.4.2.1 --- gpgme/gpgme/ath-pth.c:1.4 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath-pth.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* ath-pth.c - Pth module for self-adapting thread-safeness library - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H Index: gpgme/gpgme/ath-pthread-compat.c diff -u gpgme/gpgme/ath-pthread-compat.c:1.1 gpgme/gpgme/ath-pthread-compat.c:1.1.2.1 --- gpgme/gpgme/ath-pthread-compat.c:1.1 Wed Aug 20 22:20:46 2003 +++ gpgme/gpgme/ath-pthread-compat.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,22 @@ /* ath-pthread.c - pthread module for self-adapting thread-safeness library - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/gpgme/ath-pthread.c diff -u gpgme/gpgme/ath-pthread.c:1.4 gpgme/gpgme/ath-pthread.c:1.4.2.1 --- gpgme/gpgme/ath-pthread.c:1.4 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath-pthread.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,22 @@ /* ath-pthread.c - pthread module for self-adapting thread-safeness library - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/ath.c diff -u gpgme/gpgme/ath.c:1.4 gpgme/gpgme/ath.c:1.4.2.1 --- gpgme/gpgme/ath.c:1.4 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* ath.c - Thread-safeness library. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/ath.h diff -u gpgme/gpgme/ath.h:1.6 gpgme/gpgme/ath.h:1.6.2.1 --- gpgme/gpgme/ath.h:1.6 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath.h Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* ath.h - Interfaces for thread-safeness library. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef ATH_H #define ATH_H Index: gpgme/gpgme/context.h diff -u gpgme/gpgme/context.h:1.56 gpgme/gpgme/context.h:1.56.2.1 --- gpgme/gpgme/context.h:1.56 Sun Sep 14 02:02:40 2003 +++ gpgme/gpgme/context.h Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* context.h - Definitions for a GPGME context. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef CONTEXT_H #define CONTEXT_H Index: gpgme/gpgme/conversion.c diff -u gpgme/gpgme/conversion.c:1.20 gpgme/gpgme/conversion.c:1.20.2.1 --- gpgme/gpgme/conversion.c:1.20 Mon Apr 5 15:49:29 2004 +++ gpgme/gpgme/conversion.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* conversion.c - String conversion helper functions. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-compat.c diff -u gpgme/gpgme/data-compat.c:1.8 gpgme/gpgme/data-compat.c:1.8.2.1 --- gpgme/gpgme/data-compat.c:1.8 Sun Feb 1 14:39:45 2004 +++ gpgme/gpgme/data-compat.c Tue Dec 7 22:11:52 2004 @@ -4,18 +4,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-fd.c diff -u gpgme/gpgme/data-fd.c:1.3 gpgme/gpgme/data-fd.c:1.3.2.1 --- gpgme/gpgme/data-fd.c:1.3 Sun May 18 22:44:52 2003 +++ gpgme/gpgme/data-fd.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* data-fd.c - A file descripor based data object. - Copyright (C) 2002 g10 Code GmbH + Copyright (C) 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-mem.c diff -u gpgme/gpgme/data-mem.c:1.8 gpgme/gpgme/data-mem.c:1.8.2.1 --- gpgme/gpgme/data-mem.c:1.8 Sun Jun 22 22:56:48 2003 +++ gpgme/gpgme/data-mem.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* data-mem.c - A memory based data object. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-stream.c diff -u gpgme/gpgme/data-stream.c:1.5 gpgme/gpgme/data-stream.c:1.5.2.1 --- gpgme/gpgme/data-stream.c:1.5 Thu Sep 23 19:54:26 2004 +++ gpgme/gpgme/data-stream.c Tue Dec 7 22:11:52 2004 @@ -4,18 +4,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-user.c diff -u gpgme/gpgme/data-user.c:1.4 gpgme/gpgme/data-user.c:1.4.2.1 --- gpgme/gpgme/data-user.c:1.4 Sun May 18 22:44:52 2003 +++ gpgme/gpgme/data-user.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* data-user.c - A user callback based data object. - Copyright (C) 2002 g10 Code GmbH + Copyright (C) 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data.c diff -u gpgme/gpgme/data.c:1.41 gpgme/gpgme/data.c:1.41.2.1 --- gpgme/gpgme/data.c:1.41 Thu Sep 30 02:19:22 2004 +++ gpgme/gpgme/data.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* data.c - An abstraction for data objects. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data.h diff -u gpgme/gpgme/data.h:1.5 gpgme/gpgme/data.h:1.5.2.1 --- gpgme/gpgme/data.h:1.5 Thu Sep 23 19:54:26 2004 +++ gpgme/gpgme/data.h Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* data.h - Internal data object abstraction interface. - Copyright (C) 2002 g10 Code GmbH + Copyright (C) 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef DATA_H #define DATA_H Index: gpgme/gpgme/debug.c diff -u gpgme/gpgme/debug.c:1.12 gpgme/gpgme/debug.c:1.12.2.1 --- gpgme/gpgme/debug.c:1.12 Mon Oct 6 16:50:19 2003 +++ gpgme/gpgme/debug.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* debug.c - helpful output in desperate situations Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/debug.h diff -u gpgme/gpgme/debug.h:1.2 gpgme/gpgme/debug.h:1.2.4.1 --- gpgme/gpgme/debug.h:1.2 Thu Jul 25 19:51:42 2002 +++ gpgme/gpgme/debug.h Tue Dec 7 22:11:52 2004 @@ -1,22 +1,22 @@ /* debug.h - interface to debugging functions - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef DEBUG_H #define DEBUG_H Index: gpgme/gpgme/decrypt-verify.c diff -u gpgme/gpgme/decrypt-verify.c:1.19 gpgme/gpgme/decrypt-verify.c:1.19.2.1 --- gpgme/gpgme/decrypt-verify.c:1.19 Thu Apr 8 11:53:01 2004 +++ gpgme/gpgme/decrypt-verify.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* decrypt-verify.c - Decrypt and verify function. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/decrypt.c diff -u gpgme/gpgme/decrypt.c:1.41 gpgme/gpgme/decrypt.c:1.41.2.1 --- gpgme/gpgme/decrypt.c:1.41 Fri May 21 21:17:25 2004 +++ gpgme/gpgme/decrypt.c Tue Dec 7 22:11:52 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/delete.c diff -u gpgme/gpgme/delete.c:1.24 gpgme/gpgme/delete.c:1.24.2.1 --- gpgme/gpgme/delete.c:1.24 Fri Jun 6 01:19:58 2003 +++ gpgme/gpgme/delete.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* delete.c - Delete a key. - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/edit.c diff -u gpgme/gpgme/edit.c:1.19 gpgme/gpgme/edit.c:1.19.2.1 --- gpgme/gpgme/edit.c:1.19 Thu Oct 2 17:03:01 2003 +++ gpgme/gpgme/edit.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* edit.c - Key edit function. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/encrypt-sign.c diff -u gpgme/gpgme/encrypt-sign.c:1.23 gpgme/gpgme/encrypt-sign.c:1.23.2.1 --- gpgme/gpgme/encrypt-sign.c:1.23 Tue Jul 29 21:34:03 2003 +++ gpgme/gpgme/encrypt-sign.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* encrypt-sign.c - encrypt and verify functions Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/encrypt.c diff -u gpgme/gpgme/encrypt.c:1.46 gpgme/gpgme/encrypt.c:1.46.2.1 --- gpgme/gpgme/encrypt.c:1.46 Tue Jul 29 21:34:03 2003 +++ gpgme/gpgme/encrypt.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* encrypt.c - Encrypt function. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/engine-backend.h diff -u gpgme/gpgme/engine-backend.h:1.15 gpgme/gpgme/engine-backend.h:1.15.2.1 --- gpgme/gpgme/engine-backend.h:1.15 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/engine-backend.h Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ -/* engine-backend.h - A crypto backend for the engine interface. - Copyright (C) 2002, 2003 g10 Code GmbH +/* engine-backend.h - A crypto backend for the engine interface. + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef ENGINE_BACKEND_H #define ENGINE_BACKEND_H Index: gpgme/gpgme/engine-gpgsm.c diff -u gpgme/gpgme/engine-gpgsm.c:1.100 gpgme/gpgme/engine-gpgsm.c:1.100.2.1 --- gpgme/gpgme/engine-gpgsm.c:1.100 Fri Oct 22 18:55:16 2004 +++ gpgme/gpgme/engine-gpgsm.c Tue Dec 7 22:11:52 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/engine.c diff -u gpgme/gpgme/engine.c:1.44 gpgme/gpgme/engine.c:1.44.2.1 --- gpgme/gpgme/engine.c:1.44 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/engine.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* engine.c - GPGME engine support. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/engine.h diff -u gpgme/gpgme/engine.h:1.34 gpgme/gpgme/engine.h:1.34.2.1 --- gpgme/gpgme/engine.h:1.34 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/engine.h Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ -/* engine.h - GPGME engine interface. +/* engine.h - GPGME engine interface. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef ENGINE_H #define ENGINE_H Index: gpgme/gpgme/error.c diff -u gpgme/gpgme/error.c:1.3 gpgme/gpgme/error.c:1.3.2.1 --- gpgme/gpgme/error.c:1.3 Tue Sep 30 21:36:20 2003 +++ gpgme/gpgme/error.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* error.c - Error handling for GPGME. - Copyright (C) 2003 g10 Code GmbH + Copyright (C) 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/export.c diff -u gpgme/gpgme/export.c:1.26 gpgme/gpgme/export.c:1.26.2.1 --- gpgme/gpgme/export.c:1.26 Fri Jun 6 01:19:58 2003 +++ gpgme/gpgme/export.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* export.c - Export a key. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/funopen.c diff -u gpgme/gpgme/funopen.c:1.1 gpgme/gpgme/funopen.c:1.1.2.1 --- gpgme/gpgme/funopen.c:1.1 Mon Aug 18 21:17:08 2003 +++ gpgme/gpgme/funopen.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,22 @@ /* funopen.c - Replacement for funopen. - * Copyright (C) 2003 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2004 g10 Code GmbH + + This file is part of GPGME + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include @@ -32,12 +32,11 @@ cookie_close_function_t *closefn) { cookie_io_functions_t io = { read: readfn, write: writefn, - seek: seekfn, - close: closefn }; + seek: seekfn, close: closefn }; return fopencookie ((void *) cookie, - readfn ? ( writefn ? "rw" : "r" ) - : ( writefn ? "w" : ""), io); + readfn ? (writefn ? "rw" : "r") + : (writefn ? "w" : ""), io); } #else #error No known way to implement funopen. Index: gpgme/gpgme/genkey.c diff -u gpgme/gpgme/genkey.c:1.30 gpgme/gpgme/genkey.c:1.30.2.1 --- gpgme/gpgme/genkey.c:1.30 Fri Oct 10 11:08:23 2003 +++ gpgme/gpgme/genkey.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* genkey.c - Key generation. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/get-env.c diff -u gpgme/gpgme/get-env.c:1.1 gpgme/gpgme/get-env.c:1.1.2.1 --- gpgme/gpgme/get-env.c:1.1 Sat Sep 13 19:45:04 2003 +++ gpgme/gpgme/get-env.c Tue Dec 7 22:11:52 2004 @@ -1,21 +1,22 @@ /* get_env.c - A getenv() replacement. - Copyright (C) 2003 g10 Code GmbH + Copyright (C) 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/gpgme.c diff -u gpgme/gpgme/gpgme.c:1.76 gpgme/gpgme/gpgme.c:1.76.2.1 --- gpgme/gpgme/gpgme.c:1.76 Wed Feb 25 00:08:46 2004 +++ gpgme/gpgme/gpgme.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* gpgme.c - GnuPG Made Easy. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/gpgme.h diff -u gpgme/gpgme/gpgme.h:1.149 gpgme/gpgme/gpgme.h:1.149.2.1 --- gpgme/gpgme/gpgme.h:1.149 Tue Dec 7 16:27:11 2004 +++ gpgme/gpgme/gpgme.h Tue Dec 7 22:11:52 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef GPGME_H #define GPGME_H Index: gpgme/gpgme/import.c diff -u gpgme/gpgme/import.c:1.31 gpgme/gpgme/import.c:1.31.2.1 --- gpgme/gpgme/import.c:1.31 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/import.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* import.c - Import a key. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/io.h diff -u gpgme/gpgme/io.h:1.11 gpgme/gpgme/io.h:1.11.2.1 --- gpgme/gpgme/io.h:1.11 Mon Oct 6 18:17:13 2003 +++ gpgme/gpgme/io.h Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* io.h - Interface to the I/O functions. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef IO_H #define IO_H Index: gpgme/gpgme/isascii.c diff -u gpgme/gpgme/isascii.c:1.1 gpgme/gpgme/isascii.c:1.1.2.1 --- gpgme/gpgme/isascii.c:1.1 Mon Aug 18 21:17:08 2003 +++ gpgme/gpgme/isascii.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,21 @@ -/* isascii.c - Replacement for isascii. - * Copyright (C) 2002 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library 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. + + The GNU C Library 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 the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/key.c diff -u gpgme/gpgme/key.c:1.53 gpgme/gpgme/key.c:1.53.2.1 --- gpgme/gpgme/key.c:1.53 Wed Jun 23 23:15:21 2004 +++ gpgme/gpgme/key.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* key.c - Key objects. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/keylist.c diff -u gpgme/gpgme/keylist.c:1.67 gpgme/gpgme/keylist.c:1.67.2.1 --- gpgme/gpgme/keylist.c:1.67 Fri May 21 17:15:19 2004 +++ gpgme/gpgme/keylist.c Tue Dec 7 22:11:52 2004 @@ -1,22 +1,23 @@ /* keylist.c - Listing keys. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/memrchr.c diff -u gpgme/gpgme/memrchr.c:1.2 gpgme/gpgme/memrchr.c:1.2.2.1 --- gpgme/gpgme/memrchr.c:1.2 Sun Feb 15 17:02:36 2004 +++ gpgme/gpgme/memrchr.c Tue Dec 7 22:11:53 2004 @@ -1,39 +1,210 @@ -/* memrchr.c - Replacement for memrchr. - * Copyright (C) 2002, 2004 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* memrchr -- find the last occurrence of a byte in a memory block + Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Based on strlen implementation by Torbjorn Granlund (tege@sics.se), + with help from Dan Sahlin (dan@sics.se) and + commentary by Jim Blandy (jimb@ai.mit.edu); + adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), + and implemented by Roland McGrath (roland@ai.mit.edu). + + The GNU C Library 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. + + The GNU C Library 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 the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include #ifdef HAVE_CONFIG_H -#include +# include +#endif + +#undef __ptr_t +#if defined __cplusplus || (defined __STDC__ && __STDC__) +# define __ptr_t void * +#else /* Not C++ or ANSI C. */ +# define __ptr_t char * +#endif /* C++ or ANSI C. */ + +#if defined _LIBC +# include +# include +#else +# define reg_char char +#endif + +#if defined HAVE_LIMITS_H || defined _LIBC +# include +#endif + +#define LONG_MAX_32_BITS 2147483647 + +#ifndef LONG_MAX +# define LONG_MAX LONG_MAX_32_BITS #endif -#include +#include -void * -memrchr (const void *block, int c, size_t size) +#undef __memrchr +#undef memrchr + +#ifndef weak_alias +# define __memrchr memrchr +#endif + +/* Search no more than N bytes of S for C. */ +__ptr_t +__memrchr (s, c_in, n) + const __ptr_t s; + int c_in; + size_t n; { - const unsigned char *p = block; + const unsigned char *char_ptr; + const unsigned long int *longword_ptr; + unsigned long int longword, magic_bits, charmask; + unsigned reg_char c; + + c = (unsigned char) c_in; + + /* Handle the last few characters by reading one character at a time. + Do this until CHAR_PTR is aligned on a longword boundary. */ + for (char_ptr = (const unsigned char *) s + n; + n > 0 && ((unsigned long int) char_ptr + & (sizeof (longword) - 1)) != 0; + --n) + if (*--char_ptr == c) + return (__ptr_t) char_ptr; + + /* All these elucidatory comments refer to 4-byte longwords, + but the theory applies equally well to 8-byte longwords. */ + + longword_ptr = (const unsigned long int *) char_ptr; + + /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits + the "holes." Note that there is a hole just to the left of + each byte, with an extra at the end: + + bits: 01111110 11111110 11111110 11111111 + bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD + + The 1-bits make sure that carries propagate to the next 0-bit. + The 0-bits provide holes for carries to fall into. */ + + if (sizeof (longword) != 4 && sizeof (longword) != 8) + abort (); - if (size) +#if LONG_MAX <= LONG_MAX_32_BITS + magic_bits = 0x7efefeff; +#else + magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; +#endif + + /* Set up a longword, each of whose bytes is C. */ + charmask = c | (c << 8); + charmask |= charmask << 16; +#if LONG_MAX > LONG_MAX_32_BITS + charmask |= charmask << 32; +#endif + + /* Instead of the traditional loop which tests each character, + we will test a longword at a time. The tricky part is testing + if *any of the four* bytes in the longword in question are zero. */ + while (n >= sizeof (longword)) { - for (p += size - 1; size; p--, size--) - if (*p == c) - return (void *)p; + /* We tentatively exit the loop if adding MAGIC_BITS to + LONGWORD fails to change any of the hole bits of LONGWORD. + + 1) Is this safe? Will it catch all the zero bytes? + Suppose there is a byte with all zeros. Any carry bits + propagating from its left will fall into the hole at its + least significant bit and stop. Since there will be no + carry from its most significant bit, the LSB of the + byte to the left will be unchanged, and the zero will be + detected. + + 2) Is this worthwhile? Will it ignore everything except + zero bytes? Suppose every byte of LONGWORD has a bit set + somewhere. There will be a carry into bit 8. If bit 8 + is set, this will carry into bit 16. If bit 8 is clear, + one of bits 9-15 must be set, so there will be a carry + into bit 16. Similarly, there will be a carry into bit + 24. If one of bits 24-30 is set, there will be a carry + into bit 31, so all of the hole bits will be changed. + + The one misfire occurs when bits 24-30 are clear and bit + 31 is set; in this case, the hole at bit 31 is not + changed. If we had access to the processor carry flag, + we could close this loophole by putting the fourth hole + at bit 32! + + So it ignores everything except 128's, when they're aligned + properly. + + 3) But wait! Aren't we looking for C, not zero? + Good point. So what we do is XOR LONGWORD with a longword, + each of whose bytes is C. This turns each byte that is C + into a zero. */ + + longword = *--longword_ptr ^ charmask; + + /* Add MAGIC_BITS to LONGWORD. */ + if ((((longword + magic_bits) + + /* Set those bits that were unchanged by the addition. */ + ^ ~longword) + + /* Look at only the hole bits. If any of the hole bits + are unchanged, most likely one of the bytes was a + zero. */ + & ~magic_bits) != 0) + { + /* Which of the bytes was C? If none of them were, it was + a misfire; continue the search. */ + + const unsigned char *cp = (const unsigned char *) longword_ptr; + +#if LONG_MAX > 2147483647 + if (cp[7] == c) + return (__ptr_t) &cp[7]; + if (cp[6] == c) + return (__ptr_t) &cp[6]; + if (cp[5] == c) + return (__ptr_t) &cp[5]; + if (cp[4] == c) + return (__ptr_t) &cp[4]; +#endif + if (cp[3] == c) + return (__ptr_t) &cp[3]; + if (cp[2] == c) + return (__ptr_t) &cp[2]; + if (cp[1] == c) + return (__ptr_t) &cp[1]; + if (cp[0] == c) + return (__ptr_t) cp; + } + + n -= sizeof (longword); } - return NULL; + + char_ptr = (const unsigned char *) longword_ptr; + + while (n-- > 0) + { + if (*--char_ptr == c) + return (__ptr_t) char_ptr; + } + + return 0; } +#ifdef weak_alias +weak_alias (__memrchr, memrchr) +#endif Index: gpgme/gpgme/mkstatus diff -u gpgme/gpgme/mkstatus:1.7 gpgme/gpgme/mkstatus:1.7.2.1 --- gpgme/gpgme/mkstatus:1.7 Sun May 18 22:44:52 2003 +++ gpgme/gpgme/mkstatus Tue Dec 7 22:11:53 2004 @@ -6,18 +6,18 @@ # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# GPGME 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# GPGME 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. +# +# GPGME 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, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # resetting collate is important, so that the bsearch works properly Index: gpgme/gpgme/op-support.c diff -u gpgme/gpgme/op-support.c:1.15 gpgme/gpgme/op-support.c:1.15.2.1 --- gpgme/gpgme/op-support.c:1.15 Tue Oct 5 17:08:45 2004 +++ gpgme/gpgme/op-support.c Tue Dec 7 22:11:53 2004 @@ -1,21 +1,22 @@ /* op-support.c - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/ops.h diff -u gpgme/gpgme/ops.h:1.55 gpgme/gpgme/ops.h:1.55.2.1 --- gpgme/gpgme/ops.h:1.55 Fri Jun 6 02:55:42 2003 +++ gpgme/gpgme/ops.h Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* ops.h - Internal operation support. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef OPS_H #define OPS_H Index: gpgme/gpgme/passphrase.c diff -u gpgme/gpgme/passphrase.c:1.23 gpgme/gpgme/passphrase.c:1.23.2.1 --- gpgme/gpgme/passphrase.c:1.23 Wed Aug 18 02:48:49 2004 +++ gpgme/gpgme/passphrase.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* passphrase.c - Passphrase callback. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/posix-io.c diff -u gpgme/gpgme/posix-io.c:1.26 gpgme/gpgme/posix-io.c:1.26.2.1 --- gpgme/gpgme/posix-io.c:1.26 Mon Oct 6 18:17:13 2003 +++ gpgme/gpgme/posix-io.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* posix-io.c - Posix I/O functions Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/posix-sema.c diff -u gpgme/gpgme/posix-sema.c:1.8 gpgme/gpgme/posix-sema.c:1.8.2.1 --- gpgme/gpgme/posix-sema.c:1.8 Wed Jan 29 21:00:32 2003 +++ gpgme/gpgme/posix-sema.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* posix-sema.c Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/posix-util.c diff -u gpgme/gpgme/posix-util.c:1.8 gpgme/gpgme/posix-util.c:1.8.2.1 --- gpgme/gpgme/posix-util.c:1.8 Wed Jan 29 21:00:32 2003 +++ gpgme/gpgme/posix-util.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* posix-util.c - Utility functions for Posix Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/progress.c diff -u gpgme/gpgme/progress.c:1.11 gpgme/gpgme/progress.c:1.11.2.1 --- gpgme/gpgme/progress.c:1.11 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/progress.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* progress.c - status handler for progress status Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/putc_unlocked.c diff -u gpgme/gpgme/putc_unlocked.c:1.1 gpgme/gpgme/putc_unlocked.c:1.1.2.1 --- gpgme/gpgme/putc_unlocked.c:1.1 Mon Aug 18 21:17:08 2003 +++ gpgme/gpgme/putc_unlocked.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,22 @@ /* putc_unlocked.c - Replacement for putc_unlocked. - * Copyright (C) 2002 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/rungpg.c diff -u gpgme/gpgme/rungpg.c:1.101 gpgme/gpgme/rungpg.c:1.101.2.1 --- gpgme/gpgme/rungpg.c:1.101 Thu Sep 30 02:24:58 2004 +++ gpgme/gpgme/rungpg.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* rungpg.c - Gpg Engine. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/sema.h diff -u gpgme/gpgme/sema.h:1.3 gpgme/gpgme/sema.h:1.3.2.1 --- gpgme/gpgme/sema.h:1.3 Sun May 18 23:08:43 2003 +++ gpgme/gpgme/sema.h Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* sema.h - Definitions for semaphores. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef SEMA_H #define SEMA_H Index: gpgme/gpgme/sign.c diff -u gpgme/gpgme/sign.c:1.41 gpgme/gpgme/sign.c:1.41.2.1 --- gpgme/gpgme/sign.c:1.41 Mon Jan 12 14:28:31 2004 +++ gpgme/gpgme/sign.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* sign.c - Signing function. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/signers.c diff -u gpgme/gpgme/signers.c:1.15 gpgme/gpgme/signers.c:1.15.2.1 --- gpgme/gpgme/signers.c:1.15 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/signers.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* signers.c - Maintain signer sets. Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/stpcpy.c diff -u gpgme/gpgme/stpcpy.c:1.1 gpgme/gpgme/stpcpy.c:1.1.4.1 --- gpgme/gpgme/stpcpy.c:1.1 Wed Aug 21 00:42:48 2002 +++ gpgme/gpgme/stpcpy.c Tue Dec 7 22:11:53 2004 @@ -1,23 +1,20 @@ -/* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995, 1997, 2002, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@prep.ai.mit.edu. + The GNU C Library 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 free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, + The GNU C Library 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 General Public License for more details. + 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 General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #ifdef HAVE_CONFIG_H # include @@ -34,7 +31,9 @@ /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ char * -__stpcpy (char *dest, const char *src) +__stpcpy (dest, src) + char *dest; + const char *src; { register char *d = dest; register const char *s = src; @@ -45,6 +44,12 @@ return d - 1; } +#ifdef libc_hidden_def +libc_hidden_def (__stpcpy) +#endif #ifdef weak_alias weak_alias (__stpcpy, stpcpy) #endif +#ifdef libc_hidden_builtin_def +libc_hidden_builtin_def (stpcpy) +#endif Index: gpgme/gpgme/trust-item.c diff -u gpgme/gpgme/trust-item.c:1.4 gpgme/gpgme/trust-item.c:1.4.2.1 --- gpgme/gpgme/trust-item.c:1.4 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/trust-item.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* trust-item.c - Trust item objects. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/trustlist.c diff -u gpgme/gpgme/trustlist.c:1.24 gpgme/gpgme/trustlist.c:1.24.2.1 --- gpgme/gpgme/trustlist.c:1.24 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/trustlist.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* trustlist.c - Trust item listing. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/util.h diff -u gpgme/gpgme/util.h:1.27 gpgme/gpgme/util.h:1.27.2.1 --- gpgme/gpgme/util.h:1.27 Wed Nov 19 16:15:21 2003 +++ gpgme/gpgme/util.h Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* util.h Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef UTIL_H #define UTIL_H Index: gpgme/gpgme/verify.c diff -u gpgme/gpgme/verify.c:1.69 gpgme/gpgme/verify.c:1.69.2.1 --- gpgme/gpgme/verify.c:1.69 Fri Oct 22 19:57:56 2004 +++ gpgme/gpgme/verify.c Tue Dec 7 22:11:53 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/version.c diff -u gpgme/gpgme/version.c:1.25 gpgme/gpgme/version.c:1.25.2.1 --- gpgme/gpgme/version.c:1.25 Mon Oct 6 18:17:13 2003 +++ gpgme/gpgme/version.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* version.c - Version check routines. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/w32-io.c diff -u gpgme/gpgme/w32-io.c:1.29 gpgme/gpgme/w32-io.c:1.29.2.1 --- gpgme/gpgme/w32-io.c:1.29 Sat Sep 13 19:45:04 2003 +++ gpgme/gpgme/w32-io.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* w32-io.c - W32 API I/O functions. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/w32-sema.c diff -u gpgme/gpgme/w32-sema.c:1.6 gpgme/gpgme/w32-sema.c:1.6.2.1 --- gpgme/gpgme/w32-sema.c:1.6 Sun May 18 23:08:43 2003 +++ gpgme/gpgme/w32-sema.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* w32-sema.c Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/w32-util.c diff -u gpgme/gpgme/w32-util.c:1.10 gpgme/gpgme/w32-util.c:1.10.2.1 --- gpgme/gpgme/w32-util.c:1.10 Wed Jan 29 21:00:32 2003 +++ gpgme/gpgme/w32-util.c Tue Dec 7 22:11:53 2004 @@ -1,23 +1,24 @@ /* w32-util.c - Utility functions for the W32 API Copyright (C) 1999 Free Software Foundation, Inc Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/wait-global.c diff -u gpgme/gpgme/wait-global.c:1.10 gpgme/gpgme/wait-global.c:1.10.2.1 --- gpgme/gpgme/wait-global.c:1.10 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait-global.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* wait-global.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait-private.c diff -u gpgme/gpgme/wait-private.c:1.9 gpgme/gpgme/wait-private.c:1.9.2.1 --- gpgme/gpgme/wait-private.c:1.9 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait-private.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* wait-private.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait-user.c diff -u gpgme/gpgme/wait-user.c:1.5 gpgme/gpgme/wait-user.c:1.5.2.1 --- gpgme/gpgme/wait-user.c:1.5 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait-user.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ -/* wait.c +/* wait-user.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait.c diff -u gpgme/gpgme/wait.c:1.42 gpgme/gpgme/wait.c:1.42.2.1 --- gpgme/gpgme/wait.c:1.42 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* wait.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait.h diff -u gpgme/gpgme/wait.h:1.10 gpgme/gpgme/wait.h:1.10.2.1 --- gpgme/gpgme/wait.h:1.10 Sun May 18 23:08:43 2003 +++ gpgme/gpgme/wait.h Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* wait.h - Definitions for the wait queue interface. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef WAIT_H #define WAIT_H Index: gpgme/tests/ChangeLog diff -u gpgme/tests/ChangeLog:1.100 gpgme/tests/ChangeLog:1.100.2.1 --- gpgme/tests/ChangeLog:1.100 Tue Aug 17 23:13:20 2004 +++ gpgme/tests/ChangeLog Tue Dec 7 22:11:53 2004 @@ -1,3 +1,19 @@ +2004-12-07 Marcus Brinkmann + + * gpg/mkdemodirs: Add copyright notice. + + * gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c, + gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c, + gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c, + gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c, + gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c, + gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c, + gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c, + gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c, + gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c, + gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c, + t-version.c: Change license to LGPL. + 2004-08-17 Marcus Brinkmann * gpgsm/t-keylist.c (struct): Add new fields VALIDITY and @@ -630,7 +646,7 @@ * tests/t-verify.c (print_sig_stat): Print info about the keys. - Copyright 2001 g10 Code GmbH + Copyright 2001, 2004 g10 Code GmbH This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without @@ -639,11 +655,3 @@ This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - - - - - - - \ No newline at end of file Index: gpgme/tests/Makefile.am diff -u gpgme/tests/Makefile.am:1.21 gpgme/tests/Makefile.am:1.21.2.1 --- gpgme/tests/Makefile.am:1.21 Tue Jul 22 13:40:47 2003 +++ gpgme/tests/Makefile.am Tue Dec 7 22:11:53 2004 @@ -1,20 +1,21 @@ +# Makefile.am - Makefile for GPGME tests. # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/tests/gpg/Makefile.am diff -u gpgme/tests/gpg/Makefile.am:1.19 gpgme/tests/gpg/Makefile.am:1.19.2.1 --- gpgme/tests/gpg/Makefile.am:1.19 Sun Sep 14 03:32:41 2003 +++ gpgme/tests/gpg/Makefile.am Tue Dec 7 22:11:53 2004 @@ -1,20 +1,20 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/tests/gpg/mkdemodirs diff -u gpgme/tests/gpg/mkdemodirs:1.1 gpgme/tests/gpg/mkdemodirs:1.1.4.1 --- gpgme/tests/gpg/mkdemodirs:1.1 Thu Nov 22 04:01:26 2001 +++ gpgme/tests/gpg/mkdemodirs Tue Dec 7 22:11:53 2004 @@ -1,4 +1,21 @@ #!/bin/sh +# Copyright (C) 2004 g10 Code GmbH +# +# This file is part of GPGME. +# +# GPGME 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. +# +# GPGME 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA set -e @@ -36,9 +53,3 @@ echo "." [ -f ./tdb.tmp ] && rm ./tdb.tmp rm pubdemo.gpg secdemo.gpg - - - - - - Index: gpgme/tests/gpg/t-decrypt-verify.c diff -u gpgme/tests/gpg/t-decrypt-verify.c:1.14 gpgme/tests/gpg/t-decrypt-verify.c:1.14.2.1 --- gpgme/tests/gpg/t-decrypt-verify.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-decrypt-verify.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-decrypt-verify.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-decrypt.c diff -u gpgme/tests/gpg/t-decrypt.c:1.11 gpgme/tests/gpg/t-decrypt.c:1.11.2.1 --- gpgme/tests/gpg/t-decrypt.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-decrypt.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-decrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-edit.c diff -u gpgme/tests/gpg/t-edit.c:1.13 gpgme/tests/gpg/t-edit.c:1.13.2.1 --- gpgme/tests/gpg/t-edit.c:1.13 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-edit.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-edit.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-encrypt-sign.c diff -u gpgme/tests/gpg/t-encrypt-sign.c:1.15 gpgme/tests/gpg/t-encrypt-sign.c:1.15.2.1 --- gpgme/tests/gpg/t-encrypt-sign.c:1.15 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-encrypt-sign.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ -/* t-encrypt.c - Regression test. +/* t-encrypt-sign.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-encrypt-sym.c diff -u gpgme/tests/gpg/t-encrypt-sym.c:1.11 gpgme/tests/gpg/t-encrypt-sym.c:1.11.2.1 --- gpgme/tests/gpg/t-encrypt-sym.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-encrypt-sym.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-encrypt-sym.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-encrypt.c diff -u gpgme/tests/gpg/t-encrypt.c:1.11 gpgme/tests/gpg/t-encrypt.c:1.11.2.1 --- gpgme/tests/gpg/t-encrypt.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-encrypt.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-encrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-eventloop.c diff -u gpgme/tests/gpg/t-eventloop.c:1.11 gpgme/tests/gpg/t-eventloop.c:1.11.2.1 --- gpgme/tests/gpg/t-eventloop.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-eventloop.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ -/* t-eventloop.c - regression test +/* t-eventloop.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-export.c diff -u gpgme/tests/gpg/t-export.c:1.8 gpgme/tests/gpg/t-export.c:1.8.2.1 --- gpgme/tests/gpg/t-export.c:1.8 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-export.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-export.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-genkey.c diff -u gpgme/tests/gpg/t-genkey.c:1.9 gpgme/tests/gpg/t-genkey.c:1.9.2.1 --- gpgme/tests/gpg/t-genkey.c:1.9 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-genkey.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ -/* t-genkey.c - regression test +/* t-genkey.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-import.c diff -u gpgme/tests/gpg/t-import.c:1.12 gpgme/tests/gpg/t-import.c:1.12.2.1 --- gpgme/tests/gpg/t-import.c:1.12 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-import.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ -/* t-import.c - regression test +/* t-import.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-keylist-sig.c diff -u gpgme/tests/gpg/t-keylist-sig.c:1.9 gpgme/tests/gpg/t-keylist-sig.c:1.9.2.1 --- gpgme/tests/gpg/t-keylist-sig.c:1.9 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-keylist-sig.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-keylist-sig.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-keylist.c diff -u gpgme/tests/gpg/t-keylist.c:1.11 gpgme/tests/gpg/t-keylist.c:1.11.2.1 --- gpgme/tests/gpg/t-keylist.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-keylist.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-keylist.c - regression test Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-sign.c diff -u gpgme/tests/gpg/t-sign.c:1.14 gpgme/tests/gpg/t-sign.c:1.14.2.1 --- gpgme/tests/gpg/t-sign.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-sign.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-sign.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-signers.c diff -u gpgme/tests/gpg/t-signers.c:1.14 gpgme/tests/gpg/t-signers.c:1.14.2.1 --- gpgme/tests/gpg/t-signers.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-signers.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-signers.c - Regression tests for the multiple signers interface. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-support.h diff -u gpgme/tests/gpg/t-support.h:1.4 gpgme/tests/gpg/t-support.h:1.4.2.1 --- gpgme/tests/gpg/t-support.h:1.4 Wed Nov 19 16:15:32 2003 +++ gpgme/tests/gpg/t-support.h Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-support.h - Helper routines for regression tests. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/tests/gpg/t-thread1.c diff -u gpgme/tests/gpg/t-thread1.c:1.4 gpgme/tests/gpg/t-thread1.c:1.4.2.1 --- gpgme/tests/gpg/t-thread1.c:1.4 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-thread1.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-thread1.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-trustlist.c diff -u gpgme/tests/gpg/t-trustlist.c:1.7 gpgme/tests/gpg/t-trustlist.c:1.7.2.1 --- gpgme/tests/gpg/t-trustlist.c:1.7 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-trustlist.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-trustlist.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-verify.c diff -u gpgme/tests/gpg/t-verify.c:1.14 gpgme/tests/gpg/t-verify.c:1.14.2.1 --- gpgme/tests/gpg/t-verify.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-verify.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-verify.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/Makefile.am diff -u gpgme/tests/gpgsm/Makefile.am:1.23 gpgme/tests/gpgsm/Makefile.am:1.23.2.1 --- gpgme/tests/gpgsm/Makefile.am:1.23 Mon Apr 5 20:40:09 2004 +++ gpgme/tests/gpgsm/Makefile.am Tue Dec 7 22:11:53 2004 @@ -3,18 +3,18 @@ # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/tests/gpgsm/t-decrypt.c diff -u gpgme/tests/gpgsm/t-decrypt.c:1.7 gpgme/tests/gpgsm/t-decrypt.c:1.7.2.1 --- gpgme/tests/gpgsm/t-decrypt.c:1.7 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-decrypt.c Tue Dec 7 22:11:53 2004 @@ -1,23 +1,23 @@ /* t-encrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-encrypt.c diff -u gpgme/tests/gpgsm/t-encrypt.c:1.14 gpgme/tests/gpgsm/t-encrypt.c:1.14.2.1 --- gpgme/tests/gpgsm/t-encrypt.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-encrypt.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-encrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-export.c diff -u gpgme/tests/gpgsm/t-export.c:1.9 gpgme/tests/gpgsm/t-export.c:1.9.2.1 --- gpgme/tests/gpgsm/t-export.c:1.9 Wed Mar 3 16:15:35 2004 +++ gpgme/tests/gpgsm/t-export.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-export.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-genkey.c diff -u gpgme/tests/gpgsm/t-genkey.c:1.7 gpgme/tests/gpgsm/t-genkey.c:1.7.2.1 --- gpgme/tests/gpgsm/t-genkey.c:1.7 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-genkey.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ -/* t-genkey.c - regression test +/* t-genkey.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-import.c diff -u gpgme/tests/gpgsm/t-import.c:1.11 gpgme/tests/gpgsm/t-import.c:1.11.2.1 --- gpgme/tests/gpgsm/t-import.c:1.11 Tue Aug 17 23:13:20 2004 +++ gpgme/tests/gpgsm/t-import.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-import.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-keylist.c diff -u gpgme/tests/gpgsm/t-keylist.c:1.14 gpgme/tests/gpgsm/t-keylist.c:1.14.2.1 --- gpgme/tests/gpgsm/t-keylist.c:1.14 Tue Aug 17 23:13:20 2004 +++ gpgme/tests/gpgsm/t-keylist.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-keylist.c - regression test Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-sign.c diff -u gpgme/tests/gpgsm/t-sign.c:1.10 gpgme/tests/gpgsm/t-sign.c:1.10.2.1 --- gpgme/tests/gpgsm/t-sign.c:1.10 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-sign.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-sign.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-support.h diff -u gpgme/tests/gpgsm/t-support.h:1.3 gpgme/tests/gpgsm/t-support.h:1.3.2.1 --- gpgme/tests/gpgsm/t-support.h:1.3 Wed Nov 19 16:15:32 2003 +++ gpgme/tests/gpgsm/t-support.h Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-support.h - Helper routines for regression tests. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/tests/gpgsm/t-verify.c diff -u gpgme/tests/gpgsm/t-verify.c:1.15 gpgme/tests/gpgsm/t-verify.c:1.15.2.1 --- gpgme/tests/gpgsm/t-verify.c:1.15 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-verify.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,23 @@ /* t-verify.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/t-data.c diff -u gpgme/tests/t-data.c:1.10 gpgme/tests/t-data.c:1.10.2.1 --- gpgme/tests/t-data.c:1.10 Tue Feb 17 18:26:20 2004 +++ gpgme/tests/t-data.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,22 @@ /* t-data - Regression tests for the gpgme_data_t abstraction. - * Copyright (C) 2001 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2001, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/t-engine-info.c diff -u gpgme/tests/t-engine-info.c:1.3 gpgme/tests/t-engine-info.c:1.3.2.1 --- gpgme/tests/t-engine-info.c:1.3 Sun May 18 22:45:03 2003 +++ gpgme/tests/t-engine-info.c Tue Dec 7 22:11:53 2004 @@ -1,21 +1,22 @@ /* t-engine-info.c - Regression test for gpgme_get_engine_info. - Copyright (C) 2003 g10 Code GmbH + Copyright (C) 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/tests/t-version.c diff -u gpgme/tests/t-version.c:1.5 gpgme/tests/t-version.c:1.5.2.1 --- gpgme/tests/t-version.c:1.5 Thu Jul 31 17:44:31 2003 +++ gpgme/tests/t-version.c Tue Dec 7 22:11:53 2004 @@ -1,22 +1,22 @@ -/* t-version.c - regression test - * Copyright (C) 2001 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* t-version.c - Regression test. + Copyright (C) 2001, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include From cvs at cvs.gnupg.org Fri Dec 10 23:17:19 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:53:57 2004 Subject: gnupg/po (30 files) Message-ID: Date: Friday, December 10, 2004 @ 23:21:02 Author: wk Path: /cvs/gnupg/gnupg/po Added: LINGUAS.contrib Modified: ChangeLog LINGUAS be.po ca.po cs.po da.po de.po el.po eo.po es.po et.po fi.po fr.po gl.po hu.po id.po it.po ja.po nl.po pl.po pt.po pt_BR.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po * sv.po: Take the update done for 1.2.6. * zh_CN.po, fr.po, cs.po, ja.po: Updated. -----------------+ ChangeLog | 18 LINGUAS | 1 LINGUAS.contrib | 4 be.po | 1281 +++++++------- ca.po | 1378 ++++++++------- cs.po | 3240 +++++++++++++++--------------------- da.po | 1308 +++++++------- de.po | 1372 ++++++++------- el.po | 1381 ++++++++------- eo.po | 1361 ++++++++------- es.po | 1371 ++++++++------- et.po | 1365 ++++++++------- fi.po | 1369 ++++++++------- fr.po | 3346 ++++++++++++++++--------------------- gl.po | 1369 ++++++++------- hu.po | 1367 ++++++++------- id.po | 1369 ++++++++------- it.po | 1369 ++++++++------- ja.po | 3720 ++++++++++++++++++----------------------- nl.po | 191 +- pl.po | 1373 ++++++++------- pt.po | 1366 ++++++++------- pt_BR.po | 1365 ++++++++------- ro.po | 1369 ++++++++------- ru.po | 1367 ++++++++------- sk.po | 1373 ++++++++------- sv.po | 1916 +++++++++++---------- tr.po | 1372 ++++++++------- zh_CN.po | 4850 ++++++++++++++++++++++++------------------------------ zh_TW.po | 1361 ++++++++------- 30 files changed, 23637 insertions(+), 22255 deletions(-) Index: gnupg/po/ChangeLog diff -u gnupg/po/ChangeLog:1.58 gnupg/po/ChangeLog:1.59 --- gnupg/po/ChangeLog:1.58 Wed Oct 27 18:32:51 2004 +++ gnupg/po/ChangeLog Fri Dec 10 23:21:02 2004 @@ -1,3 +1,9 @@ +2004-12-10 Werner Koch + + * sv.po: Take the update done for 1.2.6. + + * zh_CN.po, fr.po, cs.po, ja.po: Updated. + 2004-10-27 Werner Koch * LINGUAS: Better don't have comments in this file. @@ -283,7 +289,7 @@ 2000-06-07 18:26:58 Werner Koch (wk@habibti.openit.de) - * fr.po: New version from Gaël + * fr.po: New version from Gaël 2000-05-02 10:44:42 Werner Koch (wk@habibti.openit.de) @@ -355,7 +361,7 @@ Thu Sep 23 06:26:28 1999 Werner Koch (wk@gnupg.org) - * fr.po: Updated by Gaël. + * fr.po: Updated by Gaël. Sat Sep 18 11:49:51 1999 Werner Koch (wk@gnupg.org) @@ -379,7 +385,7 @@ * POTFILES.in (delkey.c): New. - * fr.po: Gaël was the first to update it again. + * fr.po: Gaël was the first to update it again. Wed Sep 1 15:30:44 CEST 1999 Werner Koch @@ -390,7 +396,7 @@ * it.po: Updated (Marco). * de.po: Updated (Walter). * pt_BR-po: Update (Thiago). - * fr.po: Updated (Gaël). + * fr.po: Updated (Gaël). Wed Aug 4 10:34:18 CEST 1999 Werner Koch @@ -519,7 +525,7 @@ Mon Sep 21 09:28:54 1998 Werner Koch (wk@(none)) - * fr.po: New version from Gaël Quéri + * fr.po: New version from Gaël Quéri Tue Aug 11 12:28:11 1998 Werner Koch (wk@(none)) @@ -547,7 +553,7 @@ - Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without Index: gnupg/po/LINGUAS diff -u gnupg/po/LINGUAS:1.3 gnupg/po/LINGUAS:1.4 --- gnupg/po/LINGUAS:1.3 Wed Oct 27 18:32:51 2004 +++ gnupg/po/LINGUAS Fri Dec 10 23:21:02 2004 @@ -8,7 +8,6 @@ hu id it ja -nl pl pt_BR pt ro ru sk sv Index: gnupg/po/LINGUAS.contrib diff -u /dev/null gnupg/po/LINGUAS.contrib:1.1 --- /dev/null Fri Dec 10 23:21:04 2004 +++ gnupg/po/LINGUAS.contrib Fri Dec 10 23:21:02 2004 @@ -0,0 +1,4 @@ +# these are languages files for which we don't have a proper disclaimer + +nl.po + Index: gnupg/po/be.po diff -u gnupg/po/be.po:1.7 gnupg/po/be.po:1.8 --- gnupg/po/be.po:1.7 Thu Oct 28 11:06:50 2004 +++ gnupg/po/be.po Fri Dec 10 23:21:02 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -15,11 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" - #: cipher/primegen.c:120 #, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -34,11 +29,12 @@ msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -71,9 +67,9 @@ msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "" @@ -116,89 +112,148 @@ "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" msgstr "" -#: g10/app-openpgp.c:1301 -#, c-format -msgid "PIN [sigs done: %lu]" +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 -#, c-format -msgid "can't access %s - invalid OpenPGP card?\n" +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1025 #, fuzzy, c-format -msgid "error getting serial number: %s\n" +msgid "error getting new PIN: %s\n" msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" -#: g10/app-openpgp.c:1763 -#, fuzzy, c-format -msgid "failed to store the key: %s\n" -msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n" +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +msgid "error reading application data\n" +msgstr "" -#: g10/app-openpgp.c:1805 -msgid "reading the key failed\n" +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "паказаць ключы й адбіткі пальцаў" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "выдаліць ключы Ñа зьвÑзку ÑакрÑтных ключоў" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "Ñтварыць новую пару ключоў" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "Ñтварыць новую пару ключоў" + +#: g10/app-openpgp.c:1141 +#, c-format +msgid "key generation completed (%d seconds)\n" msgstr "" -#: g10/app-openpgp.c:1812 +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 msgid "response does not contain the public key data\n" msgstr "" -#: g10/app-openpgp.c:1820 +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1831 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 msgid "response does not contain the RSA public exponent\n" msgstr "" +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 +#, c-format +msgid "PIN [sigs done: %lu]" +msgstr "" + +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 +#, c-format +msgid "can't access %s - invalid OpenPGP card?\n" +msgstr "" + +#: g10/app-openpgp.c:1734 +#, fuzzy, c-format +msgid "error getting serial number: %s\n" +msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" + +#: g10/app-openpgp.c:1829 +#, fuzzy, c-format +msgid "failed to store the key: %s\n" +msgstr "%s: немагчыма Ñтварыць Ñ…Ñш-табліцу: %s\n" + +#: g10/app-openpgp.c:1871 +msgid "reading the key failed\n" +msgstr "" + #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -283,14 +338,14 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "" @@ -298,136 +353,145 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 msgid "male" msgstr "" -#: g10/card-util.c:377 +#: g10/card-util.c:379 msgid "female" msgstr "" -#: g10/card-util.c:377 +#: g10/card-util.c:379 msgid "unspecified" msgstr "" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "непадтрымліваецца" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 msgid "URL to retrieve public key: " msgstr "" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 msgid "not an OpenPGP card" msgstr "" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, c-format msgid "error getting current key info: %s\n" msgstr "" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -435,225 +499,246 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "ÐŸÐ¾Ð´Ð¿Ñ–Ñ Ñтвораны Ñž %.*s з выкарыÑтаньнем %s ID ключа %08lX\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 msgid " (2) Encryption key\n" msgstr "" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Калі лаÑка, абÑрыце від ключа, Ñкі Вам патрÑбны:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "невÑдомы альгарытм ÑьціÑканьнÑ" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 msgid "secret key already stored on a card\n" msgstr "" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quit [выйÑьці]" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "даведка (help)" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "паказаць гÑтую даведку" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Даведка адÑутнічае" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "name" msgstr "" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 msgid "login" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 msgid "change the login name" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 msgid "cafpr" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 msgid "forcesig" msgstr "" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "Ð°Ð³ÑƒÐ»ÑŒÐ½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "Ñтварыць новую пару ключоў" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Загад> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "ÐерÑчаіÑны загад (паÑпрабуйце \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Паўтарыце пароль: " + +#: g10/cardglue.c:718 +msgid "PIN not correctly repeated; try again" +msgstr "" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -663,13 +748,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -710,7 +795,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "" @@ -729,7 +814,7 @@ msgid "`%s' already compressed\n" msgstr "" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "" @@ -754,7 +839,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -851,27 +936,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "Ключ абаронены.\n" -#: g10/export.c:214 +#: g10/export.c:219 #, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "" -#: g10/export.c:361 +#: g10/export.c:384 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "" @@ -1050,15 +1135,15 @@ msgid "prompt before overwriting" msgstr "пытацца перад перазапіÑам" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1066,7 +1151,7 @@ "@\n" "(ГлÑдзіце man Ñтаронку, Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ поўнага апіÑÐ°Ð½ÑŒÐ½Ñ ÑžÑÑ–Ñ… загадаў Ñ– выбараў)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1086,15 +1171,15 @@ " --list-keys [назвы] паказаць ключы\n" " --fingerprint [назвы] паказаць адбіткі пальцаў\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Калі лаÑка, паведамлÑйце пра памылкі на .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "ВыкарыÑтаньне: gpg [выбары] [файлы] (-h Ð´Ð»Ñ Ð´Ð°Ð²ÐµÐ´ÐºÑ–)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1104,7 +1189,7 @@ "sign, check, encrypt ці decrypt\n" "Дапомнае дзеÑньне залежыць ад уваходных даньнÑÑž\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1112,478 +1197,478 @@ "\n" "Ðльгарытмы, ÑÐºÑ–Ñ Ð¿Ð°Ð´Ñ‚Ñ€Ñ‹Ð¼Ð»Ñ–Ð²Ð°ÑŽÑ†Ñ†Ð°:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "" -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "" -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "" -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "" -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "ВыкарыÑтаньне: gpg [выбары] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 msgid "could not parse keyserver URL\n" msgstr "" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s не дазвалÑецца разам з %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2684 +#: g10/g10.c:2717 msgid "selected compression algorithm is invalid\n" msgstr "" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2709 +#: g10/g10.c:2742 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [назва_файла]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [назва_файла]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [назва_файла]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [назва_файла]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [назва_файла]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [назва_файла]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [назва_файла]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [загады]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[назва_файла]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "" -#: g10/g10.c:3911 +#: g10/g10.c:3944 msgid "the given preferred keyserver URL is invalid\n" msgstr "" @@ -1591,26 +1676,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 msgid "[User ID not found]" msgstr "" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "" @@ -1876,373 +1961,373 @@ msgid "No help available for `%s'" msgstr "Ð”Ð»Ñ \"%s\" даведка адÑутнічае" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "" -#: g10/import.c:256 +#: g10/import.c:258 #, c-format msgid "%lu keys processed so far\n" msgstr "" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr "" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr "" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr "" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr "" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr "" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr "" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr "" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr "" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr "" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 msgid "algorithms on these user IDs:\n" msgstr "" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/import.c:713 +#: g10/import.c:715 #, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/import.c:752 +#: g10/import.c:754 #, c-format msgid "key %s: new key - skipped\n" msgstr "" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "" -#: g10/import.c:791 +#: g10/import.c:793 #, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "" -#: g10/import.c:815 +#: g10/import.c:817 #, c-format msgid "key %s: doesn't match our copy\n" msgstr "" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "" -#: g10/import.c:875 +#: g10/import.c:877 #, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– подпіÑаў" -#: g10/import.c:884 +#: g10/import.c:886 #, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "" -#: g10/import.c:887 +#: g10/import.c:889 #, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "" -#: g10/import.c:908 +#: g10/import.c:910 #, c-format msgid "key %s: \"%s\" not changed\n" msgstr "" -#: g10/import.c:1053 +#: g10/import.c:1055 #, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "" -#: g10/import.c:1092 +#: g10/import.c:1094 #, c-format msgid "key %s: secret key imported\n" msgstr "" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "выдаліць ключы Ñа зьвÑзку ÑакрÑтных ключоў" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" -#: g10/import.c:1204 +#: g10/import.c:1206 #, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "" -#: g10/import.c:1236 +#: g10/import.c:1238 #, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "" -#: g10/import.c:1301 +#: g10/import.c:1303 #, c-format msgid "key %s: no user ID for signature\n" msgstr "" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/import.c:1336 +#: g10/import.c:1338 #, c-format msgid "key %s: no subkey for key binding\n" msgstr "" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "" -#: g10/import.c:1349 +#: g10/import.c:1351 #, c-format msgid "key %s: invalid subkey binding\n" msgstr "" -#: g10/import.c:1364 +#: g10/import.c:1366 #, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "" -#: g10/import.c:1386 +#: g10/import.c:1388 #, c-format msgid "key %s: no subkey for key revocation\n" msgstr "" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/import.c:1477 +#: g10/import.c:1479 #, c-format msgid "key %s: skipped subkey\n" msgstr "" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "Ключ абаронены.\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "" -#: g10/import.c:1531 +#: g10/import.c:1533 #, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "" -#: g10/import.c:1545 +#: g10/import.c:1547 #, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "" -#: g10/import.c:1553 +#: g10/import.c:1555 #, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "" -#: g10/import.c:1653 +#: g10/import.c:1655 #, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "" -#: g10/import.c:1715 +#: g10/import.c:1717 #, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" -#: g10/import.c:1729 +#: g10/import.c:1731 #, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" -#: g10/import.c:1788 +#: g10/import.c:1790 #, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "%s: Ñ‚Ñчка Ñтворана\n" @@ -2463,7 +2548,7 @@ msgstr "" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +msgid "Your selection? (enter `?' for more information): " msgstr "" #: g10/keyedit.c:918 @@ -2509,7 +2594,7 @@ msgid "Really sign? (y/N) " msgstr "" -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2540,7 +2625,7 @@ "УвÑдзіце новы пароль Ð´Ð»Ñ Ð³Ñтага ÑакрÑтнага ключа.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "" @@ -3000,292 +3085,287 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 +#: g10/keyedit.c:2245 #, c-format -msgid "This key may be revoked by %s key " +msgid "This key may be revoked by %s key %s" msgstr "" -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, c-format msgid "trust: %s" msgstr "" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -msgid "revoked" -msgstr "" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -msgid "expired" -msgstr "" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +msgid "revoked" +msgstr "" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +msgid "expired" +msgstr "" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "" -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "" -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 msgid "this key has already been designated as a revoker\n" msgstr "" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 msgid "Are you sure you want to replace it? (y/N) " msgstr "" -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 msgid "Are you sure you want to delete it? (y/N) " msgstr "" -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 msgid " (non-revocable)" msgstr "" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, c-format msgid "revoked by your key %s on %s\n" msgstr "" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3327,12 +3407,12 @@ msgid "writing key binding signature\n" msgstr "" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "" @@ -3399,81 +3479,60 @@ #: g10/keygen.c:1353 #, c-format -msgid " (%d) Elgamal (encrypt only)\n" +msgid " (%d) DSA (set your own capabilities)\n" msgstr "" -#: g10/keygen.c:1354 +#: g10/keygen.c:1355 #, c-format -msgid " (%d) RSA (sign only)\n" +msgid " (%d) Elgamal (encrypt only)\n" msgstr "" #: g10/keygen.c:1356 #, c-format -msgid " (%d) RSA (encrypt only)\n" +msgid " (%d) RSA (sign only)\n" msgstr "" #: g10/keygen.c:1358 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" +msgid " (%d) RSA (encrypt only)\n" msgstr "" -#: g10/keygen.c:1409 +#: g10/keygen.c:1360 #, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "" - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +msgid " (%d) RSA (set your own capabilities)\n" msgstr "" -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, c-format +msgid "DSA keypair will have %u bits.\n" msgstr "" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1447 -msgid "Are you sure that you want this keysize? (y/N) " +#: g10/keygen.c:1446 +#, c-format +msgid "What keysize do you want? (%u) " msgstr "" -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3483,7 +3542,7 @@ " y = key expires in n years\n" msgstr "" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3493,39 +3552,39 @@ " y = signature expires in n years\n" msgstr "" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "" -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "" -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 msgid "Is this correct? (y/N) " msgstr "" -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3535,44 +3594,44 @@ "\n" msgstr "" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "" -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "" -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "" -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3580,38 +3639,38 @@ "\n" msgstr "" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "" -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3619,7 +3678,7 @@ "\n" msgstr "" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3627,109 +3686,105 @@ "generator a better chance to gain enough entropy.\n" msgstr "" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 msgid "Really create? (y/N) " msgstr "" -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -3775,28 +3830,28 @@ msgid "expired: %s)" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr "" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr "" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr "" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4147,7 +4202,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 #, fuzzy msgid "unknown" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" @@ -4179,27 +4234,39 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "немагчыма адкрыць %s: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" +#: g10/misc.c:299 +#, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "" + +#: g10/misc.c:314 +#, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" msgstr "" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" + +#: g10/misc.c:334 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" #: g10/misc.c:430 @@ -4306,50 +4373,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, c-format msgid " (main key ID %s)" msgstr "" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4360,40 +4427,40 @@ "\"%.*s\"\n" "%u-бітавы %s ключ, ID %08lX, Ñтвораны %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Паўтарыце пароль\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "УвÑдзіце пароль\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "пароль занадта доўгі\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "ÑкаÑавана карыÑтальнікам\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 -msgid "can't query password in batch mode\n" +#: g10/passphrase.c:1094 g10/passphrase.c:1256 +msgid "can't query passphrase in batch mode\n" msgstr "" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "УвÑдзіце пароль: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4403,17 +4470,17 @@ "Вам неабходна ўвеÑьці пароль, каб адчыніць ÑакрÑтны ключ длÑ\n" "карыÑтальніка: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-бітавы %s ключ, ID %08lX, Ñтвораны %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Паўтарыце пароль: " @@ -4596,7 +4663,7 @@ msgstr "" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +msgid " This could mean that the signature is forged.\n" msgstr "" #: g10/pkclist.c:527 @@ -4695,28 +4762,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Калі лаÑка, задайце назву файла даньнÑÑž: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "чытаецца stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "" @@ -5012,49 +5079,44 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, c-format msgid "skipped \"%s\": duplicated\n" msgstr "" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "" -#: g10/skclist.c:186 +#: g10/skclist.c:185 msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5236,12 +5298,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "" @@ -5291,84 +5353,119 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "збой падпіÑаньнÑ: %s\n" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 msgid "never" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5675,6 +5772,10 @@ msgstr "" #, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n" + +#, fuzzy #~ msgid "can't create file `%s': %s\n" #~ msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n" @@ -5682,10 +5783,6 @@ #~ msgid "can't open file `%s': %s\n" #~ msgstr "немагчыма адкрыць %s: %s\n" -#, fuzzy -#~ msgid "expires" -#~ msgstr "збой падпіÑаньнÑ: %s\n" - #~ msgid "%s: can't create directory: %s\n" #~ msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n" Index: gnupg/po/ca.po diff -u gnupg/po/ca.po:1.9 gnupg/po/ca.po:1.10 --- gnupg/po/ca.po:1.9 Thu Oct 28 11:06:50 2004 +++ gnupg/po/ca.po Fri Dec 10 23:21:01 2004 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.4rc\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2003-12-05 19:15+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -35,12 +35,6 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" -"l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -55,11 +49,12 @@ msgid "no entropy gathering module detected\n" msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -94,9 +89,9 @@ msgid "note: random_seed file not updated\n" msgstr "nota: el fitxer random_seed no s'ha actualitzat\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "no s'ha pogut crear �%s�: %s\n" @@ -151,90 +146,150 @@ "sistema tinga oportunitat de recollir m�s entropia. (Calen %d bytes " "m�s)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "no s'ha pogut reconstruir la mem�ria cau de l'anell: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "l'enviament al servidor de claus ha fallat: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "error en la creaci� de la contrasenya: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: error en llegir el registre lliure: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "�%s� ja est� comprimida\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "genera un nou parell de claus" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "no s'ha pogut eliminar el bloc de claus: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "La generaci� de claus ha fallat: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "no s'han trobat dades OpenPGP v�lides.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "error en la creaci� de la contrasenya: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "no s'ha pogut eliminar el bloc de claus: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -328,15 +383,15 @@ # Dest�s? ivb # Desat�s, s�. jm -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "no es pot fet aix� en mode desat�s\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Seleccioneu: " @@ -344,17 +399,17 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "No s'ha especificat cap ra�" @@ -363,127 +418,136 @@ # Probablement �s una clau, femen�. jm # Werner FIXME: please add translator comment saying *what* is # uncompressed so we know the gender. jm -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "no processat" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "no hi ha cap clau p�blica corresponent: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "error en la lectura de �%s�: %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "prefer�ncies actualitzades" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "hi ha un car�cter inv�lid en la cadena de prefer�ncia\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "error: l'empremta digital �s inv�lida\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Empremta digital:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "error: l'empremta digital �s inv�lida\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "La generaci� de claus ha fallat: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "no s'han trobat dades OpenPGP v�lides.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "" "s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -491,235 +555,259 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Seleccioneu quin tipus de clau voleu:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Aquesta signatura va caducar el %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (nom�s xifrar)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "La selecci� �s inv�lida.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Seleccioneu la ra� de la revocaci�:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "l'algorisme de protecci� �s desconegut\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "es descarta: la clau secreta ja �s present\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "ix" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ix del men�" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "les ordres entren en conflicte\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "ajuda" # �pantalla� o �ajuda�? ivb # �ajuda�, evidentment. jm -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra aquesta ajuda" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "llista" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "La clau �s disponible en: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "depura" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "canvia la data de caducitat" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "canvia la confian�a" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra empremta" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "error general" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "genera un nou parell de claus" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Ordre> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "les ordres entren en conflicte\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "les ordres entren en conflicte\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "s'est� escrivint la clau secreta a �%s�\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "L'ordre no �s v�lida (proveu �help�)\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Introdu�u el nom d'usuari: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Introdu�u el nom d'usuari: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Introdu�u el nom d'usuari: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Repetiu la contrasenya: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -729,13 +817,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona per a aquesta ordre\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "no s'ha trobat la clau �%s�: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -781,7 +869,7 @@ msgstr "" "utilitzeu l'opci� �--delete-secret-keys� per a eliminar-la primer.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "error en la creaci� de la contrasenya: %s\n" @@ -800,7 +888,7 @@ msgid "`%s' already compressed\n" msgstr "�%s� ja est� comprimida\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AV�S: �%s� �s un fitxer buit\n" @@ -830,7 +918,7 @@ "for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del " "destinatari\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -941,28 +1029,28 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AV�S: no s'ha pogut eliminar el directori temporal �%s�: %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "s'est� escrivint la clau secreta a �%s�\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "clau %08lX: no est� protegida - es descarta\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" "AV�S: la clau secreta %08lX no te una simple suma de comprovaci� SK\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "AV�S: no s'ha exportat res\n" @@ -1144,15 +1232,15 @@ msgid "prompt before overwriting" msgstr "pregunta abans de sobreescriure" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1163,7 +1251,7 @@ # Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman # en el manual original de PGP. A, B, C... ivb # En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1183,15 +1271,15 @@ " --list-keys [noms] mostra claus\n" " --fingerprint [noms] mostra empremtes digitals\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Si us plau, informeu sobre els errors a .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1206,7 +1294,7 @@ # Precissament acabem de parlar d'�implementat a la llista del GNOME # i s'ha dit que �s erroni, igual que �suportat� :) Les alternatives # encara no m'agraden massa... jm -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1214,480 +1302,480 @@ "\n" "Algoritmes suportats:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Clau p�blica: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Xifratge: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Dispersi�: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Compressi�: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "forma d'�s: gpg [opcions] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "les ordres entren en conflicte\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "no s'ha trobat cap signe = en la definici� de grup �%s�\n" # Indi. ivb -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "AV�S: el propietari �s insegur en %s �%s�\n" # Indi. ivb -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "AV�S: el propietari �s insegur en %s �%s�\n" # Indi. ivb -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "AV�S: el propietari �s insegur en %s �%s�\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" "AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "" "AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" "AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" "AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "" "AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" "AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "s'ha creat el nou fitxer d'opcions �%s�\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "fitxer d'opcions �%s�: %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "s'estan llegint opcions de �%s�\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s no �s per a �s normal!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "la extensi� de xifrat �%s� no s'ha carregat per tindre permissos " "insegurs\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s no �s un joc de car�cters v�lid\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "" "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcions d'importanci� no v�lides\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "opcions d'importaci� no v�lides\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcions d'importanci� no v�lides\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "opcions d'importaci� no v�lides\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "no s'ha pogut fixar l'exec-path a %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "AV�S: el programa podria crear un fitxer core!\n" # FIXME: prefer�ncia? jm # Ho discut�rem en la llista, segur. Deu ser als arxius. ivb -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AV�S: %s t� prefer�ncia sobre %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s no �s perm�s amb %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s no t� sentit amb %s!\n" # clares -> en clar? ivb -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 " "habilitat.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no �s v�lid\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "l'algorisme de resum seleccionat no �s v�lid\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no �s v�lid\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ha de ser major que 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ha de ser major que 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "les prefer�ncies per defecte s�n inv�lides\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "les prefer�ncies personals de digest s�n inv�lides\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s encara no funciona amb %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [nom_del_fitxer]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [nom_del_fitxer]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "ha fallat el desxifratge: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [nom_del_fitxer]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [nom_del_fitxer]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom_del_fitxer]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [nom_del_fitxer]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [nom_del_fitxer]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [ordres]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [anell]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'enviament al servidor de claus ha fallat: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la recepci� des del servidor de claus ha fallat: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "l'exportaci� de la clau ha fallat: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "ha fallat la cerca al servidor de claus: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "ha fallat el refresc des del servidor de claus: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "no s'ha pogut llevar l'armadura: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "no s'ha pogut crear l'armadura: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nom_del_fitxer]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Endavant, escriviu el missatge...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1695,23 +1783,23 @@ "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i " "acabar amb el signe �=�\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" @@ -1721,29 +1809,29 @@ msgstr "" "hi ha massa entrades en la mem�ria cau de claus p�bliques - desactivada\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[No s'ha trobat l'id d'usuari]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "La clau inv�lida %08lX s'ha fet v�lida amb --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "no hi ha una clau secreta per a la subclau p�blica %08lX - es descarta\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "s'usar� la clau secund�ria %08lX en lloc de la prim�ria %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "clau %08lX: clau secreta sense clau p�blica - es descarta\n" @@ -2127,254 +2215,254 @@ msgid "No help available for `%s'" msgstr "No hi ha ajuda disponible per a `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "es descarta un bloc de tipus %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "fins ara s'han processat %lu claus\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Nombre total processat: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " claus noves descartades: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sense ID: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importades: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " no modificades: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " ID d'usuaris nous: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " subclaus noves: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " signatures noves: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " noves revocacions: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " claus privades llegides: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "claus privades importades: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "claus privades no canviades: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " importades: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Heu signat els seg�ents ID d'usuari:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "signatura %s, algorisme de resum %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "clau %08lX: sense ID\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada �%s�\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "clau %08lX: l'ID no �s v�lid\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "a�� pot ser causat per l'abs�ncia d'autosignatura\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "clau %08lX: clau nova - es descarta \n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "no s'ha trobat cap anell escrivible: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "s'est� escrivint en �%s�\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "error mentre s'escrivia l'anell �%s�: %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "clau %08lX: s'ha importat la clau p�blica �%s�\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "clau %08lX: no correspon a la nostra c�pia\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "clau %08lX: �%s� 1 ID d'usuari nou\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "clau %08lX: �%s� %d ID d'usuari nous\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "clau %08lX: �%s� 1 signatura nova\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "clau %08lX: �%s� %d signatures noves\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "clau %08lX: �%s� 1 subclau nova\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "clau %08lX: �%s� %d subclaus noves\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "clau %08lX: �%s� no ha estat modificada\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "clau %08lX: clau secreta amb xifrat %d no v�lid - es descarta\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "s'est� escrivint la clau secreta a �%s�\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "no hi ha anell secret predeterminat: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "clau %08lX: s'ha importat la clau secreta\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "clau %08lX: ja es troba en l'anell privat\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" @@ -2384,23 +2472,23 @@ # O �rebutjara�? ivb # Per tots els canvis d'anglicisme �ignorat� -> �es descarta�, # �es rebutja� est� b�. jm -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "" "clau %08lX: el certificat de revocaci� �s inv�lid: %s: es rebutja\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "clau %08lX: s'ha importat el certificat de revocaci� �%s�\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "clau %08lX: no hi ha ID per a la signatura\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" @@ -2408,114 +2496,114 @@ "�%s�\n" "\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "" "clau %08lX: l'autosignatura no �s v�lida en l'id d'usuari �%s�\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "clau %08lX: l'algoritme de clau p�blica no �s suportat\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "clau %08lX: s'ha eliminat un enlla� de subclau m�ltiple\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci�\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "clau %08lX: Subclau de revocaci� no v�lida\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "clau %08lX: s'han eliminat subclaus de revocaci� m�ltiples\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "clau %08lX: es descarta l'ID d'usuari '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "clau %08lX: es descarta la subclau\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "" "clau %08lX: la signatura �s inexportable (classe %02x) - es descarta\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "" "clau %08lX: el certificat de revocaci� �s en el lloc equivocat - es " "descarta\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "" "clau %08lX: el certificat de revocaci� �s inv�lid: %s - es descarta\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "" "clau %08lX: la signatura de la subclau �s en el lloc equivocat - es " "descarta\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "" "clau %08lX: la classe de signatura �s inesperada (0x%02x) - es descarta\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci� " "%08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no " "est� present.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci� �%s�\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n" @@ -2752,7 +2840,8 @@ msgstr " (3) He fet comprovacions molt acurades.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "" "Seleccioneu una opci� (introdu�u �?� per obtindre m�s " "informaci�):" @@ -2827,7 +2916,7 @@ msgid "Really sign? (y/N) " msgstr "Signar realment? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2858,7 +2947,7 @@ "Introdu�u la nova contrasenya per a la clau secreta.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" @@ -3351,83 +3440,67 @@ # Potser %s haja d'anar darrere de �clau�. ivb # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Aquesta clau pot ser revocada per la clau %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "no s'ha pogut creat %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " confian�a: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " confian�a: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Aquesta clau ha estat desactivada" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revocada]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3436,7 +3509,19 @@ "necess�riament\n" "correcta a no ser que torneu a executar el programa.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[revocada]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3446,7 +3531,7 @@ "assumida.\n" # Photo ID com abans. ivb -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3455,49 +3540,49 @@ "AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que " "algunes versions de PGP rebutgen aquesta clau.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Esteu segur que encara voleu afegir-lo? (s/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n" # Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)? ivb # Hmm. S�... (s/N/x) jm -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "S'ha esborrat %d signatura.\n" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "S'han esborrat %d signatures.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "No s'hi ha eliminat res.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3507,168 +3592,168 @@ "pot\n" "fer que algunes versions de PGP rebutjen aquesta clau.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Introdu�u l'ID d'usuari del revocador designat: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no podeu nominar una clau com el seu propi revocador designat\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AV�S: no es pot desfer la nominaci� d'una clau com a revocador " "designat!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Per favor, elimineu les seleccions de les claus secretes.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "No podeu canviar la data de caducitat de les claus v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "No hi ha cap signatura corresponent en l'anell secret\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Heu de seleccionar exactament un ID.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "No hi ha cap ID amb l'�ndex %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID d'usuari: �" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " signat per %08lX el %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (no-exportable)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Aquesta signatura va caducar el %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Esteu segur de que encara voleu revocarla? (s/N) " # (s/N) ivb # S! jm -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" "Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Heu signat els seg�ents ID d'usuari:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (no-exportable)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocat per %08lX el %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Esteu a punt de revocar aquestes signatures:\n" # (s/N)? ivb -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Realment voleu crear els certificats de revocaci�? (s/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "ho hi ha clau secreta\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'ID d'usuari �%s� ja est� revocat\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3711,12 +3796,12 @@ msgid "writing key binding signature\n" msgstr "s'est� escrivint la signatura de comprovaci� de la clau\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "la mida de la clau �s inv�lida; s'hi usaran %u bits\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n" @@ -3784,93 +3869,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (nom�s xifrar)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (nom�s xifrar)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (nom�s signar)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (nom�s xifrar)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (nom�s xifrar)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Preparat per a generar un nou parell de claus %s.\n" -" grand�ria m�nima: 768 bits\n" -" grand�ria predeterminada: 1024 bits\n" -" grand�ria m�xima aconsellada: 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Quina grand�ria voleu? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus " -"RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "La parella de claus DSA ha de tenir 1024 bits.\n" -# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons. ivb #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"No es recomanen claus m�s llargues de 2048 bits perqu�\n" -"els c�lculs s�n VERITABLEMENT llargs!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Segur que voleu aquesta grand�ria? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Quina grand�ria voleu? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� " -"son molt vulnerables als atacs!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La grand�ria sol�licitada �s %u bits\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "arrodonida fins a %u bits\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3886,7 +3938,7 @@ " m = la clau caduca als n mesos\n" " y = la clau caduca als n anys\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3902,31 +3954,31 @@ " m = la signatura caduca als n mesos\n" " y = la signatura caduca als n anys\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Indiqueu la validesa de la clau (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Indiqueu la validesa de la signatura (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "el valor no �s v�lid\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s no caduca en absolut\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s caduca el %s\n" # Amb �it� es refereix a les dates? ivb # Aix� vaig entendre jo. jm -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3934,12 +3986,12 @@ "El vostre sistema no pot representar dates posteriors a l'any 2038.\n" "Tanmateix, les tractar� b� fins l'any 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "�s correcte? (s/n)" -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3956,44 +4008,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nom i cognoms: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Hi ha un car�cter inv�lid en el camp *nom*\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "El nom no pot comen�ar amb un d�git\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "El nom ha de tenir, si m�s no, 5 car�cters\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Adre�a electr�nica: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "No �s una adre�a v�lida\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Comentari: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Hi ha un car�cter inv�lid en el camp *comentari*\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Esteu usant el joc de car�cters `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -4004,30 +4056,30 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n" # xX? ivb # Hmm... s�. jm -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoXx" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix" -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Corregiu l'error primer\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -4035,12 +4087,12 @@ "Cal una contrasenya per a protegir la clau secreta.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -4052,7 +4104,7 @@ "useu aquest programa amb l'opci� \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -4065,59 +4117,55 @@ "aleatoris\n" "d'aconseguir prou entropia.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "La parella de claus DSA ha de tenir 1024 bits.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "La generaci� de claus ha estat cancel�lada.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "s'est� escrivint la clau p�blica a �%s�\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "s'est� escrivint la clau secreta a �%s�\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "s'est� escrivint la clau secreta a �%s�\n" # Potser no hi haja cap anell! ivb -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "no s'ha trobat cap anell p�blic escrivible: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "" "no s'ha trobat cap anell secret de escrivible: %s\n" "\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "" "s'ha produ�t un error mentre s'escrivia l'anell p�blic �%s�: %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "" "s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "s'han creat i signat les claus p�blica i secreta.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -4125,13 +4173,13 @@ "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n" "\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "La generaci� de claus ha fallat: %s\n" # Werner FIXME: Use ngettext. jm -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4140,7 +4188,7 @@ "amb el rellotge)\n" # Werner FIXME: use ngettext. jm -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4148,40 +4196,40 @@ "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n" "amb el rellotge)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTA: crear subclaus per a claus v3 no �s conforme amb OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Crear realment? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "no s'ha pogut eliminar el bloc de claus: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "no s'ha pogut crear �%s�: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: la clau secreta %08lX caduca el %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4227,28 +4275,28 @@ msgid "expired: %s)" msgstr " [caduca: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Empremtes digital de la clau prim�ria:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Empremta digital de la subclau:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Empremta digital de la clau prim�ria:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Empremta digital de la subclau:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Empremta digital =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4615,7 +4663,7 @@ msgid "textmode" msgstr "mode text" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "desconeguda" @@ -4649,30 +4697,42 @@ msgstr "s'ha detectat un paquet arrel inv�lid en proc_tree()\n" # bolcats de mem�ria? ivb -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "no s'han pogut desactivar els bolcats de mem�ria: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "ha fallat l'actualitzaci� de la base de dades de confian�a: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "base de dades de confian�a: ha fallat la lectura (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "No haur�eu d'usar algoritmes experimentals!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "l'algoritme de xifratge no �s implementat" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "signatura %s, algorisme de resum %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s " -"est�ndard!\n" +"for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del " +"destinatari\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4791,46 +4851,46 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent no est� disponible en aquesta sessi�\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "no es pot establir el pid del client per l'agent\n" # llija/llegisca/llegesca. ivb -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versi� %d del protocol de gpg-agent no est� suportada\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no s'ha pogut connectar amb �%s�: %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID de la clau principal %08lX)" @@ -4846,7 +4906,7 @@ # Se't passava l'argument �*�. printf(3), hieroglyph(7). ivb # Ah! Prova-ho, no casque alguna cosa :P ivb # Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4857,41 +4917,41 @@ "�%2$.*1$s�\n" "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Repetiu la contrasenya\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Introdu�u la contrasenya\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "la contrasenya �s massa llarga\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "la resposta de l'agent �s inv�lida\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "s'ha cancel�lat per l'usuari\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "no es pot demanar la contrasenya en mode desat�s\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Introdu�u la contrasenya: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4901,17 +4961,17 @@ "Necessiteu la contrasenya per desblocar la clau secreta de\n" "l'usuari: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Repetiu la contrasenya: " @@ -5122,7 +5182,8 @@ msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " A�� podria significar que la signatura �s falsificada.\n" #: g10/pkclist.c:527 @@ -5225,30 +5286,30 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "les dades no s'han desat; useu l'opci� \"--output\" per desar-les\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "error en crear �%s�: %s\n" # Indi? ivb # Em pense que no. jm -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Signatura separada.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Introdu�u el nom del fitxer de dades: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "s'est� llegint d'stdin...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "no hi ha dades signades\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "no s'han pogut obrir les dades signades `%s'\n" @@ -5590,12 +5651,7 @@ "nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre " "esteu en mode --pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "s'est� escrivint en �%s�\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" @@ -5603,41 +5659,41 @@ "for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del " "destinatari\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "signatura:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "s'utilitzar� xifratge %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA " "fals!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "es descarta �%s�: duplicat\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "es descarta �%s�: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "es descarta: la clau secreta ja �s present\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5830,12 +5886,12 @@ "la base de dades de confian�a est� corrompuda; per favor, executeu " "�gpg --fix-trustdb�.\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "no es poden tractar l�nies m�s llargues de %d car�cters\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "la l�nia d'entrada �s superior a %d car�cters\n" @@ -5887,93 +5943,128 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[revocada]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[caducada]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "desconeguda" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "" "la pr?xima comprovaci� de la base de dades de confian�a ser� el %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "no s'ha trobat la clau p�blica %08lX: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "si us plau, feu un --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "s'est� comprovant la base de dades de confian�a\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "no s'han trobat claus amb confian�a absoluta\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n" @@ -6306,6 +6397,67 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "" +#~ "l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Preparat per a generar un nou parell de claus %s.\n" +#~ " grand�ria m�nima: 768 bits\n" +#~ " grand�ria predeterminada: 1024 bits\n" +#~ " grand�ria m�xima aconsellada: 2048 bits\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus " +#~ "RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n" + +# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons. ivb +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "No es recomanen claus m�s llargues de 2048 bits perqu�\n" +#~ "els c�lculs s�n VERITABLEMENT llargs!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Segur que voleu aquesta grand�ria? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� " +#~ "son molt vulnerables als atacs!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "No haur�eu d'usar algoritmes experimentals!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s " +#~ "est�ndard!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "s'est� escrivint en �%s�\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "no es pot fet aix� en mode desat�s\n" @@ -6437,12 +6589,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[revocada]" - -#~ msgid "[expired] " -#~ msgstr "[caducada]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [caduca: %s]" Index: gnupg/po/cs.po diff -u gnupg/po/cs.po:1.12 gnupg/po/cs.po:1.13 --- gnupg/po/cs.po:1.12 Thu Oct 28 11:06:50 2004 +++ gnupg/po/cs.po Fri Dec 10 23:21:01 2004 @@ -3,25 +3,20 @@ # Magda Procházková 2001, Roman Pavlik 2001, 2002, 2003, 2004. msgid "" msgstr "" -"Project-Id-Version: gnupg-1.2.3\n" +"Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" -"PO-Revision-Date: 2003-12-07 16:20+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "hashovací algoritmus `%s' je v tomto release read-only\n" - #: cipher/primegen.c:120 -#, fuzzy, c-format +#, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" -msgstr "nemohu vygenerovat prvoèíslo s ménì ne¾ %d bity\n" +msgstr "nemohu vygenerovat prvoèíslo s pbits=%u qbits=%u\n" #: cipher/primegen.c:311 #, c-format @@ -32,11 +27,12 @@ msgid "no entropy gathering module detected\n" msgstr "nebyl detekován ¾ádný modul pro získání entropie\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -69,9 +65,9 @@ msgid "note: random_seed file not updated\n" msgstr "poznámka: soubor random_seed není aktualizován\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "nemohu vytvoøit `%s': %s\n" @@ -124,90 +120,152 @@ "Nedostatek náhodných bajtù. Prosím, pracujte s operaèním systémem, abyste\n" "mu umo¾nili získat více entropie (je potøeba %d bajtù).\n" -#: g10/app-openpgp.c:534 -#, fuzzy, c-format +#: g10/app-openpgp.c:539 +#, c-format msgid "failed to store the fingerprint: %s\n" -msgstr "nemohu inicializovat databázi dùvìry: %s\n" +msgstr "ulo¾ení fingerprintu se nezdaøilo: %s\n" -#: g10/app-openpgp.c:547 -#, fuzzy, c-format +#: g10/app-openpgp.c:552 +#, c-format msgid "failed to store the creation date: %s\n" -msgstr "selhalo obnovení vyrovnávací pamìti klíèù: %s\n" +msgstr "ulo¾ení datumu vytvoøení se nezdaøilo: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" -msgstr "" +msgstr "funkce PIN callback zkonèila chybou: %s\n" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" -msgstr "" +msgstr "PIN pro CHV%d je pøíli¹ krátký; minimální délka je %d\n" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 -#, fuzzy, c-format +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 +#, c-format msgid "verify CHV%d failed: %s\n" -msgstr "odeslání na keyserver se nezdaøilo: %s\n" +msgstr "verifikace CHV%d se nezdaøila: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" -msgstr "" +msgstr "pøístup k administrátorským pøíkazùm není nakonfigurován\n" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" -msgstr "" +msgstr "chyba pøi získání CHV z karty\n" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" -msgstr "" +msgstr "karta je trvale uzamèena!\n" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" +"do trvalého uzamèení karty zùstává %d pokusù o zadání PINu administrátora\n" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" -msgstr "" +#: g10/app-openpgp.c:865 +#, fuzzy +msgid "|A|Admin PIN" +msgstr "PIN administrátora" -#: g10/app-openpgp.c:1301 -#, c-format -msgid "PIN [sigs done: %lu]" +#: g10/app-openpgp.c:1021 +#, fuzzy +msgid "|AN|New Admin PIN" +msgstr "PIN administrátora" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1025 #, fuzzy, c-format -msgid "can't access %s - invalid OpenPGP card?\n" -msgstr "nenalezena ¾ádná platná data ve formátu OpenPGP.\n" +msgid "error getting new PIN: %s\n" +msgstr "chyba pøi získání sériového èísla: %s\n" -#: g10/app-openpgp.c:1668 -#, fuzzy, c-format -msgid "error getting serial number: %s\n" -msgstr "chyba pøi vytváøení hesla: %s\n" +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "chyba pøi ètení bloku klíèe: %s\n" -#: g10/app-openpgp.c:1763 -#, fuzzy, c-format -msgid "failed to store the key: %s\n" -msgstr "nemohu inicializovat databázi dùvìry: %s\n" +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: chyba pøi ètení volného záznamu: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1107 #, fuzzy -msgid "reading the key failed\n" -msgstr "smazání bloku klíèe se nezdaøilo: %s\n" +msgid "key already exists\n" +msgstr "`%s' je ji¾ zkomprimován\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "vytvoøit nový pár klíèù" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1831 +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "ètení klíèe se nezdaøilo\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "odpovìï neobsahuje veøejný klíè\n" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "odpovìï neobsahuje RSA modulus\n" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 msgid "response does not contain the RSA public exponent\n" +msgstr "odpovìï neobsahuje veøejný RSA exponent\n" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" +#: g10/app-openpgp.c:1367 +#, c-format +msgid "PIN [sigs done: %lu]" +msgstr "PIN [podpis hotov: %lu]" + +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 +#, c-format +msgid "can't access %s - invalid OpenPGP card?\n" +msgstr "pøístup na %s se nezdaøil - vadná OpenPGP karta?\n" + +#: g10/app-openpgp.c:1734 +#, c-format +msgid "error getting serial number: %s\n" +msgstr "chyba pøi získání sériového èísla: %s\n" + +#: g10/app-openpgp.c:1829 +#, c-format +msgid "failed to store the key: %s\n" +msgstr "nelze ulo¾it klíè: %s\n" + +#: g10/app-openpgp.c:1871 +msgid "reading the key failed\n" +msgstr "ètení klíèe se nezdaøilo\n" + #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -230,18 +288,17 @@ msgstr "vnoøené podpisy v èitelném formátu\n" #: g10/armor.c:551 -#, fuzzy msgid "unexpected armor: " -msgstr "neoèekávané kódování ASCII:" +msgstr "neoèekávaný ASCII armor: " #: g10/armor.c:563 msgid "invalid dash escaped line: " msgstr "nesprávné oznaèení øádku mínusy: " #: g10/armor.c:715 g10/armor.c:1300 -#, fuzzy, c-format +#, c-format msgid "invalid radix64 character %02X skipped\n" -msgstr "neplatný znak formátu radix64 %02x byl pøeskoèen\n" +msgstr "neplatný radix64 znak %02X byl pøeskoèen\n" #: g10/armor.c:758 msgid "premature eof (no CRC)\n" @@ -256,12 +313,11 @@ msgstr "¹patný formát CRC\n" #: g10/armor.c:804 g10/armor.c:1337 -#, fuzzy, c-format +#, c-format msgid "CRC error; %06lX - %06lX\n" -msgstr "Chyba CRC; %06lx - %06lx\n" +msgstr "Chyba CRC; %06lX - %06lX\n" #: g10/armor.c:824 -#, fuzzy msgid "premature eof (in trailer)\n" msgstr "pøedèasný konec souboru (v patièce)\n" @@ -286,399 +342,405 @@ "¹patný MTA\n" #: g10/card-util.c:58 g10/card-util.c:282 -#, fuzzy, c-format +#, c-format msgid "OpenPGP card not available: %s\n" -msgstr "tajný klíè není dostupný" +msgstr "OpenPGp karta není dostupná: %s\n" #: g10/card-util.c:63 #, c-format msgid "OpenPGP card no. %s detected\n" -msgstr "" +msgstr "Nalezena OpenPGP karta èíslo %s\n" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 -#, fuzzy +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "nelze provést v dávkovém módu\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Vá¹ výbìr? " #: g10/card-util.c:194 g10/card-util.c:244 msgid "[not set]" -msgstr "" +msgstr "[není nastaven]" -#: g10/card-util.c:376 -#, fuzzy +#: g10/card-util.c:378 msgid "male" -msgstr "enable" +msgstr "mu¾" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "female" -msgstr "enable" +msgstr "¾ena" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "unspecified" -msgstr "Dùvod nebyl specifikován" +msgstr "neuvedeno" -#: g10/card-util.c:396 -#, fuzzy +#: g10/card-util.c:406 msgid "not forced" -msgstr "nezpracováno" +msgstr "není vy¾adováno" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" -msgstr "" +msgstr "vy¾adováno" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" -msgstr "" +msgstr "Chyba: V souèasné verzi je povolenou pouze plain ASCII.\n" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" -msgstr "" +msgstr "Chyba: Znak \"<\" nelze pou¾ít.\n" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" -msgstr "" +msgstr "Chyba: Více mezer není povoleno.\n" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " -msgstr "" +msgstr "Pøíjmení dr¾itele karty: " -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " -msgstr "" +msgstr "Jméno (køestní) dr¾itele karty: " -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" -msgstr "" +msgstr "Chyba: jméno a pøíjmení je pøíli¹ dlouhé (limit je %d znakù).\n" -#: g10/card-util.c:502 -#, fuzzy +#: g10/card-util.c:521 msgid "URL to retrieve public key: " -msgstr "neexistuje odpovídající veøejný klíè: %s\n" +msgstr "URL pro získání veøejného klíèe: " -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" -msgstr "" +msgstr "Chyba: URL je pøíli¹ dlouhé (limit je %d znakù).\n" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "chyba pøi ètení `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " -msgstr "" +msgstr "Login (jménu úètu): " -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" +msgstr "Chyba: Login je pøíli¹ dlouhý (limit je %d znakù).\n" + +#: g10/card-util.c:699 +msgid "Private DO data: " msgstr "" -#: g10/card-util.c:641 -#, fuzzy +#: g10/card-util.c:709 +#, fuzzy, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "Chyba: URL je pøíli¹ dlouhé (limit je %d znakù).\n" + +#: g10/card-util.c:729 msgid "Language preferences: " -msgstr "aktualizovat pøedvolby" +msgstr "Jazykové pøedvolby: " -#: g10/card-util.c:649 -#, fuzzy +#: g10/card-util.c:737 msgid "Error: invalid length of preference string.\n" -msgstr "neplatný znak v øetìzci s pøedvolbami\n" +msgstr "Chyba: neplatná délka øetezce s pøedvolbami.\n" -#: g10/card-util.c:658 -#, fuzzy +#: g10/card-util.c:746 msgid "Error: invalid characters in preference string.\n" -msgstr "neplatný znak v øetìzci s pøedvolbami\n" +msgstr "Chyba: neplatný znak v øetìzci s pøedvolbami\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " -msgstr "" +msgstr "Zadejte pohlaví: M - mu¾ské, F - ¾enské nebo stisnìte mezerník: " -#: g10/card-util.c:693 -#, fuzzy +#: g10/card-util.c:781 msgid "Error: invalid response.\n" -msgstr "chyba: neplatný fingerprint\n" +msgstr "Chyba: neplatná odpovìï.\n" -#: g10/card-util.c:714 -#, fuzzy +#: g10/card-util.c:802 msgid "CA fingerprint: " -msgstr "vypsat fingerprint" +msgstr "CA fingerprint: " -#: g10/card-util.c:737 -#, fuzzy +#: g10/card-util.c:825 msgid "Error: invalid formatted fingerprint.\n" -msgstr "chyba: neplatný fingerprint\n" +msgstr "Chyba: nesprávnì naformátovaný fingerprint.\n" -#: g10/card-util.c:785 -#, fuzzy, c-format +#: g10/card-util.c:873 +#, c-format msgid "key operation not possible: %s\n" -msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" +msgstr "operace s klíèem není mo¾ná: %s\n" -#: g10/card-util.c:786 -#, fuzzy +#: g10/card-util.c:874 msgid "not an OpenPGP card" -msgstr "nenalezena ¾ádná platná data ve formátu OpenPGP.\n" +msgstr "toto není OpenPGP karta" -#: g10/card-util.c:795 -#, fuzzy, c-format +#: g10/card-util.c:883 +#, c-format msgid "error getting current key info: %s\n" -msgstr "chyba pøi zápisu do souboru tajných klíèù `%s': %s\n" +msgstr "chyba pøi získání informací o aktuálním klíèi: %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " -msgstr "" +msgstr "Pøepsat existující klíè? (a/N) " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " -msgstr "" +msgstr "Vytvoøit zálohu ¹ifrovacího klíèe mimo kartu? (A/n) " -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " -msgstr "" +msgstr "Pøepsat existující klíèe? (a/N) " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" " PIN = `%s' Admin PIN = `%s'\n" "You should change them using the command --change-pin\n" msgstr "" +"Prosím nezapomeòte, ¾e tovární nastavení PINu je\n" +" PIN = `%s' PIN administrátora = `%s'\n" +"Toto nastavení mù¾ete zmìnit pøíkazem --change-pin\n" -#: g10/card-util.c:968 -#, fuzzy +#: g10/card-util.c:1056 msgid "Please select the type of key to generate:\n" -msgstr "Prosím, vyberte druh klíèe, který chcete:\n" +msgstr "Prosím, vyberte druh klíèe, který chcete generovat:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 -#, fuzzy +#: g10/card-util.c:1058 g10/card-util.c:1138 msgid " (1) Signature key\n" -msgstr "Platnost podpisu skonèila %s\n" +msgstr " (1) Podepisovací klíè\n" -#: g10/card-util.c:971 g10/card-util.c:1052 -#, fuzzy +#: g10/card-util.c:1059 g10/card-util.c:1140 msgid " (2) Encryption key\n" -msgstr " (%d) RSA (pouze pro ¹ifrování)\n" +msgstr " (2) ©ifrovací klíè\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" -msgstr "" +msgstr " (3) Autentizaèní klíè\n" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Neplatný výbìr.\n" -#: g10/card-util.c:1047 -#, fuzzy +#: g10/card-util.c:1135 msgid "Please select where to store the key:\n" -msgstr "Prosím vyberte dùvod revokace:\n" +msgstr "Prosím vyberte místo pro uchování klíèe:\n" -#: g10/card-util.c:1082 -#, fuzzy +#: g10/card-util.c:1170 msgid "unknown key protection algorithm\n" -msgstr "neznámý kompresní algoritmus\n" +msgstr "neznámý algoritmus pro ochranu klíèe\n" -#: g10/card-util.c:1087 -#, fuzzy +#: g10/card-util.c:1175 msgid "secret parts of key are not available\n" -msgstr "Tajné èásti primárního klíèe nejsou dostupné.\n" +msgstr "tajné èásti klèe nejsou dostupné\n" -#: g10/card-util.c:1092 -#, fuzzy +#: g10/card-util.c:1180 msgid "secret key already stored on a card\n" -msgstr "pøeskoèeno: tajný klíè je u¾ v databázi\n" +msgstr "tajný klíè je na kartì ulo¾en\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "ukonèit" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ukonèit toto menu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "u" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" -msgstr "" +msgstr "admin" -#: g10/card-util.c:1164 -#, fuzzy +#: g10/card-util.c:1252 msgid "show admin commands" -msgstr "konfliktní pøíkazy\n" +msgstr "zobraz administrátorské pøíkazy" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "ukázat tuto pomoc" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 -#, fuzzy +#: g10/card-util.c:1255 msgid "list all available data" -msgstr "Klíè k dispozici na: " +msgstr "vypi¹ v¹echna dostupná data" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 -#, fuzzy +#: g10/card-util.c:1258 msgid "name" -msgstr "enable" +msgstr "jméno" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" -msgstr "" +msgstr "zmìní jméno majitele karty" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" -msgstr "" +msgstr "url" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" -msgstr "" +msgstr "zmìní URL pro záskání klíèe" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" -msgstr "" +msgstr "fetch" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" -msgstr "" +msgstr "získá klíè specifikovaný v URL karty" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "login" -msgstr "lsign" +msgstr "login" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "change the login name" -msgstr "zmìnit dobu platnosti" +msgstr "zmìnit login name" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" -msgstr "" +msgstr "lang" -#: g10/card-util.c:1175 -#, fuzzy +#: g10/card-util.c:1263 msgid "change the language preferences" -msgstr "zmìnit dùvìryhodnost vlastníka klíèe" +msgstr "zmìnit jazykové pøedvolby" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" -msgstr "" +msgstr "sex" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" -msgstr "" +msgstr "zmìní pohlaví dr¾itele karty" -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "cafpr" -msgstr "fpr" +msgstr "cafpr" -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "change a CA fingerprint" -msgstr "vypsat fingerprint" +msgstr "vypsat fingerprint certifikaèní autority" -#: g10/card-util.c:1178 -#, fuzzy +#: g10/card-util.c:1266 msgid "forcesig" -msgstr "revsig" +msgstr "forcesig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" -msgstr "" +msgstr "zapnout/vypnout po¾adování PINu pøi ka¾dé self-sign operaci" -#: g10/card-util.c:1180 -#, fuzzy +#: g10/card-util.c:1268 msgid "generate" -msgstr "obecná chyba" +msgstr "generate" -#: g10/card-util.c:1181 -#, fuzzy +#: g10/card-util.c:1269 msgid "generate new keys" msgstr "vytvoøit nový pár klíèù" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" +msgstr "nabídka pro zmìnu anebo odblokování PINu" + +#: g10/card-util.c:1272 +msgid "privatedo" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Pøíkaz> " -#: g10/card-util.c:1281 -#, fuzzy +#: g10/card-util.c:1371 msgid "Admin-only command\n" -msgstr "konfliktní pøíkazy\n" +msgstr "pouze administrátorské pøíkazy\n" -#: g10/card-util.c:1297 -#, fuzzy +#: g10/card-util.c:1387 msgid "Admin commands are allowed\n" -msgstr "konfliktní pøíkazy\n" +msgstr "administrátorské pøíkazy jsou povoleny\n" -#: g10/card-util.c:1299 -#, fuzzy +#: g10/card-util.c:1389 msgid "Admin commands are not allowed\n" -msgstr "zapisuji tajný klíè do `%s'\n" +msgstr "administrátorské pøíkazy nejsou povoleny\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný pøíkaz (zkuste \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " -msgstr "" +msgstr "Prosím vo¾te kartu a stisknìte enter. Operaci zru¹íte stisknutím 'z': " -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" +"Prosím vyjmìte kartu a vlo¾te jinou se seriovým èíslem:\n" +" %.*s\n" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" +"Je-li nová karta pøipravena, stisknìte enter. Operaci zru¹íte stisknutím " +"'z': " + +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Vlo¾te PIN administrátora: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Vlo¾te PIN: " -#: g10/cardglue.c:638 +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " -msgstr "" +msgstr "Vlo¾te PIN administrátora: " -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " -msgstr "" +msgstr "Vlo¾te PIN: " + +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Opakujte heslo: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "heslo není zopakováno správnì; zkuste to znovu" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -688,13 +750,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output pro tento pøíkaz není platný\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found: %s\n" -msgstr "klíè `%s' nenalezen: %s\n" +msgstr "klíè \"%s\" nenalezen: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -705,19 +767,16 @@ msgstr "(dokud neurèíte klíè jeho fingerprintem)\n" #: g10/delkey.c:127 -#, fuzzy msgid "can't do this in batch mode without \"--yes\"\n" msgstr "bez parametru \"--yes\" to nemohu v dávkovém módu provést\n" #: g10/delkey.c:139 -#, fuzzy msgid "Delete this key from the keyring? (y/N) " -msgstr "Smazat tento klíè ze souboru klíèù? " +msgstr "Smazat tento klíè ze souboru klíèù? (a/N) " #: g10/delkey.c:147 -#, fuzzy msgid "This is a secret key! - really delete? (y/N) " -msgstr "Toto je tajný klíè! - opravdu smazat? " +msgstr "Toto je tajný klíè! - opravdu smazat? (a/N) " #: g10/delkey.c:157 #, c-format @@ -738,7 +797,7 @@ msgstr "" "abyste ho smazal(a), pou¾ijte nejprve parametr \"--delete-secret-key\".\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "chyba pøi vytváøení hesla: %s\n" @@ -757,7 +816,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' je ji¾ zkomprimován\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "VAROVÁNÍ: soubor `%s' je prázdný\n" @@ -778,18 +837,20 @@ msgstr "algoritmus IDEA nelze pou¾ít pro v¹echny klíèe, pro které ¹ifrujete.\n" #: g10/encode.c:540 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "vy¾ádaná symetrická ¹ifra %s (%d) nevyhovuje pøedvolbám pøíjemce\n" +msgstr "" +"VAROVÁNÍ: vy¾ádaná symetrická ¹ifra %s (%d) nevyhovuje pøedvolbám pøíjemce\n" -#: g10/encode.c:648 g10/sign.c:876 -#, fuzzy, c-format +#: g10/encode.c:648 g10/sign.c:877 +#, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " "preferences\n" msgstr "" -"vy¾ádaný komprimaèní algoritmus %s (%d) nevyhovuje pøedvolbám pøíjemce\n" +"VAROVÁNÍ: vy¾ádaný komprimaèní algoritmus %s (%d) nevyhovuje pøedvolbám " +"pøíjemce\n" #: g10/encode.c:735 #, c-format @@ -842,21 +903,20 @@ "nastaveny nebezpeènì\n" #: g10/exec.c:355 -#, fuzzy msgid "this platform requires temporary files when calling external programs\n" msgstr "" "na této platformì jsou pøi volání externích programù vy¾adovány\n" "doèasné soubory (temp files)\n" #: g10/exec.c:433 -#, fuzzy, c-format +#, c-format msgid "unable to execute program `%s': %s\n" -msgstr "nelze spustit %s \"%s\": %s\n" +msgstr "nelze spustit program `%s': %s\n" #: g10/exec.c:436 -#, fuzzy, c-format +#, c-format msgid "unable to execute shell `%s': %s\n" -msgstr "nelze spustit %s \"%s\": %s\n" +msgstr "nelze spustit shell `%s': %s\n" #: g10/exec.c:521 #, c-format @@ -886,27 +946,26 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VAROVÁNÍ: nelze smazat doèasný adresáø `%s': %s\n" -#: g10/export.c:176 -#, fuzzy +#: g10/export.c:182 msgid "exporting secret keys not allowed\n" -msgstr "zapisuji tajný klíè do `%s'\n" +msgstr "exportování tajného klíèe není povoleno\n" -#: g10/export.c:206 -#, fuzzy, c-format +#: g10/export.c:211 +#, c-format msgid "key %s: not protected - skipped\n" -msgstr "klíè %08lX: není chránìný - pøeskoèeno\n" +msgstr "klíè %s: není chránìný - pøeskoèeno\n" -#: g10/export.c:214 -#, fuzzy, c-format +#: g10/export.c:219 +#, c-format msgid "key %s: PGP 2.x style key - skipped\n" -msgstr "klíè %08lX: PGP 2.x klíè - pøeskoèeno\n" +msgstr "klíè %s: PGP 2.x klíè - pøeskoèeno\n" -#: g10/export.c:361 -#, fuzzy, c-format +#: g10/export.c:384 +#, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" -msgstr "VAROVÁNÍ: tajný klíè %08lX není chránìn pomocí simple SK checksum\n" +msgstr "VAROVÁNÍ: tajný klíè %s není chránìn pomocí simple SK checksum\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n" @@ -955,9 +1014,8 @@ msgstr "vypsat seznam klíèù a podpisù" #: g10/g10.c:374 -#, fuzzy msgid "list and check key signatures" -msgstr "zkontrolovat podpisy klíèù" +msgstr "vypsat a zkontrolovat podpisy klíèù" #: g10/g10.c:375 msgid "list keys and fingerprints" @@ -1021,15 +1079,15 @@ #: g10/g10.c:400 msgid "print the card status" -msgstr "" +msgstr "vytisknout stav karty" #: g10/g10.c:401 msgid "change data on a card" -msgstr "" +msgstr "zmìnit data na kartì" #: g10/g10.c:402 msgid "change a card's PIN" -msgstr "" +msgstr "zmìnit PIN karty" #: g10/g10.c:410 msgid "update the trust database" @@ -1089,15 +1147,15 @@ msgid "prompt before overwriting" msgstr "vy¾ádat potvrzení pøed pøepsáním" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" -msgstr "" +msgstr "pou¾ít chování striktnì podle OpenPGP" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" -msgstr "" +msgstr "generovat zprávu komplatibilní s PGP 2.x" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1105,7 +1163,7 @@ "@\n" "(Pou¾ijte manuálové stránky pro kompletní seznam v¹ech pøíkazù a mo¾ností)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1123,17 +1181,17 @@ " --list-keys [jména] vypsat klíèe\n" " --fingerprint [jména] vypsat fingerprinty \n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "Chyby oznamte, prosím, na adresu .\n" -"Pøipomínky k pøekladu .\n" +"Pøipomínky k pøekladu .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pou¾ití: gpg [mo¾nosti] [soubory] (-h pro pomoc)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1143,7 +1201,7 @@ "podepsat, ovìøit, ¹ifrovat nebo de¹ifrovat\n" "implicitní operace závisí na vstupních datech\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1151,472 +1209,479 @@ "\n" "Podporované algoritmy:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Veøejný klíè: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "©ifra: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Komprese: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "u¾ití: gpg [mo¾nosti]" -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "konfliktní pøíkazy\n" -#: g10/g10.c:982 -#, fuzzy, c-format +#: g10/g10.c:1017 +#, c-format msgid "no = sign found in group definition `%s'\n" -msgstr "no = podpis nalezen v definici skupiny \"%s\"\n" +msgstr "no = podpis nalezen v definici skupiny `%s'\n" -#: g10/g10.c:1179 -#, fuzzy, c-format +# g10/g10.c:1179#, c-format +#: g10/g10.c:1214 +#, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" -msgstr "VAROVÁNÍ: vlastnictví pro %s nastaveno nebezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: vlastnictví domovského adresáøe není nastaveno bezpeènì `%s'\n" -#: g10/g10.c:1182 -#, fuzzy, c-format +#: g10/g10.c:1217 +#, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" -msgstr "VAROVÁNÍ: vlastnictví pro %s nastaveno nebezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: vlastnictví konfiguraèního souboru není nastaveno bezpeènì `%s'\n" -#: g10/g10.c:1185 -#, fuzzy, c-format +#: g10/g10.c:1220 +#, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" -msgstr "VAROVÁNÍ: vlastnictví pro %s nastaveno nebezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: vlastnictví roz¹iøujícího modulu není nastaveno bezpeènì `%s'\n" -#: g10/g10.c:1191 -#, fuzzy, c-format +#: g10/g10.c:1226 +#, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" -msgstr "VAROVÁNÍ: pøístupová práva pro %s nejsou nastavena bezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: pøístupová práva pro domovský adresáøe nejsou bezpeèná `%s'\n" -#: g10/g10.c:1194 -#, fuzzy, c-format +#: g10/g10.c:1229 +#, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" -msgstr "VAROVÁNÍ: pøístupová práva pro %s nejsou nastavena bezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: pøístupová práva pro konfiguraèní soubor nejsou bezpeèná `%s'\n" -#: g10/g10.c:1197 -#, fuzzy, c-format +#: g10/g10.c:1232 +#, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" -msgstr "VAROVÁNÍ: pøístupová práva pro %s nejsou nastavena bezpeènì \"%s\"\n" +msgstr "VAROVÁNÍ: pøístupová práva roz¹iøujícímu modulu nejsou bezpeèná `%s'\n" -#: g10/g10.c:1203 -#, fuzzy, c-format +#: g10/g10.c:1238 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" -msgstr "VAROVÁNÍ: vlastnictví adresáøe %s nastaveno nebezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: vlastnictví adresáøe s domovkým adresáøem není nastaveno " +"nebezpeènì `%s'\n" -#: g10/g10.c:1206 -#, fuzzy, c-format +#: g10/g10.c:1241 +#, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" -msgstr "VAROVÁNÍ: vlastnictví adresáøe %s nastaveno nebezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: vlastnictví adresáøe s konfiguraèním souborem není nastaveno " +"nebezpeènì `%s'\n" -#: g10/g10.c:1209 -#, fuzzy, c-format +#: g10/g10.c:1244 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" -msgstr "VAROVÁNÍ: vlastnictví adresáøe %s nastaveno nebezpeènì \"%s\"\n" +msgstr "" +"VAROVÁNÍ: vlastnictví adresáøe s roz¹iøujícím modulem není nastaveno " +"nebezpeènì `%s'\n" -#: g10/g10.c:1215 -#, fuzzy, c-format +#: g10/g10.c:1250 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" -"VAROVÁNÍ: pøístupová práva adresáøe %s nejsou nastavena bezpeènì \"%s\"\n" +"VAROVÁNÍ: pøístupová práva k adresáøi s domovským adresáøem nejsou nastavena " +"bezpeènì `%s'\n" -#: g10/g10.c:1218 -#, fuzzy, c-format +#: g10/g10.c:1253 +#, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "" -"VAROVÁNÍ: pøístupová práva adresáøe %s nejsou nastavena bezpeènì \"%s\"\n" +"VAROVÁNÍ: pøístupová práva k adersáøi s konfiguraèním souborem nejsou " +"nastavena bezpeènì `%s'\n" -#: g10/g10.c:1221 -#, fuzzy, c-format +#: g10/g10.c:1256 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" -"VAROVÁNÍ: pøístupová práva adresáøe %s nejsou nastavena bezpeènì \"%s\"\n" +"VAROVÁNÍ: pøístupová práva k adresáøi s roz¹iøujícím modulem nejsou " +"nastavena bezpeènì `%s'\n" # c-format -#: g10/g10.c:1362 -#, fuzzy, c-format +#: g10/g10.c:1397 +#, c-format msgid "unknown configuration item `%s'\n" msgstr "neznámá konfiguraèní polo¾ka \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitní soubor s mo¾nostmi `%s ignorován'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitní soubor s mo¾nostmi `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "soubor s mo¾nostmi `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "ètu mo¾nosti z `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s není pro normální pou¾ití!\n" -#: g10/g10.c:2048 -#, fuzzy, c-format +#: g10/g10.c:2079 +#, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -"¹ifra \"%s\" nebyla nahrána, proto¾e pøístupová práva nejsou nastavena " +"¹ifra `%s' nebyla nahrána, proto¾e pøístupová práva nejsou nastavena " "bezpeènì\n" -#: g10/g10.c:2260 -#, fuzzy, c-format +#: g10/g10.c:2293 +#, c-format msgid "`%s' is not a valid character set\n" -msgstr "%s není platná znaková sada\n" +msgstr "`%s' není platná znaková sada\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 -#, fuzzy +#: g10/g10.c:2312 g10/keyedit.c:3434 msgid "could not parse keyserver URL\n" -msgstr "nelze pou¾ít URI serveru klíèù - chyba analýzy URI\n" +msgstr "nelze zpracovat URL serveru klíèù\n" -#: g10/g10.c:2285 -#, fuzzy, c-format +#: g10/g10.c:2318 +#, c-format msgid "%s:%d: invalid keyserver options\n" -msgstr "%s:%d: neplatný parametr pro export\n" +msgstr "%s:%d: neplatný parametr pro server klíèù\n" -#: g10/g10.c:2288 -#, fuzzy +#: g10/g10.c:2321 msgid "invalid keyserver options\n" -msgstr "neplatný parametr pro export\n" +msgstr "neplatný parametr pro server klíèù\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parametr pro import\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "neplatný parametr pro import\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parametr pro export\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "neplatný parametr pro export\n" -#: g10/g10.c:2315 -#, fuzzy, c-format +#: g10/g10.c:2348 +#, c-format msgid "%s:%d: invalid list options\n" -msgstr "%s:%d: neplatný parametr pro import\n" +msgstr "%s:%d: neplatný parametr pro výpis\n" -#: g10/g10.c:2318 -#, fuzzy +#: g10/g10.c:2351 msgid "invalid list options\n" -msgstr "neplatný parametr pro import\n" +msgstr "neplatný parametr pro výpis\n" -#: g10/g10.c:2340 -#, fuzzy, c-format +#: g10/g10.c:2373 +#, c-format msgid "%s:%d: invalid verify options\n" -msgstr "%s:%d: neplatný parametr pro export\n" +msgstr "%s:%d: neplatný parametr pro ovìøení\n" -#: g10/g10.c:2343 -#, fuzzy +#: g10/g10.c:2376 msgid "invalid verify options\n" -msgstr "neplatný parametr pro export\n" +msgstr "neplatný parametr pro ovìøení\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nelze nastavit exec-path na %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVÁNÍ: %s pøepí¹e %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "Není dovoleno pou¾ívat %s s %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedává s %s smysl!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v módu --pgp2 mù¾ete vytváøet pouze oddìlené podpisy nebo podpisy èitelné " "jako text\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v módu --pgp2 nelze souèasnì ¹ifrovat a podepisovat\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v módu --pgp2 musíte pou¾ít soubor (ne rouru).\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrování zpráv v módu --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2684 -#, fuzzy +#: g10/g10.c:2717 msgid "selected compression algorithm is invalid\n" -msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" +msgstr "vybraný komprimovací algoritmus je neplatný\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n" -#: g10/g10.c:2709 -#, fuzzy +#: g10/g10.c:2742 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "polo¾ka max-cert-depth musí být v rozmezí od 1 do 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "neplatná implicitní úroveò certifikace (default-cert-level); musí být 0, 1, " "2 nebo 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "neplatná minimální úroveò certifikace (min-cert-level); musí být 0, 1, 2 " "nebo 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dùraznì nedoporuèován\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "neplatné defaultní pøedvolby\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro ¹ifrování\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro hashování\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro komprimaci\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s dosud není funkèní s %s\n" -#: g10/g10.c:2824 -#, fuzzy, c-format +#: g10/g10.c:2857 +#, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" -msgstr "pou¾ití ¹ifrovacího algoritmu \"%s\" v módu %s dovoleno\n" +msgstr "pou¾ití ¹ifrovacího algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2829 -#, fuzzy, c-format +#: g10/g10.c:2862 +#, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" -msgstr "pou¾ití hashovacího algoritmu \"%s\" v módu %s dovoleno\n" +msgstr "pou¾ití hashovacího algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2834 -#, fuzzy, c-format +#: g10/g10.c:2867 +#, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" -msgstr "pou¾ití komprimaèního algoritmu \"%s\" v módu %s dovoleno\n" +msgstr "pou¾ití komprimaèního algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemohu inicializovat databázi dùvìry: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVÁNÍ: specifikován adresát (-r) bez pou¾ití ¹ifrování s veøejným klíèem\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [jméno souboru]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [jméno souboru]" -#: g10/g10.c:2961 -#, fuzzy, c-format +#: g10/g10.c:2994 +#, c-format msgid "symmetric encryption of `%s' failed: %s\n" -msgstr "de¹ifrování selhalo: %s\n" +msgstr "symetrické ¹ifrování `%s' se nepovedlo: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [jméno souboru]" -#: g10/g10.c:2984 -#, fuzzy +#: g10/g10.c:3017 msgid "--symmetric --encrypt [filename]" -msgstr "--sign --encrypt [jméno souboru]" +msgstr "--symmetric --encrypt [jméno souboru]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" -msgstr "" +msgstr "nelze pou¾ít --symmetric --encrypt s pøíkazem --s2k-mode 0\n" -#: g10/g10.c:2989 -#, fuzzy, c-format +#: g10/g10.c:3022 +#, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" -msgstr "pou¾ití %s není v módu %s dovoleno\n" +msgstr "nelze pou¾ít --symmetric --encrypt v módu %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [jméno souboru]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [jméno souboru]" -#: g10/g10.c:3035 -#, fuzzy +#: g10/g10.c:3068 msgid "--symmetric --sign --encrypt [filename]" -msgstr "--sign --encrypt [jméno souboru]" +msgstr "--symmetric --sign --encrypt [jméno souboru]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" -msgstr "" +msgstr "nelze pou¾ít --symmetric --sign --encrypt s pøíkazem --s2k-mode 0\n" -#: g10/g10.c:3040 -#, fuzzy, c-format +#: g10/g10.c:3073 +#, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" -msgstr "pou¾ití %s není v módu %s dovoleno\n" +msgstr "nelze pou¾ít --symmetric --sign --encrypt v módu %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [jméno souboru]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [jméno souboru]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [jméno souboru]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id u¾ivatele" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ivatele" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u¾ivatele" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u¾ivatele" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ivatele [pøíkazy]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ivatele] [soubor s klíèi (keyring)]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "odeslání na keyserver se nezdaøilo: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "získání dat z keyserveru se nezdaøilo: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "export klíèe se nepodaøil: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "hledání na keyserveru se nezdaøilo: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "refresh dat na keyserveru se nezdaøil: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódování z ASCII formátu selhalo: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódování do ASCII formátu selhalo: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[jméno souboru]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Zaènìte psát svou zprávu ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1624,57 +1689,54 @@ "symbolické jméno smí obsahovat pouze písmena, èíslice, teèky nebo podtr¾ítka " "a musí konèit znakem '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "jméno u¾ivatele musí obsahovat znakt '@' \n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "hodnota nemù¾e obsahovat ¾ádné kontrolní znaky\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pro certifikaèní politiku je neplatné\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pro podepisovací politiku je neplatné\n" -#: g10/g10.c:3911 -#, fuzzy +#: g10/g10.c:3944 msgid "the given preferred keyserver URL is invalid\n" -msgstr "zadané URL pro podepisovací politiku je neplatné\n" +msgstr "zadané URL preferovaného serveru klíèù je neplaté\n" #: g10/getkey.c:150 msgid "too many entries in pk cache - disabled\n" msgstr "pøíli¹ mnoho polo¾ek v bufferu veøejných klíèù - vypnuto\n" -#: g10/getkey.c:186 g10/getkey.c:2691 -#, fuzzy +#: g10/getkey.c:186 g10/getkey.c:2711 msgid "[User ID not found]" -msgstr "[User ID not found]" +msgstr "[ID u¾ivatele nenalezeno]" # c-format -#: g10/getkey.c:1614 -#, fuzzy, c-format +#: g10/getkey.c:1639 +#, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" -msgstr "" -"Neplatný klíè %08lX zmìnìn na platný pomocí --always-non-selfsigned-uid\n" +msgstr "Neplatný klíè %s zmìnìn na platný pomocí --always-non-selfsigned-uid\n" -#: g10/getkey.c:2169 -#, fuzzy, c-format +#: g10/getkey.c:2189 +#, c-format msgid "no secret subkey for public subkey %s - ignoring\n" -msgstr "neexistuje tajný podklíè pro veøejný klíè %08lX - ignorováno\n" +msgstr "neexistuje tajný podklíè pro veøejný klíè %s - ignorováno\n" -#: g10/getkey.c:2400 -#, fuzzy, c-format +#: g10/getkey.c:2420 +#, c-format msgid "using secondary key %s instead of primary key %s\n" -msgstr "pou¾ívám sekundární klíè %08lX místo primárního klíèe %08lX\n" +msgstr "pou¾ívám sekundární klíè %s místo primárního klíèe %s\n" -#: g10/getkey.c:2447 -#, fuzzy, c-format +#: g10/getkey.c:2467 +#, c-format msgid "key %s: secret key without public key - skipped\n" -msgstr "klíè %08lX: tajný klíè bez klíèe veøejného - pøeskoèeno\n" +msgstr "klíè %s: tajný klíè bez klíèe veøejného - pøeskoèeno\n" #: g10/gpgv.c:68 msgid "be somewhat more quiet" @@ -1750,6 +1812,16 @@ "\n" "The first (primary) key must always be a key which is capable of signing." msgstr "" +"Vyberte algoritmus, který chcete pou¾ít.\n" +"\n" +"DSA (alias DSS) je Digital Signature Algorithm a mù¾e být pou¾it pouze pro\n" +"podepisování.\n" +"\n" +"Elgamal je pouze ¹ifrovací algoritmus.\n" +"\n" +"RSA mù¾e být pou¾it pro ¹ifrování anebo podepisování.\n" +"\n" +"První (primární) klíè musí být v¾dy klíè, pomocí kterého lze podepisovat." #: g10/helptext.c:83 msgid "" @@ -1886,7 +1958,6 @@ "Pokud nevíte, jaká je správná odpovìï, odpovìzte \"0\"." #: g10/helptext.c:185 -#, fuzzy msgid "Answer \"yes\" if you want to sign ALL the user IDs" msgstr "" "Pokud chcete podepsat V©ECHNY identifikátory u¾ivatelù, odpovìzte \"ano\"" @@ -2028,384 +2099,381 @@ msgid "No help available for `%s'" msgstr "Pomoc není dostupná pro '%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "blok typu %d byl pøeskoèen\n" -#: g10/import.c:256 -#, fuzzy, c-format +#: g10/import.c:258 +#, c-format msgid "%lu keys processed so far\n" msgstr "%lu klíèe byly doposud zpracovány\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Celkový poèet zpracovaných klíèù: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " pøeskoèeny nové klíèe: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " bez identifikátorù (user ID): %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importováno: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " beze zmìn: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nové id u¾ivatelù (user ID): %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nové podklíèe: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nové podpisy: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " nové revokace klíèù: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " pøeètené tajné klíèe: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " importované tajné klíèe: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "tajné klíèe nezmìnìny: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " neimportováno: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" -msgstr "" +msgstr "VAROVÁNÍ: klíè %s obsahuje preference pro algoritmy,\n" -#: g10/import.c:545 -#, fuzzy +#: g10/import.c:547 msgid "algorithms on these user IDs:\n" -msgstr "Podepsal(a) jste následující identifikátory u¾ivatele:\n" +msgstr "které nesjou k dispozici. Táká se to tìchto user ID:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" -msgstr "" +msgstr " \"%s\": preference pro ¹ifrovací algortimus %s\n" -#: g10/import.c:594 -#, fuzzy, c-format +#: g10/import.c:596 +#, c-format msgid " \"%s\": preference for digest algorithm %s\n" -msgstr "podpis %s, hashovací algoritmus %s\n" +msgstr " \"%s\": preference pro podepisovací algoritmus %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" -msgstr "" +msgstr " \"%s\": preference pro komprimaèní algoritmus %s\n" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" -msgstr "" +msgstr "velmi doporuèujeme aktualiaci nastavení va¹ich preferencí a\n" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" +"distribuci tohoto klíèe aby jste pøede¹el problémùm s neshodou algoritmù\n" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" -msgstr "" +msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n" -#: g10/import.c:693 g10/import.c:1047 -#, fuzzy, c-format +#: g10/import.c:695 g10/import.c:1049 +#, c-format msgid "key %s: no user ID\n" -msgstr "klíè %08lX: chybí identifikátor u¾ivatele\n" +msgstr "klíè %s: chybí identifikátor u¾ivatele\n" -#: g10/import.c:713 -#, fuzzy, c-format +#: g10/import.c:715 +#, c-format msgid "key %s: PKS subkey corruption repaired\n" -msgstr "klíè %08lX: HKP po¹kození podklíèe opraveno\n" +msgstr "klíè %s: PKS po¹kození podklíèe opraveno\n" # c-format -#: g10/import.c:728 -#, fuzzy, c-format +#: g10/import.c:730 +#, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" -msgstr "klíè %08lX: pøijat id u¾ivatele '%s',který není podepsán jím samým\n" +msgstr "klíè %s: pøijat id u¾ivatele \"%s\",který není podepsán jím samým\n" -#: g10/import.c:734 -#, fuzzy, c-format +#: g10/import.c:736 +#, c-format msgid "key %s: no valid user IDs\n" -msgstr "klíè %08lX: chybí platný identifikátor u¾ivatele\n" +msgstr "klíè %s: chybí platný identifikátor u¾ivatele\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "mù¾e to být zpùsobeno chybìjícím podpisem klíèe jím samým\n" -#: g10/import.c:746 g10/import.c:1168 -#, fuzzy, c-format +#: g10/import.c:748 g10/import.c:1170 +#, c-format msgid "key %s: public key not found: %s\n" -msgstr "klíè %08lX: veøejný klíè nenalezen: %s\n" +msgstr "klíè %s: veøejný klíè nenalezen: %s\n" -#: g10/import.c:752 -#, fuzzy, c-format +#: g10/import.c:754 +#, c-format msgid "key %s: new key - skipped\n" -msgstr "klíè %08lX: nový klíè - pøeskoèen\n" +msgstr "klíè %s: nový klíè - pøeskoèen\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor klíèù (keyring): %s\n" -#: g10/import.c:766 g10/openfile.c:261 +# g10/import.c:766 g10/openfile.c:261#, c-format +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "zapisuji do '%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "chyba pøi zápisu souboru klíèù (keyring) `%s': %s\n" -#: g10/import.c:791 -#, fuzzy, c-format +#: g10/import.c:793 +#, c-format msgid "key %s: public key \"%s\" imported\n" -msgstr "klíè %08lX: veøejný klíè \"%s\" importován\n" +msgstr "klíè %s: veøejný klíè \"%s\" importován\n" -#: g10/import.c:815 -#, fuzzy, c-format +#: g10/import.c:817 +#, c-format msgid "key %s: doesn't match our copy\n" -msgstr "klíè %08lX: neodpovídá na¹í kopii\n" +msgstr "klíè %s: neodpovídá na¹í kopii\n" -#: g10/import.c:832 g10/import.c:1186 -#, fuzzy, c-format +#: g10/import.c:834 g10/import.c:1188 +#, c-format msgid "key %s: can't locate original keyblock: %s\n" -msgstr "klíè %08lX: nemohu najít originální blok klíèe: %s\n" +msgstr "klíè %s: nemohu najít originální blok klíèe: %s\n" -#: g10/import.c:840 g10/import.c:1193 -#, fuzzy, c-format +#: g10/import.c:842 g10/import.c:1195 +#, c-format msgid "key %s: can't read original keyblock: %s\n" -msgstr "klíè %08lX: nemohu èíst originální blok klíèe: %s\n" +msgstr "klíè %s: nemohu èíst originální blok klíèe: %s\n" -#: g10/import.c:872 -#, fuzzy, c-format +#: g10/import.c:874 +#, c-format msgid "key %s: \"%s\" 1 new user ID\n" -msgstr "klíè %08lX: \"%s\" 1 nový identifikátor u¾ivatele\n" +msgstr "klíè %s: \"%s\" 1 nový identifikátor u¾ivatele\n" -#: g10/import.c:875 -#, fuzzy, c-format +#: g10/import.c:877 +#, c-format msgid "key %s: \"%s\" %d new user IDs\n" -msgstr "klíè %08lX: \"%s\" %d nových identifikátorù u¾ivatele\n" +msgstr "klíè %s: \"%s\" %d nových identifikátorù u¾ivatele\n" -#: g10/import.c:878 -#, fuzzy, c-format +#: g10/import.c:880 +#, c-format msgid "key %s: \"%s\" 1 new signature\n" -msgstr "klíè %08lX: \"%s\" 1 nový podpis\n" +msgstr "klíè %s: \"%s\" 1 nový podpis\n" -#: g10/import.c:881 -#, fuzzy, c-format +#: g10/import.c:883 +#, c-format msgid "key %s: \"%s\" %d new signatures\n" -msgstr "klíè %08lX: \"%s\" %d nových podpisù\n" +msgstr "klíè %s: \"%s\" %d nových podpisù\n" -#: g10/import.c:884 -#, fuzzy, c-format +#: g10/import.c:886 +#, c-format msgid "key %s: \"%s\" 1 new subkey\n" -msgstr "klíè %08lX: \"%s\" 1 nový podklíè\n" +msgstr "klíè %s: \"%s\" 1 nový podklíè\n" -#: g10/import.c:887 -#, fuzzy, c-format +#: g10/import.c:889 +#, c-format msgid "key %s: \"%s\" %d new subkeys\n" -msgstr "klíè %08lX: \"%s\" %d nových podklíèù\n" +msgstr "klíè %s: \"%s\" %d nových podklíèù\n" -#: g10/import.c:908 -#, fuzzy, c-format +#: g10/import.c:910 +#, c-format msgid "key %s: \"%s\" not changed\n" -msgstr "klíè %08lX: \"%s\" beze zmìn\n" +msgstr "klíè %s: \"%s\" beze zmìn\n" -#: g10/import.c:1053 -#, fuzzy, c-format +#: g10/import.c:1055 +#, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" -msgstr "klíè %08lX: tajný klíè s neplatnou ¹ifrou %d - pøeskoèeno\n" +msgstr "klíè %s: tajný klíè s neplatnou ¹ifrou %d - pøeskoèeno\n" -#: g10/import.c:1064 -#, fuzzy +#: g10/import.c:1066 msgid "importing secret keys not allowed\n" -msgstr "zapisuji tajný klíè do `%s'\n" +msgstr "import tajných klíèù není povolen\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "není nastaven implicitní soubor tajných klíèù %s\n" -#: g10/import.c:1092 -#, fuzzy, c-format +#: g10/import.c:1094 +#, c-format msgid "key %s: secret key imported\n" -msgstr "klíè %08lX: tajný klíè importován\n" +msgstr "klíè %s: tajný klíè importován\n" -#: g10/import.c:1121 -#, fuzzy, c-format +#: g10/import.c:1123 +#, c-format msgid "key %s: already in secret keyring\n" -msgstr "klíè %08lX: je ji¾ v souboru tajných klíèù\n" +msgstr "klíè %s: je ji¾ v souboru tajných klíèù\n" -#: g10/import.c:1131 -#, fuzzy, c-format +#: g10/import.c:1133 +#, c-format msgid "key %s: secret key not found: %s\n" -msgstr "klíè %08lX: nenalezen tajný klíè: %s\n" +msgstr "klíè %s: nenalezen tajný klíè: %s\n" -#: g10/import.c:1161 -#, fuzzy, c-format +#: g10/import.c:1163 +#, c-format msgid "key %s: no public key - can't apply revocation certificate\n" -msgstr "" -"klíè %08lX: chybí veøejný klíè - nemohu aplikovat revokaèní certifikát\n" +msgstr "klíè %s: chybí veøejný klíè - nemohu aplikovat revokaèní certifikát\n" -#: g10/import.c:1204 -#, fuzzy, c-format +#: g10/import.c:1206 +#, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" -msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - zamítnuto\n" +msgstr "klíè %s: neplatný revokaèní certifikát: %s - zamítnuto\n" -#: g10/import.c:1236 -#, fuzzy, c-format +#: g10/import.c:1238 +#, c-format msgid "key %s: \"%s\" revocation certificate imported\n" -msgstr "klíè %08lX: \"%s\" revokaèní certifikát importován\n" +msgstr "klíè %s: \"%s\" revokaèní certifikát importován\n" -#: g10/import.c:1301 -#, fuzzy, c-format +#: g10/import.c:1303 +#, c-format msgid "key %s: no user ID for signature\n" -msgstr "klíè %08lX: neexistuje id u¾ivatele pro podpis\n" +msgstr "klíè %s: neexistuje id u¾ivatele pro podpis\n" -#: g10/import.c:1316 -#, fuzzy, c-format +#: g10/import.c:1318 +#, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" -"klíè %08lX: nepodporovaný algoritmus veøejného klíèe u u¾ivatelského id \"%s" +"klíè %s: nepodporovaný algoritmus veøejného klíèe u u¾ivatelského id \"%s" "\"\n" -#: g10/import.c:1318 -#, fuzzy, c-format +#: g10/import.c:1320 +#, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" -msgstr "" -"klíè %08lX: neplatný podpis klíèe jím samým u u¾ivatelského id \"%s\"\n" +msgstr "klíè %s neplatný podpis klíèe jím samým u u¾ivatelského id \"%s\"\n" -#: g10/import.c:1336 -#, fuzzy, c-format +#: g10/import.c:1338 +#, c-format msgid "key %s: no subkey for key binding\n" -msgstr "klíè %08lX: neexistuje podklíè pro vázání klíèù\n" +msgstr "klíè %s: neexistuje podklíè pro vázání klíèù\n" -#: g10/import.c:1347 g10/import.c:1397 -#, fuzzy, c-format +#: g10/import.c:1349 g10/import.c:1399 +#, c-format msgid "key %s: unsupported public key algorithm\n" -msgstr "klíè %08lX: nepodporovaný algoritmus veøejného klíèe\n" +msgstr "klíè %s: nepodporovaný algoritmus veøejného klíèe\n" -#: g10/import.c:1349 -#, fuzzy, c-format +#: g10/import.c:1351 +#, c-format msgid "key %s: invalid subkey binding\n" -msgstr "klíè %08lX: neplatná vazba podklíèe\n" +msgstr "klíè %s: neplatná vazba podklíèe\n" -#: g10/import.c:1364 -#, fuzzy, c-format +#: g10/import.c:1366 +#, c-format msgid "key %s: removed multiple subkey binding\n" -msgstr "klíè %08lX: smazána vícenásobná vazba podklíèe\n" +msgstr "klíè %s: smazána vícenásobná vazba podklíèe\n" -#: g10/import.c:1386 -#, fuzzy, c-format +#: g10/import.c:1388 +#, c-format msgid "key %s: no subkey for key revocation\n" -msgstr "klíè %08lX: neexistuje podklíè pro revokaci klíèe\n" +msgstr "klíè %s: neexistuje podklíè pro revokaci klíèe\n" -#: g10/import.c:1399 -#, fuzzy, c-format +#: g10/import.c:1401 +#, c-format msgid "key %s: invalid subkey revocation\n" -msgstr "klíè %08lX: neplatný revokaèní podklíè\n" +msgstr "klíè %s: neplatný revokaèní podklíè\n" -#: g10/import.c:1414 -#, fuzzy, c-format +#: g10/import.c:1416 +#, c-format msgid "key %s: removed multiple subkey revocation\n" -msgstr "klíè %08lX: smazána vícenásobná revokace podklíèe\n" +msgstr "klíè %s: smazána vícenásobná revokace podklíèe\n" -#: g10/import.c:1456 -#, fuzzy, c-format +#: g10/import.c:1458 +#, c-format msgid "key %s: skipped user ID \"%s\"\n" -msgstr "klíè %08lX: identifikátor u¾ivatele pøeskoèen '" +msgstr "klíè %s: pøeskoèen identifikátor u¾ivatele \"%s\"\n" -#: g10/import.c:1477 -#, fuzzy, c-format +#: g10/import.c:1479 +#, c-format msgid "key %s: skipped subkey\n" -msgstr "klíè %08lX: podklíè pøeskoèen\n" +msgstr "klíè %s: podklíè pøeskoèen\n" -#: g10/import.c:1504 -#, fuzzy, c-format +#: g10/import.c:1506 +#, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" -msgstr "klíè %08lX: podpis není exportovatelný (tøída %02x) - pøeskoèeno\n" +msgstr "klíè %s: podpis není exportovatelný (tøída %02X) - pøeskoèeno\n" -#: g10/import.c:1514 -#, fuzzy, c-format +#: g10/import.c:1516 +#, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" -msgstr "klíè %08lX: revokaèní certifikát na ¹patném místì - pøeskoèeno \n" +msgstr "klíè %s: revokaèní certifikát na ¹patném místì - pøeskoèeno \n" -#: g10/import.c:1531 -#, fuzzy, c-format +#: g10/import.c:1533 +#, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" -msgstr "klíè %08lX: neplatný revokaèní certifikát: %s - pøeskoèen\n" +msgstr "klíè %s: neplatný revokaèní certifikát: %s - pøeskoèen\n" -#: g10/import.c:1545 -#, fuzzy, c-format +#: g10/import.c:1547 +#, c-format msgid "key %s: subkey signature in wrong place - skipped\n" -msgstr "klíè %08lX: podpis podklíèe na ¹patném místì - pøeskoèeno \n" +msgstr "klíè %s: podpis podklíèe na ¹patném místì - pøeskoèeno \n" -#: g10/import.c:1553 -#, fuzzy, c-format +#: g10/import.c:1555 +#, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" -msgstr "klíè %08lX: neoèekávaná podpisová tøída (0x%02X) - pøeskoèeno\n" +msgstr "klíè %s: neoèekávaná podpisová tøída (0x%02X) - pøeskoèeno\n" -#: g10/import.c:1653 -#, fuzzy, c-format +#: g10/import.c:1655 +#, c-format msgid "key %s: duplicated user ID detected - merged\n" -msgstr "klíè %08lX: objeven duplikovaný identifikátor u¾ivatele - slouèen\n" +msgstr "klíè %s: objeven duplikovaný identifikátor u¾ivatele - slouèen\n" -#: g10/import.c:1715 -#, fuzzy, c-format +#: g10/import.c:1717 +#, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" -"VAROVÁNÍ: klíè %08lX mù¾e být revokován: zkou¹ím získat revokaèníklíè %08lX\n" +"VAROVÁNÍ: klíè %s mù¾e být revokován: zkou¹ím získat revokaèní klíè %s\n" -#: g10/import.c:1729 -#, fuzzy, c-format +#: g10/import.c:1731 +#, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" -msgstr "" -"VAROVÁNÍ: klíè %08lX mù¾e být revokován: revokaèní klíè %08lX nenalezen.\n" +msgstr "VAROVÁNÍ: klíè %s mù¾e být revokován: revokaèní klíè %s nenalezen.\n" -#: g10/import.c:1788 -#, fuzzy, c-format +#: g10/import.c:1790 +#, c-format msgid "key %s: \"%s\" revocation certificate added\n" -msgstr "klíè %08lX: \"%s\" pøidán revokaèní certifikát\n" +msgstr "klíè %s: \"%s\" pøidán revokaèní certifikát\n" -#: g10/import.c:1822 -#, fuzzy, c-format +#: g10/import.c:1824 +#, c-format msgid "key %s: direct key signature added\n" -msgstr "klíè %08lX: podpis klíèe jím samým (direct key signature)\n" +msgstr "klíè %s: podpis klíèe jím samým (direct key signature) pøidán\n" #: g10/keydb.c:167 #, c-format @@ -2467,7 +2535,6 @@ msgstr "objeveno %d identifikátorù u¾ivatele bez platného podpisu jím samým\n" #: g10/keyedit.c:402 g10/pkclist.c:262 -#, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2480,12 +2547,12 @@ "\n" #: g10/keyedit.c:406 g10/pkclist.c:274 -#, fuzzy, c-format +#, c-format msgid " %d = I trust marginally\n" msgstr " %d = Dùvìøuji èásteènì\n" #: g10/keyedit.c:407 g10/pkclist.c:276 -#, fuzzy, c-format +#, c-format msgid " %d = I trust fully\n" msgstr " %d = Dùvìøuji úplnì\n" @@ -2495,10 +2562,15 @@ "A depth greater than 1 allows the key you are signing to make\n" "trust signatures on your behalf.\n" msgstr "" +"Prosím vlo¾te hloubku dùvìry (depth trust) k tomuto podpisu.\n" +"Hloubka vìt¹í ne¾ 1 umo¾òuje klíèùm, které jste podepsal\n" +"podepsat jiný klíè, který bude pro Vás dùvìryhodný.\n" #: g10/keyedit.c:442 msgid "Please enter a domain to restrict this signature, or enter for none.\n" msgstr "" +"Prosím vlo¾te doménu, pro kterou je podpis omezen nebo stisknìte enter pro " +"podpis bez omezení na doménu.\n" #: g10/keyedit.c:584 #, c-format @@ -2569,23 +2641,23 @@ msgstr "Pøejete si jej zmìnit na plnì exportovatelný podpise? (a/N) " #: g10/keyedit.c:748 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already locally signed by key %s\n" -msgstr "\"%s\" je ji¾ lokálnì podepsán klíèem %08lX\n" +msgstr "\"%s\" je ji¾ lokálnì podepsán klíèem %s\n" #: g10/keyedit.c:751 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already signed by key %s\n" -msgstr "\"%s\" je ji¾ podepsán klíèem %08lX\n" +msgstr "\"%s\" je ji¾ podepsán klíèem %s\n" #: g10/keyedit.c:756 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Chcete klíè pøesto znova podepsat? (a/N) " #: g10/keyedit.c:778 -#, fuzzy, c-format +#, c-format msgid "Nothing to sign with key %s\n" -msgstr "Nic k podepsání klíèem %08lX\n" +msgstr "Nic k podepsání klíèem %s\n" #: g10/keyedit.c:793 msgid "This key has expired!" @@ -2642,80 +2714,56 @@ msgstr " (3) Velmi peèlivì jsem to ovìøil(a).%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Va¹ výbìr? (pro detailnìj¹í informace stisknìtì '?'):" #: g10/keyedit.c:918 -#, fuzzy, c-format +#, c-format msgid "" "Are you sure that you want to sign this key with your\n" "key \"%s\" (%s)\n" msgstr "" "Jste si jistý(á), ¾e chcete podepsat tento klíè\n" -"svým klíèem: \"" +"svým klíèem \"%s\" (%s)\n" #: g10/keyedit.c:925 -#, fuzzy msgid "This will be a self-signature.\n" -msgstr "" -"\n" -"Jedná se o podpis klíèe jím samým\n" +msgstr "Jedná se o podpis klíèe jím samým.\n" #: g10/keyedit.c:931 -#, fuzzy msgid "WARNING: the signature will not be marked as non-exportable.\n" -msgstr "" -"\n" -"VAROVÁNÍ: podpis nebude oznaèen jako neexportovatelný.\n" +msgstr "VAROVÁNÍ: podpis nebude oznaèen jako neexportovatelný.\n" #: g10/keyedit.c:939 -#, fuzzy msgid "WARNING: the signature will not be marked as non-revocable.\n" -msgstr "" -"\n" -"VAROVÁNÍ: podpis nebude oznaèen jako neodvolatelný (non-revocable).\n" +msgstr "VAROVÁNÍ: podpis nebude oznaèen jako neodvolatelný (non-revocable).\n" #: g10/keyedit.c:949 -#, fuzzy msgid "The signature will be marked as non-exportable.\n" -msgstr "" -"\n" -"Podpis bude oznaèen jako neexportovatelný.\n" +msgstr "Podpis bude oznaèen jako neexportovatelný.\n" #: g10/keyedit.c:956 -#, fuzzy msgid "The signature will be marked as non-revocable.\n" -msgstr "" -"\n" -"Podpis bude oznaèen jako neodvolatelný (non-revocable).\n" +msgstr "Podpis bude oznaèen jako neodvolatelný (non-revocable).\n" #: g10/keyedit.c:963 -#, fuzzy msgid "I have not checked this key at all.\n" -msgstr "" -"\n" -"Nijak jsem tento klíè neovìøil.\n" +msgstr "Nijak jsem tento klíè neovìøil.\n" #: g10/keyedit.c:968 -#, fuzzy msgid "I have checked this key casually.\n" -msgstr "" -"\n" -"Èásteènì jsem ovìøil tento klíè.\n" +msgstr "Èásteènì jsem ovìøil tento klíè.\n" #: g10/keyedit.c:973 -#, fuzzy msgid "I have checked this key very carefully.\n" -msgstr "" -"\n" -"Velmi peèlivì jsem ovìøil tento klíè.\n" +msgstr "Velmi peèlivì jsem ovìøil tento klíè.\n" #: g10/keyedit.c:983 -#, fuzzy msgid "Really sign? (y/N) " -msgstr "Skuteènì podepsat? " +msgstr "Skuteènì podepsat? (a/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2746,7 +2794,7 @@ "Vlo¾te nové heslo (passphrase) pro tento tajný klíè.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "heslo není zopakováno správnì; zkuste to znovu" @@ -2759,9 +2807,8 @@ "\n" #: g10/keyedit.c:1135 -#, fuzzy msgid "Do you really want to do this? (y/N) " -msgstr "Opravdu to chcete udìlat? " +msgstr "Opravdu to chcete udìlat? (a/N) " #: g10/keyedit.c:1201 msgid "moving a key signature to the correct place\n" @@ -2828,14 +2875,12 @@ msgstr "s" #: g10/keyedit.c:1259 -#, fuzzy msgid "tsign" -msgstr "sign" +msgstr "tsign" #: g10/keyedit.c:1259 -#, fuzzy msgid "make a trust signature" -msgstr "vytvoøit podpis oddìlený od dokumentu" +msgstr "vytvoøit trust signature" #: g10/keyedit.c:1260 msgid "lsign" @@ -2898,21 +2943,20 @@ msgstr "pøidat sekundární klíè" #: g10/keyedit.c:1271 -#, fuzzy msgid "addcardkey" -msgstr "addkey" +msgstr "addcardkey" #: g10/keyedit.c:1271 msgid "add a key to a smartcard" -msgstr "" +msgstr "pøidat klíè na kartu" #: g10/keyedit.c:1272 msgid "keytocard" -msgstr "" +msgstr "keytocard" #: g10/keyedit.c:1272 msgid "move a key to a smartcard" -msgstr "" +msgstr "pøesunout klíè na kartu" #: g10/keyedit.c:1274 msgid "delkey" @@ -2999,14 +3043,12 @@ msgstr "aktualizovat pøedvolby" #: g10/keyedit.c:1286 -#, fuzzy msgid "keyserver" -msgstr "chyba serveru klíèù" +msgstr "keyserver" #: g10/keyedit.c:1286 -#, fuzzy msgid "set preferred keyserver URL" -msgstr "nelze pou¾ít URI serveru klíèù - chyba analýzy URI\n" +msgstr "nastavit URL pro preferovaný server klíèù" #: g10/keyedit.c:1287 msgid "change the passphrase" @@ -3069,9 +3111,9 @@ msgstr "ukázat fotografický ID" #: g10/keyedit.c:1347 -#, fuzzy, c-format +#, c-format msgid "error reading secret keyblock \"%s\": %s\n" -msgstr "chyba pøi ètení bloku tajného klíèe `%s': %s\n" +msgstr "chyba pøi ètení bloku tajného klíèe \"%s\": %s\n" #: g10/keyedit.c:1365 msgid "Secret key is available.\n" @@ -3090,9 +3132,8 @@ msgstr "Klíè revokován." #: g10/keyedit.c:1500 -#, fuzzy msgid "Really sign all user IDs? (y/N) " -msgstr "Opravdu podepsat v¹echny id u¾ivatele? " +msgstr "Opravdu podepsat v¹echny id u¾ivatele? (a/N) " #: g10/keyedit.c:1502 msgid "Hint: Select the user IDs to sign\n" @@ -3112,88 +3153,75 @@ msgstr "Nemù¾ete smazat poslední id u¾ivatele!\n" #: g10/keyedit.c:1553 -#, fuzzy msgid "Really remove all selected user IDs? (y/N) " -msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? " +msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? (a/N) " #: g10/keyedit.c:1554 -#, fuzzy msgid "Really remove this user ID? (y/N) " -msgstr "Opravdu odstranit tento id u¾ivatele? " +msgstr "Opravdu odstranit tento id u¾ivatele? (a/N) " #: g10/keyedit.c:1604 -#, fuzzy msgid "Really move the primary key? (y/N) " -msgstr "Opravdu odstranit tento id u¾ivatele? " +msgstr "Opravdu pøesunout primární klíè? (a/N) " #: g10/keyedit.c:1616 -#, fuzzy msgid "You must select exactly one key.\n" -msgstr "Musíte vybrat alespoò jeden klíè.\n" +msgstr "Musíte vybrat právì jeden klíè.\n" #: g10/keyedit.c:1636 g10/keyedit.c:1691 msgid "You must select at least one key.\n" msgstr "Musíte vybrat alespoò jeden klíè.\n" #: g10/keyedit.c:1639 -#, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " -msgstr "Opravdu chcete smazat vybrané klíèe? " +msgstr "Opravdu chcete smazat vybrané klíèe? (a/N) " #: g10/keyedit.c:1640 -#, fuzzy msgid "Do you really want to delete this key? (y/N) " -msgstr "Opravdu chcete smazat tento klíè? " +msgstr "Opravdu chcete smazat tento klíè? (a/N) " #: g10/keyedit.c:1675 -#, fuzzy msgid "Really revoke all selected user IDs? (y/N) " -msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? " +msgstr "Opravdu revokovat v¹echny vybrané id u¾ivatele? (a/N) " #: g10/keyedit.c:1676 -#, fuzzy msgid "Really revoke this user ID? (y/N) " -msgstr "Opravdu odstranit tento id u¾ivatele? " +msgstr "Opravdu revokovat tento id u¾ivatele? (a/N) " #: g10/keyedit.c:1695 -#, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " -msgstr "Opravdu chcete revokovat vybrané klíèe? " +msgstr "Opravdu chcete revokovat vybrané klíèe? (a/N) " #: g10/keyedit.c:1696 -#, fuzzy msgid "Do you really want to revoke this key? (y/N) " -msgstr "Opravdu chcete revokovat tento klíè? " +msgstr "Opravdu chcete revokovat tento klíè? (a/N) " #: g10/keyedit.c:1735 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" +"Dùvìryhodnost vlastníka nelze mìnit je-li pou¾ívána databáze dùvìry " +"poskytnutá u¾ivatelem\n" #: g10/keyedit.c:1767 -#, fuzzy msgid "Set preference list to:\n" -msgstr "nastavit seznam pøedvoleb" +msgstr "Nastavit seznam pøedvoleb:\n" #: g10/keyedit.c:1773 -#, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " -msgstr "Opravdu aktualizovat pøedvolby pro vybraný id u¾ivatele? " +msgstr "Opravdu aktualizovat pøedvolby pro vybraný id u¾ivatele? (a/N) " #: g10/keyedit.c:1775 -#, fuzzy msgid "Really update the preferences? (y/N) " -msgstr "Opravdu aktualizovat pøedvolby? " +msgstr "Opravdu aktualizovat pøedvolby? (a/N) " #: g10/keyedit.c:1825 -#, fuzzy msgid "Save changes? (y/N) " -msgstr "Ulo¾it zmìny? " +msgstr "Ulo¾it zmìny? (a/N) " #: g10/keyedit.c:1828 -#, fuzzy msgid "Quit without saving? (y/N) " -msgstr "Ukonèit bez ulo¾ení? " +msgstr "Ukonèit bez ulo¾ení? (a/N) " #: g10/keyedit.c:1838 #, c-format @@ -3219,89 +3247,73 @@ #: g10/keyedit.c:1987 msgid "Keyserver no-modify" -msgstr "" +msgstr "Keyserver bez modifikace" #: g10/keyedit.c:2002 g10/keylist.c:244 msgid "Preferred keyserver: " -msgstr "" +msgstr "Preferovaný keyserver: " -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Tento klíè mù¾e být revokován klíèem %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr "(citlivá informace)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 -#, fuzzy, c-format +#, c-format msgid "created: %s" -msgstr "%s: nemohu vytvoøit: %s\n" +msgstr "vytvoøen: %s" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 -#, fuzzy, c-format +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#, c-format msgid "revoked: %s" -msgstr "[revokován] " +msgstr "revokován: %s" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 -#, fuzzy, c-format +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#, c-format msgid "expired: %s" -msgstr " [platnost skonèí: %s]" +msgstr "platnost skonèila: %s" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 -#, fuzzy, c-format +#, c-format msgid "expires: %s" -msgstr " [platnost skonèí: %s]" +msgstr "platnost skonèí: %s" -#: g10/keyedit.c:2270 -#, fuzzy, c-format +#: g10/keyedit.c:2276 +#, c-format msgid "usage: %s" -msgstr "dùvìra: %c/%c" +msgstr "pou¾ití: %s" -#: g10/keyedit.c:2285 -#, fuzzy, c-format +#: g10/keyedit.c:2291 +#, c-format msgid "trust: %s" -msgstr "dùvìra: %c/%c" +msgstr "dùvìra: %s" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" -msgstr "" +msgstr "platnost: %s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Tento klíè byl oznaèen za neplatný (disabled)" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revokován] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" +msgstr "èíslo karty: " -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "U¾ivatelský ID formátu PGP 2.x nemá ¾ádné pøedvolby\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3309,7 +3321,17 @@ "Prosím nezapomeòte, ¾e zobrazované údaje o platnosti klíèù nemusí\n" "být nutnì správné, dokud znova nespustíte program.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +msgid "revoked" +msgstr "revokován" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +msgid "expired" +msgstr "platnost skonèila" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3317,7 +3339,7 @@ "VAROVÁNÍ: ¾ádné u¾ivatelské ID nebylo oznaèeno jako primární. Tento pøíkaz\n" " mù¾e zpùsobit, ¾e za primární bude pova¾ováno jiné user ID.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3326,45 +3348,45 @@ "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání fotografického ID mù¾e v nìkterých\n" " verzích PGP vést k odmítnutí tohoto klíèe.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Jste si jistý, ¾e jej chcete stále pøidat? (a/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nemìli by jste pøidávat fotografický ID k PGP2 klíèi.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Smazat tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Smazat tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Smazat tento neznámý podpis? (a/N/u)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Smazán %d podpis.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Smazáno %d podpisù.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nic nebylo smazáno.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3373,189 +3395,180 @@ "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání 'povìøení revokace' mù¾e v nìkterých\n" " verzích PGP vést k odmítnutí tohoto klíèe.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nemìli by jste pøidávat 'povìøení revokace' k PGP2 klíèi.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ivatele povìøeného revokací: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "klíè formátu PGP 2.x nelze povìøit revokací\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "klíè nelze povìøit revokací jím samým\n" -#: g10/keyedit.c:2968 -#, fuzzy +#: g10/keyedit.c:2965 msgid "this key has already been designated as a revoker\n" -msgstr "VAROVÁNÍ: Tento klíè byl revokován klíèem s povìøením k revokaci!\n" +msgstr "tento klíè ji¾ bykl povìøen revokací\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "VAROVÁNÍ: ustanovení klíèe 'povøeným revokátorem' je nevratná operace!\n" -#: g10/keyedit.c:2993 -#, fuzzy +#: g10/keyedit.c:2990 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " -msgstr "Jste si jistí, ¾e tento klíè chcete povìøit revokací? (a/N): " +msgstr "Jste si jistí, ¾e tento klíè chcete povìøit revokací? (a/N) " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Prosím, odstraòte výbìr z tajných klíèù.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte nejvý¹e jeden sekundární klíè.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Mìním dobu platnosti sekundárního klíèe.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Mìním dobu platnosti primárního klíèe.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nemù¾ete zmìnit dobu platnosti klíèe verze 3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "V souboru tajných klíèù chybí odpovídající podpis\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte právì jeden id u¾ivatele .\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 -#, fuzzy, c-format +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "pøeskoèen v3 podpis klíèe jím samým u u¾ivatelského id \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " -msgstr "" +msgstr "Vlo¾te URL preferovaného keyserveru: " -#: g10/keyedit.c:3498 -#, fuzzy +#: g10/keyedit.c:3495 msgid "Are you sure you want to replace it? (y/N) " -msgstr "Jste si jistý(á), ¾e jej chcete pou¾ít (a/N)? " +msgstr "Jste si jistý(á), ¾e jej chcete pøepsat? (a/N) " -#: g10/keyedit.c:3499 -#, fuzzy +#: g10/keyedit.c:3496 msgid "Are you sure you want to delete it? (y/N) " -msgstr "Jste si jistý(á), ¾e jej chcete pou¾ít (a/N)? " +msgstr "Jste si jistý(á), ¾e jej chcete smazat? (a/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundární klíè s indexem %d\n" -#: g10/keyedit.c:3724 -#, fuzzy, c-format +#: g10/keyedit.c:3721 +#, c-format msgid "user ID: \"%s\"\n" -msgstr "id u¾ivatele: \"" +msgstr "id u¾ivatele:\"%s\"\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 -#, fuzzy, c-format +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#, c-format msgid "signed by your key %s on %s%s%s\n" -msgstr " podepsáno %08lX v %s%s%s\n" +msgstr "podepsáno va¹ím klíèem %s v %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (neexportovatelné)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnost podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Jste si jistý, ¾e jej chcete stále revokovat? (a/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvoøit pro tento podpis revokaèní certifikát? (a/N)" -#: g10/keyedit.c:3768 -#, fuzzy, c-format +#: g10/keyedit.c:3765 +#, c-format msgid "You have signed these user IDs on key %s:\n" -msgstr "Podepsal(a) jste následující identifikátory u¾ivatele:\n" +msgstr "Podepsal(a) jste následující identifikátory u¾ivatele: %s:\n" -#: g10/keyedit.c:3794 -#, fuzzy +#: g10/keyedit.c:3791 msgid " (non-revocable)" -msgstr " (neexportovatelné)" +msgstr " (nerevokovatelné)" -#: g10/keyedit.c:3801 -#, fuzzy, c-format +#: g10/keyedit.c:3798 +#, c-format msgid "revoked by your key %s on %s\n" -msgstr " revokováno %08lX v %s\n" +msgstr "revokováno va¹ím klíèem %s v %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte se revokovat tyto podpisy:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "neexistuje tajný klíè\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "U¾ivatelské ID \"%s\" je ji¾ revokováno.\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "VAROVÁNÍ: podpis ID u¾ivatele je datován %d sekund v budoucnosti\n" -#: g10/keyedit.c:4129 -#, fuzzy, c-format +#: g10/keyedit.c:4126 +#, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" -msgstr "" -"Zobrazuji %s fotografický ID o velikosti %ld pro klíè 0x%08lX (uid %d)\n" +msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíè %s (uid %d)\n" #: g10/keygen.c:293 -#, fuzzy, c-format +#, c-format msgid "preference `%s' duplicated\n" -msgstr "duplicita pøedvolby %c%lu\n" +msgstr "duplicita pøedvolby `%s'\n" #: g10/keygen.c:300 -#, fuzzy msgid "too many cipher preferences\n" -msgstr "pøíli¹ mnoho `%c' pøedvoleb\n" +msgstr "pøíli¹ mnoho pøedvoleb pro ¹ifrování\n" #: g10/keygen.c:302 -#, fuzzy msgid "too many digest preferences\n" -msgstr "pøíli¹ mnoho `%c' pøedvoleb\n" +msgstr "pøíli¹ mnoho pøedvoleb pro vzorkování\n" #: g10/keygen.c:304 -#, fuzzy msgid "too many compression preferences\n" -msgstr "pøíli¹ mnoho `%c' pøedvoleb\n" +msgstr "pøíli¹ mnoho pøedvoleb pro komprimaci\n" #: g10/keygen.c:401 -#, fuzzy, c-format +#, c-format msgid "invalid item `%s' in preference string\n" -msgstr "neplatný znak v øetìzci s pøedvolbami\n" +msgstr "neplatná polo¾ka `%s' v øetìzci s pøedvolbami\n" #: g10/keygen.c:827 msgid "writing direct signature\n" @@ -3569,69 +3582,67 @@ msgid "writing key binding signature\n" msgstr "zapisuji \"key-binding\" podpis\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "neplatná délka klíèe; pou¾iji %u bitù\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "délka klíèe zaokrouhlena na %u bitù\n" #: g10/keygen.c:1247 -#, fuzzy msgid "Sign" -msgstr "sign" +msgstr "Podepisování" #: g10/keygen.c:1250 -#, fuzzy msgid "Encrypt" -msgstr "¹ifrovat data" +msgstr "©ifrování" #: g10/keygen.c:1253 msgid "Authenticate" -msgstr "" +msgstr "Autentizace" #: g10/keygen.c:1261 msgid "SsEeAaQq" -msgstr "" +msgstr "SsEeAaQq" #: g10/keygen.c:1276 #, c-format msgid "Possible actions for a %s key: " -msgstr "" +msgstr "Pro klíè %s lze provést: " #: g10/keygen.c:1280 msgid "Current allowed actions: " -msgstr "" +msgstr "Aktuálnì povolené akce: " #: g10/keygen.c:1285 #, c-format msgid " (%c) Toggle the sign capability\n" -msgstr "" +msgstr " (%c) Zapnout/vypnout schopnost podepisovat\n" #: g10/keygen.c:1288 -#, fuzzy, c-format +#, c-format msgid " (%c) Toggle the encrypt capability\n" -msgstr " (%d) ElGamal (pouze pro ¹ifrování)\n" +msgstr " (%c) Zapnout/vypnout schopnost ¹ifrovat\n" #: g10/keygen.c:1291 #, c-format msgid " (%c) Toggle the authenticate capability\n" -msgstr "" +msgstr " (%c) Zapnout/vypnout schopnost autentizovat\n" #: g10/keygen.c:1294 #, c-format msgid " (%c) Finished\n" -msgstr "" +msgstr " (%c) Konec\n" #: g10/keygen.c:1348 msgid "Please select what kind of key you want:\n" msgstr "Prosím, vyberte druh klíèe, který chcete:\n" #: g10/keygen.c:1350 -#, fuzzy, c-format +#, c-format msgid " (%d) DSA and Elgamal (default)\n" msgstr " (%d) DSA a ElGamal (implicitní)\n" @@ -3642,93 +3653,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (nastavit si vlastní pou¾ití)\n" + +#: g10/keygen.c:1355 +#, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (pouze pro ¹ifrování)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (pouze pro podpis)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (pouze pro ¹ifrování)\n" -#: g10/keygen.c:1358 -#, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (pouze pro ¹ifrování)\n" - -#: g10/keygen.c:1409 +#: g10/keygen.c:1360 #, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Chystám se vytvoøit nový pár klíèù %s.\n" -" minimální velikost klíèe je 768 bitù\n" -" implicitní velikost klíèe je 1024 bitù\n" -" nejvy¹¹í navrhovaná velikost klíèe je 2048 bitù\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Jakou velikost klíèe si pøejete? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "Klíè DSA musí mít velikost od 512 do 1024 bitù.\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"velikost klíèe je pøíli¹ malá; minimální dovolená velikost pro RSA je 1024 " -"bitù.\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (nastavit si vlastní pou¾ití)\n" -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "" -"velikost klíèe je pøíli¹ malá; minimální dovolená velikost je 768 bitù.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Pár klíèù DSA bude dlouhý 1024 bitù.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "velikost klíèe je pøíli¹ velká; maximální dovolená hodnota je %d.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Velikosti klíèe vìt¹í jak 2048 bitù se nedoporuèují, proto¾e\n" -"výpoèty pak trvají VELMI dlouho!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Opravdu chcete vytvoøit klíè této délky? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Jakou velikost klíèe si pøejete? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Dobøe, ale nezapomeòte, ¾e informace mohou být vyzrazeny z poèítaèe také " -"elektromagnetickým vyzaøováním monitoru nebo klávesnice!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Po¾adovaná délka klíèe je %u bitù.\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "zaokrouhleno na %u bitù\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3744,7 +3722,7 @@ " m = doba platnosti klíèe skonèí za n mìsícù\n" " y = doba platnosti klíèe skonèí za n let\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3760,29 +3738,29 @@ " m = doba platnosti podpisu skonèí za n mìsícù\n" " y = doba platnosti podpisu skonèí za n let\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Klíè je platný pro? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Podpis je platný pro? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "neplatná hodnota\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "platnost %s neskonèí\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "platnost %s skonèí %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3790,13 +3768,11 @@ "Vá¹ systém neumí zobrazit data po roce 2038.\n" "V ka¾dém pøípadì budou data korektnì zpracovávána do roku 2106.\n" -#: g10/keygen.c:1577 -#, fuzzy +#: g10/keygen.c:1589 msgid "Is this correct? (y/N) " -msgstr "Je to správnì (a/n)? " +msgstr "Je to správnì (a/N)? " -#: g10/keygen.c:1620 -#, fuzzy +#: g10/keygen.c:1632 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3812,44 +3788,44 @@ " \"Magda Prochazkova (student) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Jméno a pøíjmení: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Neplatný znak ve jménì\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Jméno nemù¾e zaèínat èíslicí\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Jméno musí být dlouhé alespoò 5 znakù\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "E-mailová adresa: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Neplatná e-mailová adresa\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Komentáø: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Neplatný znak v komentáøi\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Pou¾íváte znakovou sadu `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3860,29 +3836,29 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Do pole jméno nebo komentáø nepi¹te, prosím, e-mailovou adresu.\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "jJkKeEPpUu" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Zmìnit (J)méno, (K)omentáø, (E)-mail nebo (U)konèit? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "Zmìnit (J)méno, (K)omentáø, (E)-mail, (P)okraèovat dál nebo (U)konèit " "program? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Nejdøív, prosím, opravte chybu\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3890,12 +3866,12 @@ "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3907,7 +3883,7 @@ "tohoto programu s parametrem \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3920,54 +3896,50 @@ "pou¾ívat disky); díky tomu má generátor lep¹í ¹anci získat dostatek " "entropie.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Pár klíèù DSA bude dlouhý 1024 bitù.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Vytváøení klíèe bylo zru¹eno.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisuji veøejný klíè do `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 -#, fuzzy, c-format +#: g10/keygen.c:2761 g10/keygen.c:2899 +#, c-format msgid "writing secret key stub to `%s'\n" msgstr "zapisuji tajný klíè do `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisuji tajný klíè do `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor veøejných klíèù (pubring): %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "nenalezen zapisovatelný soubor tajných klíèù (secring): %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "chyba pøi zápisu do souboru veøejných klíèù `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "chyba pøi zápisu do souboru tajných klíèù `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "veøejný a tajný klíè byly vytvoøeny a podepsány.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3975,12 +3947,12 @@ "Tento klíè nemù¾e být pou¾itý pro ¹ifrování. K vytvoøení\n" "sekundárního klíèe pro tento úèel mù¾ete pou¾ít pøíkaz \"--edit-key\".\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Vytvoøení klíèe se nepodaøilo: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3988,7 +3960,7 @@ "klíè byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" "je problém se systémovým èasem)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -3996,43 +3968,42 @@ "klíè byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" "je problém se systémovým èasem)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "POZNÁMKA: vytvoøení podklíèe pro klíèe v3 není v souladu s OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 -#, fuzzy +#: g10/keygen.c:3052 g10/keygen.c:3174 msgid "Really create? (y/N) " -msgstr "Opravdu vytvoøit? " +msgstr "Opravdu vytvoøit? (a/N) " -#: g10/keygen.c:3315 -#, fuzzy, c-format +#: g10/keygen.c:3327 +#, c-format msgid "storing key onto card failed: %s\n" -msgstr "smazání bloku klíèe se nezdaøilo: %s\n" +msgstr "ulo¾ení klíèe na kartu se nezdaøilo: %s\n" -#: g10/keygen.c:3362 -#, fuzzy, c-format +#: g10/keygen.c:3374 +#, c-format msgid "can't create backup file `%s': %s\n" -msgstr "nemohu vytvoøit `%s': %s\n" +msgstr "nemohu vytvoøit zálohu souboru `%s': %s\n" -#: g10/keygen.c:3385 -#, fuzzy, c-format +#: g10/keygen.c:3397 +#, c-format msgid "NOTE: backup of card key saved to `%s'\n" -msgstr "POZNÁMKA: platnost tajného klíèe %08lX skonèila %s\n" +msgstr "POZNÁMKA: záloha klíèe z karty ulo¾ena do `%s'\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" -msgstr "" +msgstr "RSA modulus není dlouhý %d\n" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" -msgstr "" +msgstr "veøejný RSA exponent je pøíli¹ dlouhý (více ne¾ 32 bitù)\n" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" -msgstr "" +msgstr "délka RSA prvoèísla není %d\n" #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533 msgid "never " @@ -4048,7 +4019,7 @@ #: g10/keylist.c:242 msgid "Critical preferred keyserver: " -msgstr "" +msgstr "Kriticky preferovaný keyserver: " #: g10/keylist.c:291 g10/keylist.c:335 msgid "WARNING: invalid notation data found\n" @@ -4071,39 +4042,38 @@ msgstr "soubor klíèù (keyring)" #: g10/keylist.c:729 -#, fuzzy, c-format +#, c-format msgid "expired: %s)" -msgstr " [platnost skonèí: %s]" +msgstr "platnost skonèila: %s)" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Primární fingerprint klíèe:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Fingerprint podklíèe:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Primární fingerprint klíèe:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Fingerprint podklíèe:" -#: g10/keylist.c:1446 g10/keylist.c:1450 -#, fuzzy +#: g10/keylist.c:1440 g10/keylist.c:1444 msgid " Key fingerprint =" -msgstr " Fingerprint klíèe =" +msgstr " Fingerprint klíèe =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" -msgstr "" +msgstr " Seriové èíslo karty =" #: g10/keyring.c:1245 -#, fuzzy, c-format +#, c-format msgid "renaming `%s' to `%s' failed: %s\n" -msgstr "kódování do ASCII formátu selhalo: %s\n" +msgstr "pøejmenování `%s' na `%s' se nezdaøilo: %s\n" #: g10/keyring.c:1251 msgid "WARNING: 2 files with confidential information exists.\n" @@ -4124,19 +4094,19 @@ msgstr "Prosím, opravte tento mo¾ný bezpeènostní problém\n" #: g10/keyring.c:1375 -#, fuzzy, c-format +#, c-format msgid "caching keyring `%s'\n" -msgstr "kontroluji soubor klíèù (keyring) `%s'\n" +msgstr "cache souboru klíèù `%s'\n" #: g10/keyring.c:1421 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached so far (%lu signatures)\n" -msgstr "%lu klíèù zkontrolován (%lu podpisù)\n" +msgstr "%lu klíèù ji¾ ulo¾eno v cache (%lu podpisù)\n" #: g10/keyring.c:1433 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached (%lu signatures)\n" -msgstr "%lu klíèù zkontrolován (%lu podpisù)\n" +msgstr "%lu klíèù ulo¾eno v cache (%lu podpisù)\n" #: g10/keyring.c:1504 #, c-format @@ -4144,137 +4114,130 @@ msgstr "%s: soubor klíèù (keyring) vytvoøen\n" #: g10/keyserver.c:98 -#, fuzzy, c-format +#, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" -msgstr "VAROVÁNÍ: nastavení z `%s' nejsou pøi tomto spu¹tìní zatím aktivní\n" +msgstr "VAROVÁNÍ: volba `%s' pro server klíèù není na této platformì úèinná\n" #: g10/keyserver.c:378 -#, fuzzy msgid "disabled" -msgstr "disable" +msgstr "disabled" #: g10/keyserver.c:579 msgid "Enter number(s), N)ext, or Q)uit > " -msgstr "" +msgstr "Vlo¾te èíslo (èísla), 'N' pro dal¹í nebo 'Q' pro konec> " #: g10/keyserver.c:662 g10/keyserver.c:1142 -#, fuzzy, c-format +#, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" -msgstr "neplatný parametr pro export\n" +msgstr "neplatný protokol serveru klíèù (us %d!=handler %d)\n" #: g10/keyserver.c:752 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found on keyserver\n" -msgstr "klíè `%s' nenalezen: %s\n" +msgstr "klíè \"%s\" nebyl na serveru klíèù nalezen\n" #: g10/keyserver.c:754 -#, fuzzy msgid "key not found on keyserver\n" -msgstr "klíè `%s' nenalezen: %s\n" +msgstr "klíè nebyl na serveru klíèù nalezen\n" #: g10/keyserver.c:896 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s server %s\n" -msgstr "po¾aduji klíè %08lX z %s\n" +msgstr "po¾aduji klíè %s ze %s server %s\n" #: g10/keyserver.c:900 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s\n" -msgstr "po¾aduji klíè %08lX z %s\n" +msgstr "po¾aduji klíè %s z %s\n" #: g10/keyserver.c:1045 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s server %s\n" -msgstr "vyhledávám \"%s\" na HKP serveru %s\n" +msgstr "posílám klíè %s na %s server %s\n" #: g10/keyserver.c:1049 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s\n" -msgstr "" -"\"\n" -"podepsáno Va¹ím klíèem %08lX v %s\n" +msgstr "posílám klíè %s na %s\n" #: g10/keyserver.c:1092 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s server %s\n" -msgstr "vyhledávám \"%s\" na HKP serveru %s\n" +msgstr "vyhledávám \"%s\" na %s serveru %s\n" #: g10/keyserver.c:1095 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s\n" -msgstr "vyhledávám \"%s\" na HKP serveru %s\n" +msgstr "vyhledávám \"%s\" na serveru %s\n" #: g10/keyserver.c:1102 g10/keyserver.c:1197 -#, fuzzy msgid "no keyserver action!\n" -msgstr "neplatný parametr pro export\n" +msgstr "¾ádná operace se serverem klíèù!\n" #: g10/keyserver.c:1150 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" -msgstr "" +msgstr "VAROVÁNÍ: keyserver handler z jiné verze GnuPG (%s)\n" #: g10/keyserver.c:1159 msgid "keyserver did not send VERSION\n" -msgstr "" +msgstr "server klíèù neposlal VERSION\n" #: g10/keyserver.c:1218 msgid "no keyserver known (use option --keyserver)\n" -msgstr "" +msgstr "¾adný server klíèù není znám (pou¾íjte volbu --keyserver)\n" #: g10/keyserver.c:1224 msgid "external keyserver calls are not supported in this build\n" -msgstr "" +msgstr "volání externího keyserver není v této verzi podporováno\n" #: g10/keyserver.c:1236 #, c-format msgid "no handler for keyserver scheme `%s'\n" -msgstr "" +msgstr "protokol serveru klíèù `%s' není podporován\n" #: g10/keyserver.c:1241 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" -msgstr "" +msgstr "akce `%s' není podporována v protokolu `%s' serveru klíèù\n" #: g10/keyserver.c:1249 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" -msgstr "" +msgstr "gpgkeys_%s nepodporuje protokol verze %d\n" #: g10/keyserver.c:1254 -#, fuzzy msgid "keyserver timed out\n" -msgstr "chyba serveru klíèù" +msgstr "èasový limit pro server klíèù vypr¹el\n" #: g10/keyserver.c:1259 -#, fuzzy msgid "keyserver internal error\n" -msgstr "chyba serveru klíèù" +msgstr "interní chyba serveru klíèù\n" #: g10/keyserver.c:1268 -#, fuzzy, c-format +#, c-format msgid "keyserver communications error: %s\n" -msgstr "získání dat z keyserveru se nezdaøilo: %s\n" +msgstr "chyba komunikace se serverem klíèù: %s\n" #: g10/keyserver.c:1293 g10/keyserver.c:1327 #, c-format msgid "\"%s\" not a key ID: skipping\n" -msgstr "" +msgstr "\"%s\" není ID klíèe: pøeskoèeno\n" #: g10/keyserver.c:1578 -#, fuzzy, c-format +#, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" -msgstr "VAROVÁNÍ: nelze smazat doèasný soubor (%s) `%s': %s\n" +msgstr "VAROVÁNÍ: nelze aktualizovat klíè %s prostøednictvím %s: %s\n" #: g10/keyserver.c:1600 -#, fuzzy, c-format +#, c-format msgid "refreshing 1 key from %s\n" -msgstr "po¾aduji klíè %08lX z %s\n" +msgstr "aktualizuji 1 klíè z %s\n" #: g10/keyserver.c:1602 -#, fuzzy, c-format +#, c-format msgid "refreshing %d keys from %s\n" -msgstr "po¾aduji klíè %08lX z %s\n" +msgstr "aktualizuji %d klíèù z %s\n" #: g10/mainproc.c:248 #, c-format @@ -4292,35 +4255,35 @@ msgstr "%s za¹ifrovaný klíè sezení\n" #: g10/mainproc.c:309 -#, fuzzy, c-format +#, c-format msgid "passphrase generated with unknown digest algorithm %d\n" -msgstr "za¹ifrováno neznámým algoritmem %d\n" +msgstr "heslo (passphraze) generováno s pou¾itím neznámého algoritmu %d\n" #: g10/mainproc.c:373 -#, fuzzy, c-format +#, c-format msgid "public key is %s\n" -msgstr "veøejný klíè je %08lX\n" +msgstr "veøejný klíè je %s\n" #: g10/mainproc.c:428 msgid "public key encrypted data: good DEK\n" msgstr "data za¹ifrována veøejným klíèem: správný DEK\n" #: g10/mainproc.c:461 -#, fuzzy, c-format +#, c-format msgid "encrypted with %u-bit %s key, ID %s, created %s\n" -msgstr "za¹ifrována %u-bitovým %s klíèem, ID %08lX, vytvoøeným %s\n" +msgstr "za¹ifrována %u-bitovým %s klíèem, ID %s, vytvoøeným %s\n" #: g10/mainproc.c:465 g10/pkclist.c:218 -#, fuzzy, c-format +#, c-format msgid " \"%s\"\n" -msgstr " alias \"" +msgstr " \"%s\"\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-( # [kw] #: g10/mainproc.c:469 -#, fuzzy, c-format +#, c-format msgid "encrypted with %s key, ID %s\n" -msgstr "za¹ifrováno %s klíèem, ID %08lX\n" +msgstr "za¹ifrováno %s klíèem, ID %s\n" #: g10/mainproc.c:483 #, c-format @@ -4389,48 +4352,48 @@ msgstr "neumím pracovat s tìmito násobnými podpisy\n" #: g10/mainproc.c:1350 -#, fuzzy, c-format +#, c-format msgid "Signature made %s\n" -msgstr "Platnost podpisu skonèila %s\n" +msgstr "Podpis vytvoøen %s\n" #: g10/mainproc.c:1351 -#, fuzzy, c-format +#, c-format msgid " using %s key %s\n" -msgstr " alias \"" +msgstr " pou¾ití %s klíèe %s\n" # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-( #: g10/mainproc.c:1355 -#, fuzzy, c-format +#, c-format msgid "Signature made %s using %s key ID %s\n" -msgstr "Podpis vytvoøen %.*s pomocí klíèe %s s ID u¾ivatele %08lX\n" +msgstr "Podpis vytvoøen %s pomocí klíèe %s s ID u¾ivatele %s\n" #: g10/mainproc.c:1375 msgid "Key available at: " msgstr "Klíè k dispozici na: " #: g10/mainproc.c:1480 g10/mainproc.c:1528 -#, fuzzy, c-format +#, c-format msgid "BAD signature from \"%s\"" -msgstr "©PATNÝ podpis od \"" +msgstr "©PATNÝ podpis od \"%s\"" #: g10/mainproc.c:1482 g10/mainproc.c:1530 -#, fuzzy, c-format +#, c-format msgid "Expired signature from \"%s\"" -msgstr "Podpis s vypr¹enou platností od \"" +msgstr "Podpis s vypr¹enou platností od \"%s\"" #: g10/mainproc.c:1484 g10/mainproc.c:1532 -#, fuzzy, c-format +#, c-format msgid "Good signature from \"%s\"" -msgstr "Dobrý podpis od \"" +msgstr "Dobrý podpis od \"%s\"" #: g10/mainproc.c:1536 msgid "[uncertain]" -msgstr "[nejistý] " +msgstr "[nejistý]" #: g10/mainproc.c:1568 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"" -msgstr " alias \"" +msgstr " alias \"%s\"" #: g10/mainproc.c:1662 #, c-format @@ -4455,7 +4418,7 @@ msgid "textmode" msgstr "textový formát" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "neznámý formát" @@ -4486,30 +4449,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "nalezen neplatný koøenový paket v proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "nemohu vypnout vytváøení core souborù: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 -#, fuzzy, c-format +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 +#, c-format msgid "fstat of `%s' failed in %s: %s\n" -msgstr "nelze otevøít soubor: %s\n" +msgstr "fstat `%s' selhal na %s: %s\n" -#: g10/misc.c:186 -#, fuzzy, c-format +#: g10/misc.c:190 +#, c-format msgid "fstat(%d) failed in %s: %s\n" -msgstr "databáze dùvìry: procedura read() (n=%d) selhala: %s\n" +msgstr "fstat(%d) selhal v %s: %s\n" + +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "nemohu pracovat s algoritmem veøejného klíèe %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "¹ifrovací algoritmus není implementován" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Experimentální algoritmy by se nemìly pou¾ívat!\n" +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "podpis %s, hashovací algoritmus %s\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"tento ¹ifrovací algoritmus se nedoporuèuje; prosím, pou¾ijte nìjaký " -"standardnìj¹í!\n" +"VAROVÁNÍ: vy¾ádaný hashovací algoritmus %s (%d) nevyhovuje pøedvolbám " +"pøíjemce\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4541,9 +4516,8 @@ msgstr "Nezakomprimováno" #: g10/misc.c:706 -#, fuzzy msgid "uncompressed|none" -msgstr "Nezakomprimováno" +msgstr "nezakomprimováno|nic" #: g10/misc.c:816 #, c-format @@ -4551,14 +4525,14 @@ msgstr "tato zpráva nemusí být s %s pou¾itelná\n" #: g10/misc.c:973 -#, fuzzy, c-format +#, c-format msgid "ambiguous option `%s'\n" -msgstr "ètu mo¾nosti z `%s'\n" +msgstr "nejednoznaèné volby `%s'\n" #: g10/misc.c:998 -#, fuzzy, c-format +#, c-format msgid "unknown option `%s'\n" -msgstr "neznámý implicitní adresát `%s'\n" +msgstr "neznámá volba `%s'\n" #: g10/openfile.c:84 #, c-format @@ -4566,7 +4540,6 @@ msgstr "Soubor `%s' existuje. " #: g10/openfile.c:86 -#, fuzzy msgid "Overwrite? (y/N) " msgstr "Pøepsat (a/N)? " @@ -4599,9 +4572,9 @@ msgstr "VAROVÁNÍ: nastavení z `%s' nejsou pøi tomto spu¹tìní zatím aktivní\n" #: g10/openfile.c:409 -#, fuzzy, c-format +#, c-format msgid "directory `%s' created\n" -msgstr "%s: adresáø vytvoøen\n" +msgstr "adresáø `%s' vytvoøen\n" #: g10/parse-packet.c:119 #, c-format @@ -4617,51 +4590,51 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent není v tomto sezení dostupný\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "nemohu nastavit PID klienta pro gpg-agenta\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "nelze získat server read file descriptor pro agenta r\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "nezle získat server write file descriptor pro agenta\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "¹patný formát promìnné prostøedí GPG_AGENT_INFO\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verze %d není podporován\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemohu se pøipojit k `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problém v komunikaci s gpg-agentem\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentem - pou¾ívání agenta vypnuto\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 -#, fuzzy, c-format +#: g10/passphrase.c:698 g10/passphrase.c:1203 +#, c-format msgid " (main key ID %s)" -msgstr " (hlavní ID klíèe %08lX)" +msgstr "(hlavní ID klíèe %s)" -#: g10/passphrase.c:698 -#, fuzzy, c-format +#: g10/passphrase.c:712 +#, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" "\"%.*s\"\n" @@ -4669,63 +4642,62 @@ msgstr "" "Potøebujete heslo, abyste odemknul(a) tajný klíè pro u¾ivatele:\n" "\"%.*s\"\n" -"Klíè o délce %u bitù, typ %s, ID %08lX, vytvoøený %s%s\n" +"Klíè o délce %u bitù, typ %s, ID %s, vytvoøený %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Opakovat heslo\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Vlo¾it heslo\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "heslo je pøíli¹ dlouhé\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "neplatná reakce od agenta\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "zru¹eno u¾ivatelem\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentem: agent vrací 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "v dávkovém re¾imu se nemohu ptát na heslo\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1141 -#, fuzzy, c-format +#: g10/passphrase.c:1184 +#, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" msgstr "" -"\n" "Musíte znát heslo, abyste odemknul(a) tajný klíè pro\n" -"u¾ivatele: \"" +"u¾ivatele: \"%s\"\n" -#: g10/passphrase.c:1147 -#, fuzzy, c-format +#: g10/passphrase.c:1190 +#, c-format msgid "%u-bit %s key, ID %s, created %s" -msgstr "délka %u bitù, typ %s, klíè %08lX, vytvoøený %s" +msgstr "délka %u bitù, typ %s, klíè %s, vytvoøený %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" -msgstr "" +msgstr " (podklíè na hlavním klíèi ID %s)" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -4748,24 +4720,23 @@ msgstr "Vlo¾te jméno JPEG souboru s fotografickým ID: " #: g10/photoid.c:94 -#, fuzzy, c-format +#, c-format msgid "unable to open JPEG file `%s': %s\n" -msgstr "nelze otevøít soubor: %s\n" +msgstr "nelze otevøít JPEG soubor `%s': %s\n" #: g10/photoid.c:102 #, c-format msgid "This JPEG is really large (%d bytes) !\n" -msgstr "" +msgstr "Tento JPEG je opravdu velký (%d bajtù)!\n" #: g10/photoid.c:104 -#, fuzzy msgid "Are you sure you want to use it? (y/N) " -msgstr "Jste si jistý(á), ¾e jej chcete pou¾ít (a/N)? " +msgstr "Jste si jistý(á), ¾e jej chcete pou¾ít? (a/N) " #: g10/photoid.c:119 -#, fuzzy, c-format +#, c-format msgid "`%s' is not a JPEG file\n" -msgstr "\"%s\" není soubor ve formátu JPEG\n" +msgstr "`%s' není soubor ve formátu JPEG\n" #: g10/photoid.c:136 msgid "Is this photo correct (y/N/q)? " @@ -4808,50 +4779,43 @@ msgstr "iImMuUsS" #: g10/pkclist.c:213 -#, fuzzy msgid "No trust value assigned to:\n" -msgstr "" -"K není pøiøazena ¾ádná hodnota dùvìry:\n" -"%4u%c/%08lX %s \"" +msgstr "Není pøiøazena ¾ádná hodnota dùvìry:\n" #: g10/pkclist.c:245 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"\n" -msgstr " alias \"" +msgstr " alias \"%s\"\n" #: g10/pkclist.c:255 -#, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" -msgstr "Tento klíè pravdìpodobnì nále¾í jeho majiteli\n" +msgstr "Nakolik dùvìøujete tvrzení, ¾e tento klíè patøí uvedenému u¾ivateli?\n" #: g10/pkclist.c:270 -#, fuzzy, c-format +#, c-format msgid " %d = I don't know or won't say\n" -msgstr " %d = Nevím\n" +msgstr " %d = Nevím nebo neøeknu\n" #: g10/pkclist.c:272 -#, fuzzy, c-format +#, c-format msgid " %d = I do NOT trust\n" msgstr " %d = Nedùvìøuji\n" #: g10/pkclist.c:278 -#, fuzzy, c-format +#, c-format msgid " %d = I trust ultimately\n" msgstr " %d = Dùvìøuji absolutnì\n" #: g10/pkclist.c:284 -#, fuzzy msgid " m = back to the main menu\n" msgstr " m = zpìt do hlavního menu\n" #: g10/pkclist.c:287 -#, fuzzy msgid " s = skip this key\n" msgstr " s = pøeskoèit tento klíè\n" #: g10/pkclist.c:288 -#, fuzzy msgid " q = quit\n" msgstr " u = ukonèit\n" @@ -4861,43 +4825,40 @@ "The minimum trust level for this key is: %s\n" "\n" msgstr "" +"Minimální úroveò dùvìry tohoto klíèe je: %s\n" +"\n" #: g10/pkclist.c:298 g10/revoke.c:609 msgid "Your decision? " msgstr "Va¹e rozhodnutí? " #: g10/pkclist.c:319 -#, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " -msgstr "Opravdu chcete nastavit pro tento klíè absolutní dùvìru? " +msgstr "Opravdu chcete nastavit pro tento klíè absolutní dùvìru? (a/N) " #: g10/pkclist.c:333 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certifikáty vedoucí k finálnímu dùvìryhodnému klíèi:\n" #: g10/pkclist.c:418 -#, fuzzy, c-format +#, c-format msgid "%s: There is no assurance this key belongs to the named user\n" -msgstr "" -"%08lX: Nic nenaznaèuje tomu, ¾e tento podpis patøí vlastníkovi klíèe.\n" +msgstr "%s: Nic nenaznaèuje tomu, ¾e tento klíè patøí uvedenému u¾ivateli\n" #: g10/pkclist.c:423 -#, fuzzy, c-format +#, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" -msgstr "" -"%08lX: Nic nenaznaèuje tomu, ¾e tento podpis patøí vlastníkovi klíèe.\n" +msgstr "%s: Je zde èásteèná dùvìra, ¾e tento klíè patøí uvedenému uv¾ivateli\n" #: g10/pkclist.c:429 -#, fuzzy msgid "This key probably belongs to the named user\n" -msgstr "Tento klíè pravdìpodobnì nále¾í jeho majiteli\n" +msgstr "Tento klíè pravdìpodobnì nále¾í uvedenému u¾ivateli\n" #: g10/pkclist.c:434 msgid "This key belongs to us\n" msgstr "Tento klíè nále¾í nám (máme odpovídající tajný klíè)\n" #: g10/pkclist.c:460 -#, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" "in the user ID. If you *really* know what you are doing,\n" @@ -4909,9 +4870,8 @@ "\n" #: g10/pkclist.c:467 -#, fuzzy msgid "Use this key anyway? (y/N) " -msgstr "Pou¾ít pøesto tento klíè? " +msgstr "Pou¾ít pøesto tento klíè? (a/N) " #: g10/pkclist.c:501 msgid "WARNING: Using untrusted key!\n" @@ -4930,7 +4890,8 @@ msgstr "VAROVÁNÍ: Tento klíè byl revokován svým vlastníkem!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " To mù¾e znamenat, ¾e podpis je padìlaný.\n" #: g10/pkclist.c:527 @@ -4990,7 +4951,7 @@ #: g10/pkclist.c:802 msgid "Current recipients:\n" -msgstr "" +msgstr "Aktuální pøíjemci:\n" #: g10/pkclist.c:828 msgid "" @@ -5017,9 +4978,9 @@ msgstr "pøeskoèeno: veøejný klíè je ji¾ nastaven\n" #: g10/pkclist.c:903 -#, fuzzy, c-format +#, c-format msgid "unknown default recipient \"%s\"\n" -msgstr "neznámý implicitní adresát `%s'\n" +msgstr "neznámý implicitní adresát \"%s\"\n" #: g10/pkclist.c:948 #, c-format @@ -5036,36 +4997,36 @@ "data nebyla ulo¾ena; k jejich ulo¾ení pou¾ijte parametr pøíkazu \"--output" "\"\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "chyba pøi vytváøení `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Podpis oddìlený od dokumentu.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Prosím, vlo¾te název datového souboru: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "ètu standardní vstup ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "chybí podepsaná data\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "nemohu otevøít podepsaná data '%s'\n" #: g10/pubkey-enc.c:103 -#, fuzzy, c-format +#, c-format msgid "anonymous recipient; trying secret key %s ...\n" -msgstr "anonymní adresát; zkou¹ím tajný klíè %08lX ...\n" +msgstr "anonymní adresát; zkou¹ím tajný klíè %s ...\n" #: g10/pubkey-enc.c:119 msgid "okay, we are the anonymous recipient.\n" @@ -5081,14 +5042,14 @@ msgstr "¹ifrovací algoritmus %d%s je neznámý nebo je zneplatnìn\n" #: g10/pubkey-enc.c:266 -#, fuzzy, c-format +#, c-format msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" -msgstr "POZNÁMKA: v pøedvolbách nenalezen ¹ifrovací algoritmus %d\n" +msgstr "VAROVÁNÍ: v pøedvolbách pøíjemce nenalezen ¹ifrovací algoritmus %s\n" #: g10/pubkey-enc.c:286 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %s expired at %s\n" -msgstr "POZNÁMKA: platnost tajného klíèe %08lX skonèila %s\n" +msgstr "POZNÁMKA: platnost tajného klíèe %s skonèila %s\n" #: g10/pubkey-enc.c:292 msgid "NOTE: key has been revoked" @@ -5101,9 +5062,9 @@ msgstr "selhalo vytvoøení paketu (build_packet): %s\n" #: g10/revoke.c:146 -#, fuzzy, c-format +#, c-format msgid "key %s has no user IDs\n" -msgstr "klíè %08lX: chybí identifikátor u¾ivatele\n" +msgstr "klíè %s: chybí identifikátor u¾ivatele\n" #: g10/revoke.c:272 msgid "To be revoked by:\n" @@ -5114,9 +5075,8 @@ msgstr "(Toto je citlivý revokaèní klíè)\n" #: g10/revoke.c:280 -#, fuzzy msgid "Create a designated revocation certificate for this key? (y/N) " -msgstr "Vytvoøit pro tento klíè revokaèní certifikát? " +msgstr "Vytvoøit pro tento klíè povìøený revokaèní certifikát? (a/N)" #: g10/revoke.c:293 g10/revoke.c:511 msgid "ASCII armored output forced.\n" @@ -5132,14 +5092,14 @@ msgstr "Revokaèní certifikát vytvoøen.\n" #: g10/revoke.c:376 -#, fuzzy, c-format +#, c-format msgid "no revocation keys found for \"%s\"\n" -msgstr "pro `%s' nebyl nalezen ¾ádný revokaèní klíè\n" +msgstr "pro \"%s\" nebyl nalezen ¾ádný revokaèní klíè\n" #: g10/revoke.c:432 -#, fuzzy, c-format +#, c-format msgid "secret key \"%s\" not found: %s\n" -msgstr "tajný klíè `%s' nenalezen: %s\n" +msgstr "tajný klíè \"%s\" nenalezen: %s\n" #: g10/revoke.c:461 #, c-format @@ -5151,9 +5111,8 @@ msgstr "veøejný klíè neodpovídá tajnému klíèi!\n" #: g10/revoke.c:479 -#, fuzzy msgid "Create a revocation certificate for this key? (y/N) " -msgstr "Vytvoøit pro tento klíè revokaèní certifikát? " +msgstr "Vytvoøit pro tento klíè revokaèní certifikát? (a/N) " #: g10/revoke.c:496 msgid "unknown protection algorithm\n" @@ -5209,9 +5168,8 @@ msgstr "(Nebyl zadán ®ádný popis)\n" #: g10/revoke.c:680 -#, fuzzy msgid "Is this okay? (y/N) " -msgstr "Je dùvod revokace vybrán správnì? " +msgstr "Je dùvod revokace vybrán správnì? (a/N) " #: g10/seckey-cert.c:54 msgid "secret key parts are not available\n" @@ -5223,9 +5181,9 @@ msgstr "ochranný algoritmus %d%s není podporován\n" #: g10/seckey-cert.c:71 -#, fuzzy, c-format +#, c-format msgid "protection digest %d is not supported\n" -msgstr "ochranný algoritmus %d%s není podporován\n" +msgstr "ochranný algoritmus %d není podporován\n" #: g10/seckey-cert.c:250 msgid "Invalid passphrase; please try again" @@ -5266,63 +5224,62 @@ msgstr "VAROVÁNÍ: konflikt hashe podpisu ve zprávì\n" #: g10/sig-check.c:99 -#, fuzzy, c-format +#, c-format msgid "WARNING: signing subkey %s is not cross-certified\n" -msgstr "VAROVÁNÍ: podepisovací podklíè %08lX není køí¾ovì certifikován\n" +msgstr "VAROVÁNÍ: podepisovací podklíè %s není køí¾ovì certifikován\n" #: g10/sig-check.c:102 -#, fuzzy, c-format +#, c-format msgid "WARNING: signing subkey %s has an invalid cross-certification\n" -msgstr "" -"VAROVÁNÍ: podepisovací podklíè %08lX má neplatnou køí¾ovou certifikaci\n" +msgstr "VAROVÁNÍ: podepisovací podklíè %s má neplatnou køí¾ovou certifikaci\n" #: g10/sig-check.c:168 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu second newer than the signature\n" -msgstr "veøejný klíè %08lX je o %lu sekund novìj¹í ne¾ podpis\n" +msgstr "veøejný klíè %s je o %lu sekund novìj¹í ne¾ podpis\n" #: g10/sig-check.c:169 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu seconds newer than the signature\n" -msgstr "veøejný klíè %08lX je o %lu sekund novìj¹í ne¾ podpis\n" +msgstr "veøejný klíè %s je o %lu sekund novìj¹í ne¾ podpis\n" #: g10/sig-check.c:180 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" -"klíè byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" +"klíè %s byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" "je problém se systémovým èasem)\n" #: g10/sig-check.c:182 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" -"klíè byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" +"klíè %s byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu nebo\n" "je problém se systémovým èasem)\n" #: g10/sig-check.c:192 -#, fuzzy, c-format +#, c-format msgid "NOTE: signature key %s expired %s\n" -msgstr "POZNÁMKA: podpisovému klíèi %08lX skonèila platnost %s\n" +msgstr "POZNÁMKA: podpisovému klíèi %s skonèila platnost %s\n" #: g10/sig-check.c:275 -#, fuzzy, c-format +#, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" -"pøedpokládám ¹patný podpis klíèem %08lX, proto¾e je nastaven neznámý " -"kritický bit\n" +"pøedpokládám ¹patný podpis klíèem %s, proto¾e je nastaven neznámý kritický " +"bit\n" #: g10/sig-check.c:532 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey revocation signature\n" -msgstr "klíè %08lX: neexistuje podklíè pro revokaci podklíèe\n" +msgstr "klíè %s: neexistuje podklíè pro revokaci podklíèe\n" #: g10/sig-check.c:558 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey binding signature\n" -msgstr "klíè %08lX: podklíè který je svázán s podpisem neexistuje\n" +msgstr "klíè %s: podklíè který je svázán s podpisem neexistuje\n" #: g10/sign.c:85 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" @@ -5349,7 +5306,7 @@ msgstr "nelze ulo¾it URL politiky do podpisu v3 klíèem (formát PGP 2.x)\n" #: g10/sign.c:159 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n" msgstr "" @@ -5357,13 +5314,13 @@ "neexpandované.\n" #: g10/sign.c:187 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand preferred keyserver URL (too large). Using " "unexpanded.\n" msgstr "" -"VAROVÁNÍ: nemohu %%-expandovat URL politiky (pøíli¹ dlouhé). Pou¾ity " -"neexpandované.\n" +"VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (pøíli¹ dlouhé). " +"Pou¾ity neexpandované.\n" #: g10/sign.c:364 #, c-format @@ -5371,9 +5328,9 @@ msgstr "kontrola vytvoøeného podpisu se nepodaøila: %s\n" #: g10/sign.c:373 -#, fuzzy, c-format +#, c-format msgid "%s/%s signature from: \"%s\"\n" -msgstr "%s podpis od: \"%s\"\n" +msgstr "%s/%s podpis od: \"%s\"\n" #: g10/sign.c:741 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" @@ -5381,57 +5338,53 @@ "v módu --pgp2 mù¾ete vytvoøit pouze oddìlený podpis (detach-sign)s klíèi " "formátu PGP-2.x\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "zapisuji do '%s'\n" - -#: g10/sign.c:807 -#, fuzzy, c-format +#: g10/sign.c:808 +#, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" -msgstr "vy¾ádaný hashovací algoritmus %s (%d) nevyhovuje pøedvolbám pøíjemce\n" +msgstr "" +"VAROVÁNÍ: vy¾ádaný hashovací algoritmus %s (%d) nevyhovuje pøedvolbám " +"pøíjemce\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "podepisuji:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "v módu --pgp2 mù¾ete vytváøet jen èitelné podpisy s klíèi formátu PGP-2.x\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "bude pou¾ito ¹ifrování %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "klíè není oznaèen jako nedostateènì bezpeèný - nemohu jej pou¾ít s padìlaným " "RNG!\n" -#: g10/skclist.c:158 -#, fuzzy, c-format +#: g10/skclist.c:157 +#, c-format msgid "skipped \"%s\": duplicated\n" -msgstr "pøeskoèen `%s': duplikován\n" +msgstr "pøeskoèen \"%s\": duplikován\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 -#, fuzzy, c-format +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 +#, c-format msgid "skipped \"%s\": %s\n" -msgstr "pøeskoèen `%s': %s\n" +msgstr "pøeskoèen \"%s\": %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "pøeskoèeno: tajný klíè je u¾ v databázi\n" -#: g10/skclist.c:186 -#, fuzzy +#: g10/skclist.c:185 msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" -"pøeskoèen `%s': toto je vygenerovaný PGP klíè podle algoritmu ElGamal,\n" -"podpisy vytvoøené tímto klíèem nejsou bezpeèné!\n" +"toto je PGP klíè vygenerovaný podle algoritmu ElGamal,\n" +"podpisy vytvoøené tímto klíèem nejsou bezpeèné!" #: g10/tdbdump.c:59 g10/trustdb.c:365 #, c-format @@ -5448,40 +5401,37 @@ "# (Pou¾ijte \"gpg --import-ownertrust\" k jeho obnovì)\n" #: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177 -#, fuzzy, c-format +#, c-format msgid "error in `%s': %s\n" -msgstr "chyba pøi ètení `%s': %s\n" +msgstr "chyba v `%s': %s\n" #: g10/tdbdump.c:159 -#, fuzzy msgid "line too long" -msgstr "øádek je pøíli¹ dlouhý\n" +msgstr "øádek je pøíli¹ dlouhý" #: g10/tdbdump.c:167 msgid "colon missing" -msgstr "" +msgstr "sloupec schází" #: g10/tdbdump.c:173 -#, fuzzy msgid "invalid fingerprint" -msgstr "chyba: neplatný fingerprint\n" +msgstr "neplatný fingerprint" #: g10/tdbdump.c:178 -#, fuzzy msgid "ownertrust value missing" msgstr "" -"importovat hodnoty dùvìryhodnosti\n" +"hodnota dùvìryhodnosti vlastníka scházíimportovat hodnoty dùvìryhodnosti\n" " vlastníka klíèe" #: g10/tdbdump.c:214 -#, fuzzy, c-format +#, c-format msgid "error finding trust record in `%s': %s\n" -msgstr "chyba pøi hledání záznamu dùvìryhodnosti: %s\n" +msgstr "chyba pøi hledání záznamu dùvìryhodnosti v `%s': %s\n" #: g10/tdbdump.c:218 -#, fuzzy, c-format +#, c-format msgid "read error in `%s': %s\n" -msgstr "chyba pøi ètení: %s\n" +msgstr "chyba pøi ètení v `%s': %s\n" #: g10/tdbdump.c:227 g10/trustdb.c:380 #, c-format @@ -5503,9 +5453,9 @@ msgstr "transakce s databází dùvìry je pøíli¹ dlouhá\n" #: g10/tdbio.c:497 -#, fuzzy, c-format +#, c-format msgid "can't access `%s': %s\n" -msgstr "nemohu zavøít `%s': %s\n" +msgstr "nemohu otevøít `%s': %s\n" #: g10/tdbio.c:512 #, c-format @@ -5513,14 +5463,14 @@ msgstr "%s: adresáø neexistuje!\n" #: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588 -#, fuzzy, c-format +#, c-format msgid "can't create lock for `%s'\n" -msgstr "nemohu vytvoøit `%s': %s\n" +msgstr "nemohu vytvoøit zámek pro `%s'\n" #: g10/tdbio.c:524 g10/tdbio.c:591 -#, fuzzy, c-format +#, c-format msgid "can't lock `%s'\n" -msgstr "nelze otevøít `%s'\n" +msgstr "nelze zamèít `%s'\n" #: g10/tdbio.c:550 #, c-format @@ -5616,12 +5566,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "databáze dùvìry je po¹kozena; prosím spus»te \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nemohu pracovat s øádky del¹ími ne¾ %d znakù\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "vstupní øádek je del¹í ne¾ %d znakù\n" @@ -5632,25 +5582,24 @@ msgstr "`%s' není platný dlouhý keyID\n" #: g10/trustdb.c:257 -#, fuzzy, c-format +#, c-format msgid "key %s: accepted as trusted key\n" -msgstr "klíè %08lX: akceptován jako dùvìryhodný klíè\n" +msgstr "klíè %s: akceptován jako dùvìryhodný klíè\n" #: g10/trustdb.c:295 -#, fuzzy, c-format +#, c-format msgid "key %s occurs more than once in the trustdb\n" -msgstr "klíè %08lX se v databázi dùvìry vyskytuje více ne¾ jednou\n" +msgstr "klíè %s se v databázi dùvìry vyskytuje více ne¾ jednou\n" #: g10/trustdb.c:310 -#, fuzzy, c-format +#, c-format msgid "key %s: no public key for trusted key - skipped\n" -msgstr "" -"klíè %08lX: nenalezen veøejný klíè k dùvìryhodnému klíèi - pøeskoèeno\n" +msgstr "klíè %s: nenalezen veøejný klíè k dùvìryhodnému klíèi - pøeskoèeno\n" #: g10/trustdb.c:320 -#, fuzzy, c-format +#, c-format msgid "key %s marked as ultimately trusted\n" -msgstr "klíè oznaèen jako absolutnì dùvìryhodný.\n" +msgstr "klíè %s oznaèen jako absolutnì dùvìryhodný.\n" #: g10/trustdb.c:344 #, c-format @@ -5666,94 +5615,133 @@ #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" +"nelze pou¾ít neznámý model dùvìry (%d) - pøedpokládáme pou¾ití modelu %s\n" #: g10/trustdb.c:452 #, c-format msgid "using %s trust model\n" +msgstr "poui¾ití modelu dùvìry %s\n" + +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:501 -msgid "undefined" +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "revokován" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "platnost skonèila" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "neznámý formát" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +#, fuzzy +msgid "[marginal]" +msgstr "èásteèná" + +#: g10/trustdb.c:514 +msgid "[ full ]" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:515 #, fuzzy +msgid "[ultimate]" +msgstr "absolutní" + +#: g10/trustdb.c:530 +msgid "undefined" +msgstr "nedefinován" + +#: g10/trustdb.c:531 msgid "never" -msgstr "nikdy " +msgstr "¾ádná" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" -msgstr "" +msgstr "èásteèná" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" -msgstr "" +msgstr "plná" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" -msgstr "" +msgstr "absolutní" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "není nutné kontrolovat databázi dùvìry\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹í kontrola databáze dùvìry v %s\n" -#: g10/trustdb.c:560 -#, fuzzy, c-format +#: g10/trustdb.c:589 +#, c-format msgid "no need for a trustdb check with `%s' trust model\n" -msgstr "není nutné kontrolovat databázi dùvìry\n" +msgstr "není nutné kontrolovat databázi dùvìry s modelem `%s'\n" -#: g10/trustdb.c:575 -#, fuzzy, c-format +#: g10/trustdb.c:604 +#, c-format msgid "no need for a trustdb update with `%s' trust model\n" -msgstr "není nutné kontrolovat databázi dùvìry\n" +msgstr "není nutné aktualizovat databázi dùvìry s modelem `%s'\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 -#, fuzzy, c-format +#: g10/trustdb.c:822 g10/trustdb.c:1260 +#, c-format msgid "public key %s not found: %s\n" -msgstr "veøejný klíè %08lX nebyl nalezen: %s\n" +msgstr "veøejný klíè %s nebyl nalezen: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "prosím proveïte --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "kontroluji databázi dùvìry\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "zpracováno %d klíèù (%d validit vymazáno)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "¾ádný absolutnì dùvìryhodný klíè nebyl nalezen\n" -#: g10/trustdb.c:1934 -#, fuzzy, c-format +#: g10/trustdb.c:1963 +#, c-format msgid "public key of ultimately trusted key %s not found\n" -msgstr "veøejný klíè k absolutnì dùvìryhodnému klíèi %08lX nebyl nalezen\n" +msgstr "veøejný klíè k absolutnì dùvìryhodnému klíèi %s nebyl nalezen\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" -msgstr "" +msgstr "po¾adováno %d èásteèné dùvìry a %d úplné dùvìry, model %s\n" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" +"hloubka: %d platných: %3d podepsaných: %3d dùvìra: %d-, %dq, %dn, %dm, %" +"df, %du\n" -#: g10/trustdb.c:2118 -#, fuzzy, c-format +#: g10/trustdb.c:2147 +#, c-format msgid "unable to update trustdb version record: write failed: %s\n" -msgstr "záznam dùvìry %lu, typ %d: zápis selhal: %s\n" +msgstr "nelze aktualizovat záznam v databázi dùvìry: chyba pøi zápisu: %s\n" #: g10/verify.c:116 msgid "" @@ -5979,22 +5967,20 @@ msgstr "chyba serveru klíèù" #: util/errors.c:108 -#, fuzzy msgid "canceled" -msgstr "Zru¹it" +msgstr "zru¹eno" #: util/errors.c:109 -#, fuzzy msgid "no card" -msgstr "neza¹ifrováno" +msgstr "¾ádná karta" #: util/logger.c:157 msgid "ERROR: " -msgstr "" +msgstr "CHYBA: " #: util/logger.c:160 msgid "WARNING: " -msgstr "" +msgstr "VAROVÁNÍ: " #: util/logger.c:223 #, c-format @@ -6028,20 +6014,19 @@ #: util/miscutil.c:384 msgid "okay|okay" -msgstr "" +msgstr "okey|okey" #: util/miscutil.c:386 msgid "cancel|cancel" -msgstr "" +msgstr "zru¹it|zru¹it" #: util/miscutil.c:387 msgid "oO" -msgstr "" +msgstr "oO" #: util/miscutil.c:388 -#, fuzzy msgid "cC" -msgstr "c" +msgstr "zZ" #: util/secmem.c:90 msgid "WARNING: using insecure memory!\n" @@ -6059,462 +6044,63 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(pravdìpodobnì jste pro tento úkol pou¾ili nesprávný program)\n" -#~ msgid "sorry, can't do this in batch mode\n" -#~ msgstr "nelze provést v dávkovém módu\n" - -#~ msgid "key `%s' not found: %s\n" -#~ msgstr "klíè `%s' nenalezen: %s\n" - -#, fuzzy -#~ msgid "can't create file `%s': %s\n" -#~ msgstr "nemohu vytvoøit `%s': %s\n" - -#, fuzzy -#~ msgid "can't open file `%s': %s\n" -#~ msgstr "nelze otevøít soubor: %s\n" - -#, fuzzy -#~ msgid " \"" -#~ msgstr " alias \"" - -#~ msgid " i = please show me more information\n" -#~ msgstr " i = prosím o více informací\n" - -#~ msgid "key %08lX: key has been revoked!\n" -#~ msgstr "klíè %08lX: klíè byl revokován\n" - -#~ msgid "key %08lX: subkey has been revoked!\n" -#~ msgstr "klíè %08lX: podklíè byl revokován!\n" - -#~ msgid "%08lX: key has expired\n" -#~ msgstr "%08lX: skonèila platnost klíèe\n" - -#~ msgid "%08lX: We do NOT trust this key\n" -#~ msgstr "%08lX: NEdùvìøujeme tomuto klíèi!\n" - -#~ msgid " (%d) RSA (sign and encrypt)\n" -#~ msgstr " (%d) RSA (pro ¹ifrování a podpis)\n" - -#, fuzzy -#~ msgid " (%d) RSA (auth only)\n" -#~ msgstr " (%d) RSA (pouze pro podpis)\n" - -#, fuzzy -#~ msgid " (%d) RSA (sign and auth)\n" -#~ msgstr " (%d) RSA (pro ¹ifrování a podpis)\n" - -#, fuzzy -#~ msgid " (%d) RSA (encrypt and auth)\n" -#~ msgstr " (%d) RSA (pouze pro ¹ifrování)\n" - -#, fuzzy -#~ msgid " (%d) RSA (sign, encrypt and auth)\n" -#~ msgstr " (%d) RSA (pro ¹ifrování a podpis)\n" - -#~ msgid "%s: can't open: %s\n" -#~ msgstr "%s: nemohu otevøít: %s\n" - -#~ msgid "%s: WARNING: empty file\n" -#~ msgstr "%s: VAROVÁNÍ: soubor je prázdný\n" - -#~ msgid "can't open %s: %s\n" -#~ msgstr "nelze otevøít %s: %s\n" - -#, fuzzy -#~ msgid " (%d) I trust marginally\n" -#~ msgstr " %d = Dùvìøuji èásteènì\n" - -#, fuzzy -#~ msgid " (%d) I trust fully\n" -#~ msgstr " %d = Dùvìøuji úplnì\n" - -#, fuzzy -#~ msgid "expires" -#~ msgstr "expire" - -#, fuzzy -#~ msgid "" -#~ "\"\n" -#~ "locally signed with your key %s at %s\n" -#~ msgstr "" -#~ "\"\n" -#~ "lokálnì podepsáno Va¹ím klíèem %08lX v %s\n" - -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " podepsáno %08lX v %s%s\n" - -#~ msgid "%s: can't access: %s\n" -#~ msgstr "%s: nemohu pøistoupit k: %s\n" - -#~ msgid "%s: can't create lock\n" -#~ msgstr "%s: nemohu vytvoøit zámek\n" - -#~ msgid "%s: can't make lock\n" -#~ msgstr "%s: nemohu zamknout\n" - -#~ msgid "%s: can't create: %s\n" -#~ msgstr "%s: nemohu vytvoøit: %s\n" - -#~ msgid "%s: can't create directory: %s\n" -#~ msgstr "%s: nemohu vytvoøit adresáø: %s\n" - -#~ msgid "If you want to use this revoked key anyway, answer \"yes\"." -#~ msgstr "" -#~ "Pokud pøesto chcete pou¾ít tento revokovaný klíè, odpovìzte \"ano\"." - -#~ msgid "Unable to open photo \"%s\": %s\n" -#~ msgstr "Nelze otevøít fotografii \"%s\": %s\n" - -#~ msgid "can't open file: %s\n" -#~ msgstr "nelze otevøít soubor: %s\n" - -#~ msgid "error: missing colon\n" -#~ msgstr "chyba: schází sloupec\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "hashovací algoritmus `%s' je v tomto release read-only\n" -#~ msgid "error: no ownertrust value\n" -#~ msgstr "chyba: schází hodnota dùvìryhodnosti\n" - -#~ msgid " (main key ID %08lX)" -#~ msgstr " (hlavní ID klíèe %08lX)" - -#~ msgid "rev! subkey has been revoked: %s\n" -#~ msgstr "rev! podklíè byl revokován: %s\n" - -#~ msgid "rev- faked revocation found\n" -#~ msgstr "rev- nalezena padìlaná revokace\n" - -#~ msgid "rev? problem checking revocation: %s\n" -#~ msgstr "rev? problém ovìøení revokace: %s\n" - -#~ msgid "[revoked] " -#~ msgstr "[revokován] " - -#~ msgid "[expired] " -#~ msgstr "[expirován] " - -#, fuzzy -#~ msgid " [expired: %s]" -#~ msgstr " [platnost skonèí: %s]" - -#~ msgid " [expires: %s]" -#~ msgstr " [platnost skonèí: %s]" - -#, fuzzy -#~ msgid " [revoked: %s]" -#~ msgstr "[revokován] " - -#~ msgid "can't create %s: %s\n" -#~ msgstr "%s: nemohu vytvoøit: %s\n" +#~ msgid "[%8.8s] " +#~ msgstr "[%8.8s]" #~ msgid "" -#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" -#~ msgstr "" -#~ "VAROVÁNÍ: hash `%s' není souèástí definice OpenPGP. Pou¾ití na vlastní " -#~ "nebezpeèí!\n" - -#~ msgid "|[files]|encrypt files" -#~ msgstr "|[soubor]|¹ifrovat soubor" - -#~ msgid "store only" -#~ msgstr "pouze ulo¾ení" - -#~ msgid "|[files]|decrypt files" -#~ msgstr "|[soubor]|de¹ifrovat soubor" - -#~ msgid "sign a key non-revocably" -#~ msgstr "podepsat klíè bez mo¾nosti revokace podpisu" - -#~ msgid "sign a key locally and non-revocably" -#~ msgstr "" -#~ "podepsat klíè lokálnì a bez mo¾nosti\n" -#~ " revokace podpisu" - -#~ msgid "list only the sequence of packets" -#~ msgstr "vypsat pouze poøadí paketù" - -#~ msgid "export the ownertrust values" -#~ msgstr "" -#~ "exportovat hodnoty dùvìryhodnosti\n" -#~ " vlastníka klíèe" - -#~ msgid "unattended trust database update" -#~ msgstr "neinteraktivní aktualizace databáze dùvìry" - -#~ msgid "fix a corrupted trust database" -#~ msgstr "opravit naru¹enou databázi dùvìry" - -#~ msgid "De-Armor a file or stdin" -#~ msgstr "Dekódovat ASCII soubor nebo std. vstup" - -#~ msgid "En-Armor a file or stdin" -#~ msgstr "Zakódovat soubor nebo std. vstup do ASCII" - -#~ msgid "|NAME|use NAME as default recipient" -#~ msgstr "|JMÉNO|pou¾ít JMÉNO jako implicitního adresáta" - -#~ msgid "use the default key as default recipient" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" #~ msgstr "" -#~ "pou¾ít implicitní klíè jako implicitního\n" -#~ " adresáta" - -#~ msgid "don't use the terminal at all" -#~ msgstr "vùbec nepou¾ívat terminál" - -#~ msgid "force v3 signatures" -#~ msgstr "vynutit podpisy verze 3" - -#~ msgid "do not force v3 signatures" -#~ msgstr "nevynucovat podpisy verze 3" - -#~ msgid "force v4 key signatures" -#~ msgstr "vynutit podpisy verze 4" - -#~ msgid "do not force v4 key signatures" -#~ msgstr "nevynucovat podpisy verze 4" - -#~ msgid "always use a MDC for encryption" -#~ msgstr "pro ¹ifrování v¾dy pou¾ít MDC" - -#~ msgid "never use a MDC for encryption" -#~ msgstr "pro ¹ifrování nikdy nepou¾ít MDC" +#~ "Chystám se vytvoøit nový pár klíèù %s.\n" +#~ " minimální velikost klíèe je 768 bitù\n" +#~ " implicitní velikost klíèe je 1024 bitù\n" +#~ " nejvy¹¹í navrhovaná velikost klíèe je 2048 bitù\n" -#~ msgid "use the gpg-agent" -#~ msgstr "pou¾ijte gpg-agenta" +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "Klíè DSA musí mít velikost od 512 do 1024 bitù.\n" -#~ msgid "batch mode: never ask" -#~ msgstr "dávkový re¾im: nikdy se na nic neptat" - -#~ msgid "assume yes on most questions" -#~ msgstr "automaticky odpovìdìt ANO na vìt¹inu otázek" - -#~ msgid "assume no on most questions" -#~ msgstr "automaticky odpovìdìt NE na vìt¹inu otázek" - -#~ msgid "add this keyring to the list of keyrings" +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" #~ msgstr "" -#~ "pøidat tento soubor klíèù do seznamu\n" -#~ " pou¾ívaných souborù klíèù" - -#~ msgid "add this secret keyring to the list" -#~ msgstr "pøidat tento soubor tajných klíèù do seznamu" - -#~ msgid "show which keyring a listed key is on" -#~ msgstr "uka¾ ve kterém souboru klíèù je vypsaný klíè" - -#~ msgid "|NAME|use NAME as default secret key" -#~ msgstr "|JMÉNO|pou¾ij JMÉNO jako implicitní tajný klíè" +#~ "velikost klíèe je pøíli¹ malá; minimální dovolená velikost pro RSA je " +#~ "1024 bitù.\n" -#~ msgid "|HOST|use this keyserver to lookup keys" +#~ msgid "keysize too small; 768 is smallest value allowed.\n" #~ msgstr "" -#~ "|POÈÍTAÈ|pou¾ij tento server klíèù pro vyhledávání\n" -#~ " klíèù" - -#~ msgid "|NAME|set terminal charset to NAME" -#~ msgstr "|JMÉNO|nastav znakovou sadu terminálu na JMÉNO" - -#~ msgid "read options from file" -#~ msgstr "èíst nastavení ze souboru" - -#~ msgid "|[file]|write status info to file" -#~ msgstr "|[SOUBOR]|zapi¹ informaci o stavu do SOUBORu" - -#~ msgid "|KEYID|ultimately trust this key" -#~ msgstr "|KLÍÈ|úplnì dùvìøovat tomuto klíèi" - -#~ msgid "|FILE|load extension module FILE" -#~ msgstr "|SOUBOR|nahrát roz¹iøující modul SOUBOR" +#~ "velikost klíèe je pøíli¹ malá; minimální dovolená velikost je 768 bitù.\n" -#~ msgid "emulate the mode described in RFC1991" -#~ msgstr "emulovat mód popsaný v RFC1991" - -#~ msgid "set all packet, cipher and digest options to OpenPGP behavior" -#~ msgstr "" -#~ "nastav v¹echny vlastnosti paketù, ¹ifer\n" -#~ " a hashù jako v OpenPGP" - -#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior" -#~ msgstr "" -#~ "nastav v¹echny vlastnosti paketù, ¹ifer\n" -#~ " a hashù jako v PGP 2.x" - -#~ msgid "|N|use passphrase mode N" -#~ msgstr "|N|pou¾ít mód hesla N" - -#~ msgid "|NAME|use message digest algorithm NAME for passphrases" -#~ msgstr "|ALG|pou¾ít hashovací algoritmus ALG pro hesla" - -#~ msgid "|NAME|use cipher algorithm NAME for passphrases" -#~ msgstr "|ALG|pou¾ít ¹ifrovací algoritmus ALG pro hesla" - -#~ msgid "|NAME|use cipher algorithm NAME" -#~ msgstr "|ALG|pou¾ít ¹ifrovací algoritmus ALG" - -#~ msgid "|NAME|use message digest algorithm NAME" -#~ msgstr "|ALG|pou¾ít hashovací algoritmus ALG" - -#~ msgid "|N|use compress algorithm N" -#~ msgstr "|N|pou¾ít komprimaèní algoritmus N" - -#~ msgid "throw keyid field of encrypted packets" -#~ msgstr "zahodit identifikátor klíèe z ¹ifrovaných paketù" - -#~ msgid "Show Photo IDs" -#~ msgstr "Zobrazit fotografický ID" - -#~ msgid "Don't show Photo IDs" -#~ msgstr "Nezobrazovat fotografický ID" - -#~ msgid "Set command line to view Photo IDs" -#~ msgstr "Nastavit pøíkazový øádek k prohlí¾ení fotografického ID" - -#~ msgid "compress algorithm `%s' is read-only in this release\n" -#~ msgstr "komprimaèní algoritmus `%s' je v tomto release read-only\n" - -#~ msgid "compress algorithm must be in range %d..%d\n" -#~ msgstr "komprimaèní algoritmus musí být v rozmezí %d..%d\n" +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "velikost klíèe je pøíli¹ velká; maximální dovolená hodnota je %d.\n" #~ msgid "" -#~ "%08lX: It is not sure that this key really belongs to the owner\n" -#~ "but it is accepted anyway\n" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" #~ msgstr "" -#~ "%08lX: Není jisté, zda tento podpis patøí vlastníkovi, pøesto je " -#~ "akceptován\n" - -#~ msgid "preference %c%lu is not valid\n" -#~ msgstr "pøedvolba %c%lu není platná\n" +#~ "Velikosti klíèe vìt¹í jak 2048 bitù se nedoporuèují, proto¾e\n" +#~ "výpoèty pak trvají VELMI dlouho!\n" -#~ msgid "key %08lX: not a rfc2440 key - skipped\n" -#~ msgstr "klíè %08lX: není ve formátu RFC 2440 - pøeskoèeno\n" +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Opravdu chcete vytvoøit klíè této délky? (a/N) " #~ msgid "" -#~ "NOTE: Elgamal primary key detected - this may take some time to import\n" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" #~ msgstr "" -#~ "POZNÁMKA: detekován primární klíè Elgamal - import mù¾e chvilku trvat\n" - -#~ msgid " (default)" -#~ msgstr " (implicitnì)" - -#~ msgid "%s%c %4u%c/%08lX created: %s expires: %s" -#~ msgstr "%s%c %4u%c/%08lX vytvoøen: %s platnost skonèí: %s" - -#~ msgid "Notation: " -#~ msgstr "Notace: " - -#~ msgid "Policy: " -#~ msgstr "Politika: " - -#~ msgid "can't get key from keyserver: %s\n" -#~ msgstr "nemohu dostat klíè ze serveru klíèù: %s\n" - -#~ msgid "error sending to `%s': %s\n" -#~ msgstr "chyba pøi posílání na `%s': %s\n" +#~ "Dobøe, ale nezapomeòte, ¾e informace mohou být vyzrazeny z poèítaèe také " +#~ "elektromagnetickým vyzaøováním monitoru nebo klávesnice!\n" -#~ msgid "success sending to `%s' (status=%u)\n" -#~ msgstr "úspì¹né odeslání na `%s' (status=%u)\n" - -#~ msgid "failed sending to `%s': status=%u\n" -#~ msgstr "chyba odeslání na `%s': (status=%u)\n" - -#~ msgid "this keyserver does not support --search-keys\n" -#~ msgstr "tento keyserver nepodporuje --search-keys\n" - -#~ msgid "can't search keyserver: %s\n" -#~ msgstr "nemohu prohledávat server klíèù: %s\n" - -#~ msgid "" -#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " -#~ "signatures!\n" -#~ msgstr "" -#~ "klíè %08lX: toto je klíè algoritmu ElGamal vygenerovaný v PGP - podpisy " -#~ "jím vytvoøené NEJSOU bezpeèné!\n" - -#~ msgid "" -#~ "key %08lX has been created %lu second in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "" -#~ "klíè %08lX byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu " -#~ "nebo\n" -#~ "je problém se systémovým èasem)\n" - -#~ msgid "" -#~ "key %08lX has been created %lu seconds in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "" -#~ "klíè %08lX byl vytvoøen %lu sekund v budoucnosti (do¹lo ke zmìnì èasu " -#~ "nebo\n" -#~ "je problém se systémovým èasem)\n" - -#~ msgid "key %08lX marked as ultimately trusted\n" -#~ msgstr "klíè %08lX oznaèen jako absolutnì dùvìryhodný.\n" - -#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n" -#~ msgstr "podpis od podepisovacího klíèe Elgamal %08lX na %08lX pøeskoèen\n" - -#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n" -#~ msgstr "podpis od %08lX na podepisovacím klíèi Elgamal %08lX pøeskoèen\n" - -#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" -#~ msgstr "" -#~ "kontrola v hloubce %d podepsáno=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Experimentální algoritmy by se nemìly pou¾ívat!\n" #~ msgid "" -#~ "Select the algorithm to use.\n" -#~ "\n" -#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n" -#~ "for signatures. This is the suggested algorithm because verification of\n" -#~ "DSA signatures are much faster than those of ElGamal.\n" -#~ "\n" -#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n" -#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt " -#~ "only\n" -#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n" -#~ "selected in a special way to create a safe key for signatures: this " -#~ "program\n" -#~ "does this but other OpenPGP implementations are not required to " -#~ "understand\n" -#~ "the signature+encryption flavor.\n" -#~ "\n" -#~ "The first (primary) key must always be a key which is capable of " -#~ "signing;\n" -#~ "this is the reason why the encryption only ElGamal key is not available " -#~ "in\n" -#~ "this menu." +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" #~ msgstr "" -#~ "Vyberte algoritmus.\n" -#~ "\n" -#~ "DSA (nazývaný také DSS) je algoritmus digitálního podpisu, který mù¾e " -#~ "být\n" -#~ "pou¾itý pouze pro podpisy. Je to doporuèovaný algoritmus, proto¾e " -#~ "ovìøení\n" -#~ "DSA podpisù je mnohem rychlej¹í ne¾ v algoritmu ElGamal.\n" -#~ "\n" -#~ "Algoritmus ElGamal mù¾e být pou¾íván jak pro podpisy tak pro ¹ifrování.\n" -#~ "Standard OpenPGP rozli¹uje mezi dvìma re¾imy tohoto algoritmu:\n" -#~ "pouze ¹ifrování a ¹ifrování+podpis; v podstatì je to stejné, ale nìkolik\n" -#~ "parametrù musí být vybráno speciálním zpùsobem pro vytvoøení bezpeèného " -#~ "klíèe\n" -#~ "pro podpisy: tento program to umí, ale není vy¾adováno, aby i jiné\n" -#~ "implementace OpenPGP pracovaly v re¾imu podpis+¹ifrování.\n" -#~ "\n" -#~ "První (primární) klíè musí být v¾dy klíè, který je schopný podepisovat;\n" -#~ "to je dùvod, proè v tomto menu není k dispozi klíè algoritmu ElGamal\n" -#~ "urèný pouze pro ¹ifrování." - -#~ msgid "" -#~ "Although these keys are defined in RFC2440 they are not suggested\n" -#~ "because they are not supported by all programs and signatures created\n" -#~ "with them are quite large and very slow to verify." -#~ msgstr "" -#~ "Aèkoli jsou tyto klíèe definovány v RFC2440, nejsou doporuèovány,\n" -#~ "proto¾e nejsou podporovány v¹emi programy a podpisy jimi vytvoøené\n" -#~ "jsou znaènì velké a pro ovìøení velmi pomalé." - -#~ msgid "%lu keys so far checked (%lu signatures)\n" -#~ msgstr "%lu klíèù ji¾ zkontrolováno (%lu podpisù)\n" - -#~ msgid "key incomplete\n" -#~ msgstr "klíè není kopletní\n" +#~ "tento ¹ifrovací algoritmus se nedoporuèuje; prosím, pou¾ijte nìjaký " +#~ "standardnìj¹í!\n" -#~ msgid "key %08lX incomplete\n" -#~ msgstr "klíè %08lX není kompletní\n" +#~ msgid "writing to file `%s'\n" +#~ msgstr "zapisuji do souboru '%s'\n" Index: gnupg/po/da.po diff -u gnupg/po/da.po:1.17 gnupg/po/da.po:1.18 --- gnupg/po/da.po:1.17 Thu Oct 28 11:06:50 2004 +++ gnupg/po/da.po Fri Dec 10 23:21:01 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -16,11 +16,6 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" - #: cipher/primegen.c:120 #, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -35,11 +30,12 @@ msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -72,9 +68,9 @@ msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, fuzzy, c-format msgid "can't create `%s': %s\n" msgstr "kan ikke oprette %s: %s\n" @@ -126,91 +122,151 @@ "the OS a chance to collect more entropy! (Kræver %d byte mere)\n" # er det klogt at oversætte TrustDB? -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "ingen standard offentlig nøglering\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "fejl ved oprettelse af kodesætning: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "fejl ved læsning af '%s': %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "fejl i trailerlinie\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "fjern nøgle fra den hemmelige nøglering" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "generér et nyt nøglepar" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "fjernelse af beskyttelse fejlede: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Nøgleoprettelse annulleret.\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "ingen gyldig OpenPGP data fundet.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "fejl ved oprettelse af kodesætning: %s\n" # er det klogt at oversætte TrustDB? -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -296,14 +352,14 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Dit valg? " @@ -311,142 +367,151 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "slåtil" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "slåtil" -#: g10/card-util.c:377 +#: g10/card-util.c:379 msgid "unspecified" msgstr "" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "ikke bearbejdet" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "skriver offentligt certifikat til '%s'\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "vis præferencer" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "fejl i trailerlinie\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Fingeraftryk:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "fejl i trailerlinie\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "ingen gyldig OpenPGP data fundet.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Vil du gerne signere? " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Vil du gerne signere? " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -454,232 +519,256 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Ugyldigt valg.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "rev- forkert nøgletilbagekald\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "ukendt kompressionsalgoritme" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "hemmelig nøgle ikke tilgængelig" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "udelod: hemmelig nøgle er allerede tilstede\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "afslut" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "afslut denne menu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "a" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "hjælp" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "vis denne hjælp" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "vis" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Ingen hjælp tilgængelig" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "aflus" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "slåtil" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsignér" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "ændr udløbsdatoen" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "vis præferencer" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "vis fingeraftryk" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 msgid "forcesig" msgstr "" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "generel fejl" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "generér et nyt nøglepar" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "kodeord" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "" -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Indtast bruger-id: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Indtast bruger-id: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Indtast bruger-id: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Gentag kodesætning: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -689,13 +778,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, fuzzy, c-format msgid "error reading keyblock: %s\n" @@ -736,7 +825,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "fejl ved oprettelse af kodesætning: %s\n" @@ -755,7 +844,7 @@ msgid "`%s' already compressed\n" msgstr "" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ADVARSEL: '%s' er en tom fil\n" @@ -780,7 +869,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -877,27 +966,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/export.c:361 +#: g10/export.c:384 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "ADVARSEL: intet blev eksporteret\n" @@ -1080,21 +1169,21 @@ msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1114,16 +1203,16 @@ " --list-keys [navne] vis nøgler\n" " --fingerprint [navne] vis fingeraftryk\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Rapportér venligst fejl til .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Brug: gpg [flag] [filer] (-h for hjælp)" # Skal alt dette oversættes eller er det flagene? -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1133,7 +1222,7 @@ "sign, check, encrypt eller decrypt\n" "standard operation afhænger af inddata\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1141,497 +1230,497 @@ "\n" "Understøttede algoritmer:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "" -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "" -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "" -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 #, fuzzy msgid "Compression: " msgstr "Kommentar: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "brug: gpg [flag] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "konfliktende kommandoer\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "ukendt standard modtager '%s'\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "alternativfil`%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTITS: %s er ikke til normal brug!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 #, fuzzy msgid "invalid import options\n" msgstr "ugyldig rustning" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 #, fuzzy msgid "invalid export options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "ugyldig rustning" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ikke tilladt med %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2709 +#: g10/g10.c:2742 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/g10.c:2711 +#: g10/g10.c:2744 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 #, fuzzy msgid "invalid default preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2736 +#: g10/g10.c:2769 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2740 +#: g10/g10.c:2773 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2744 +#: g10/g10.c:2777 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "valgte cifferalgoritme er ugyldig\n" # er det klogt at oversætte TrustDB? -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [filnavn (som gemmes)]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn (som krypteres)]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [filnavn (som signeres)]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3060 +#: g10/g10.c:3093 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn (som dekrypteres)]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key bruger-id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key bruger-id [kommandoer]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [bruger-id] [nøglering]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "signering fejlede: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hash-algoritme `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[filnavn]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Gå til sagen og skriv meddelelsen ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3832 +#: g10/g10.c:3865 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" @@ -1640,27 +1729,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[bruger ikke fundet]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" @@ -1929,373 +2018,373 @@ msgid "No help available for `%s'" msgstr "Ingen hjælp tilgængelig for `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "sprang over blok af typen %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu nøgler behandlet indtil nu\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Totalt antal behandlede: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, fuzzy, c-format msgid " skipped new keys: %lu\n" msgstr " nye undernøgler: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importerede: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " uændrede: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nye bruger-id'er: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nye undernøgler: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nye signaturer: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " nye nøgletilbagekald: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " hemmelige nøgler læst: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "hemmelige nøgler import: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "hemmelige nøgler uændre: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, fuzzy, c-format msgid " not imported: %lu\n" msgstr " importerede: %lu" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 msgid "algorithms on these user IDs:\n" msgstr "" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s signatur fra: %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:761 +#: g10/import.c:763 #, fuzzy, c-format msgid "no writable keyring found: %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "skriver til `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "nøgle %08lX: stemmer ikke med vores kopi\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "nøgle %08lX: kan ikke lokalisere original nøgleblok: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "nøgle %08lX: kan ikke læse original nøgleblok: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, fuzzy, c-format msgid "no default secret keyring: %s\n" msgstr "ingen standard offentlig nøglering\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "hemmelige nøgler import: %lu\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "fjern nøgle fra den hemmelige nøglering" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "Generér en annullérbar certifikat" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "Generér en annullérbar certifikat" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "Generér en annullérbar certifikat" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "nøgle %08lX: ingen bruger-id\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "%s: udelod: %s\n" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "%s: udelod: %s\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "Generér en annullérbar certifikat" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "nøgle %08lX: ikke en rfc2440 nøgle - udeladt\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "nøgle %08lX: offentlig nøgle importeret\n" @@ -2519,7 +2608,7 @@ msgstr "" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +msgid "Your selection? (enter `?' for more information): " msgstr "" #: g10/keyedit.c:918 @@ -2568,7 +2657,7 @@ msgid "Really sign? (y/N) " msgstr "Vil du gerne signere? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2598,7 +2687,7 @@ "\n" msgstr "" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 #, fuzzy msgid "passphrase not correctly repeated; try again" msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n" @@ -3091,305 +3180,300 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 +#: g10/keyedit.c:2245 #, fuzzy, c-format -msgid "This key may be revoked by %s key " +msgid "This key may be revoked by %s key %s" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "kan ikke oprette %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "tilføj nøgle" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr "betro" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr "betro" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " +#: g10/keyedit.c:2397 +msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 +#: g10/keyedit.c:2405 +msgid "" +"Please note that the shown key validity is not necessarily correct\n" +"unless you restart the program.\n" +msgstr "" + +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 #, fuzzy msgid "revoked" msgstr "tilføj nøgle" -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 #, fuzzy msgid "expired" msgstr "udløb" -#: g10/keyedit.c:2400 -msgid "There are no preferences on a PGP 2.x-style user ID.\n" -msgstr "" - -#: g10/keyedit.c:2408 -msgid "" -"Please note that the shown key validity is not necessarily correct\n" -"unless you restart the program.\n" -msgstr "" - -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Slettede %d signatur.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Indtast nøglens størrelse" -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen bruger-id med indeks %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen sekundær nøgle med indeks %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "bruger-id: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr "signér en nøgle lokalt" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3432,12 +3516,12 @@ msgid "writing key binding signature\n" msgstr "" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, fuzzy, c-format msgid "keysize invalid; using %u bits\n" msgstr "Ønsket nøglestørrelse er %u bit\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, fuzzy, c-format msgid "keysize rounded up to %u bits\n" msgstr "rundet op til %u bit\n" @@ -3505,82 +3589,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) ElGamal (kryptér kun)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, fuzzy, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) DSA (signér kun)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, fuzzy, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) ElGamal (kryptér kun)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Hvilken nøglestørrelse ønsker du? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA nøglepar vil have 1024 bit.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" -msgstr "" - -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Hvilken nøglestørrelse ønsker du? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ønsket nøglestørrelse er %u bit\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "rundet op til %u bit\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3590,7 +3652,7 @@ " y = key expires in n years\n" msgstr "" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3600,42 +3662,42 @@ " y = signature expires in n years\n" msgstr "" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Nøgle er gyldig for? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 #, fuzzy msgid "Signature is valid for? (0) " msgstr "Nøgle er gyldig for? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "ugyldig værdi\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, fuzzy, c-format msgid "%s does not expire at all\n" msgstr "Nøglen udløber aldrig\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, fuzzy, c-format msgid "%s expires at %s\n" msgstr "Nøgle udløber d. %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" # virker j automatisk istedetfor y? -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Er dette korrekt (j/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3645,44 +3707,44 @@ "\n" msgstr "" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Rigtige navn: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Ugyldige bogstaver i navn\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Navn må ikke starte med et tal\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Navn skal være mindst 5 bogstaver langt\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Epostadresse: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Ikke en gyldig epostadresse\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Ugyldigt tegn i kommentar\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du bruger '%s' tegnsættet.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3693,28 +3755,28 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 #, fuzzy msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3722,12 +3784,12 @@ "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3735,7 +3797,7 @@ "\n" msgstr "" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3743,110 +3805,106 @@ "generator a better chance to gain enough entropy.\n" msgstr "" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA nøglepar vil have 1024 bit.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Nøgleoprettelse annulleret.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, fuzzy, c-format msgid "writing public key to `%s'\n" msgstr "skriver offentligt certifikat til '%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, fuzzy, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, fuzzy, c-format msgid "no writable public keyring found: %s\n" msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, fuzzy, c-format msgid "no writable secret keyring found: %s\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, fuzzy, c-format msgid "error writing public keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, fuzzy, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "kan ikke oprette %s: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "hemmelige nøgler import: %lu\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -3894,32 +3952,32 @@ msgid "expired: %s)" msgstr "Nøgle udløber d. %s\n" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 #, fuzzy msgid "Primary key fingerprint:" msgstr "vis nøgle og fingeraftryk" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeraftryk:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 #, fuzzy msgid " Primary key fingerprint:" msgstr " Fingeraftryk:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 #, fuzzy msgid " Subkey fingerprint:" msgstr " Fingeraftryk:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Fingeraftryk:" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4273,7 +4331,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 #, fuzzy msgid "unknown" msgstr "ukendt version" @@ -4306,28 +4364,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "kan ikke slå core-dump fra: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "kan ikke åbne %s: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "nøgle %08lX: offentlig nøgle ikke fundet: %s\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "uimplementeret cifferalgoritme" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s signatur fra: %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "ADVARSEL: '%s' er en tom fil\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4435,50 +4505,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "valgte cifferalgoritme %d er ugyldig\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (hovednøgle-ID %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4486,42 +4556,42 @@ "%u-bit %s key, ID %s, created %s%s\n" msgstr "" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 #, fuzzy msgid "Repeat passphrase\n" msgstr "Gentag kodesætning: " -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 #, fuzzy msgid "Enter passphrase\n" msgstr "Indtast kodesætning: " -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 -msgid "can't query password in batch mode\n" +#: g10/passphrase.c:1094 g10/passphrase.c:1256 +msgid "can't query passphrase in batch mode\n" msgstr "" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Indtast kodesætning: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4530,17 +4600,17 @@ "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Gentag kodesætning: " @@ -4740,7 +4810,8 @@ msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Dette kan betyde at signaturen er forfalsket.\n" #: g10/pkclist.c:527 @@ -4844,28 +4915,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, fuzzy, c-format msgid "error creating `%s': %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "" -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "læser stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "" @@ -5168,50 +5239,45 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "skriver til `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "signerer:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "vis præferencer" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "%s: udelod: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 #, fuzzy msgid "skipped: secret key already present\n" msgstr "udelod: hemmelig nøgle er allerede tilstede\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5393,12 +5459,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "" @@ -5448,85 +5514,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "tilføj nøgle" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "udløb" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "ukendt version" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 msgid "never" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "offentlig nøgle ikke fundet" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 #, fuzzy msgid "checking the trustdb\n" msgstr "|[NAMES]|tjek tillidsdatabasen" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5835,6 +5936,17 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan have brugt et forkert program til denne opgave)\n" +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "skriver til `%s'\n" + #, fuzzy #~ msgid "key `%s' not found: %s\n" #~ msgstr "%s: bruger ikke fundet: %s\n" @@ -5930,14 +6042,6 @@ #~ msgstr "rev- forkert nøgletilbagekald\n" #, fuzzy -#~ msgid "[revoked] " -#~ msgstr "tilføj nøgle" - -#, fuzzy -#~ msgid "[expired] " -#~ msgstr "udløb" - -#, fuzzy #~ msgid " [expired: %s]" #~ msgstr "Nøgle udløber d. %s\n" Index: gnupg/po/de.po diff -u gnupg/po/de.po:1.97 gnupg/po/de.po:1.98 --- gnupg/po/de.po:1.97 Thu Oct 28 11:06:50 2004 +++ gnupg/po/de.po Fri Dec 10 23:20:54 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-10-05 10:11+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -13,11 +13,6 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "Hashmethode `%s' ist in diesem Release read-only\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -32,11 +27,12 @@ msgid "no entropy gathering module detected\n" msgstr "Kein Modul zum sammeln von Entropie vorhanden\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -70,9 +66,9 @@ msgid "note: random_seed file not updated\n" msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "'%s' kann nicht erzeugt werden: %s\n" @@ -127,90 +123,150 @@ "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benötigt.)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "Fehler beim Erzeugen der Passphrase: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' ist bereits komprimiert\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "Ein neues Schlüsselpaar erzeugen" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "Keine gültigen OpenPGP-Daten gefunden.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "Fehler beim Erzeugen der Passphrase: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -298,15 +354,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Ihre Auswahl? " @@ -314,143 +370,152 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "unbestimmt" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "nicht bearbeitet" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "kein zugehöriger öffentlicher Schlüssel: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "Fehler beim Lesen von `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "geänderte Voreinstellungen" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Ungültiges Feld in der Voreinstellungszeichenkette\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Ungültiges Feld in der Voreinstellungszeichenkette\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "Fehler: ungültiger Fingerabdruck\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Fingerabdruck:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "Fehler: ungültiger Fingerabdruck\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "Keine gültigen OpenPGP-Daten gefunden.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Wirklich unterschreiben? (j/N) " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Wirklich unterschreiben? (j/N) " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -458,233 +523,257 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (nur verschlüsseln)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Ungültige Auswahl.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Grund für den Widerruf:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "Unbekanntes Schutzverfahren\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quit" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "Menü verlassen" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "Widersprüchliche Befehle\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "Diese Hilfe zeigen" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "Liste der Schlüssel" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Schlüssel erhältlich bei: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "Ändern des Verfallsdatums" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "Den \"Owner trust\" ändern" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "\"Fingerabdruck\" anzeigen" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "Allgemeiner Fehler" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "Ein neues Schlüsselpaar erzeugen" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Befehl> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "Widersprüchliche Befehle\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "Widersprüchliche Befehle\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Geben Sie die User-ID ein: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Geben Sie die User-ID ein: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Geben Sie die User-ID ein: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Geben Sie die Passphrase nochmal ein: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -694,13 +783,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output funktioniert nicht bei diesem Kommando\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "Schlüssel `%s' nicht gefunden: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -746,7 +835,7 @@ "Verwenden Sie zunächst das Kommando \"--delete-secret-key\", um ihn zu " "entfernen.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "Fehler beim Erzeugen der Passphrase: %s\n" @@ -767,7 +856,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' ist bereits komprimiert\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "WARNUNG: '%s' ist eine leere Datei.\n" @@ -798,7 +887,7 @@ "Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren %s (%d) " "verletzt die Empfängervoreinstellungen\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -906,28 +995,28 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "WARNUNG: Temporäres Verzeichnis `%s' kann nicht entfernt werden: %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "Schlüssel %08lX: ungeschützt - übersprungen\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "Schlüssel %08lX: PGP 2.x-artiger Schlüssel - übersprungen\n" # translated by wk -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "WARNUNG: Der geheime Schlüssel %08lX hat keine einfache SK Prüfsumme\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "WARNUNG: Nichts exportiert\n" @@ -1106,15 +1195,15 @@ msgid "prompt before overwriting" msgstr "vor Überschreiben nachfragen" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1123,7 +1212,7 @@ "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und " "Optionen)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1143,17 +1232,17 @@ " --list-keys [Namen] Schlüssel anzeigen\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "Berichte über Programmfehler bitte in englisch an .\n" "Sinn- oder Schreibfehler in den deutschen Texten bitte an .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1163,7 +1252,7 @@ "Signieren, prüfen, verschlüsseln, entschlüsseln.\n" "Die voreingestellte Operation ist abhängig von den Eingabedaten\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1171,73 +1260,73 @@ "\n" "Unterstützte Verfahren:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Öff.Schlüssel: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Verschlü.: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Komprimierung: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "Widersprüchliche Befehle\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "WARNUNG: Unsicheres Besitzverhältnis (%s) \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" "WARNUNG: Unsicheres Besitzverhältnis des Verzeichnisses für Home-Verzeichnis " "\"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" @@ -1245,19 +1334,19 @@ "WARNUNG: Unsicheres Besitzverhältnis des Verzeichnisses der " "Konfigurationsdatei \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "WARNUNG: Unsicheres Besitzverhältnis des Verzeichnisses (%s) \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses des Home-" "Verzeichnisses \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" @@ -1265,386 +1354,386 @@ "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses der Konfigurationsdatei " "\"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "Unbekanntes Konfigurationselement `%s'\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "Verschlüsselungserweiterung \"%s\" wurde wegen falscher Rechte nicht " "geladen\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ungültige Import Option.\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "Ungültige Import Option\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ungültige Import Option.\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "Ungültige Import Option\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNUNG: %s ersetzt %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften " "machen\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und " "verschlüsseln\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes " "verwenden.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-" "Verschlüsselung\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 msgid "selected compression algorithm is invalid\n" msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen gröÂßer als 0 sein\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen gröÂßer als 1 sein\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "ungültige Standard Voreinstellungen\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "ungültige private Verschlüsselungsvoreinstellungen\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "ungültige private Hashvoreinstellungen\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "ungültige private Komprimierungsvoreinstellungen\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s arbeitet noch nicht mit %s zusammen\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht " "erlaubt.\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Entschlüsselung fehlgeschlagen: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [Dateiname]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key User-ID" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key User-ID" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "Schlüsselexport fehlgeschlagen: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1652,23 +1741,23 @@ "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muß mit einem '=' enden\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n" @@ -1677,30 +1766,30 @@ msgid "too many entries in pk cache - disabled\n" msgstr "zu viele Einträge im pk-Cache - abgeschaltet\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[User-ID nicht gefunden]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Ungültiger Schlüssel %08lX, gültig gemacht per --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "Kein privater Schlüssel zum öffentlichen Schlüssel %08lX - übergangen\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "" "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "" @@ -2076,393 +2165,393 @@ msgid "No help available for `%s'" msgstr "Keine Hilfe für '%s' vorhanden." -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "überspringe den Block vom Typ %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu Schlüssel bislang bearbeitet\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " ignorierte neue Schlüssel: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ohne User-ID: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importiert: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " unverändert: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " neue User-IDs: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " neue Unterschlüssel: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " neue Signaturen: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " neue Schlüsselwiderrufe: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " gelesene geheime Schlüssel: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " geheime Schlüssel importiert: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " unveränderte geh.Schl.: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " nicht importiert: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Sie haben folgende User-IDs beglaubigt:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s Unterschrift, Hashmethode \"%s\"\n" -#: g10/import.c:606 +#: g10/import.c:608 #, fuzzy, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "Schlüssel %08lX: Keine User-ID\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "Schlüssel %08lX: HKP Unterschlüsseldefekt repariert\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "Schlüssel %08lX: Nicht eigenbeglaubigte User-ID `%s' übernommen\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "Schlüssel %08lX: neuer Schlüssel - übersprungen\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "Schlüssel %08lX: Öffentlicher Schlüssel \"%s\" importiert\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "Schlüssel %08lX: Stimmt nicht mit unserer Kopie überein\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "" "Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: %" "s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "" "Schlüssel %08lX: Lesefehler im lokalen originalen Schlüsselblocks: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "Schlüssel %08lX: \"%s\" 1 neue User-ID\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "Schlüssel %08lX: \"%s\" %d neue User-IDs\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "Schlüssel %08lX: \"%s\" 1 neue Signatur\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "Schlüssel %08lX: \"%s\" %d neue Signaturen\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "Schlüssel %08lX: \"%s\" 1 neuer Unterschlüssel\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "Schlüssel %08lX: \"%s\" %d neue Unterschlüssel\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "Schlüssel %08lX: \"%s\" Nicht geändert\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "" "Schlüssel %08lX: geheimer Schlüssel mit ungültiger Verschlüsselung %d - " "übersprungen\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "Schlüssel %08lX: Geheimer Schlüssel importiert\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "Schlüssel %08lX: geheimer Schlüssel nicht gefunden: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "Schlüssel %08lX: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann " "nicht angebracht werden\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat importiert\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "Schlüssel %08lX: Keine User-ID für Signatur\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s" "\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "" "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselanbindungs-" "Beglaubigung\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "Schlüssel %08lX: Nicht unterstütztes Public-Key-Verfahren\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "Schlüssel %08lX: Ungültige Unterschlüssel-Anbindung entfernt\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "" "Schlüssel %08lX: Kein Unterschlüssel für die Unterschlüsselwiderruf-" "Beglaubigung\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "Schlüssel %08lX: Ungültiger Unterschlüsselwiderruf\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "" "Schlüssel %08lX: Mehrfacher Unterschlüssel-Widerruf-Beglaubigung entfernt\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "Schlüssel %08lX: User-ID übergangen '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "Schlüssel %08lX: Unterschlüssel ignoriert\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "" "Schlüssel %08lX: Nicht exportfähige Unterschrift (Klasse %02x) - übergangen\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "" "Schlüssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - übergangen\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "Schlüssel %08lX: Doppelte User-ID entdeckt - zusammengeführt\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "WARNUNG: Schlüssel %08lX ist u.U. widerrufen: hole Widerrufschlüssel %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "WARNUNG: Schlüssel %08lX ist u.U. widerrufen: Widerrufschlüssel %08lX ist " "nicht vorhanden\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "Schlüssel %08lX: \"%s\" Widerrufzertifikat hinzugefügt\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "Schlüssel %08lX: \"direct-key\"-Signaturen hinzugefügt\n" @@ -2709,7 +2798,8 @@ # translated by wk #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Ihre Auswahl? ('?' für weitere Informationen): " #: g10/keyedit.c:918 @@ -2782,7 +2872,7 @@ msgid "Really sign? (y/N) " msgstr "Wirklich unterschreiben? (j/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2813,7 +2903,7 @@ "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen" @@ -3291,83 +3381,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Dieser Schlüssel könnte widerrufen worden sein von %s Schlüssel " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr "(empfindlich)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s kann nicht erzeugt werden: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[widerrufen]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [verfällt: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [verfällt: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "Gültigkeit: %s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[widerrufen]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3375,8 +3449,20 @@ "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n" "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n" +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[widerrufen]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + # translated by wk -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3384,7 +3470,7 @@ "WARNUNG: Keine User-ID ist als primär markiert. Dieses Kommando kann\n" "dazu führen, daß eine andere User-ID as primär angesehen wird.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3394,45 +3480,45 @@ "könnte\n" " bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nichts entfernt.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3442,37 +3528,37 @@ " Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n" " des Schlüssels führen.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer " "hinzufügen.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Geben sie die User-ID des designierten Widerrufers ein: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer " "eingetragen werden\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 msgid "this key has already been designated as a revoker\n" msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann " "nicht rückgangig gemacht werden!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3480,129 +3566,129 @@ "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer " "deklarieren? (j/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Bitte genau eine User-ID auswählen.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Wollen Sie es wirklich benutzen? (j/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Wollen Sie es wirklich benutzen? (j/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein Zweitschlüssel mit Index %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "User-ID: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " beglaubigt durch %08lX um %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Sie haben folgende User-IDs beglaubigt:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " widerrufen durch %08lX um %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Es werden nun folgende Beglaubigungen entfernt:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "Kein geheimer Schlüssel\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User-ID \"%s\" ist bereits widerrufen\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3643,12 +3729,12 @@ msgid "writing key binding signature\n" msgstr "Schreiben der \"key-binding\" Signatur\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "Schlüssellänge auf %u Bit aufgerundet\n" @@ -3718,90 +3804,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (nur verschlüsseln)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (nur verschlüsseln)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (nur signieren/beglaubigen)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (nur verschlüsseln)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (nur verschlüsseln)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Es wird ein neues %s Schlüsselpaar erzeugt.\n" -" kleinste Schlüssellänge ist 768 Bit\n" -" standard Schlüssellänge ist 1024 Bit\n" -" gröÂßte sinnvolle Schlüssellänge ist 2048 Bit\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Welche Schlüssellänge wünschen Sie? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "zu kurz; 1024 ist die kleinste für RSA mögliche Schlüssellänge.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Das DSA-Schlüsselpaar wird 1024 Bit haben.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "SchüsselgröÂße zu hoch; %d ist der Maximalwert.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Schlüssellängen gröÂßer als 2048 werden nicht empfohlen, da die\n" -"Berechnungen dann WIRKLICH lange brauchen!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Welche Schlüssellänge wünschen Sie? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Gut, aber bitte denken Sie auch daran, daß Monitor und Tastatur Daten " -"abstrahlen und diese leicht mitgelesen werden können.\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "aufgerundet auf %u Bit\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3817,7 +3873,7 @@ " m = Schlüssel verfällt nach n Monaten\n" " y = Schlüssel verfällt nach n Jahren\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3833,29 +3889,29 @@ " m = Schlüssel verfällt nach n Monaten\n" " y = Schlüssel verfällt nach n Jahren\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Wie lange bleibt der Schlüssel gültig? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Wie lange bleibt die Beglaubigung gültig? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "Ungültiger Wert.\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s verfällt nie.\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s verfällt am %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3863,12 +3919,12 @@ "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n" "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Ist dies richtig? (j/n) " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3885,44 +3941,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Ihr Name (\"Vorname Nachname\"): " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Ungültiges Zeichen im Namen\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Der Name muß min. 5 Zeichen lang sein.\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "E-Mail-Adresse: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Diese E-Mail-Adresse ist ungültig\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Ungültiges Zeichen im Kommentar.\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Sie benutzen den Zeichensatz `%s'\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3933,27 +3989,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnKkEeFfBb" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Bitte beseitigen Sie zuerst den Fehler\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3961,12 +4017,12 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3979,7 +4035,7 @@ "aufrufen.\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3990,54 +4046,50 @@ "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n" "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Das DSA-Schlüsselpaar wird 1024 Bit haben.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Schlüsselerzeugung abgebrochen.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -4046,12 +4098,12 @@ "werden kann. Sie können aber mit dem Befehl \"--edit-key\" einen\n" "Zweitschlüssel für diesem Zweck erzeugen.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4059,7 +4111,7 @@ "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren " "stimmen nicht überein)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4067,40 +4119,40 @@ "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder " "Uhren stimmen nicht überein)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Wirklich erzeugen? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "löschen des Schlüsselblocks fehlgeschlagen: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "'%s' kann nicht erzeugt werden: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4146,28 +4198,28 @@ msgid "expired: %s)" msgstr " [verfällt: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Haupt-Fingerabdruck =" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr "Unter-Fingerabdruck =" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Haupt-Fingerabdruck =" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Unter-Fingerabdruck =" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Schl.-Fingerabdruck =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4527,7 +4579,7 @@ msgid "textmode" msgstr "Textmodus" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "unbekannt" @@ -4559,28 +4611,41 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "ungültiges root-Paket in proc_tree() entdeckt\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "Änderung der \"Trust-DB\" fehlgeschlagen: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Experimentiermethoden sollten nicht benutzt werden!\n" - -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "Es ist davon abzuraten, diese Verschlüsselungsmethode zu benutzen!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "Verschlüsselungsverfahren ist nicht implementiert" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s Unterschrift, Hashmethode \"%s\"\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "" +"Erzwingen des Hashverfahrens %s (%d) verletzt die Empfängervoreinstellungen\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4690,51 +4755,51 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "Client-PID für den Agent kann nicht gesetzt werden\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "Server-Lese-Handle für den Agent nicht verfügbar\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "Server-Schreib-Handle für den Agent nicht verfügbar\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit GPG-Agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "" "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (Hauptschlüssel-ID %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4745,41 +4810,41 @@ "Benutzer: \"%.*s\"\n" "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Geben Sie die Passphrase nochmal ein\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Geben Sie die Passphrase ein\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "Passphrase ist zu lang\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "Falsche Antwort des Agenten\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "Abbruch durch Benutzer\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Geben Sie die Passphrase ein: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4789,17 +4854,17 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Geben Sie die Passphrase nochmal ein: " @@ -5012,7 +5077,8 @@ msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Das könnte bedeuten, daß die Signatur gefälscht ist.\n" #: g10/pkclist.c:527 @@ -5123,28 +5189,28 @@ msgstr "" "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "Fehler beim Erstellen von `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Abgetrennte Beglaubigungen.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Bitte geben Sie den Namen der Datendatei ein: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "lese stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "keine unterschriebene Daten\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "kann signierte Datei '%s' nicht öffnen.\n" @@ -5488,54 +5554,49 @@ "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schlüsseln eine abgetrennte " "Unterschrift erzeugt werden\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "Schreiben nach '%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "Erzwingen des Hashverfahrens %s (%d) verletzt die Empfängervoreinstellungen\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "unterschreibe:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie Klartextunterschriften nur mit PGP-2.x-artigen " "Schlüssel machen\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s Verschlüsselung wird verwendet\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n" "echten Zufallsgenerator verwendbar\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "übersprungen '%s': doppelt\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "übersprungen '%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5725,12 +5786,12 @@ "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb" "\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "Textzeilen länger als %d Zeichen können nicht benutzt werden\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "Eingabezeile ist länger als %d Zeichen\n" @@ -5782,88 +5843,125 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[widerrufen]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[verfallen]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "unbekannt" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +#, fuzzy +msgid "[marginal]" +msgstr "marginal" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +#, fuzzy +msgid "[ultimate]" +msgstr "uneingeschränkt" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "unbestimmt" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "niemals " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "vollständig" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "uneingeschränkt" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "\"Trust-DB\"-Überprüfung ist beim \"%s\"-Vertrauensmodell nicht nötig\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "\"Trust-DB\"-Änderung ist beim \"%s\"-Vertrauensmodell nicht nötig\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "Öffentlicher Schlüssel %08lX nicht gefunden: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "Bitte ein --check-trustdb durchführen\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "\"Trust-DB\" wird überprüft\n" # translated by wk -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "kein uneingeschränkt vertrauenswürdiger Schlüssel %08lX gefunden\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %08lX nicht gefunden\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6177,6 +6275,62 @@ msgstr "" "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "Hashmethode `%s' ist in diesem Release read-only\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Es wird ein neues %s Schlüsselpaar erzeugt.\n" +#~ " kleinste Schlüssellänge ist 768 Bit\n" +#~ " standard Schlüssellänge ist 1024 Bit\n" +#~ " gröÂßte sinnvolle Schlüssellänge ist 2048 Bit\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "zu kurz; 1024 ist die kleinste für RSA mögliche Schlüssellänge.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "SchüsselgröÂße zu hoch; %d ist der Maximalwert.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Schlüssellängen gröÂßer als 2048 werden nicht empfohlen, da die\n" +#~ "Berechnungen dann WIRKLICH lange brauchen!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Gut, aber bitte denken Sie auch daran, daß Monitor und Tastatur Daten " +#~ "abstrahlen und diese leicht mitgelesen werden können.\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Experimentiermethoden sollten nicht benutzt werden!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "Es ist davon abzuraten, diese Verschlüsselungsmethode zu benutzen!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "Schreiben nach '%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n" @@ -6308,12 +6462,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? Schwierigkeiten bei der Widerruf-Überprüfung: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[widerrufen]" - -#~ msgid "[expired] " -#~ msgstr "[verfallen]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [verfällt: %s]" Index: gnupg/po/el.po diff -u gnupg/po/el.po:1.13 gnupg/po/el.po:1.14 --- gnupg/po/el.po:1.13 Thu Oct 28 11:06:49 2004 +++ gnupg/po/el.po Fri Dec 10 23:20:54 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -14,12 +14,6 @@ "Content-Type: text/plain; charset=ISO-8859-7\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" -"ï áëãüñéèìïò ðåñßëçøçò `%s' åßíáé óå áõôÞ ôçí Ýêäïóç ãéá áíÜãíùóç ìüíï\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -34,11 +28,12 @@ msgid "no entropy gathering module detected\n" msgstr "äåí åíôïðßóôçêå Üñèñùìá óõëëïãÞò åíôñïðßáò\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -73,9 +68,9 @@ msgid "note: random_seed file not updated\n" msgstr "óçìåßùóç: äåí Ý÷åé áíáíåùèåß ôï áñ÷åßï random_seed\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n" @@ -128,90 +123,150 @@ "íá áðáó÷ïëåßôå ôï ëåéôïõñãéêü óýóôçìá ìÝ÷ñé áõôü íá óõãêåíôñþóåé\n" "ðåñéóóüôåñç åíôñïðßá! (×ñåéÜæïíôáé %d ðåñéóóüôåñá bytes)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "áðïôõ÷ßá åðáíáäüìçóçò ôçò cache êëåéäïèÞêçò: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "keyserver áðïóôïëÞ áðÝôõ÷å: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ ìðëïê êëåéäéþí: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: óöÜëìá óôçí áíÜãíùóç ôçò åããñáöÞò free : %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' Þäç óõìðéÝóôçêå\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "äå âñÝèçêáí Ýãêõñá OpenPGP äåäïìÝíá.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -299,15 +354,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "äåí ìðïñåß íá ãßíåé áõôü óå êáôÜóôáóç äÝóìçò (batchmode)\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Ç åðéëïãÞ óáò; " @@ -315,141 +370,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Äåí Ý÷åé ïñéóôåß áéôßá" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "ìç åðåîåñãáóìÝíï" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "êáíÝíá áíôßóôé÷ï äçìüóéï êëåéäß: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ôïõ `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "áíáùåùìÝíåò åðéëïãÝò" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "ìç Ýãêõñïò ÷áñáêôÞñáò óôï \"êïñäüíé\" ôçò åðéëïãÞò\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "ìç Ýãêõñïò ÷áñáêôÞñáò óôï \"êïñäüíé\" ôçò åðéëïãÞò\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "óöÜëìá: ìç Ýãêõñï áðïôýðùìá\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "áðåéêüíéóç ôïõ fingerprint" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "óöÜëìá: ìç Ýãêõñï áðïôýðùìá\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "äå âñÝèçêáí Ýãêõñá OpenPGP äåäïìÝíá.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -457,232 +521,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôïí ôýðï ôïõ êëåéäéïý ðïõ èÝëåôå:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "ÕðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Ìç Ýãêõñç åðéëïãÞ.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôçí áéôßá ãéá ôçí áíÜêëçóç:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "Üãíùóôïò áëãüñéèìïò ðñïóôáóßáò\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "ÌõóôéêÜ ôìÞìáôá ôïõ êýñéïõ êëåéäéïý äåí åßíáé äéáèÝóéìá.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "ôåñìáôéóìüò" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Êëåéäß äéáèÝóéìï óôï: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "áðåéêüíéóç ôïõ fingerprint" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "ãåíéêü óöÜëìá" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "ÅíôïëÞ> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Ìç Ýãêõñç åíôïëÞ (äïêéìÜóôå \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -692,13 +778,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -742,7 +828,7 @@ msgstr "" "÷ñçóéìïðïéåßóôå ðñþôá ôçí åðéëïãÞ \"--delete-secret-key\" ãéá äéáãñáöÞ ôïõ.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "óöÜëìá óôç äçìéïõñãßá ôçò öñÜóçò êëåéäß: %s\n" @@ -761,7 +847,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' Þäç óõìðéÝóôçêå\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: `%s' åßíáé Ýíá Üäåéï áñ÷åßï\n" @@ -792,7 +878,7 @@ "ï åîáíáãêáóìüò óõììåôñéêïý áëãüñéèìïõ %s (%d) ðáñáâéÜæåé ôéò\n" "åðéëïãÝò ôïõ ðáñáëÞðôç\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -899,27 +985,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò ðñïóùñéíïý öáêÝëïõ `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "êëåéäß %08lX: äåí åßíáé ðñïóôáôåõìÝíï - ðáñáëåßöèçêå\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "êëåéäß %08lX: êëåéäß ôýðïõ PGP 2.x - ðáñáëåßöèçêå\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ìõóôéêü êëåéäß %08lX äåí Ý÷åé áðëü SK checksum\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ýãéíå êáììßá åîáãùãÞ\n" @@ -1098,15 +1184,15 @@ msgid "prompt before overwriting" msgstr "åñþôçóç ðñéí ôçí åðéêÜëõøç" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1114,7 +1200,7 @@ "@\n" "(äåßôå ôç óåëßäá man ãéá ìéá ðëÞñç ëßóôá åíôïëþí êáé åðéëïãþí)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1134,15 +1220,15 @@ " --list-keys [ïíüìáôá] áðåéêüíéóç êëåéäéþí\n" " --fingerprint [ïíüìáôá] áðåéêüíéóç áðïôõðùìÜôùí (fingerprints)\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "ÁíáöÝñåôå ôá ðñïâëÞìáôá óôï \n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "×ñÞóç: gpg [åðéëïãÝò] [áñ÷åßá] (-h ãéá âïÞèåéá)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1152,7 +1238,7 @@ "õðïãñáöÞ, Ýëåã÷ïò, êñõðôïãñÜöçóç Þ áðïêñõðôïãñÜöçóç\n" "ç ðñïêáèïñéóìÝíç ëåéôïõñãßá åîáñôÜôáé áðü ôá äåäïìÝíá åéóüäïõ\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1160,474 +1246,474 @@ "\n" "Õðïóôçñéæüìåíïé áëãüñéèìïé:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "ÄçìïóÊëåéäß:" -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Êñõðôáëãüñéèìïò: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Óõìðßåóç: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "÷ñÞóç: gpg [åðéëïãÝò] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "äåí âñÝèçêå ôï óýìâïëï = óôïí ïñéóìü ôçò ïìÜäáò \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßá óôï %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßá óôï %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßá óôï %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò óôï %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò óôï %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò óôï %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßáåóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßáåóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëÞò éäéïêôçóßáåóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò åóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò åóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìç áóöáëåßò Üäåéåò åóþêëåéóôïõ öáêÝëïõ óôï %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "Üãíùóôï áíôéêåßìåíï ñõèìßóåùò \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "ÓÇÌÅÉÙÓÇ: áãíïÞèçêå ôï ðáëéü áñ÷åßï ðñïêáèïñéóìÝíùí åðéëïãþí `%s'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ÓÇÌÅÉÙÓÇ: ìç ðñïêáèïñéóìÝíï áñ÷åßï åðéëïãþí `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "áñ÷åßï åðéëïãþí `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "ç åðÝêôáóç ôïõ êñõðôáëãüñéèìïõ \"%s\" äåí öïñôþèçêå åðåéäÞ õðÜñ÷ïõí\n" "áíáóöáëåßò Üäåéåò\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --pgp2 êáôÜóôáóç\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --pgp2 " "êáôÜóôáóç\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "" "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò ãéá ðéóôïðïßçóç\n" "äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ìç Ýãêõñï default-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ìç Ýãêõñï min-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý êñõðôáëãüñéèìïõ\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ ðåñßëçøçò\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ óõìðßåóçò\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "ôï %s áêüìá äå ëåéôïõñãåß ìáæß ìå ôï %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ êñõðôáëãüñéèìïõ \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ óõìðßåóçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äþèçêáí ðáñáëÞðôåò (-r) ÷þñéò ÷ñÞóç êñõðôïãñÜöçóçò\n" "äçìïóßïõ êëåéäéïý\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [åíôïëÝò]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [êëåéäïèÞêç]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver áðïóôïëÞ áðÝôõ÷å: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "åîáãùãÞ êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver áíáæÞôçóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver áíáíÝùóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "èùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ìç Ýãêõñïò áëãüñéèìïò hash `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[üíïìá áñ÷åßïõ]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Ìðïñåßôå ôþñá íá åéóáãÜãåôå ôï ìÞíõìá óáò ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1635,23 +1721,23 @@ "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï åêôõðþóéìïõò ÷áñáêôÞñåò êáé êåíÜ " "êáé íá ëÞãåé ìå Ýíá '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "ôï üíïìá óçìåßùóçò ÷ñÞóôç ðñÝðåé íá ðåñéÝ÷åé ôï '@' ÷áñáêôÞñá\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "ç ôéìÞ óçìåßùóçò ðñÝðåé íá ìç ÷ñçóéìïðïéåß ÷áñáêôÞñåò control\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" @@ -1660,28 +1746,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "ðÜñá ðïëëÝò êáôá÷ùñÞóåéò óôç pk cache - áðåíåñãïðïéÞèçêå\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[User id äåí âñÝèçêå]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Ìç Ýãêõñï êëåéäß %08lX Ýãéíå Ýãêõñï áðü ôï --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "êáíÝíá ìõóôéêü õðïêëåéäß ãéá ôï äçìüóéï õðïêëåéäß %08lX - áãíüçóç\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "÷ñÞóç ôïõ äåõôåñåýïíôïò êëåéäéïý %08lX áíôß ôïõ ðñùôåýïíôïò %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ÷ùñßò äçìüóéï - ðáñáëåßöèçêå\n" @@ -2044,384 +2130,384 @@ msgid "No help available for `%s'" msgstr "Äåí õðÜñ÷åé äéáèÝóéìç âïÞèåéá ãéá `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "ðáñÜëåéøç ôìÞìáôïò ôïõ ôýðïõ %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu êëåéäéÜ Ý÷ïõí ìÝ÷ñé ôþñá åðåîåñãáóôåß\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Óõíïëéêüò áñéèìüò ðïõ åðåîåñãÜóôçêáí: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " íÝá êëåéäéÜ ðïõ ðáñáëåßöèçêáí: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ÷ùñßò user ID: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " åéóá÷èÝíôá: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " áìåôÜâëçôá: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " íÝá user ID: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " íÝá õðïêëåéäéÜ: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " íÝåò õðïãñáöÝò: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " íÝåò áíáêëÞóåéò êëåéäéþí: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " áíáãíùóìÝíá ìõóôéêÜ êëåéäéÜ: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " åéóá÷èÝíôá ìõóôéêÜ êëåéäéÜ: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " áìåôÜâëçôá ìõóôéêÜ êëåéäéÜ: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " ìç åéóá÷èÝíôá: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s õðïãñáöÞ, áëãüñéèìïò ðåñßëçøçò %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé áõôü ôï user ID\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "êëåéäß %08lX: åðéäéüñèùóç öèáñìÝíïõ õðïêëåéäéïý HKP\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "êëåéäß %08lX: äåêôü ìç éäéï-õðïãåãñáììÝíï user ID '%s'\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "êëåéäß %08lX: äåí Ý÷åé Ýãêõñá user ID\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "áõôü ìðïñåß íá óõíÝâåé áðü ìéá áðïýóá éäéïûðïãñáöÞ\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ðïõ äå âñÝèçêå: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "êëåéäß %08lX: íÝï êëåéäß - ðáñáëåßöèçêå\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "äåí âñåèçêå åããñÜøéìç êëåéäïèÞêç: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "åããñáöÞ óôï `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò ôçò êëåéäïèÞêçò `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "êëåéäß %08lX: ôï äçìüóéï êëåéäß \"%s\" Ý÷åé åéóá÷èåß\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "êëåéäß %08lX: äåí ôáéñéÜæåé ìå ôï áíôßãñáöï ìáò\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "êëåéäß %08lX: áäõíáìßá åíôïðéóìïý ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "êëåéäß %08lX: áäõíáìßá áíÜãíùóçò ôïõ áñ÷éêïý ôìÞìáôïò êëåéäéïý: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "êëåéäß %08lX: \"%s\" 1 íÝï user ID\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "êëåéäß %08lX: \"%s\" %d íÝá user ID\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "êëåéäß %08lX: \"%s\" 1 íÝá õðïãñáöÞ\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "êëåéäß %08lX: \"%s\" %d íÝåò õðïãñáöÝò\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "êëåéäß %08lX: \"%s\" 1 íÝï õðïêëåéäß\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "êëåéäß %08lX: \"%s\" %d íÝá õðïêëåéäéÜ\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "êëåéäß %08lX: \"%s\" áìåôÜâëçôï\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ìå Üêõñï êñõðôáëã. %d - ðáñáëåßöèçêå\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "äåí õðÜñ÷åé ðñïêáèïñéóìÝíç êëåéäïèÞêç: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß åéóÞ÷èçêå\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "êëåéäß %08lX: Þäç óôç ìõóôéêÞ êëåéäïèÞêç\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "êëåéäß %08lX: äå âñÝèçêå ôï ìõóôéêü êëåéäß: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "êëåéäß %08lX: ü÷é äçìüóéï êëåéäß - áäõíáìßá åöáñìïãÞò ðéóôïðïéçôéêïý " "áíÜêëçóçò\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - áðüññéøç\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "êëåéäß %08lX: \"%s\" ðéóôïðïéçôéêü áíÜêëçóçò åéóÞ÷èçêå\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé user ID ãéá ôçí õðïãñáöÞ\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý óôï user id \"%" "s\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "êëåéäß %08lX: ìç Ýãêõñç éäéï-õðïãñáöÞ óôï user id \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôç äÝóìåõóç êëåéäéïý\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "êëåéäß %08lX: ìç õðïóôçñéæüìåíïò áëãüñéèìïò äçìïóßïõ êëåéäéïý\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "êëåéäß %08lX: ìç Ýãêõñç äÝóìåõóç õðïêëåéäéïý\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "êëåéäß %08lX: áöáéñÝèçêå ç äÝóìåõóç ðïëëáðëïý õðïêëåéäéïý\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "êëåéäß %08lX: äåí õðÜñ÷åé õðïêëåéäß ãéá ôçí áíÜêëçóç êëåéäéïý\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "êëåéäß %08lX: ìç Ýãêõñç áíÜêëçóç õðïêëåéäéïý\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "êëåéäß %08lX: áöáéñÝèçêå ç áíÜêëçóç ðïëëáðëïý õðïêëåéäéïý\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "êëåéäß %08lX: ðáñáëåßöèçêå user ID '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "êëåéäß %08lX: ðáñáëåßöèçêå õðïêëåéäß\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "êëåéäß %08lX: ìç åîáãüìåíç õðïãñáöÞ (êëÜóç %02x) - ðáñáëåßöèçêå\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "" "êëåéäß %08lX: ôï ðéóôïðïéçôéêü áíÜêëçóçò óå ëÜèïò óçìåßï - ðáñáëåßöèçêå\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "êëåéäß %08lX: ìç Ýãêõñï ðéóôïðïéçôéêü áíÜêëçóçò: %s - ðáñáëåßöèçêå\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "" "êëåéäß %08lX: ç õðïãñáöÞ ôïõ õðïêëåéäéïý óå ëÜèïò óçìåßï - ðáñáëåßöèçêå\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "êëåéäß %08lX: ìç áíáìåíþìåíç êëÜóç õðïãñáöÞò (0x%02x) - ðáñáëåßöèçêå\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "êëåéäß %08lX: åíôïðßóôçêå äéðëü user ID - åíþèçêáí\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: êëåéäß %08lX ìðïñåß íá áíáêëçèåß: ëÞøç êëåéäéïý áíÜêëçóçò %" "08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: êëåéäß %08lX ìðïñåß íá áíáêëçèåß: ôï êëåéäß áíÜêëçóçò %08lX\n" "äåí åßíáé ðáñþí.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "êëåéäß %08lX: \"%s\" ðéóôïðïéçôéêü áíÜêëçóçò ðñïóôÝèçêå\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "êëåéäß %08lX: Üìåóç õðïãñáöÞ êëåéäéïý ðñïóôÝèçêå\n" @@ -2659,7 +2745,8 @@ msgstr " (3) ¸÷ù êÜíåé åêôåôáìÝíï Ýëåã÷ï.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Ç åðéëïãÞ óáò; (ðëçêôñïëïãÞóôå ? ãéá ðëçñïöïñßåò): " #: g10/keyedit.c:918 @@ -2734,7 +2821,7 @@ msgid "Really sign? (y/N) " msgstr "Óßãïõñá íá õðïãñáöåß; " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2765,7 +2852,7 @@ "ÐëçêôñïëïãÞóôå ôçí íÝá öñÜóç êëåéäß ãéá áõôü ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ" @@ -3243,83 +3330,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (åõáßóèçôï)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[áíáêëçìÝíï]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[áíáêëçìÝíï]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Äåí õðÜñ÷ïõí ðñïåðéëïãÝò óå Ýíá user ID ôýðïõ PGP 2.x.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3327,7 +3398,19 @@ "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\n" "åêôüò êáé åÜí åðáíáêêéíÞóåôå ôï ðñüãñáììá.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[áíáêëçìÝíï]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3335,7 +3418,7 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ý÷åé óçìåéùèåß ID ÷ñÞóôç óáí ðñùôåýùí. ÁõôÞ ç åíôïëÞ\n" " ìðïñåß íá êÜíåé Ýíá Üëëï ID ÷ñÞóôç íá ãßíåé ôï ðñùôåýùí.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3344,45 +3427,45 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n" " ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3392,38 +3475,38 @@ " êáèïñéóìÝíïõ áíáêëçôÞ ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP\n" " íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Äåí ìðïñåßôå íá ðñïóèÝóåôå Ýíá êáèïñéóìÝíï áíáêëçôÞ óå êëåéäß ôýðïõ PGP2.x.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "ÐëçêôñïëïãÞóôå ôï user ID ôïõ äéïñéóìÝíïõ áíáêëçôÞ: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí ïñéóìÝíï áíáêëçôÞ!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: åÜí ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ äåí ìðïñåß íá " "åðáíÝëèåé!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3431,129 +3514,129 @@ "Åßóôå óßãïõñïé üôé èÝëåôå íá ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ; (y/" "N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "ðáñáëåßöèçêå ç v3 éäéï-õðïãñáöÞ óôï user id \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Äåí õðÜñ÷åé äåõôåñåýïí êëåéäß ìå äåßêôç %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " áíáêëÞèçêå áðü %08lX óôéò %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)" -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "êáíÝíá ìõóôéêü êëåéäß\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìéá õðïãñáöÞ user ID Ý÷åé çìåñïìçíßá %d äåýôåñá óôï ìÝëëïí\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Áðåéêüíéóç %s photo ID ìåãÝèïõò %ld ãéá ôï êëåéäß 0x%08lX (uid %d)\n" @@ -3595,12 +3678,12 @@ msgid "writing key binding signature\n" msgstr "åããñáöÞ õðïãñáöÞò \"äÝóéìïõ\" êëåéäéïý\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "ìç Ýãêõñï ìÝãåèïò êëåéäéïý, ÷ñÞóç %u bits\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "óôñïããõëïðïßçóç ôïõ ìÝãåèïò êëåéäéïý Ýùò %u bits\n" @@ -3668,95 +3751,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (ãéá õðïãñáöÞ ìüíï)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (ãéá êñõðôïãñÜöçóç ìüíï)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Óå äéáäéêáóßá äçìéïõñãßáò åíüò íÝïõ %s keypair.\n" -" åëÜ÷éóôï ìÝãåèïò êëåéäéïý åßíáé 768 bits\n" -" ðñïêáèïñéóìÝíï ìÝãåèïò êëåéäéïý åßíáé 1024 bits\n" -" ìÝãéóôï ðñïôåéíüìåíï ìÝãåèïò êëåéäéïý åßíáé 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "Ï DSA åðéôñÝðåé ìüíï ìÝãåèïò êëåéäéïý áðü 512 Ýùò 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 1024 åßíáé ç åëÜ÷éóôç ôéìÞ ãéá RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "" -"ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 768 åßíáé ç åëÜ÷éóôç åðéôñåðüìåíç " -"ôéìÞ.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Ôï æåýãïò êëåéäéþí DSA èá åßíáé 1024 bits.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìåãÜëï, %d åßíáé ç ìÝãéóôç ôéìÞ ðïõ " -"åðéôñÝðåôáé.\n" -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" -msgstr "" -"ÌåãÝèç êëåéäéþí ìåãáëýôåñá ôïõ 2048 äåí óõíéóôþíôáé ãéáôß\n" -"ïé õðïëïãéóìïß åßíáé ÷ñïíïâüñïé!\n" - -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Óßãïõñá èÝëåôå áõôü ôï ìÝãåèïò êëåéäéïý; " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Ôé ìÝãåèïò êëåéäéïý èá èÝëáôå; (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"ÅíôÜîåé, áëëÜ íá Ý÷åôå õð'üøç üôé ç ïèüíç êáé ôï ðëçêôñïëüãéï åßíáé\n" -"åðßóçò ðïëý ôñùôÜ óå åðéèÝóåéò!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ôï ìÝãåèïò êëåéäéïý ðïõ æçôÞèçêå åßíáé %u bits\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "óôñïããõëïðïéÞèçêå Ýùò ôá %u bits\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3772,7 +3820,7 @@ " m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n" " y = ôï êëåéäß ëÞãåé óå n Ýôç\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3788,29 +3836,29 @@ " m = ôï êëåéäß ëÞãåé óå n ìÞíåò\n" " y = ôï êëåéäß ëÞãåé óå n Ýôç\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Ôï êëåéäß åßíáé Ýãêõñï ãéá; (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Ç õðïãñáöÞ Ýéíáé Ýãêõñç ãéá; (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "ìç Ýãêõñç ôéìÞ\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "ôï %s äåí ëÞãåé ðïôÝ\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "ôï %s ëÞãåé óôéò %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3818,12 +3866,12 @@ "Ôï óýóôçìá óáò äåí ìðïñåß íá áðåéêïíßóåé çìåñïìçíßåò ðÝñá ôïõ 2038.\n" "¼ìùò, èá ÷åéñßæïíôáé óùóôÜ Ýùò ôï 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Åßíáé áõôü óùóôü (y/n); " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3840,44 +3888,44 @@ " \"Nikolaoy Nikos (toy Ioanni) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Áëçèéíü ¼íïìá: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï üíïìá\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Ôï üíïìá äåí åðéôñÝðåôáé íá îåêéíÜ ìå áñéèìçôéêü øçößï\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Ôï üíïìá ðñÝðåé íá Ý÷åé ôïõëÜ÷éóôïí 5 ÷áñáêôÞñåò\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Äéåýèõíóç Email: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Ìç Ýãêõñç äéåýèõíóç Email\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Ó÷üëéï: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôï ó÷üëéï\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "×ñçóéìïðïéåßôå ôï `%s' óåô ÷áñáêôÞñùí.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3888,27 +3936,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ðáñáêáëþ ìçí ôïðïèåôåßôå ôçí äéåýèõíóç email óôï üíïìá Þ óôï ó÷üëéï\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (Q)ôåñìáôéóìüò; " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "ÁëëáãÞ (N)üíïìá, (C)ó÷üëéï, (E)mail Þ (O)åíôÜîåé/(Q)ôåñìáôéóìüò; " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Ðáñáêáëþ, äéïñèþóôå ðñþôá ôï óöÜëìá\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3916,12 +3964,12 @@ "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3933,7 +3981,7 @@ "üðïôå èÝëåôå, ìå ôçí åðéëïãÞ \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3945,54 +3993,50 @@ "ôïõò äßóêïõò) êáôá ôç äéÜñêåéá õðïëïãéóìïý ðñþôùí áñéèìþí. Áõôü äßíåé\n" "óôç ãåííÞôñéá ôõ÷áßùí áñéèìþí ìéá åõêáéñßá íá ìáæÝøåé áñêåôÞ åíôñïðßá.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Ôï æåýãïò êëåéäéþí DSA èá åßíáé 1024 bits.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áíáâëÞèçêå.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "åããñáöÞ ôïõ äçìïóßïõ êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "äå âñÝèçêå åããñÜøéìç äçìüóéá êëåéäïèÞêç: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "äå âñÝèçêå åããñÜøéìç ìõóôéêÞ êëåéäïèÞêç: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò äçìüóéáò êëåéäïèÞêçò `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "áäõíáìßá åããñáöÞò ìõóôéêÞò êëåéäïèÞêçò `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "ôï äçìüóéï êáé ôï ìõóôéêü êëåéäß äçìéïõñãÞèçêáí êáé õðïãñÜöçêáí.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -4002,12 +4046,12 @@ "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôçí åíôïëÞ \"--edit-key\" ãéá íá äçìéïõñãçèåß\n" "Ýíá äåõôåñåýïí êëåéäß ãéá áõôü ôï ëüãï.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Ç äçìéïõñãßá êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4015,7 +4059,7 @@ "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôï óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4023,42 +4067,42 @@ "ôï êëåéäß äçìéïõñãÞèçêå %lu äåõôåñüëåðôá óôï ìÝëëïí (÷ñïíïäßíç Þ\n" "áðëþò ðñüâëçìá óôï ñïëüé)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "ÓÇÌÅÉÙÓÇ: ç äçìéïõñãßá õðïêëåéäéþí ãéá êëåéäéÜ v3 äåí åßíáé óýìöùíï\n" "ìå ôï OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Óßãïõñá íá äçìéïõñãçèåß; " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "äéáãñáöÞ block êëåéäéþí áðÝôõ÷å: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï ìõóôéêü êëåéäß %08lX Ýëçîå óôéò %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4104,28 +4148,28 @@ msgid "expired: %s)" msgstr " [ëÞãåé: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Áðïôýðùìá ðñùôåýùí êëåéäéïý:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Áðïôýðùìá õðïêëåéäéïý:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Áðïôýðùìá ðñùôåýùí êëåéäéïý:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Áðïôýðùìá õðïêëåéäéïý:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Áðïôýðùìá êëåéäéïý =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4480,7 +4524,7 @@ msgid "textmode" msgstr "êáôÜóôáóç-êåéìÝíïõ" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "Üãíùóôï" @@ -4512,30 +4556,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "ìç Ýãêõñï ñéæéêü(root) ðáêÝôï áíé÷íåýôçêå óôï proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "áäõíáìßá áðåíåñãïðïßçóçò ôùí core dump: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "áäõíáìßá ðñüóâáóçò ôïõ áñ÷åßïõ: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: read áðÝôõ÷å (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Ðåéñáìáôéêïß áëãüñéèìïé äåí ðñÝðåé íá ÷ñçóéìïðïéïýíôáé!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "áäõíáìßá ÷åéñéóìïý ôïõ áëãüñéèìïõ äçìïóßïõ êëåéäéïý %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "ìç õëïðïéçìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s õðïãñáöÞ, áëãüñéèìïò ðåñßëçøçò %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"ç ÷ñÞóç áõôïý ôïõ áëãüñéèìïõ êñõðôïãñÜöçóçò äåí óõíéóôÜôáé. ×ñçóéìïðïéÞóôå " -"Ýíá ðéï óõíçèéóìÝíï!\n" +"ï åîáíáãêáóìüò ôïõ áëãüñéèìïõ ðåñßëçøçò %s (%d) ðáñáâéÜæåé ôéò\n" +"ðñïåðéëïãÝò ôïõ ðáñáëÞðôç\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4645,50 +4701,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "õðïðáêÝôï ôýðïõ %d Ý÷åé ïñéóìÝíï ôï êñéôéêü bit\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "áäõíáìßá ïñéóìïý ôïõ pid ôïõ ðåëÜôç óéá ôï agent\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "áäõíáìßá áíÜãíùóçò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "áäõíáìßá åããñáöÞò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "ðñüâëçìá åðéêïéíùíßáò ìå ôï gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "ðñüâëçìá ìå ôïí agent - áðåíåñãïðïéÞóç ôçò ÷ñÞóçò ôïõ agent\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (êýñéï êëåéäß, ID %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4700,41 +4756,41 @@ "\"%.*s\"\n" "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "ÅðáíáëÜâåôå ôç öñÜóç\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "ç öñÜóç êëåéäß åßíáé ðïëý ìåãÜëç\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "ìç Ýãêõñç áðÜíôçóç áðü ôïí agent\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "áêõñþèçêå áðü ôï ÷ñÞóôç\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "ðñüâëçìá ìå ôïí agent: agent åðéóôñÝöåé 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "áäõíáìßá åñþôçóçò ôçò ëÝîçò êëåéäß óå êáôÜóôáóç äÝóìçò\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4744,17 +4800,17 @@ "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\n" "ãéá ôï ÷ñÞóôç: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " @@ -4962,7 +5018,8 @@ msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí éäéïêôÞôç ôïõ!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Áõôü ìðïñåß íá óçìáßíåé üôé ç õðïãñáöÞ åßíáé ðëáóôïãñáößá.\n" #: g10/pkclist.c:527 @@ -5069,28 +5126,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "äåäïìÝíá äåí áðïèçêåýôçêáí. ÁðïèÞêåõóç ìå ôçí åðéëïãÞ \"--output\"\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "óöÜëìá êáôÜ ôç äçìéïõñãßá ôïõ `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "ÁðïêïììÝíç õðïãñáöÞ.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "ÅéóÜãåôå ôï üíïìá áñ÷åßïõ äåäïìÝíùí: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "áíÜãíùóç ôçò stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "äåí õðÜñ÷ïõí õðïãåãñáììÝíá äåäïìÝíá\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "áäõíáìßá ðñüóâáóçò õðïãåãñáììÝíùí äåäïìÝíùí `%s'\n" @@ -5420,12 +5477,7 @@ "ìðïñåßôå íá õðïãñÜøåôå-áðïêïììÝíá ìå êëåéäéÜ ôýðïõ PGP 2.x ìüíï óå\n" "--pgp2 êáôÜóôáóç\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "åããñáöÞ óôï `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" @@ -5433,41 +5485,41 @@ "ï åîáíáãêáóìüò ôïõ áëãüñéèìïõ ðåñßëçøçò %s (%d) ðáñáâéÜæåé ôéò\n" "ðñïåðéëïãÝò ôïõ ðáñáëÞðôç\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "õðïãñáöÞ:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "ìðïñåßôå íá õðïãñÜøåôå êáèáñÜ ìå êëåéäéÜ ôýðïõ PGP 2.x óå êáôÜóôáóç --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s êñõðôïãñÜöçóç èá ÷ñçóéìïðïéçèåß\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "ôï êëåéäß äåí Ý÷åé óçìåéùèåß óáí áíáóöáëÝò - äåí ìðïñåß íá ÷ñçóéìïðïéçèåß ìå " "øåýôéêç RNG!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "ðáñáëåßöèçêå `%s': áíôéãñÜöôçêå\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "ðáñáëåßöèçêå `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5655,12 +5707,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "ç trustdb åßíáé öèáñìÝíç - ÷ñçóéìïðïéåßóôå ôï \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "áäõíáìßá ÷åéñéóìïý ãñáììþí êåéìÝíïõ ìåãáëýôåñåò áðü %d ÷áñáêôÞñåò\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "ãñáììÞ åéóüäïõ ìåãáëýôåñç áðü %d ÷áñáêôÞñåò\n" @@ -5712,86 +5764,121 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[áíáêëçìÝíï]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[ëçãìÝíï]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "Üãíùóôï" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "ðïôÝ " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "åðüìåíïò Ýëåã÷ïò ôçò trustdb èá ãßíåé óôéò %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ôï äçìüóéï êëåéäß %08lX äåí âñÝèçêå: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "ðáñáêáëþ êÜíôå Ýíá --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "Ýëåã÷ïò ôçò trustdb\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d êëåéäéÜ åðåîåñãÜóôçêáí (%d ìåôñÞóåéò åããõñüôçôáò ðÝñáóáí)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "äå âñÝèçêáí áðüëõôá åìðéóôåýóéìá êëåéäéÜ\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "äå âñÝèçêå ôï äçìüóéï êëåéäß ôïõ áðüëõôá åìðéóôåýóéìïõ êëåéäéïý %08lX\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "åããñáöÞ trust %lu, ôýðïò %d: write áðÝôõ÷å: %s\n" @@ -6100,6 +6187,70 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(ßóùò ÷ñçóéìïðïéÞóáôå ëÜèïò ðñüãñáììá ãéá áõôÞ ôçí åñãáóßá)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "" +#~ "ï áëãüñéèìïò ðåñßëçøçò `%s' åßíáé óå áõôÞ ôçí Ýêäïóç ãéá áíÜãíùóç ìüíï\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Óå äéáäéêáóßá äçìéïõñãßáò åíüò íÝïõ %s keypair.\n" +#~ " åëÜ÷éóôï ìÝãåèïò êëåéäéïý åßíáé 768 bits\n" +#~ " ðñïêáèïñéóìÝíï ìÝãåèïò êëåéäéïý åßíáé 1024 bits\n" +#~ " ìÝãéóôï ðñïôåéíüìåíï ìÝãåèïò êëåéäéïý åßíáé 2048 bits\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "Ï DSA åðéôñÝðåé ìüíï ìÝãåèïò êëåéäéïý áðü 512 Ýùò 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 1024 åßíáé ç åëÜ÷éóôç ôéìÞ ãéá " +#~ "RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "" +#~ "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìéêñü, 768 åßíáé ç åëÜ÷éóôç åðéôñåðüìåíç " +#~ "ôéìÞ.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "" +#~ "ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìåãÜëï, %d åßíáé ç ìÝãéóôç ôéìÞ ðïõ " +#~ "åðéôñÝðåôáé.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "ÌåãÝèç êëåéäéþí ìåãáëýôåñá ôïõ 2048 äåí óõíéóôþíôáé ãéáôß\n" +#~ "ïé õðïëïãéóìïß åßíáé ÷ñïíïâüñïé!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Óßãïõñá èÝëåôå áõôü ôï ìÝãåèïò êëåéäéïý; " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "ÅíôÜîåé, áëëÜ íá Ý÷åôå õð'üøç üôé ç ïèüíç êáé ôï ðëçêôñïëüãéï åßíáé\n" +#~ "åðßóçò ðïëý ôñùôÜ óå åðéèÝóåéò!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Ðåéñáìáôéêïß áëãüñéèìïé äåí ðñÝðåé íá ÷ñçóéìïðïéïýíôáé!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "ç ÷ñÞóç áõôïý ôïõ áëãüñéèìïõ êñõðôïãñÜöçóçò äåí óõíéóôÜôáé. " +#~ "×ñçóéìïðïéÞóôå Ýíá ðéï óõíçèéóìÝíï!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "åããñáöÞ óôï `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "óõãíþìç, äåí ìðïñåß íá ãßíåé áõôü óå êáôÜóôáóç äÝóìçò (batchmode)\n" @@ -6228,12 +6379,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? ðñüâëçìá óôïí Ýëåã÷ï áíÜêëçóçò: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[áíáêëçìÝíï]" - -#~ msgid "[expired] " -#~ msgstr "[ëçãìÝíï]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [ëÞãåé: %s]" Index: gnupg/po/eo.po diff -u gnupg/po/eo.po:1.16 gnupg/po/eo.po:1.17 --- gnupg/po/eo.po:1.16 Thu Oct 28 11:06:49 2004 +++ gnupg/po/eo.po Fri Dec 10 23:20:54 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -14,11 +14,6 @@ "Content-Type: text/plain; charset=iso-8859-3\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" - #: cipher/primegen.c:120 #, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -33,11 +28,12 @@ msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -71,9 +67,9 @@ msgid "note: random_seed file not updated\n" msgstr "noto: dosiero random_seed ne aktualigita\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "ne povas krei '%s': %s\n" @@ -124,90 +120,150 @@ "Nesufiæe da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n" "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "malsukcesis rekonstrui þlosilaran staplon: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "eraro dum kreado de pasfrazo: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "eraro dum legado de þlosilbloko: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: eraro dum legado de libera registro: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "'%s' jam densigita\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "krei novan þlosilparon" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "forviþo de þlosilbloko malsukcesis: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Kreado de þlosiloj malsukcesis: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "validaj OpenPGP-datenoj ne trovitaj.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "eraro dum kreado de pasfrazo: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "forviþo de þlosilbloko malsukcesis: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -295,15 +351,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "ne povas fari tion en neinteraga reøimo\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Via elekto? " @@ -311,141 +367,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "en" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "en" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Nenia kialo specifita" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "ne traktita" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "skribas publikan þlosilon al '%s'\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "eraro dum legado de '%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "aktualigitaj preferoj" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "nevalida signo en signoæeno\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "nevalida signo en signoæeno\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "%s: nevalida dosiero-versio %d\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Fingrospuro:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "%s: nevalida dosiero-versio %d\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "validaj OpenPGP-datenoj ne trovitaj.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "eraro dum skribado de sekreta þlosilaro '%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -453,233 +518,257 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (nur æifri)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Nevalida elekto.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Kialo por revoko: " -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "nekonata densig-metodo" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Sekretaj partoj de æefa þlosilo ne estas disponataj.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ignorita: sekreta þlosilo jam æeestas\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "fini" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "forlasi æi tiun menuon" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "f" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "helpo" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "montri æi tiun helpon" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "listo" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nenia helpo disponata" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "spuri" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "en" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsub" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "þanøi la daton de eksvalidiøo" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "þanøi la posedantofidon" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fsp" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "montri fingrospuron" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "øenerala eraro" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "krei novan þlosilparon" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "pasf" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Komando> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Nevalida komando (provu per \"helpo\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Donu la uzantidentigilon: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Donu la uzantidentigilon: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Donu la uzantidentigilon: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Ripetu pasfrazon: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "la pasfrazo ne estis øuste ripetita; provu denove" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -689,13 +778,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ne funkcias por æi tiu komando\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -738,7 +827,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "uzu la opcion \"--delete-secret-key\" por forviþi øin unue.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "eraro dum kreado de pasfrazo: %s\n" @@ -757,7 +846,7 @@ msgid "`%s' already compressed\n" msgstr "'%s' jam densigita\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" @@ -782,7 +871,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -881,27 +970,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "þlosilo %08lX: ne protektita - ignorita\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "þlosilo %08lX: PGP-2.x-stila þlosilo - ignorita\n" -#: g10/export.c:361 +#: g10/export.c:384 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "AVERTO: nenio estis eksportita\n" @@ -1080,15 +1169,15 @@ msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1096,7 +1185,7 @@ "@\n" "(Vidu la manpaøon por kompleta listo de æiuj komandoj kaj opcioj)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1116,15 +1205,15 @@ " --list-keys [nomoj] montri þlosilojn\n" " --fingerprint [nomoj] montri fingroþpurojn\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Bonvolu raporti cimojn al .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1134,7 +1223,7 @@ "subskribi, kontroli, æifri aý malæifri\n" "implicita operacio dependas de la enigataj datenoj\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1142,469 +1231,469 @@ "\n" "Realigitaj metodoj:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "" -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "" -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "" -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 #, fuzzy msgid "Compression: " msgstr "Komento: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "uzado: gpg [opcioj] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "malkongruaj komandoj\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "%s: nova opcio-dosiero kreita\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "opcio-dosiero '%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "legas opciojn el '%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTO: %s ne estas por normala uzado!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ne estas valida signaro\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ne povis analizi URI de þlosilservilo\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 #, fuzzy msgid "invalid import options\n" msgstr "nevalida kiraso" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 #, fuzzy msgid "invalid export options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "nevalida kiraso" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "AVERTO: programo povas krei core-dosieron!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTO: %s nuligas %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ne eblas kun %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "ne eblas samtempe subskribi kaj æifri kun --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "æifri mesaøon kun --pgp2 postulas la æifron IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed devas esti pli granda ol 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed devas esti pli granda ol 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth devas esti inter 1 kaj 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "nevalida S2K-reøimo; devas esti 0, 1 aý 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 #, fuzzy msgid "invalid default preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [dosiero]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [dosiero]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "malæifrado malsukcesis: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [dosiero]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [dosiero]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [dosiero]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [dosiero]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [dosiero]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key uzantidentigilo" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key uzantidentigilo" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key uzantidentigilo" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key uzantidentigilo" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key uzantidentigilo [komandoj]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record malsukcesis: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "elkirasigo malsukcesis: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "enkirasigo malsukcesis: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "nevalida kompendi-metodo '%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[dosiero]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Ektajpu vian mesaøon ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1613,24 +1702,24 @@ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn " "kaj fini per '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "la donita gvidlinia URL por atestado ne validas\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" @@ -1639,27 +1728,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "tro da registroj en pk-staplo - malþaltas\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Uzantidentigilo ne trovita]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Nevalida þlosilo %08lX validigita per --always-trust\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "estas sekreta þlosilo por la publika þlosilo \"%s\"!\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "uzas flankan þlosilon %08lX anstataý la æefa þlosilo %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n" @@ -2012,375 +2101,375 @@ msgid "No help available for `%s'" msgstr "Nenia helpo disponata por '%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "ignoras blokon de speco %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu þlosiloj jam traktitaj\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr " Nombro traktita entute: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " ignoritaj novaj þlosiloj: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sen uzantidentigilo: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importitaj: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " neþanøitaj: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " novaj uzantidentigiloj: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " novaj subþlosiloj: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " novaj subskriboj: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " novaj þlosilrevokoj: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " sekretaj þlosiloj legitaj: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "sekretaj þlosiloj importitaj: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "sekretaj þlosiloj neþanøitaj: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, fuzzy, c-format msgid " not imported: %lu\n" msgstr " importitaj: %lu" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s-subskribo de: %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "þlosilo %08lX: mankas uzantidentigilo\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "þlosilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "þlosilo %08lX: mankas valida uzantidentigilo\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "tio povas esti kaýzata de mankanta mem-subskribo\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "þlosilo %08lX: publika þlosilo ne trovita: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "þlosilo %08lX: nova þlosilo - ignorita\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "neniu skribebla þlosilaro trovita: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "skribas al '%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "eraro dum skribado de þlosilaro '%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "þlosilo %08lX: publika þlosilo importita\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "þlosilo %08lX: diferencas de nia kopio\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "þlosilo %08lX: ne povas trovi originalan þlosilblokon: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "þlosilo %08lX: ne povas legi originalan þlosilblokon: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "þlosilo %08lX: 1 nova uzantidentigilo\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "þlosilo %08lX: %d novaj uzantidentigiloj\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "þlosilo %08lX: 1 nova subskribo\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "þlosilo %08lX: %d novaj subskriboj\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "þlosilo %08lX: 1 nova subþlosilo\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "þlosilo %08lX: %d novaj subþlosiloj\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "þlosilo %08lX: ne þanøita\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "mankas implicita sekreta þlosilaro: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "þlosilo %08lX: sekreta þlosilo importita\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "þlosilo %08lX: jam en sekreta þlosilaro\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "þlosilo %08lX: sekreta þlosilo ne trovita: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "þlosilo %08lX: publika þlosilo mankas - ne povas apliki revokatestilon\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "þlosilo %08lX: nevalida revokatestilo: %s - malakceptita\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "þlosilo %08lX: revokatestilo importita\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "þlosilo %08lX: mankas uzantidentigilo por subskribo\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "þlosilo %08lX: nerealigita publikþlosila metodo\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "þlosilo %08lX: nevalida mem-subskribo\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "þlosilo %08lX: nerealigita publikþlosila metodo\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "þlosilo %08lX: nevalida subþlosila bindado\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "þlosilo %08lX: nevalida subþlosila bindado\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "þlosilo %08lX: mankas subþlosilo por þlosilbindado\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "þlosilo %08lX.%lu: Valida subþlosilrevoko\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "þlosilo %08lX: nevalida subþlosila bindado\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "þlosilo %08lX: ignoris uzantidentigilon '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "þlosilo %08lX: ignoris subþlosilon\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "þlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "þlosilo %08lX: revokatestilo en maløusta loko - ignorita\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "þlosilo %08lX: nevalida revokatestilo: %s - ignorita\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "þlosilo %08lX: revokatestilo en maløusta loko - ignorita\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "þlosilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "þlosilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "þlosilo %08lX: revokatestilo aldonita\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "þlosilo %08lX: rekta þlosilsubskribo aldonita\n" @@ -2636,7 +2725,7 @@ msgstr " (3) Mi tre zorge kontrolis.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +msgid "Your selection? (enter `?' for more information): " msgstr "" #: g10/keyedit.c:918 @@ -2707,7 +2796,7 @@ msgid "Really sign? (y/N) " msgstr "Æu vere subskribi? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2738,7 +2827,7 @@ "Donu la novan pasfrazon por æi tiu sekreta þlosilo.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "la pasfrazo ne estis øuste ripetita; provu denove" @@ -3222,95 +3311,91 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 +#: g10/keyedit.c:2245 #, fuzzy, c-format -msgid "This key may be revoked by %s key " +msgid "This key may be revoked by %s key %s" msgstr "Æi tiu þlosilo estas revokebla per %s þlosilo %s%s\n" -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (sentema)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "ne povas krei %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "rev" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Æi tiu þlosilo estas malþaltita" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " +#: g10/keyedit.c:2397 +msgid "There are no preferences on a PGP 2.x-style user ID.\n" +msgstr "" + +#: g10/keyedit.c:2405 +msgid "" +"Please note that the shown key validity is not necessarily correct\n" +"unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 #, fuzzy msgid "revoked" msgstr "rev" -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 #, fuzzy msgid "expired" msgstr "eksval" -#: g10/keyedit.c:2400 -msgid "There are no preferences on a PGP 2.x-style user ID.\n" -msgstr "" - -#: g10/keyedit.c:2408 -msgid "" -"Please note that the shown key validity is not necessarily correct\n" -"unless you restart the program.\n" -msgstr "" - -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3319,46 +3404,46 @@ "AVERTO: Æi tiu estas PGP2-stila þlosilo. Aldono de foto-identigilo eble\n" " kaýzos, ke iuj versioj de PGP malakceptos la þlosilon.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila þlosilo.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Forviþis %d subskribon.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Forviþis %d subskribojn.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nenio estis forviþita.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 #, fuzzy msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " @@ -3368,164 +3453,164 @@ "AVERTO: Æi tiu estas PGP2-stila þlosilo. Aldono de foto-identigilo eble\n" " kaýzos, ke iuj versioj de PGP malakceptos la þlosilon.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 #, fuzzy msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila þlosilo.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Donu la þlosilgrandon" -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Þanøas la daton de eksvalidiøo de la æefa þlosilo.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vi ne povas þanøi la daton de eksvalidiøo de v3-þlosilo\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Mankas responda subskribo en sekreta þlosilaro\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Bonvolu elekti precize unu uzantidentigilon.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "þlosilo %08lX: nevalida mem-subskribo\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Mankas uzantidentigilo kun indekso %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Mankas flanka þlosilo kun indekso %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "uzantidentigilo: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " subskribita per %08lX je %s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr "subskribi þlosilon nerevokeble" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokita de %08lX je %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Vi revokos la sekvajn subskribojn:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Æu vere krei la revokatestilojn? (j/N)" -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "mankas sekreta þlosilo\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3568,12 +3653,12 @@ msgid "writing key binding signature\n" msgstr "skribas þlosilbindan subskribon\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "þlosilgrando nevalida; uzas %u bitojn\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "þlosilgrando rondigita øis %u bitoj\n" @@ -3641,90 +3726,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (nur æifri)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (nur æifri)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (nur subskribi)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (nur æifri)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (nur æifri)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Kreos novan %s-þlosilparon.\n" -" minimuma þlosilgrando estas 768 bitoj\n" -" implicita þlosilgrando estas 1024 bitoj\n" -" plej granda rekomendata þlosilgrando estas 2048 bitoj\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Kiun þlosilgrandon vi deziras? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "þlosilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA-þlosilparo havos 1024 bitojn.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "þlosilgrando tro granda; %d estas plej granda permesata valoro.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n" -"æar la komputado daýras TRE longe!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Kiun þlosilgrandon vi deziras? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre " -"facile kaptebla!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Petita þlosilgrando estas %u bitoj\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "rondigita øis %u bitoj\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3740,7 +3795,7 @@ " m = þlosilo eksvalidiøos post n monatoj\n" " y = þlosilo eksvalidiøos post n jaroj\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3756,29 +3811,29 @@ " m = þlosilo eksvalidiøos post n monatoj\n" " y = þlosilo eksvalidiøos post n jaroj\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Þlosilo validu ...? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Þlosilo validu por ...? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "nevalida valoro\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s neniam eksvalidiøos\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s eksvalidiøos je %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3786,12 +3841,12 @@ "Via sistemo ne povas montri datojn post 2038.\n" "Tamen, øi estos øuste traktata øis 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Æu tio estas øusta (j/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3807,44 +3862,44 @@ " \"Heinrich Heine (la poeto) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Vera nomo: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Nevalida signo en nomo\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Nomo ne povas komenciøi per cifero\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Nomo devas havi almenaý 5 signojn\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Retadreso: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Nevalida retadreso\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Komento: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Nevalida signo en komento\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Vi uzas la signaron '%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3855,27 +3910,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Bonvolu ne meti la retadreson en la veran nomon aý la komenton\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnKkAaBbFf" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Þanøu (N)omon, (K)omenton, (A)adreson, aý (F)ini? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Þanøu (N)omon, (K)omenton, (A)adreson, aý (B)one/(F)ini? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Bonvolu korekti la eraron unue\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3883,12 +3938,12 @@ "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3900,7 +3955,7 @@ "uzante æi tiun programon kun la opcio \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3912,54 +3967,50 @@ "kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n" "akiri sufiæe da entropio.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA-þlosilparo havos 1024 bitojn.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Kreado de þlosiloj nuligita.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "skribas publikan þlosilon al '%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "neniu skribebla publika þlosilaro trovita: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "neniu skribebla sekreta þlosilaro trovita: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "eraro dum skribado de publika þlosilaro '%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "eraro dum skribado de sekreta þlosilaro '%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3967,12 +4018,12 @@ "Notu, ke æi tiu þlosilo ne estas uzebla por æifrado. Vi eble volos\n" "uzi la komandon \"--edit-key\" por krei flankan þlosilon por tiu celo.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3980,7 +4031,7 @@ "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -3988,40 +4039,40 @@ "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý " "horloøeraro)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTO: krei subþlosilojn por v3-þlosiloj ne estas OpenPGP-kongrue\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Æu vere krei? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "forviþo de þlosilbloko malsukcesis: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "ne povas krei '%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTO: sekreta þlosilo %08lX eksvalidiøis je %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4069,32 +4120,32 @@ msgid "expired: %s)" msgstr " [eksvalidiøos: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 #, fuzzy msgid "Primary key fingerprint:" msgstr "listigi þlosilojn kaj fingroþpurojn" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 #, fuzzy msgid " Subkey fingerprint:" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 #, fuzzy msgid " Primary key fingerprint:" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 #, fuzzy msgid " Subkey fingerprint:" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Þlosilo-fingrospuro =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4450,7 +4501,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 #, fuzzy msgid "unknown" msgstr "nekonata versio" @@ -4482,28 +4533,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "nevalida radikpaketo trovita en proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "ne povas malþalti kreadon de core-dosieroj: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "aktualigo de fido-datenaro malsukcesis: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Eksperimentaj metodoj ne estu uzataj!\n" - -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "ne povas trakti publikþlosilan metodon %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "nerealigita æifrad-metodo" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s-subskribo de: %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4612,50 +4675,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ne estas disponata en æi tiu sesio\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "ne povas agordi kliento-PID por la agento\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "ne povas akiri lego-FD de servilo por la agento\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "ne povas akiri skribo-FD de servilo por la agento\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokolversio %d de gpg-agent ne estas uzebla\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ne povas konektiøi al '%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "komunikproblemo kun gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problemo kun agento - malþaltas uzadon de agento\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (æefþlosilo %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4666,41 +4729,41 @@ "\"%.*s\"\n" "%u-bita %s þlosilo, ID %08lX, kreita je %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Ripetu pasfrazon\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Donu pasfrazon\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "pasfrazo estas tro longa\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "nevalida respondo de agento\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "nuligita de uzanto\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemo kun agento: agento redonas 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Donu pasfrazon: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4710,17 +4773,17 @@ "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n" "por la uzanto: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " @@ -4926,7 +4989,8 @@ msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Tio povas signifi, ke la subskribo estas falsa.\n" #: g10/pkclist.c:527 @@ -5029,28 +5093,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "eraro dum kreado de '%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Aparta subskribo.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Bonvolu doni la nomon de la dosiero: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "legas la normalan enigon ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "mankas subskribitaj datenoj\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "ne povas malfermi subskribitan dosieron '%s'\n" @@ -5367,52 +5431,47 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "eblas subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "skribas al '%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "subskribas:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "eblas klartekste subskribi nur per PGP-2.x-stilaj þlosiloj kun --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s æifrado estos aplikata\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "þlosilo ne estas markita kiel malsekura - ne povas uzi øin kun falsa " "stokastilo!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "ignoris '%s': ripetita\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "ignoris '%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "ignorita: sekreta þlosilo jam æeestas\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5598,12 +5657,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "la fido-datenaro estas fuþita; bonvolu ruli \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "enigata linio pli longa ol %d signojn\n" @@ -5653,85 +5712,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "rev" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "eksval" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "nekonata versio" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 msgid "never" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "sekva kontrolo de fido-datenaro je %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "publika þlosilo %08lX ne trovita: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "kontrolas la fido-datenaron\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n" @@ -6042,6 +6136,59 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n" +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Kreos novan %s-þlosilparon.\n" +#~ " minimuma þlosilgrando estas 768 bitoj\n" +#~ " implicita þlosilgrando estas 1024 bitoj\n" +#~ " plej granda rekomendata þlosilgrando estas 2048 bitoj\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "þlosilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "þlosilgrando tro granda; %d estas plej granda permesata valoro.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n" +#~ "æar la komputado daýras TRE longe!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre " +#~ "facile kaptebla!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Eksperimentaj metodoj ne estu uzataj!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "skribas al '%s'\n" + #, fuzzy #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "ne povas fari tion en neinteraga reøimo\n" @@ -6172,14 +6319,6 @@ #~ msgstr "rev? problemo en kontrolo de revoko: %s\n" #, fuzzy -#~ msgid "[revoked] " -#~ msgstr "rev" - -#, fuzzy -#~ msgid "[expired] " -#~ msgstr "eksval" - -#, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [eksvalidiøos: %s]" Index: gnupg/po/es.po diff -u gnupg/po/es.po:1.12 gnupg/po/es.po:1.13 --- gnupg/po/es.po:1.12 Thu Oct 28 11:06:49 2004 +++ gnupg/po/es.po Fri Dec 10 23:20:53 2004 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-10-12 19:27+0200\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" @@ -18,11 +18,6 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "el algoritmo de resumen `%s' es de sólo lectura en esta versión\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -37,11 +32,12 @@ msgid "no entropy gathering module detected\n" msgstr "no se ha detectado módulo acumulador de entropía\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -80,9 +76,9 @@ msgid "note: random_seed file not updated\n" msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "no se puede crear %s: %s\n" @@ -137,90 +133,150 @@ "otro trabajo para que el sistema pueda recolectar más entropía\n" "(se necesitan %d bytes más).\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "fallo reconstruyendo caché del anillo de claves: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "envío al servidor de claves fallido: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "error creando frase contraseña: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "error leyendo bloque de claves: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: error leyendo registro libre: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' ya está comprimido\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "genera un nuevo par de claves" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "borrado de bloque de anillo de claves fallido: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Creación de la clave fallida: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "no se han encontrados datos OpenPGP válidos\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "error creando frase contraseña: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "borrado de bloque de anillo de claves fallido: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -308,15 +364,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "imposible hacer esto en modo de proceso por lotes\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Su elección: " @@ -324,143 +380,152 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "habcla" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "habcla" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "No se dio ninguna razón" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "no procesado" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "no existe la clave pública correspondiente: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "error leyendo `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "preferencias actualizadas" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "caracter inválido en cadena de preferencias\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "caracter inválido en cadena de preferencias\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "error: huella dactilar no válida\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Huella dactilar:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "error: huella dactilar no válida\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Creación de la clave fallida: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "no se han encontrados datos OpenPGP válidos\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "error escribiendo anillo privado `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "¿Firmar de verdad? " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "¿Firmar de verdad? " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -468,233 +533,257 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Por favor seleccione tipo de clave deseado:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Firma caducada en %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (sólo cifrar)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Elección inválida.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Por favor elija una razón para la revocación:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo de protección desconocido\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Las partes secretas de la clave primaria no están disponibles.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "omitido: clave secreta ya presente\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "salir|fin|acabar" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "sale de este menú" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "s" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "órdenes incompatibles\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "ayuda" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "muestra esta ayuda" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "lista" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Clave disponible en: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "depura" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "habcla" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "firmal" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "cambia fecha de caducidad" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "cambia valores de confianza" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "hdac" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "muestra huella dactilar" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revfir" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "Error general" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "genera un nuevo par de claves" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "contr" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Orden> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "órdenes incompatibles\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "órdenes incompatibles\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Orden inválida (pruebe \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Introduzca el ID de usuario: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Introduzca el ID de usuario: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Introduzca el ID de usuario: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Repita frase contraseña: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -704,13 +793,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona con esta orden\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "clave '%s' no encontrada: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -753,7 +842,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "use antes la opción \"--delete-secret-key\" para borrarla.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "error creando frase contraseña: %s\n" @@ -772,7 +861,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' ya está comprimido\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATENCIÓN `%s' es un fichero vacío\n" @@ -800,7 +889,7 @@ "forzar el cifrado simétrico %s (%d) viola las preferencias\n" "del destinatario\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -907,28 +996,28 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "clave %08lX: no protegida - omitida\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" "AVISO: la clave secreta %08lX no tiene suma de comprobación simple SK\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "ATENCIÓN: no se ha exportado nada\n" @@ -1111,11 +1200,11 @@ msgid "prompt before overwriting" msgstr "preguntar antes de sobreescribir" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" @@ -1123,7 +1212,7 @@ # página man -> página de manual # Vale. ¿del manual mejor? # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado. -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1131,7 +1220,7 @@ "@\n" "(Véase en la página del manual la lista completo de órdenes y opciones)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1151,15 +1240,15 @@ " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Por favor, informe de posibles \"bugs\" a .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1169,7 +1258,7 @@ "firma, comprueba, cifra o descifra\n" "la operación por defecto depende de los datos de entrada\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1177,451 +1266,451 @@ "\n" "Algoritmos disponibles:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Clave pública: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Cifrado: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Resumen: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Compresión: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "órdenes incompatibles\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "no se encontró el signo = en la definición de grupo \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "AVISO: propiedad insegura de %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "AVISO: propiedad insegura de %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "AVISO: propiedad insegura de %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "AVISO: permisos inseguros de %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "AVISO: permisos inseguros de %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "AVISO: permisos inseguros de %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "artículo de configuración desconocido \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s no es para uso normal!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "no se carga el cifrado de ampliación \"%s\" por permisos inseguros\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s no es un juego de caracteres válido\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "no se puede interpretar la URI del servidor de claves\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "opciones de importación inválidas\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "opciones de importación inválidas\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "imposible establecer camino de ejecutables %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sustituye a %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s no permitido con %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s no tiene sentido con %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "sólo puede hacer firmas separadas o en claro en modo --pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "debe usar ficheros (no tuberías) si trabaja con --pgp2 activo.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no inválido\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "el algoritmo de certificación por resumen elegido es inválido\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level inválido; debe ser 0, 1, 2, ó 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level inválido; debe ser 0, 1, 2, ó 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "preferencias por defecto inválidas\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "preferencias personales de cifrado inválidas\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "preferencias personales de algoritmo de resumen inválidas\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "preferencias personales de compresión inválidas\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s aún no funciona con %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "no puede usar el cifrado \"%s\" en modo %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "no puede usar el resumen \"%s\" en modo %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "no puede usar la compresión \"%s\" en modo %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "descifrado fallido: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "no puede usar %s en modo %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "no puede usar %s en modo %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nombre_fichero]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id-usuario" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuario" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-usuario" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-usuario" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuario [órdenes]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuario] [anillo]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "envío al servidor de claves fallido: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepción del servidor de claves fallida: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "exportación de clave fallida: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "búsqueda del servidor de claves fallida: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "renovación al servidor de claves fallida: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución inválido `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nombre_fichero]" @@ -1629,11 +1718,11 @@ # En español no se deja espacio antes de los puntos suspensivos # (Real Academia dixit) :) # Tomo nota :-). Este comentario déjalo siempre. -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1641,23 +1730,23 @@ "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y " "acabar con un '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "un nombre de notación de usuario debe contener el caracter '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación no debe usar ningún caracter de control\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "URL de política de certificado inválida\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "URL de política inválida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL de política inválida\n" @@ -1666,27 +1755,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "demasiados registros en la cache pk - anulada\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Identificador de usuario no encontrado]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Clave %08lX inválida hecha mediante --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "no hay subclave secreta para la clave pública %08lX -ignorada\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "clave %08lX: clave secreta sin clave pública - omitida\n" @@ -2048,381 +2137,381 @@ msgid "No help available for `%s'" msgstr "No hay ayuda disponible para `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "omitiendo bloque de tipo %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "hasta ahora se han procesado %lu claves\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Cantidad total procesada: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " omitidas nuevas claves: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sin identificador: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importadas: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " sin cambios: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nuevos identificativos: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nuevas subclaves: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nuevas firmas: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " nuevas revocaciones de claves: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " claves secretas leídas: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " claves secretas importadas: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "claves secretas sin cambios: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " no importadas: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Ha firmado los siguientes IDs de usuario:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "firma %s de: \"%s\"\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "clave %08lX: sin identificador de usuario\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "clave %08lX: reparada la subclave HKP corrompida\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "clave %08lX: sin identificadores de usuario válidos\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "esto puede ser debido a la ausencia de autofirma\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "clave %08lX: clave pública no encontrada: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "clave %08lX: clave nueva - omitida\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "anillo de claves no escribible encontrado: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "error escribiendo anillo `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "clave %08lX: clave pública \"%s\" importada\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "clave %08lX: no coincide con nuestra copia\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "clave %08lX: \"%s\" 1 ID de usuario nuevo\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "clave %08lX: \"%s\" %d nuevos identificadores de usuario\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "clave %08lX: \"%s\" 1 firma nueva\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "clave %08lX: \"%s\" %d firmas nuevas\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "clave %08lX: \"%s\" 1 subclave nueva\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "clave %08lX: \"%s\" %d subclaves nuevas\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "clave %08lX: \"%s\" sin cambios\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "clave %08lX: clave secreta con cifrado inválido %d - omitida\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "no hay anillo secreto de claves por defecto: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "clave %08lX: clave secreta importada\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "clave %08lX: ya estaba en el anillo secreto\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "clave %08lX: clave secreta no encontrada: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "clave %08lX: falta la clave pública - imposible emplear el\n" "certificado de revocación\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "clave %08lX: certificado de revocación inválido: %s - rechazado\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "clave %08lX: \"%s\" certificado de revocación importado\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "clave %08lX: no hay identificador de usuario para la firma\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "clave %08lX: algoritmo de clave pública no disponible para el id \"%s\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "clave %08lX: autofirma inválida para el id \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "clave %08lX: no hay subclave que unir\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "clave %08lX: algoritmo de clave pública no disponible\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "clave %08lX: unión de subclave inválida\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "clave %08lX: borrado enlace de subclaves múltiples\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "clave %08lX: no hay subclave para la revocación de clave\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "clave %08lX: revocación de subclave inválida\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "clave %08lX: borrada revocación de subclave múltiple\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "clave %08lX: omitido ID de usuario '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "clave %08lX: subclave omitida\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "clave %08lX: certificado de revocación en lugar equivocado - omitido\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "clave %08lX: certificado de revocación no valido: %s - omitido\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "clave %08lX: firma de subclave en lugar equivocado - omitida\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "clave %08lX: detectado usuario duplicado - fusionada\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "AVISO: la clave %08lX puede estar revocada: recuperando clave de revocación %" "08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "AVISO: la clave %08lX puede estar revocada: falta clave de revocación %" "08lX.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "clave %08lX: \"%s\" certificado de revocación añadido\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "clave %08lX: firma directa de clave añadida\n" @@ -2659,7 +2748,8 @@ msgstr " (3) Lo he comprobado meticulosamente.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "¿Su elección? (escriba '?' si desea más información): " #: g10/keyedit.c:918 @@ -2732,7 +2822,7 @@ msgid "Really sign? (y/N) " msgstr "¿Firmar de verdad? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2763,7 +2853,7 @@ "Introduzca la nueva frase contraseña para esta clave secreta.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo" @@ -3243,83 +3333,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Esta clave puede ser revocada por la clave %s" -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (confidencial)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "no se puede crear %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Esta clave está deshabilitada" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revocada]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expira" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3327,7 +3401,19 @@ "Por favor, advierta que la validez de clave mostrada no es necesariamente\n" "correcta a menos de que reinicie el programa.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[revocada]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expira" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3335,7 +3421,7 @@ "AVISO: ningún ID de usuario está marcado como principal. Esta orden puede\n" " causar que se tome como principal por defecto otro ID de usuario.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3344,45 +3430,45 @@ "AVISO: esta es una clave de tipo PGP2. Añadir un ID fotográfico puede\n" "hacer que algunas versiones de PGP rechacen esta clave.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de querer añadirla? (s/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta firma correcta? (s/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta firma inválida? (s/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta firma desconocida? (s/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "¿Borrar realmente esta autofirma? (s/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d firmas borradas.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d firmas borradas\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "No se borró nada\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3391,163 +3477,163 @@ "AVISO: esta es una clave tipo PGP2. Añadir un revocador designado puede\n" " hacer que algunas versiones de PGP rechacen esta clave.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Introduzca el ID de usuario del revocador designado: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no puede elegir una clave como su propio revocador designado\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ATENCIÓN: ¡Esta clave ha sido revocada por la persona designada\n" "como revocador!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "¿Está seguro de querer elegir esta clave como revocador designado? (s/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite las selecciones de las claves secretas.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo una clave secundaria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando caducidad de clave secundaria.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "No puede cambiar la fecha de caducidad de una clave v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "No existe la firma correspondiente en el anillo secreto\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Por favor seleccione exactamente un identificador de usuario.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "omitiendo autofirma V3 para el id \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Seguro que quiere usarlo? (s/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Seguro que quiere usarlo? (s/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "No hay ningún identificador de usuario con el índice %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el índice %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " firmada por %08lX el %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (no exportable)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta firma caducó el %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿De verdad quiere revocarla? (s/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta clave? (s/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ha firmado los siguientes IDs de usuario:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (no exportable)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocada por %08lX el %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Va a revocar las siguientes firmas:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Crear los certificados de revocación realmente? (s/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "no hay clave secreta\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3590,12 +3676,12 @@ msgid "writing key binding signature\n" msgstr "escribiendo la firma de comprobación de clave\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamaño de clave incorrecto; se usarán %u bits\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamaño de clave redondeado a %u bits\n" @@ -3663,90 +3749,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (sólo cifrar)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (sólo cifrar)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (sólo firmar)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (sólo cifrar)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (sólo cifrar)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Listo para generar un nuevo par de claves %s.\n" -" el tamaño mínimo es 768 bits\n" -" el tamaño por defecto es 1024 bits\n" -" el tamaño máximo recomendado es 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "¿De qué tamaño quiere la clave (1024)? " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA sólo permite tamaños desde 512 a 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "tamaño de clave insuficiente; 1024 es el mínimo permitido para RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "El par de claves DSA tendrá 1024 bits.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "tamaño excesivo; %d es el máximo valor permitido.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"No se recomiendan claves de más de 2048 bits porque\n" -"¡el tiempo de cálculo es REALMENTE largo!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "¿Seguro que quiere una clave de este tamaño? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "¿De qué tamaño quiere la clave (1024)? " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"De acuerdo, ¡pero tenga en cuenta que las radiaciones de su monitor y\n" -"teclado también son vulnerables a un ataque!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "El tamaño requerido es de %u bits\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "redondeados a %u bits\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3762,7 +3818,7 @@ " m = la clave caduca en n meses\n" " y = la clave caduca en n años\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3778,29 +3834,29 @@ " m = la clave caduca en n meses\n" " y = la clave caduca en n años\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "¿Validez de la clave (0)? " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Clave válida ¿durante (0)? " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s nunca caduca\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s caduca el %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3808,12 +3864,12 @@ "Su sistema no puede mostrar fechas más allá del 2038.\n" "Sin embargo funcionará correctamente hasta el 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "¿Es correcto (s/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3830,44 +3886,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nombre y apellidos: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Caracter inválido en el nombre\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "El nombre no puede empezar con un número\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "El nombre debe tener al menos 5 caracteres\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Dirección de correo electrónico: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Dirección inválida\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Caracter inválido en el comentario\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Está usando el juego de caracteres `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3878,29 +3934,29 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Por favor no ponga la dirección de correo-e en el nombre real o en el " "comentario\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcDdVvSs" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (S)alir? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Por favor corrija primero el error.\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3908,12 +3964,12 @@ "Necesita una frase contraseña para proteger su clave secreta.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3925,7 +3981,7 @@ "la opción \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3938,54 +3994,50 @@ "generador de números aleatorios mayor oportunidad de recoger suficiente\n" "entropía.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "El par de claves DSA tendrá 1024 bits.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Creación de claves cancelada.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "escribiendo clave pública en `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "anillo público de claves no escribible encontrado: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "anillo privado de claves no escribible encontrado: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "error escribiendo anillo público `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "error escribiendo anillo privado `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "claves pública y secreta creadas y firmadas.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3993,12 +4045,12 @@ "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n" "la orden \"--edit-key\" para crear una clave secundaria con este propósito.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Creación de la clave fallida: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4006,7 +4058,7 @@ "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4014,40 +4066,40 @@ "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n" "problemas con el reloj)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTA: crear subclaves para claves V3 no sigue el estándar OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "¿Crear de verdad? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "borrado de bloque de anillo de claves fallido: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "no se puede crear %s: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: clave secreta %08lX caducada el %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4093,28 +4145,28 @@ msgid "expired: %s)" msgstr " [caduca: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Huellas dactilares de la clave primaria:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Huella de subclave:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Huella de clave primaria:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Huella de subclave:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Huella de clave =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4467,7 +4519,7 @@ msgid "textmode" msgstr "modotexto" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "desconocido" @@ -4498,30 +4550,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete raíz inválido detectado en proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "no se pueden desactivar los volcados de core: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "actualización de base de datos de confianza fallida: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "base de datos de confianza: error lectura (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "¡No se deberían usar algoritmos experimentales!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "no puedo manejar el algoritmo de clave pública %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algoritmo de cifrado no implementado" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "firma %s de: \"%s\"\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"ese algoritmo de cifrado está desacreditado;¡por favor use uno más " -"estándar!\n" +"forzar el algoritmo de resumen %s (%d) va en contra de las\n" +"preferencias del destinatario\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4630,50 +4694,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "el agente gpg no esta disponible en esta sesión\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "no puedo establecer pid para el agente\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "no puedo conseguir el FD de lectura para el agente\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "no puedo conseguir el FD de escritura para el agente\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variable de entorno GPG_AGENT_INFO malformada\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "el programa no permite usar el protocolo agente gpg versión %d\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no se puede conectar con `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con el agente gpg\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problema con el agente - inhabilitando el uso del agente\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr "(ID clave primaria %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4684,41 +4748,41 @@ "del usuario: \"%.*s\"\n" "%u bits, clave %s, ID %08lX, creada el %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Repita frase contraseña\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Introduzca frase contraseña\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "frase contraseña demasiado larga\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "respuesta del agente inválida\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "cancelado por el usuario\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con el agente: el agente devuelve 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "imposible pedir contraseña en modo de proceso por lotes\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Introduzca frase contraseña: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4728,17 +4792,17 @@ "Necesita una frase contraseña para desbloquear la clave secreta\n" "del usuario: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Repita frase contraseña: " @@ -4945,7 +5009,8 @@ msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Esto puede significar que la firma está falsificada.\n" #: g10/pkclist.c:527 @@ -5049,28 +5114,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "error creando `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Firma separada.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Introduzca el nombre del fichero de datos: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "leyendo stdin...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "no hay datos firmados\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "imposible abrir datos firmados `%s'\n" @@ -5392,12 +5457,7 @@ "sólo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --" "pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "escribiendo en `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" @@ -5405,38 +5465,38 @@ "forzar el algoritmo de resumen %s (%d) va en contra de las\n" "preferencias del destinatario\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "firmando:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "sólo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "se usará un cifrado %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "`%s' omitido: duplicado\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "`%s' omitido: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "omitido: clave secreta ya presente\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5627,12 +5687,12 @@ "La base de datos de confianza está dañada. Por favor, ejecute\n" "\"gpg --fix-trust-db\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "no se pueden manejar líneas de texto de más de %d caracteres\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "línea de longitud superior a %d caracteres\n" @@ -5682,85 +5742,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[revocada]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[caducada]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "desconocido" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "nunca " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "siguiente comprobación de base de datos de confianza el: %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "clave pública %08lX no encontrada: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "por favor haga un --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "comprobando base de datos de confianza\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d claves procesadas (%d validaciones superadas)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "no se encuentran claves totalmente fiables\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "clave pública de la clave totalmente fiable %08lX no encontrada\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n" @@ -6095,6 +6190,64 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "el algoritmo de resumen `%s' es de sólo lectura en esta versión\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Listo para generar un nuevo par de claves %s.\n" +#~ " el tamaño mínimo es 768 bits\n" +#~ " el tamaño por defecto es 1024 bits\n" +#~ " el tamaño máximo recomendado es 2048 bits\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA sólo permite tamaños desde 512 a 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "tamaño de clave insuficiente; 1024 es el mínimo permitido para RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "tamaño excesivo; %d es el máximo valor permitido.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "No se recomiendan claves de más de 2048 bits porque\n" +#~ "¡el tiempo de cálculo es REALMENTE largo!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "¿Seguro que quiere una clave de este tamaño? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "De acuerdo, ¡pero tenga en cuenta que las radiaciones de su monitor y\n" +#~ "teclado también son vulnerables a un ataque!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "¡No se deberían usar algoritmos experimentales!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "ese algoritmo de cifrado está desacreditado;¡por favor use uno más " +#~ "estándar!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "escribiendo en `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n" @@ -6225,12 +6378,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? problema comprobando la revocación: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[revocada]" - -#~ msgid "[expired] " -#~ msgstr "[caducada]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [caduca: %s]" Index: gnupg/po/et.po diff -u gnupg/po/et.po:1.12 gnupg/po/et.po:1.13 --- gnupg/po/et.po:1.12 Thu Oct 28 11:06:49 2004 +++ gnupg/po/et.po Fri Dec 10 23:20:53 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -14,11 +14,6 @@ "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8-bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "sõnumilühendi algoritm `%s' ei ole selles versioonis muudetav\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -33,11 +28,12 @@ msgid "no entropy gathering module detected\n" msgstr "entroopia kogumise moodul puudub\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -70,9 +66,9 @@ msgid "note: random_seed file not updated\n" msgstr "märkus: random_seed faili ei uuendatud\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "`%s' ei õnnestu luua: %s\n" @@ -125,90 +121,150 @@ "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid töid,\n" "et anda masinal võimalust koguda enam entroopiat! (Vajatakse %d baiti)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "võtmeserverile saatmine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "viga parooli loomisel: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "viga võtmebloki lugemisel: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: viga vaba kirje lugemisel: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' on juba pakitud\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "genereeri uus võtmepaar" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "võtmebloki kustutamine ebaõnnestus: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Võtme genereerimine ebaõnnestus: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "ei leia OpenPGP andmeid.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "viga parooli loomisel: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "võtmebloki kustutamine ebaõnnestus: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -295,15 +351,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "seda ei saa teha pakettmoodis\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Teie valik? " @@ -311,141 +367,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Põhjus puudub" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "ei töödeldud" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "vastavat avalikku võtit pole: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "viga `%s' lugemisel: %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "uuendatud eelistused" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "lubamatu sümbol eelistuste sõnes\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "lubamatu sümbol eelistuste sõnes\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "viga: vigane sõrmejälg\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "näita sõrmejälge" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "viga: vigane sõrmejälg\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Võtme genereerimine ebaõnnestus: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "ei leia OpenPGP andmeid.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -453,232 +518,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Palun valige, millist võtmetüüpi te soovite:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Allkiri aegus %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Vigane valik.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Palun valige tühistamise põhjus:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "tundmatu kaitsealgoritm\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "jätsin vahele: avalik võti on juba olemas\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "välju" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "välju sellest menüüst" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "v" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "näita seda abiinfot" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Võtme leiate: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "muuda aegumise kuupäeva" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "muuda omaniku usaldust" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "näita sõrmejälge" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "üldine viga" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "genereeri uus võtmepaar" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Käsklus> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Vigane käsklus (proovige \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Korrake parooli: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "parooli ei korratud õieti; proovige uuesti" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -688,13 +775,13 @@ msgid "--output doesn't work for this command\n" msgstr "võti --output ei tööta selle käsuga\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "võtit '%s' ei leitud: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -737,7 +824,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "selle kustutamiseks kasutage võtit \"--delete-secret-keys\".\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "viga parooli loomisel: %s\n" @@ -756,7 +843,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' on juba pakitud\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "HOIATUS: `%s' on tühi fail\n" @@ -783,7 +870,7 @@ msgstr "" "sümmetrilise ¨ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -887,27 +974,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "HOIATUS: ei õnnestu eemaldada ajutist kataloogi `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "võti %08lX: ei ole kaitstud - jätsin vahele\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "HOIATUS: salajases võtmes %08lX puudub lihtne SK kontrollsumma\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "HOIATUS: midagi ei eksporditud\n" @@ -1086,15 +1173,15 @@ msgid "prompt before overwriting" msgstr "küsi enne ülekirjutamist" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1102,7 +1189,7 @@ "@\n" "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1122,15 +1209,15 @@ " --list-keys [nimed] näita võtmeid\n" " --fingerprint [nimed] näita sõrmejälgi\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Palun saatke veateated aadressil .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1140,7 +1227,7 @@ "allkirjasta, kontrolli, krüpti ja dekrüpti\n" "vaikimisi operatsioon sõltub sisendandmetest\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1148,461 +1235,461 @@ "\n" "Toetatud algoritmid:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Avalik võti: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "¦iffer: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Räsi: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Pakkimine: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "kasuta: gpg [võtmed] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "vastuolulised käsud\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "tundmatu seade \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "võtmete fail `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "loen võtmeid failist `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ebaturvaliste õiguste tõttu ei laetud ¨ifri laiendust \"%s\"\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ei saa parsida võtmeserveri URI\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "vigased impordi võtmed\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "vigased impordi võtmed\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path väärtuseks ei õnnestu seada %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "HOIATUS: %s määrab üle %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s ei ole koos lubatud!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s ei oma koos mõtet!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "--pgp2 moodis saate luua ainult eraldiseisvaid või avateksti allkirju\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krüpteerida\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA ¨iffrit\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "valitud lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed peab olema suurem, kui 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed peab olema suurem, kui 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "vigane S2K mood; peab olema 0, 1 või 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "vigased vaikimisi eelistused\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "vigased isikliku ¨ifri eelistused\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "vigased isikliku lühendi eelistused\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "vigased isikliku pakkimise eelistused\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ei tööta veel koos %s-ga\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "¨ifri algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [failinimi]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [failinimi]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "lahtikrüpteerimine ebaõnnestus: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [failinimi]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [failinimi]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [failinimi]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [failinimi]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [failinimi]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key kasutaja-id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key kasutaja-id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key kasutaja-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key kasutaja-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key kasutaja-id [käsud]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "võtmeserverile saatmine ebaõnnestus: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "võtme eksport ebaõnnestus: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "võtmeserveri otsing ebaõnnestus: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "lahtipakendamine ebaõnnestus: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "pakendamine ebaõnnestus: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "vigane räsialgoritm `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[failinimi]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Kirjutage nüüd oma teade ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1610,23 +1697,23 @@ "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n" "ning lõpus peab olema '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "antud sertifikaadi poliisi URL on vigane\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" @@ -1635,29 +1722,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "avalike võtmete puhvris on liiga palju võtmeid - blokeerin\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Kasutaja id puudub]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid " "kasutamisega\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "avalikul alamvõtmel %08lX puudub salajane alamvõti - ignoreerin\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n" @@ -2008,378 +2095,378 @@ msgid "No help available for `%s'" msgstr "`%s' kohta abiinfo puudub" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "jätan bloki tüübiga %d vahele\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu võtit on seni töödeldud\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Töödeldud kokku: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " vahele jäetud uusi võtmeid: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " puudub kasutaja ID: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " imporditud: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " muutmata: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " uusi kasutajaid: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " uusi alamvõtmeid: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " uusi allkirju: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " uusi tühistamisi: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " loetud salajasi võtmeid: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " salajasi võtmeid imporditud: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " muutmata salajasi võtmeid: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " pole imporditud: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s allkiri, sõnumilühendi algoritm %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "võti %08lX: kasutaja ID puudub\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "võti %08lX: HKP alamvõtme rike parandatud\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "" "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "võti %08lX: puudub kehtiv kasutaja ID\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "võti %08lX: avalikku võtit ei leitud: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "võti %08lX: uus võti - jätsin vahele\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "ei leia kirjutatavat võtmehoidlat: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "kirjutan faili `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "võti %08lX: ei sobi meie koopiaga\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "võti %08lX: \"%s\" 1 uus allkiri\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "võti %08lX: \"%s\" %d uut allkirja\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "võti %08lX: \"%s\" ei muudetud\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "võti %08lX: salajane võti vigase ¨ifriga %d - jätsin vahele\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "võti %08lX: salajane võti on imporditud\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "võti %08lX: on juba salajaste võtmete hoidlas\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "võti %08lX: salajast võtit ei leitud: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "võti %08lX: allkirjal puudub kasutaja ID\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "võti %08lX: võtmeseosel puudub alamvõti\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "võti %08lX: vigane alamvõtme seos\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "võti %08lX: vigane mitme alamvõtme seos\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "võti %08lX: vigane alamvõtme tühistamine\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "võti %08lX: jätsin vahele kasutaja ID '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "võti %08lX: jätsin alamvõtme vahele\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "võti %08lX: lisatud vahetu võtme allkiri\n" @@ -2615,7 +2702,8 @@ msgstr " (3) Ma olen kontrollinud väga hoolikalt.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): " #: g10/keyedit.c:918 @@ -2688,7 +2776,7 @@ msgid "Really sign? (y/N) " msgstr "Allkirjastan tõesti? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2719,7 +2807,7 @@ "Sisestage sellele salajasele võtmele uus parool.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "parooli ei korratud õieti; proovige uuesti" @@ -3198,83 +3286,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Selle võtme võib olla tühistanud %s võti " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (tundlik)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s ei õnnestu luua: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[tühistatud] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "See võti on blokeeritud" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[tühistatud] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3282,7 +3354,19 @@ "Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n" "näidatud võtme kehtivus olla tingimata korrektne.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[tühistatud] " + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3290,7 +3374,7 @@ "HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks. See käsklus võib\n" " põhjustada muu kasutaja ID primaarseks määramist.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3299,45 +3383,45 @@ "HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n" " PGP versioone seda võtit tagasi lükkama.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Kustutan selle korrektse allkirja? (j/E/v)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Kustutan selle vigase allkirja? (j/E/v)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Kustutan selle tundmatu allkirja? (j/E/v)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Kustutatud %d allkiri.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Kustutatud %d allkirja.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Midagi ei kustutatud.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3346,160 +3430,160 @@ "HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n" " põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Sisestage määratud tühistaja kasutaja ID: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "palun valige ülimalt üks sekundaarne võti.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Muudan sekundaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Muudan primaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3 võtme aegumise aega ei saa muuta.\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Palun valige täpselt üks kasutaja ID.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Kasutaja ID numbriga %d puudub\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Sekundaarne võti numbriga %d puudub\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "kasutaja ID: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " allkirjastanud %08lX %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "See allkiri aegub %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " tühistanud %08lX %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Te asute tühistama järgmisi allkirju:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "salajast võtit pole\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n" @@ -3541,12 +3625,12 @@ msgid "writing key binding signature\n" msgstr "kirjutan võtit siduva allkirja\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "vigane võtme suurus; kasutan %u bitti\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "võtme suurus ümardatud üles %u bitini\n" @@ -3614,90 +3698,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (ainult krüpteerimiseks)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (ainult krüptimiseks)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (ainult allkirjastamiseks)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (ainult krüpteerimiseks)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Enne uue %s võtmepaari genereerimist.\n" -" minimaalne võtmepikkus on 768 bitti\n" -" vaikimisi võtmepikkus on 1024 bitti\n" -" suurim soovitatav võtmepikkus on 2048 bitti\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Millist võtmepikkust te soovite? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA lubab võtmepikkuseid ainult vahemikus 512 kuni 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "võtmepikkus on liiga väike; RSA korral on väikseim väärtus 1024.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "võtmepikkus on liiga väike; väikseim lubatud väärtus on 768.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "võtmepikkus on liiga suur; suurim lubatud väärtus on %d.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n" -"arvutused võtavad VÄGA palju aega!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Olete kindel, et soovite sellist võtmepikkust? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Millist võtmepikkust te soovite? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n" -"võimalikud ründeobjektid!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Soovitud võtmepikkus on %u bitti\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "ümardatud üles %u bitini\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3713,7 +3767,7 @@ " m = võti aegub n kuuga\n" " y = võti aegub n aastaga\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3729,29 +3783,29 @@ " m = allkiri aegub n kuuga\n" " y = allkiri aegub n aastaga\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Võti on kehtiv kuni? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Allkiri on kehtiv kuni? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "vigane väärtus\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s ei aegu kunagi\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s aegub %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3759,12 +3813,12 @@ "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n" "Siiski käsitletakse neid korrektselt aastani 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "On see õige (j/e)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3780,44 +3834,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Pärisnimi: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Lubamatu sümbol nimes\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Nimi ei või alata numbriga\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Nimes peab olema vähemalt 5 sümbolit\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "E-posti aadress: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Selline e-posti aadress ei ole lubatud\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Kommentaar: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Lubamatu sümbol kommentaaris\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Te kasutate kooditabelit `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3828,27 +3882,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnKkEeOoVv" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Palun parandage kõigepealt viga\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3856,12 +3910,12 @@ "Te vajate oma salajase võtme kaitsmiseks parooli.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3873,7 +3927,7 @@ "kasutades seda programmi võtmega \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3885,54 +3939,50 @@ "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n" "koguda paremat entroopiat.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA võtmepaari pikkuseks saab 1024 bitti.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Võtme genereerimine katkestati.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "kirjutan avaliku võtme faili `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3941,57 +3991,57 @@ "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n" "kasutades võtit \"--edit-key\".\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Võtme genereerimine ebaõnnestus: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "MÄRKUS: v3 võtmetele alamvõtmete loomine ei ole OpenPGP ühilduv\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Loon tõesti? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "võtmebloki kustutamine ebaõnnestus: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "`%s' ei õnnestu luua: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "MÄRKUS: salajane võti %08lX aegus %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4037,28 +4087,28 @@ msgid "expired: %s)" msgstr " [aegub: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Primaarse võtme sõrmejälg:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Alamvõtme sõrmejälg:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Primaarse võtme sõrmejälg:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Alamvõtme sõrmejälg:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Võtme sõrmejälg =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4410,7 +4460,7 @@ msgid "textmode" msgstr "tekstimood" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "tundmatu" @@ -4441,29 +4491,41 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() tuvastas vigase juurmise paketi\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "ei õnnestu blokeerida mälupildi salvestamist: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "faili ei õnnestu avada: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "ei oska käsitleda avaliku võtme algoritmi %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "realiseerimata ¨ifri algoritm" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s allkiri, sõnumilühendi algoritm %s\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"see ¨ifri algoritm ei ole soovitatav; kasutage palun mõnd standardsemat!\n" +"sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4572,50 +4634,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "agendile ei õnnestu seada kliendi pid\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "agendiga suhtlemiseks ei õnnestu saada lugemise FD\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "agendiga suhtlemiseks ei õnnestu saada kirjutamise FD\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "probleem gpg-agent programmiga suhtlemisel\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "probleem agendiga - blokeerin agendi kasutamise\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (peamise võtme ID %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4626,41 +4688,41 @@ "\"%.*s\"\n" "%u-bitti %s võti, ID %08lX, loodud %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Korrake parooli\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Sisestage parool\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "liiga pikk parool\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "vigane vastus agendilt\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "katkestatud kasutaja poolt\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem agendiga: agent tagastas 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "pakettmoodis ei saa parooli küsida\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Sisestage parool: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4670,17 +4732,17 @@ "Te vajate kasutaja salajase võtme lahtilukustamiseks\n" "parooli: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bitine %s võti, ID %08lX, loodud %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Korrake parooli: " @@ -4883,7 +4945,8 @@ msgstr "HOIATUS: See võti on omaniku poolt tühistatud!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " See võib tähendada, et allkiri on võltsing.\n" #: g10/pkclist.c:527 @@ -4986,28 +5049,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "andmeid ei salvestatud; salvestamiseks kasutage võtit \"--output\"\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "viga `%s' loomisel: %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Eraldiseisev allkiri.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Palun sisestage andmefaili nimi: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "loen standardsisendit ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "allkirjastatud andmeid pole\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n" @@ -5325,52 +5388,47 @@ msgstr "" "PGP 2.x stiilis võtmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "kirjutan faili `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "sõnumilühendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "allkirjastan:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "PGP 2.x stiilis võtmetega saab avateksti allkirjastada ainult --pgp2 moodis\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "kasutatakse %s krüpteerimist\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "`%s' jätsin vahele: duplikaat\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "`%s' jätsin vahele: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "jätsin vahele: avalik võti on juba olemas\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5558,12 +5616,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "ei suuda käsitleda tekstiridu mis on pikemad, kui %d sümbolit\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "sisendrida on pikem, kui %d sümbolit\n" @@ -5613,85 +5671,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[tühistatud] " + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[aegunud] " + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "tundmatu" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "mitte kunagi" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "trustdb järgmine kontroll %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ei leia avalikku võtit %08lX: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "palun tehke --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "kontrollin trustdb faili\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d võtit töödeldud (%d kehtivust puhastatud)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "absoluutselt usaldatavaid võtmeid pole\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n" @@ -6000,6 +6093,62 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "sõnumilühendi algoritm `%s' ei ole selles versioonis muudetav\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Enne uue %s võtmepaari genereerimist.\n" +#~ " minimaalne võtmepikkus on 768 bitti\n" +#~ " vaikimisi võtmepikkus on 1024 bitti\n" +#~ " suurim soovitatav võtmepikkus on 2048 bitti\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA lubab võtmepikkuseid ainult vahemikus 512 kuni 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "võtmepikkus on liiga väike; RSA korral on väikseim väärtus 1024.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "võtmepikkus on liiga väike; väikseim lubatud väärtus on 768.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "võtmepikkus on liiga suur; suurim lubatud väärtus on %d.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Suuremad võtmepikkused kui 2048 ei ole soovitatavad, kuna\n" +#~ "arvutused võtavad VÄGA palju aega!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Olete kindel, et soovite sellist võtmepikkust? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n" +#~ "võimalikud ründeobjektid!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "see ¨ifri algoritm ei ole soovitatav; kasutage palun mõnd standardsemat!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "kirjutan faili `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "vabandust, seda ei saa pakettmoodis teha\n" @@ -6128,12 +6277,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? probleem tühistamise kontrollimisel: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[tühistatud] " - -#~ msgid "[expired] " -#~ msgstr "[aegunud] " - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [aegub: %s]" Index: gnupg/po/fi.po diff -u gnupg/po/fi.po:1.7 gnupg/po/fi.po:1.8 --- gnupg/po/fi.po:1.7 Thu Oct 28 11:06:49 2004 +++ gnupg/po/fi.po Fri Dec 10 23:20:53 2004 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -30,11 +30,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -49,11 +44,12 @@ msgid "no entropy gathering module detected\n" msgstr "entropian keräysmoduulia ei havaittu\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -87,9 +83,9 @@ msgid "note: random_seed file not updated\n" msgstr "huom: random_seed-tiedostoa ei päivitetty\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "tiedostoa \"%s\" ei voi luoda: %s\n" @@ -143,90 +139,150 @@ "antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n" "(Vielä tarvitaan %d tavua)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "virhe luotaessa salasanaa: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "virhe luettaessa avainlohkoa: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "\"%s\" on jo pakattu\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "luo uusi avainpari" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "avainlohkojen poisto epäonnistui: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Avaimen luonti epäonnistui: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "virhe luotaessa salasanaa: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "avainlohkojen poisto epäonnistui: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -315,15 +371,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "tätä ei voi tehdä eräajossa\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Valintasi? " @@ -331,141 +387,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Ei eriteltyä syytä" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "ei käsitelty" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "ei vastaavaa julkista avainta: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "virhe luettaessa tiedostoa \"%s\": %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "päivitä valinnat" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Valinnassa on luvaton merkki\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Valinnassa on luvaton merkki\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "virhe: sormenjälki on väärä\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "näytä sormenjälki" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "virhe: sormenjälki on väärä\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Avaimen luonti epäonnistui: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -473,232 +538,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Valitse millaisen avaimen haluat:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Allekirjoitus vanheni %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (vain salaus)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Valinta ei kelpaa.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Valitse mitätöinnin syy:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "tuntematon suojausalgoritmi\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ohitetaan: salainen avain on jo paikalla\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "lopeta|sulje" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ulos tästä valikosta" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "apua" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "näytä tämä ohje" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Avain saatavilla kohteessa: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "muuta voimassoloaikaa" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "muuta luottamusastetta" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "näytä sormenjälki" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "yleinen virhe" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "luo uusi avainpari" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Komento> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Komento ei kelpaa (kirjoita \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Toista salasana: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "salasanaa ei toistettu oikein, yritä uudestaan." + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -708,13 +795,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ei toimi yhdessä tämän komennon kanssa\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "avainta \"%s\" ei löydy: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -757,7 +844,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "virhe luotaessa salasanaa: %s\n" @@ -776,7 +863,7 @@ msgid "`%s' already compressed\n" msgstr "\"%s\" on jo pakattu\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n" @@ -802,7 +889,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -905,29 +992,29 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "avain %08lX: ei suojattu - ohitetaan\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-" "tarkistussummaa\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "VAROITUS: mitään ei viety\n" @@ -1106,15 +1193,15 @@ msgid "prompt before overwriting" msgstr "kysy ennen ylikirjoittamista" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1123,7 +1210,7 @@ "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-" "sivuilta)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1142,16 +1229,16 @@ " --list-keys [nimet] näytä avaimet\n" " --fingerprint [nimet] näytä sormenjäljet\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1161,7 +1248,7 @@ "allekirjoita, tarkista, salaa tai avaa\n" "oletustoiminto riippuu syötteestä\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1169,462 +1256,462 @@ "\n" "Tuetut algoritmit:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "JulkAvain: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Salaus: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Tiiviste: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Pakkaus: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "käyttö: gpg [valitsimet] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "ristiriitainen komento\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "tuntematon asetus \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "asetustiedosto \"%s\": %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "luetaan asetukset tiedostosta \"%s\"\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "HUOM: %s ei ole normaaliin käyttöön!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "avainpalvelimen URI:iä ei voi jäsentää\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-polkua kohteeseen %s ei voi asettaa\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROITUS: %s korvaa %s:n\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s eivät ole sallittuja yhdessä!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s yhdessä on järjetöntä!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "valittu tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed täytyy olla suurempi kuin 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed täytyy olla suurempi kuin 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth tulee olla välillä 1-255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "virheelliset oletusarvoiset valinnat\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "virheelliset henkilökohtaisen salaimen valinnat\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ja %s eivät vielä toimi yhdessä\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [tiedostonimi]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [tiedostonimi]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "avaus epäonnistui: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [tiedostonimi]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "valitsinta %s ei voi käyttää %s-tilassa\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--allekirjoita [tiedostonimi]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "valitsinta %s ei voi käyttää %s-tilassa\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [tiedostonimi]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [tiedostonimi]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [tiedostonimi]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key käyttäjätunnus" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key käyttäjätunnus" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrlsign-key käyttäjätunnus" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key käyttäjätunnus" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key käyttäjätunnus [komennot]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "avaimen vienti epäonnistui: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "avainpalvelimen päivitys epäonnistui: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "ascii-koodauksen purku epäonnistui: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "ascii-koodaaminen epäonnistui: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "virheellinen tiivistealgoritmi \"%s\"\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[tiedostonimi]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Kirjoita viestisi...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1632,23 +1719,23 @@ "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai " "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "notaatiosssa ei saa olla erikoismerkkejä\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "annettu varmennekäytännön URL on virheellinen\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" @@ -1657,29 +1744,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Käyttäjätunnusta ei löytynyt]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "" "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "" @@ -2040,381 +2127,381 @@ msgid "No help available for `%s'" msgstr "Ei ohjetta aiheesta \"%s\"" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "ohitetaan tyypin %d lohko\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "tähän mennessä käsitelty %lu avainta\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Kaikkiaan käsitelty: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " ohitetaan uudet avaimet: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ilman käyttäjätunnuksia: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " tuotu: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " muuttamatonta: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " uusia käyttäjätunnuksia: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " uusia aliavaimia: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " uusia allekirjoituksia: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " uusia avainten mitätöintejä: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " luettuja salaisia avaimia: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " tuotuja salaisia avaimia: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " muuttamattomia salaisia avaimia: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " ei tuotu: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" # Ensimmäinen %s on binary, textmode tai unknown, ks. alla -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%sallekirjoitus, tiivistealgoritmi %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "avain %08lX: ei käyttäjätunnusta\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "" "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "avain %08lX: julkista avainta ei löydetty: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "avain %08lX: uusi avain - ohitetaan\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "kirjoitetaan kohteeseen \"%s\"\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "avain %08lX: ei vastaa omaa kopiotamme\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "avain %08lX: \"%s\" ei muutoksia\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "avain %08lX: salainen avain tuotu\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "avain %08lX: avain on jo avainrenkaassa\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "avain %08lX: salaista avainta ei löydy: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "avain %08lX: pätemätön aliavainriippuvuus\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "avain %08lX: käyttäjätunnus ohitettu '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "avain %08lX: aliavain ohitettu\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "" "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n" "ei saatavilla.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n" @@ -2653,7 +2740,8 @@ msgstr " (3) Olen suorittanut huolellisen tarkistuksen.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): " #: g10/keyedit.c:918 @@ -2726,7 +2814,7 @@ msgid "Really sign? (y/N) " msgstr "Varmastiko allekirjoita? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2757,7 +2845,7 @@ "Syötä uusi salasana salaiselle avaimelle.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "salasanaa ei toistettu oikein, yritä uudestaan." @@ -3236,83 +3324,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Tämä avain voidaan mitätöidä %s-avaimella " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (luottamuksellinen)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "ei voida luoda kohdetta %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[mitätöity] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Tämä avain on poistettu käytöstä" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[mitätöity] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3320,7 +3392,19 @@ "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n" "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[mitätöity] " + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3328,7 +3412,7 @@ "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi. Tämän \n" "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3337,45 +3421,45 @@ "VAROITUS: Tämä on PGP2-muodon avain. Valokuvan lisääminen voi\n" " saada jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Varmastiko poista oma-allekirjoitus? (k/E)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d allekirjoitus poistettu.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d allekirjoitusta poistettu.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Mitään ei poistettu.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3385,162 +3469,162 @@ "voi\n" " saada jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Poista salaisten avainten valinnat, kiitos.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Valitse tasan yksi käyttäjätunnus!\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Indeksillä %d ei löydy toissijaista avainta\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "käyttäjätunnus: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " %08lX allekirjoitti tämän %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Tämä allekirjoitus vanheni %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Haluatko varmasti mitätöidä sen? (k/E) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " %08lX mitätöi tämän %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "salainen avain ei ole saatavilla\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän " "tulevaisuuteen\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3584,12 +3668,12 @@ msgid "writing key binding signature\n" msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "avaimen koko on pyöristetty %u bittiin\n" @@ -3657,90 +3741,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (vain salaus)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (vain salaus)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (vain allekirjoitus)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (vain salaus)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (vain salaus)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Luomassa uutta %s-avainparia.\n" -" pienin sallittu avainkoko on 768 bittiä\n" -" oletusavainkoko on 1024 bittiä\n" -" suurin suositeltava avainkoko on 2048 bittiä\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Minkä kokoisen avaimen haluat? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA sallii avaimen koot vain väliltä 512-1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "avainkoko on liian pieni; RSA vaatii vähintään 1024.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA-avainparissa on 1024 bittiä.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "avainkoko on liian suuri; suurin sallittu arvo on %d.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"2048 bittiä suurempia avaimia ei suositella, koska\n" -"laskenta kestää TODELLA pitkään!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Haluatko varmasti tämän kokoisen avaimen? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Minkä kokoisen avaimen haluat? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Hyvä on, mutta muista että näyttösi ja näppäimistösi säteily on myös " -"alttiina salakuuntelulle!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Halutun avaimen koko on %u bittiä\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "pyöristetty %u bittiin\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3756,7 +3810,7 @@ " m = Avain vanhenee n kuukauden kuluttua\n" " y = Avain vanhenee n vuoden kuluttua\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3772,29 +3826,29 @@ " m = Allekirjoitus vanhenee n kuukauden kuluttua\n" " y = Allekirjoitus vanhenee n vuoden kuluttua\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Avain on voimassa? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Allekirjoitus on voimassa? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "arvo ei kelpaa\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s ei vanhene koskaan\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s vanhenee %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3802,12 +3856,12 @@ "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n" "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Onko tämä oikein (k/e) " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3825,44 +3879,44 @@ " \"Matti Meikäläinen (nuorempi) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Oikea nimi: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Nimessä on epäkelpo merkki\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Nimi ei voi alkaa numerolla\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Sähköpostiosoite: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Sähköpostiosoite ei kelpaa\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Huomautus: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Huomautuksessa on epäkelpo merkki\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Käytät merkistöä \"%s\".\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3873,27 +3927,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnHhSsOoLl" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?" -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?" -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Ole hyvä ja korjaa ensin virhe\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3901,12 +3955,12 @@ "Tarvitset salasanan suojaamaan salaista avaintasi.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3918,7 +3972,7 @@ "tämän ohjelman valitsimella \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3930,54 +3984,50 @@ "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n" "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA-avainparissa on 1024 bittiä.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Avaimen luonti keskeytetty.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3985,12 +4035,12 @@ "Huomaa, että tätä avainta ei voida käyttää salaamiseen. Käytä komentoa\n" "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Avaimen luonti epäonnistui: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3998,7 +4048,7 @@ "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n" "kellon kanssa on ongelmia)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4006,40 +4056,40 @@ "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n" "kellon kanssa on ongelmia)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Haluatko varmasti luoda? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "avainlohkojen poisto epäonnistui: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "tiedostoa \"%s\" ei voi luoda: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "HUOM: salainen avain %08lX vanheni %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4085,28 +4135,28 @@ msgid "expired: %s)" msgstr " [vanhenee: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Ensisijaisen avaimen sormenjälki:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Aliavaimen sormenjälki:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Ensisijaisen avaimen sormenjälki:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Aliavaimen sormenjälki:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Avaimen sormenjälki =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4464,7 +4514,7 @@ msgid "textmode" msgstr "teksti" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "tuntematon " @@ -4497,30 +4547,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "core-tiedostojen luontia ei voi estää: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "ei voi avata tiedostoa: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: luku epäonnistui (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Kokeellisia algoritmeja ei pitäisi käyttää!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "salausalgoritmi ei ole käytössä" + +# Ensimmäinen %s on binary, textmode tai unknown, ks. alla +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%sallekirjoitus, tiivistealgoritmi %s\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"tämän salausalgoritmin käyttöä paheksutaan; ole hyvä ja käytä " -"standardimpaa!\n" +"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4629,50 +4691,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "agentille ei voida asettaa pid:tä\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "palvelin ei lue agentin FD:tä\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "palvelin ei kirjoita agentille FD:tä\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "gpg-agentin kanssa yhteysongelma\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (pääavaimen tunnus %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4683,41 +4745,41 @@ "\"%.*s\"\n" "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Toista salasana\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Syötä salasana\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "salasana on liian pitkä\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "agentin lähettämä vastaus ei kelpaa\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "käyttäjän peruma\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "salasanan kysyminen ei onnistu eräajossa\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Syötä salasana: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4726,17 +4788,17 @@ "\n" "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Toista salasana: " @@ -4946,7 +5008,8 @@ msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n" #: g10/pkclist.c:527 @@ -5053,28 +5116,28 @@ msgstr "" "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "virhe luotaessa \"%s\": %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Erillinen allekirjoitus.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Anna datatiedoston nimi: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "luetaan vakiosyötettä ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "ei allekirjoitettua dataa\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n" @@ -5402,54 +5465,49 @@ "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n" "vain --pgp2-tilassa\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "kirjoitetaan kohteeseen \"%s\"\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "allekirjoitetaan:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n" "vain --pgp2-tilassa\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "käytetään %s-salausta\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n" "satunnaislukugeneraattorin kanssa!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "ohitetaan \"%s\": kopio\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "ohitetaan \"%s\": %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "ohitetaan: salainen avain on jo paikalla\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5637,12 +5695,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "syöterivi on yli %d merkkiä pitkä\n" @@ -5693,85 +5751,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[mitätöity] " + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[vanhentunut] " + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "tuntematon " + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "ei koskaan" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "seuraava trustdb tarkistus %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "julkista avainta %08lX ei löydy: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "tee --check-trustdb, kiitos\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "tarkistetaan trustdb:tä\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n" @@ -6080,6 +6173,64 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "" +#~ "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Luomassa uutta %s-avainparia.\n" +#~ " pienin sallittu avainkoko on 768 bittiä\n" +#~ " oletusavainkoko on 1024 bittiä\n" +#~ " suurin suositeltava avainkoko on 2048 bittiä\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA sallii avaimen koot vain väliltä 512-1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "avainkoko on liian pieni; RSA vaatii vähintään 1024.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "avainkoko on liian suuri; suurin sallittu arvo on %d.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "2048 bittiä suurempia avaimia ei suositella, koska\n" +#~ "laskenta kestää TODELLA pitkään!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Haluatko varmasti tämän kokoisen avaimen? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Hyvä on, mutta muista että näyttösi ja näppäimistösi säteily on myös " +#~ "alttiina salakuuntelulle!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Kokeellisia algoritmeja ei pitäisi käyttää!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "tämän salausalgoritmin käyttöä paheksutaan; ole hyvä ja käytä " +#~ "standardimpaa!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "kirjoitetaan kohteeseen \"%s\"\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "valitan, tätä ei voi tehdä eräajossa\n" @@ -6209,12 +6360,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[mitätöity] " - -#~ msgid "[expired] " -#~ msgstr "[vanhentunut] " - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [vanhenee: %s]" Index: gnupg/po/fr.po diff -u gnupg/po/fr.po:1.66 gnupg/po/fr.po:1.67 --- gnupg/po/fr.po:1.66 Thu Oct 28 11:06:49 2004 +++ gnupg/po/fr.po Fri Dec 10 23:20:52 2004 @@ -1,35 +1,28 @@ # GnuPG French translation -# Copyright (C) 1998-2003 Free Software Foundation, Inc. +# Copyright (C) 1998-2004 Free Software Foundation, Inc. # Gaël Quéri , 1998. # # Thanks to Rémi Guyomarch and # for pointing me out some errors. # -# $Id: fr.po,v 1.66 2004/10/28 09:06:49 wk Exp $ +# $Id: fr.po,v 1.67 2004/12/10 22:20:52 wk Exp $ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.5\n" +"Project-Id-Version: gnupg 1.3.93-cvs\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" -"PO-Revision-Date: 2004-06-16 20:20+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"PO-Revision-Date: 2004-11-08 01:13+0100\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" -"l'algorithme de hachage `%s' ne marche que pour la lecture dans cette\n" -"version\n" - #: cipher/primegen.c:120 -#, fuzzy, c-format +#, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" -msgstr "impossible de générer un nombre premier avec moins de %d bits\n" +msgstr "impossible de générer un nombre premier avec pbits=%u qbits=%u\n" #: cipher/primegen.c:311 #, c-format @@ -40,11 +33,12 @@ msgid "no entropy gathering module detected\n" msgstr "aucun module de récupération d'entropie n'a été trouvé.\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -79,9 +73,9 @@ msgid "note: random_seed file not updated\n" msgstr "note: le fichier `random_seed' n'a pas été mis à jour\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "impossible de créer `%s': %s\n" @@ -136,90 +130,155 @@ "Il n'y a pas assez d'octets aléatoires disponibles. Faites autre chose\n" "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n" -#: g10/app-openpgp.c:534 -#, fuzzy, c-format +#: g10/app-openpgp.c:539 +#, c-format msgid "failed to store the fingerprint: %s\n" -msgstr "impossible d'initialiser la base de confiance: %s\n" +msgstr "impossible de stocker l'empreinte: %s\n" -#: g10/app-openpgp.c:547 -#, fuzzy, c-format +#: g10/app-openpgp.c:552 +#, c-format msgid "failed to store the creation date: %s\n" -msgstr "la reconstruction du cache de porte-clés a échoué : %s\n" +msgstr "impossible de stocker la date de création: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" -msgstr "" +msgstr "l'appel du PIN a retourné une erreur: %s\n" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" +"Le code PIN pour CHV%d est trop court ; la longueur minimale\n" +"est %d\n" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 -#, fuzzy, c-format +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 +#, c-format msgid "verify CHV%d failed: %s\n" -msgstr "l'envoi vers le serveur de clés a échoué: %s\n" +msgstr "la vérification CHV%d a échoué: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" -msgstr "" +msgstr "l'accès aux commandes d'administration n'est pas configuré\n" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" -msgstr "" +msgstr "erreur pendant la récupération de l'état CHV de la carte\n" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" -msgstr "" +msgstr "la carte est irrémédiablement bloquée !\n" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" +"%d tentatives de PIN admin restent jusqu'à ce que la carte\n" +"soit irrémédiablement bloquée\n" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" -msgstr "" +#: g10/app-openpgp.c:865 +#, fuzzy +msgid "|A|Admin PIN" +msgstr "PIN d'administration" -#: g10/app-openpgp.c:1301 -#, c-format -msgid "PIN [sigs done: %lu]" +#: g10/app-openpgp.c:1021 +#, fuzzy +msgid "|AN|New Admin PIN" +msgstr "PIN d'administration" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1025 #, fuzzy, c-format -msgid "can't access %s - invalid OpenPGP card?\n" -msgstr "aucune donnée OpenPGP valide n'a été trouvée.\n" +msgid "error getting new PIN: %s\n" +msgstr "erreur pendant la lecture du numéro de série: %s\n" -#: g10/app-openpgp.c:1668 -#, fuzzy, c-format -msgid "error getting serial number: %s\n" -msgstr "erreur pendant la création du mot de passe: %s\n" +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "erreur pendant la lecture du bloc de clé : %s\n" -#: g10/app-openpgp.c:1763 -#, fuzzy, c-format -msgid "failed to store the key: %s\n" -msgstr "impossible d'initialiser la base de confiance: %s\n" +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1107 #, fuzzy -msgid "reading the key failed\n" -msgstr "la suppression du bloc de clés a échoué : %s\n" +msgid "key already exists\n" +msgstr "`%s' déjà compressé\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" msgstr "" -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "générer de nouvelles clés" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1831 +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "la lecture de la clé a échoué\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "La génération de clé a échoué: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "la réponse ne contient pas les données de clé publique\n" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "la réponse ne contient pas le modulo RSA\n" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 msgid "response does not contain the RSA public exponent\n" +msgstr "la réponse ne contient pas l'exposant public RSA\n" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" +#: g10/app-openpgp.c:1367 +#, c-format +msgid "PIN [sigs done: %lu]" +msgstr "PIN [sigs faites: %lu]" + +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 +#, c-format +msgid "can't access %s - invalid OpenPGP card?\n" +msgstr "impossible d'accéder à %s - carte OpenPGP invalide ?\n" + +#: g10/app-openpgp.c:1734 +#, c-format +msgid "error getting serial number: %s\n" +msgstr "erreur pendant la lecture du numéro de série: %s\n" + +#: g10/app-openpgp.c:1829 +#, c-format +msgid "failed to store the key: %s\n" +msgstr "le stockage de la clé a échoué: %s\n" + +#: g10/app-openpgp.c:1871 +msgid "reading the key failed\n" +msgstr "la lecture de la clé a échoué\n" + #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -242,18 +301,17 @@ msgstr "signatures en texte clair imbriquées\n" #: g10/armor.c:551 -#, fuzzy msgid "unexpected armor: " -msgstr "armure inattendue:" +msgstr "armure inattendue: " #: g10/armor.c:563 msgid "invalid dash escaped line: " msgstr "ligne échappée par `-' invalide: " #: g10/armor.c:715 g10/armor.c:1300 -#, fuzzy, c-format +#, c-format msgid "invalid radix64 character %02X skipped\n" -msgstr "caractère %02x invalide en base 64 ignoré\n" +msgstr "caractère %02X invalide en radix64 ignoré\n" #: g10/armor.c:758 msgid "premature eof (no CRC)\n" @@ -268,12 +326,11 @@ msgstr "CRC déformé\n" #: g10/armor.c:804 g10/armor.c:1337 -#, fuzzy, c-format +#, c-format msgid "CRC error; %06lX - %06lX\n" -msgstr "Erreur de CRC; %06lx - %06lx\n" +msgstr "Erreur de CRC; %06lX - %06lX\n" #: g10/armor.c:824 -#, fuzzy msgid "premature eof (in trailer)\n" msgstr "fin de fichier prématurée (dans la remorque)\n" @@ -298,400 +355,411 @@ "certainement d'un agent de transfert de messages bogué\n" #: g10/card-util.c:58 g10/card-util.c:282 -#, fuzzy, c-format +#, c-format msgid "OpenPGP card not available: %s\n" -msgstr "la clé secrète n'est pas disponible" +msgstr "la carte OpenPGP n'est pas disponible: %s\n" #: g10/card-util.c:63 #, c-format msgid "OpenPGP card no. %s detected\n" -msgstr "" +msgstr "carte OpenPGP n° %s détectée\n" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 -#, fuzzy +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "impossible de faire cela en mode automatique\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Votre choix ? " #: g10/card-util.c:194 g10/card-util.c:244 msgid "[not set]" -msgstr "" +msgstr "[non positionné]" -#: g10/card-util.c:376 -#, fuzzy +#: g10/card-util.c:378 msgid "male" -msgstr "activer" +msgstr "masculin" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "female" -msgstr "activer" +msgstr "féminin" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "unspecified" -msgstr "Aucune raison spécifiée" +msgstr "non spécifié" -#: g10/card-util.c:396 -#, fuzzy +#: g10/card-util.c:406 msgid "not forced" -msgstr "non traité" +msgstr "non forcé" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" -msgstr "" +msgstr "forcé" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" -msgstr "" +msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" -msgstr "" +msgstr "Erreur: Le caractère « < » ne peut pas être utilisé.\n" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" -msgstr "" +msgstr "Erreur: Les espaces doubles ne sont pas permis.\n" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " -msgstr "" +msgstr "Nom du déteneur de la carte: " -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " -msgstr "" +msgstr "Prénom du déteneur de la carte: " -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" -msgstr "" +msgstr "Erreur: Nom combiné trop long (la limite est %d caractères).\n" -#: g10/card-util.c:502 -#, fuzzy +#: g10/card-util.c:521 msgid "URL to retrieve public key: " -msgstr "pas de clé publique correspondante: %s\n" +msgstr "URL pour récupérer la clé publique: %s" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" -msgstr "" +msgstr "Erreur: URL trop long (la limite est %d caractères).\n" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "erreur pendant la lecture de `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " -msgstr "" +msgstr "Données d'identification (nom du compte): " -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" +"Erreur: Données d'indentification trop longues (la limite est\n" +"%d caractères).\n" -#: g10/card-util.c:641 -#, fuzzy +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, fuzzy, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "Erreur: URL trop long (la limite est %d caractères).\n" + +#: g10/card-util.c:729 msgid "Language preferences: " -msgstr "préférences mises à jour" +msgstr "Préférences de langue: " -#: g10/card-util.c:649 -#, fuzzy +#: g10/card-util.c:737 msgid "Error: invalid length of preference string.\n" -msgstr "Caractère invalide dans la chaîne de préférences\n" +msgstr "Erreur: longueur invalide de la chaîne de préférences.\n" -#: g10/card-util.c:658 -#, fuzzy +#: g10/card-util.c:746 msgid "Error: invalid characters in preference string.\n" -msgstr "Caractère invalide dans la chaîne de préférences\n" +msgstr "Erreur: caractères invalide dans la chaîne de préférences.\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " -msgstr "" +msgstr "Sexe ((M)asculin, (F)éminin ou espace): " -#: g10/card-util.c:693 -#, fuzzy +#: g10/card-util.c:781 msgid "Error: invalid response.\n" -msgstr "erreur: empreinte invalide\n" +msgstr "Erreur: réponse invalide.\n" -#: g10/card-util.c:714 -#, fuzzy +#: g10/card-util.c:802 msgid "CA fingerprint: " -msgstr "afficher l'empreinte" +msgstr "empreinte de l'autorité de certification: " -#: g10/card-util.c:737 -#, fuzzy +#: g10/card-util.c:825 msgid "Error: invalid formatted fingerprint.\n" -msgstr "erreur: empreinte invalide\n" +msgstr "Erreur: empreinte mal formatée.\n" -#: g10/card-util.c:785 -#, fuzzy, c-format +#: g10/card-util.c:873 +#, c-format msgid "key operation not possible: %s\n" -msgstr "La génération de clé a échoué: %s\n" +msgstr "l'opération sur la clé n'est pas possible: %s\n" -#: g10/card-util.c:786 -#, fuzzy +#: g10/card-util.c:874 msgid "not an OpenPGP card" -msgstr "aucune donnée OpenPGP valide n'a été trouvée.\n" +msgstr "ce n'est pas une carte OpenPGP" -#: g10/card-util.c:795 -#, fuzzy, c-format +#: g10/card-util.c:883 +#, c-format msgid "error getting current key info: %s\n" -msgstr "erreur durant l'écriture du porte-clés secret `%s': %s\n" +msgstr "" +"erreur durant la lecture des informations contenues actuellement\n" +"dans la clé: %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " -msgstr "" +msgstr "Remplacer la clé existante ? (o/N) " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " -msgstr "" +msgstr "Faire une sauvegarde hors carte de la clé de chiffrement ? (O/n) " -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " -msgstr "" +msgstr "Remplacer les clés existantes ? (o/N) " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" " PIN = `%s' Admin PIN = `%s'\n" "You should change them using the command --change-pin\n" msgstr "" +"Notez que les réglages d'usine des codes PIN sont\n" +" PIN = `%s' PIN admin = `%s'\n" +"Vous devriez les changer avec la commande --change-pin\n" -#: g10/card-util.c:968 -#, fuzzy +#: g10/card-util.c:1056 msgid "Please select the type of key to generate:\n" -msgstr "Sélectionnez le type de clé désiré:\n" +msgstr "Sélectionnez le type de clé à générer:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 -#, fuzzy +#: g10/card-util.c:1058 g10/card-util.c:1138 msgid " (1) Signature key\n" -msgstr "La signature a expiré le %s\n" +msgstr " (1) Clé de signature\n" -#: g10/card-util.c:971 g10/card-util.c:1052 -#, fuzzy +#: g10/card-util.c:1059 g10/card-util.c:1140 msgid " (2) Encryption key\n" -msgstr " (%d) RSA (chiffrement seul)\n" +msgstr " (2) Clé de chiffrement\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" -msgstr "" +msgstr " (3) Clé d'authentification\n" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Choix invalide.\n" -#: g10/card-util.c:1047 -#, fuzzy +#: g10/card-util.c:1135 msgid "Please select where to store the key:\n" -msgstr "choisissez la cause de la révocation:\n" +msgstr "Sélectionnez l'endroit où stocker la clé:\n" -#: g10/card-util.c:1082 -#, fuzzy +#: g10/card-util.c:1170 msgid "unknown key protection algorithm\n" -msgstr "algorithme de protection inconnu\n" +msgstr "algorithme de protection de clé inconnu\n" -#: g10/card-util.c:1087 -#, fuzzy +#: g10/card-util.c:1175 msgid "secret parts of key are not available\n" -msgstr "Les parties secrètes de la clé principale ne sont pas disponibles.\n" +msgstr "Les parties secrètes de la clé ne sont pas disponibles.\n" -#: g10/card-util.c:1092 -#, fuzzy +#: g10/card-util.c:1180 msgid "secret key already stored on a card\n" -msgstr "ignoré: clé secrète déjà présente\n" +msgstr "la clé secrète est déjà stockée sur une carte\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quitter" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "quitter ce menu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" -msgstr "" +msgstr "admin" -#: g10/card-util.c:1164 -#, fuzzy +#: g10/card-util.c:1252 msgid "show admin commands" -msgstr "commandes en conflit\n" +msgstr "indiquer les commandes d'administration" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "afficher cette aide" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "lister" -#: g10/card-util.c:1167 -#, fuzzy +#: g10/card-util.c:1255 msgid "list all available data" -msgstr "Clé disponible sur: " +msgstr "lister toutes les données disponibles" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "déboguer" -#: g10/card-util.c:1170 -#, fuzzy +#: g10/card-util.c:1258 msgid "name" -msgstr "activer" +msgstr "nom" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" -msgstr "" +msgstr "changer le nom du propriétaire de la carte" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" -msgstr "" +msgstr "url" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" -msgstr "" +msgstr "changer l'URL pour récupérer la clé" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" -msgstr "" +msgstr "chercher" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" -msgstr "" +msgstr "aller chercher la clé spécifiée dans l'URL de la carte" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "login" -msgstr "lsigner" +msgstr "identification" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "change the login name" -msgstr "changer la date d'expiration" +msgstr "changer le nom d'identification" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" -msgstr "" +msgstr "langue" -#: g10/card-util.c:1175 -#, fuzzy +#: g10/card-util.c:1263 msgid "change the language preferences" -msgstr "changer la confiance" +msgstr "changer les préférences de langue" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" -msgstr "" +msgstr "sexe" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" -msgstr "" +msgstr "changer le sexe du propriétaire de la carte" # g10/keyedit.c:556 ??? -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "cafpr" -msgstr "fpr" +msgstr "emprac" -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "change a CA fingerprint" -msgstr "afficher l'empreinte" +msgstr "changer l'empreinte d'une autorité de certification" -#: g10/card-util.c:1178 -#, fuzzy +#: g10/card-util.c:1266 msgid "forcesig" -msgstr "revsig" +msgstr "forcersig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" +"inverser le paramètre obligeant à rentrer le code PIN pour les\n" +"signatures" -#: g10/card-util.c:1180 -#, fuzzy +#: g10/card-util.c:1268 msgid "generate" -msgstr "erreur générale" +msgstr "générer" -#: g10/card-util.c:1181 -#, fuzzy +#: g10/card-util.c:1269 msgid "generate new keys" -msgstr "générer une nouvelle paire de clés" +msgstr "générer de nouvelles clés" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "mot.pas" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" +msgstr "menu pour changer ou déverrouiller le PIN" + +#: g10/card-util.c:1272 +msgid "privatedo" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Commande> " -#: g10/card-util.c:1281 -#, fuzzy +#: g10/card-util.c:1371 msgid "Admin-only command\n" -msgstr "commandes en conflit\n" +msgstr "La commande n'est utilisable qu'en mode administration\n" -#: g10/card-util.c:1297 -#, fuzzy +#: g10/card-util.c:1387 msgid "Admin commands are allowed\n" -msgstr "commandes en conflit\n" +msgstr "Les commandes d'administration sont permises\n" -#: g10/card-util.c:1299 -#, fuzzy +#: g10/card-util.c:1389 msgid "Admin commands are not allowed\n" -msgstr "écriture de la clé secrète vers `%s'\n" +msgstr "Les commandes d'administration ne sont pas permises\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez «help»)\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " -msgstr "" +msgstr "Insérez la carte et tapez entrée ou entrez 'c' pour annuler: " -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" +"Supprimez la carte présente et insérez celle portant le numéro de\n" +"série:\n" +" %.*s\n" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " -msgstr "" +msgstr "Tapez entrée quand vous êtes prêt ou entrez 'c' pour annuler: " + +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Entrez le code PIN admin: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Entrez le code PIN: " -#: g10/cardglue.c:638 +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " -msgstr "" +msgstr "Entrez le code PIN admin: " -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " -msgstr "" +msgstr "Entrez le code PIN: " + +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Répétez le mot de passe: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "le mot de passe n'a pas été correctement répété ; recommencez." -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -701,13 +769,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output n'est pas compatible avec cette commande\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found: %s\n" -msgstr "clé '%s' introuvable: %s\n" +msgstr "clé « %s » introuvable: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -718,19 +786,16 @@ msgstr "(à moins de spécifier la clé par son empreinte)\n" #: g10/delkey.c:127 -#, fuzzy msgid "can't do this in batch mode without \"--yes\"\n" -msgstr "impossible de faire cela en mode automatique sans «--yes»\n" +msgstr "impossible de faire cela en mode automatique sans « --yes »\n" #: g10/delkey.c:139 -#, fuzzy msgid "Delete this key from the keyring? (y/N) " -msgstr "Enlever cette clé du porte-clés ? " +msgstr "Enlever cette clé du porte-clés ? (o/N) " #: g10/delkey.c:147 -#, fuzzy msgid "This is a secret key! - really delete? (y/N) " -msgstr "C'est une clé secrète - faut-il vraiment l'effacer ? " +msgstr "C'est une clé secrète ! - faut-il vraiment l'effacer ? (o/N) " #: g10/delkey.c:157 #, c-format @@ -750,7 +815,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "utiliser l'option «--delete-secret-keys» pour l'effacer d'abord.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "erreur pendant la création du mot de passe: %s\n" @@ -770,7 +835,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' déjà compressé\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVERTISSEMENT: `%s' est un fichier vide\n" @@ -794,28 +859,28 @@ "lesquelles vous chiffrez.\n" #: g10/encode.c:540 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -"forcer le chiffrement symétrique %s (%d) entre en désaccord\n" -"avec les préferences du récipient\n" +"AVERTISSEMENT: forcer le chiffrement symétrique %s (%d) entre\n" +"en désaccord avec les préférences du destinataire\n" -#: g10/encode.c:648 g10/sign.c:876 -#, fuzzy, c-format +#: g10/encode.c:648 g10/sign.c:877 +#, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " "preferences\n" msgstr "" -"forcer l'algorithme de compression %s (%d) entre en désaccord\n" -"avec les préférences du récipient\n" +"AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n" +"en désaccord avec les préférences du destinataire\n" #: g10/encode.c:735 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" "forcer le chiffrement symétrique %s (%d) entre en désaccord\n" -"avec les préferences du récipient\n" +"avec les préferences du destinataire\n" #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757 #, c-format @@ -865,21 +930,20 @@ "du fichier d'options sont trop peu sûres\n" #: g10/exec.c:355 -#, fuzzy msgid "this platform requires temporary files when calling external programs\n" msgstr "" "cette plateforme a besoin de fichiers temporaires pour appeler des\n" "programmes externes\n" #: g10/exec.c:433 -#, fuzzy, c-format +#, c-format msgid "unable to execute program `%s': %s\n" -msgstr "impossible d'exécuter %s « %s »: %s\n" +msgstr "impossible d'exécuter le programme `%s': %s\n" #: g10/exec.c:436 -#, fuzzy, c-format +#, c-format msgid "unable to execute shell `%s': %s\n" -msgstr "impossible d'exécuter %s « %s »: %s\n" +msgstr "impossible d'exécuter l'intérpréteur de commandes `%s': %s\n" #: g10/exec.c:521 #, c-format @@ -913,29 +977,28 @@ "AVERTISSEMENT: impossible d'effacer le répertoire temporaire `%s':\n" "%s\n" -#: g10/export.c:176 -#, fuzzy +#: g10/export.c:182 msgid "exporting secret keys not allowed\n" -msgstr "écriture de la clé secrète vers `%s'\n" +msgstr "il est interdit d'exporter les clé secrètes\n" -#: g10/export.c:206 -#, fuzzy, c-format +#: g10/export.c:211 +#, c-format msgid "key %s: not protected - skipped\n" -msgstr "clé %08lX: non protégée - ignorée\n" +msgstr "clé %s: non protégée - ignorée\n" -#: g10/export.c:214 -#, fuzzy, c-format +#: g10/export.c:219 +#, c-format msgid "key %s: PGP 2.x style key - skipped\n" -msgstr "clé %08lX: clé de style PGP 2.x - ignorée\n" +msgstr "clé %s: clé de style PGP 2.x - ignorée\n" -#: g10/export.c:361 -#, fuzzy, c-format +#: g10/export.c:384 +#, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" -"AVERTISSEMENT: la clé secrète %08lX n'a pas de somme de contrôle SK\n" +"AVERTISSEMENT: la clé secrète %s n'a pas de somme de contrôle SK\n" "simple\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "ATTENTION: rien n'a été exporté\n" @@ -984,9 +1047,8 @@ msgstr "lister les clés et les signatures" #: g10/g10.c:374 -#, fuzzy msgid "list and check key signatures" -msgstr "vérifier les signatures des clés" +msgstr "lister et vérifier les signatures des clés" #: g10/g10.c:375 msgid "list keys and fingerprints" @@ -1050,15 +1112,15 @@ #: g10/g10.c:400 msgid "print the card status" -msgstr "" +msgstr "afficher l'état de la carte" #: g10/g10.c:401 msgid "change data on a card" -msgstr "" +msgstr "changer les données d'une carte" #: g10/g10.c:402 msgid "change a card's PIN" -msgstr "" +msgstr "changer le code PIN d'une carte" #: g10/g10.c:410 msgid "update the trust database" @@ -1114,15 +1176,15 @@ msgid "prompt before overwriting" msgstr "demander avant d'écraser un fichier" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" -msgstr "" +msgstr "utiliser strictement le comportement OpenPGP" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" -msgstr "" +msgstr "générer des messages compatibles avec PGP 2.x" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1130,7 +1192,7 @@ "@\n" "(Voir la page de manuel pour une liste complète des commandes et options)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1150,17 +1212,17 @@ " --list-keys [utilisateur] montrer les clés\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "Signaler toutes anomalies à (en anglais)\n" "et tout problème de traduction à .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1170,7 +1232,7 @@ "signer, vérifier, chiffrer ou déchiffrer\n" "l'opération par défaut dépend des données entrées\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1178,486 +1240,494 @@ "\n" "Algorithmes supportés:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Clé publique: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Chiffrement: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hachage: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Compression: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:982 -#, fuzzy, c-format +#: g10/g10.c:1017 +#, c-format msgid "no = sign found in group definition `%s'\n" -msgstr "no = signature trouvée dans la définition du groupe \"%s\"\n" +msgstr "aucun signe = trouvé dans la définition du groupe `%s'\n" -#: g10/g10.c:1179 -#, fuzzy, c-format +#: g10/g10.c:1214 +#, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" -msgstr "AVERTISSEMENT: propriétaire de %s \"%s\" peu sûr\n" +msgstr "" +"AVERTISSEMENT: le propriétaire du répertoire personnel `%s' est\n" +"peu sûr\n" -#: g10/g10.c:1182 -#, fuzzy, c-format +#: g10/g10.c:1217 +#, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" -msgstr "AVERTISSEMENT: propriétaire de %s \"%s\" peu sûr\n" +msgstr "" +"AVERTISSEMENT: le propriétaire du fichier de configuration `%s'\n" +"est peu sûr\n" -#: g10/g10.c:1185 -#, fuzzy, c-format +#: g10/g10.c:1220 +#, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" -msgstr "AVERTISSEMENT: propriétaire de %s \"%s\" peu sûr\n" +msgstr "" +"AVERTISSEMENT: le propriétaire de l'extension `%s' est peu\n" +"sûr\n" -#: g10/g10.c:1191 -#, fuzzy, c-format +#: g10/g10.c:1226 +#, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" -msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu sûres\n" +msgstr "" +"AVERTISSEMENT: les permissions du répertoire personnel `%s'\n" +"sont peu sûres\n" -#: g10/g10.c:1194 -#, fuzzy, c-format +#: g10/g10.c:1229 +#, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" -msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu sûres\n" +msgstr "" +"AVERTISSEMENT: les permissions du fichier de configuration\n" +"`%s' sont peu sûres\n" -#: g10/g10.c:1197 -#, fuzzy, c-format +#: g10/g10.c:1232 +#, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" -msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu sûres\n" +msgstr "" +"AVERTISSEMENT: les permissions de l'extension `%s' sont\n" +"peu sûres\n" -#: g10/g10.c:1203 -#, fuzzy, c-format +#: g10/g10.c:1238 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" "AVERTISSEMENT: le propriétaire du répertoire contenant est peu\n" -"sûr pour %s \"%s\"\n" +"sûr pour le répertoire personnel `%s'\n" -#: g10/g10.c:1206 -#, fuzzy, c-format +#: g10/g10.c:1241 +#, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "" "AVERTISSEMENT: le propriétaire du répertoire contenant est peu\n" -"sûr pour %s \"%s\"\n" +"sûr pour le fichier de configuration `%s'\n" -#: g10/g10.c:1209 -#, fuzzy, c-format +#: g10/g10.c:1244 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" "AVERTISSEMENT: le propriétaire du répertoire contenant est peu\n" -"sûr pour %s \"%s\"\n" +"sûr pour l'extension `%s'\n" -#: g10/g10.c:1215 -#, fuzzy, c-format +#: g10/g10.c:1250 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" -"AVERTISSEMENT: les permissions du répertoire contenant %s \"%s\"\n" -"sont peu sûres\n" +"AVERTISSEMENT: les permissions du répertoire contenant le\n" +"répertoire personnel `%s' sont peu sûres\n" -#: g10/g10.c:1218 -#, fuzzy, c-format +#: g10/g10.c:1253 +#, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "" -"AVERTISSEMENT: les permissions du répertoire contenant %s \"%s\"\n" -"sont peu sûres\n" +"AVERTISSEMENT: les permissions du répertoire contenant le\n" +"fichier de configuration `%s' sont peu sûres\n" -#: g10/g10.c:1221 -#, fuzzy, c-format +#: g10/g10.c:1256 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" -"AVERTISSEMENT: les permissions du répertoire contenant %s \"%s\"\n" -"sont peu sûres\n" +"AVERTISSEMENT: les permissions du répertoire contenant\n" +"l'extension `%s' sont peu sûres\n" -#: g10/g10.c:1362 -#, fuzzy, c-format +#: g10/g10.c:1397 +#, c-format msgid "unknown configuration item `%s'\n" -msgstr "élément de configuration \"%s\" inconnu\n" +msgstr "élément de configuration `%s' inconnu\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTE: l'ancien fichier d'options par défaut `%s' a été ignoré\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: pas de fichier d'options par défaut `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s n'est pas pour une utilisation normale !\n" -#: g10/g10.c:2048 -#, fuzzy, c-format +#: g10/g10.c:2079 +#, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -"l'extension de chiffrement \"%s\" n'a pas été chargée car ses\n" +"l'extension de chiffrement `%s' n'a pas été chargée car ses\n" "permissions sont peu sûres\n" -#: g10/g10.c:2260 -#, fuzzy, c-format +#: g10/g10.c:2293 +#, c-format msgid "`%s' is not a valid character set\n" -msgstr "%s n'est pas une table de caractères valide\n" +msgstr "`%s' n'est pas un jeu de caractères valide\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 -#, fuzzy +#: g10/g10.c:2312 g10/keyedit.c:3434 msgid "could not parse keyserver URL\n" -msgstr "impossible d'interpréter l'URI du serveur de clés\n" +msgstr "impossible d'interpréter l'URL du serveur de clés\n" -#: g10/g10.c:2285 -#, fuzzy, c-format +#: g10/g10.c:2318 +#, c-format msgid "%s:%d: invalid keyserver options\n" -msgstr "%s:%d: options d'export invalides\n" +msgstr "%s:%d: les options du serveur de clés sont invalides\n" -#: g10/g10.c:2288 -#, fuzzy +#: g10/g10.c:2321 msgid "invalid keyserver options\n" -msgstr "options d'export invalides\n" +msgstr "les options du serveur de clés sont invalides\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: options d'import invalides\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "options d'import invalides\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: options d'export invalides\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "options d'export invalides\n" -#: g10/g10.c:2315 -#, fuzzy, c-format +#: g10/g10.c:2348 +#, c-format msgid "%s:%d: invalid list options\n" -msgstr "%s:%d: options d'import invalides\n" +msgstr "%s:%d: options de liste invalides\n" -#: g10/g10.c:2318 -#, fuzzy +#: g10/g10.c:2351 msgid "invalid list options\n" -msgstr "options d'import invalides\n" +msgstr "options de liste invalides\n" -#: g10/g10.c:2340 -#, fuzzy, c-format +#: g10/g10.c:2373 +#, c-format msgid "%s:%d: invalid verify options\n" -msgstr "%s:%d: options d'export invalides\n" +msgstr "%s:%d: options de vérification invalides\n" -#: g10/g10.c:2343 -#, fuzzy +#: g10/g10.c:2376 msgid "invalid verify options\n" -msgstr "options d'export invalides\n" +msgstr "options de vérification invalides\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossible de mettre le chemin d'exécution à %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENTION: %s remplace %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n'est pas permis avec %s !\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n'a aucun sens avec %s !\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "il n'est possible de faire une signature détachée ou en texte clair\n" "qu'en mode --pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "vous ne pouvez pas signer et chiffrer en même temps en mode --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n" "est activé.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "chiffrer un message en mode --pgp2 nécessite l'algorithme de chiffrage IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:2684 -#, fuzzy +#: g10/g10.c:2717 msgid "selected compression algorithm is invalid\n" -msgstr "l'algorithme de chiffrement sélectionné est invalide\n" +msgstr "l'algorithme de compression sélectionné est invalide\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "la fonction de hachage de certification sélectionnée est invalide\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "«completes-needed» doit être supérieur à 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "«marginals-needed» doit être supérieur à 1\n" -#: g10/g10.c:2709 -#, fuzzy +#: g10/g10.c:2742 msgid "max-cert-depth must be in the range from 1 to 255\n" -msgstr "«max-cert-depth» doit être compris entre 1 et 255\n" +msgstr "max-cert-depth doit être compris entre 1 et 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalide; doit être 0, 1, 2 ou 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalide; doit être 0, 1, 2 ou 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide; ce doit être 0, 1 ou 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "préférences par défaut invalides\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "préférences de chiffrement personnelles invalides\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "préférences de hachage personnelles invalides\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "préférences de compression personnelles invalides\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne marche pas encore avec %s\n" -#: g10/g10.c:2824 -#, fuzzy, c-format +#: g10/g10.c:2857 +#, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -"vous ne pouvez pas utiliser l'algorithme de chiffrement \"%s\"\n" +"vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n" "en mode %s.\n" -#: g10/g10.c:2829 -#, fuzzy, c-format +#: g10/g10.c:2862 +#, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -"vous ne pouvez pas utiliser l'algorithme de hachage \"%s\"\n" +"vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n" "en mode %s.\n" -#: g10/g10.c:2834 -#, fuzzy, c-format +#: g10/g10.c:2867 +#, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" -"vous ne pouvez pas utiliser l'algorithme de compression \"%s\"\n" +"vous ne pouvez pas utiliser l'algorithme de compression `%s'\n" "en mode %s.\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "impossible d'initialiser la base de confiance: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -"AVERTISSEMENT: des récipients (-r) ont donnés alors que le chiffrement\n" -"ne se fait pas par clé publique\n" +"AVERTISSEMENT: des destinataires (-r) ont été donnés alors que le\n" +"chiffrement ne se fait pas par clé publique\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:2961 -#, fuzzy, c-format +#: g10/g10.c:2994 +#, c-format msgid "symmetric encryption of `%s' failed: %s\n" -msgstr "le déchiffrement a échoué: %s\n" +msgstr "le chiffrement symétrique de `%s' a échoué: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:2984 -#, fuzzy +#: g10/g10.c:3017 msgid "--symmetric --encrypt [filename]" -msgstr "--sign --encrypt [nom du fichier]" +msgstr "--symmetric --encrypt [nom du fichier]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" -msgstr "" +msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n" -#: g10/g10.c:2989 -#, fuzzy, c-format +#: g10/g10.c:3022 +#, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" -msgstr "vous ne pouvez pas utiliser %s en mode %s.\n" +msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:3035 -#, fuzzy +#: g10/g10.c:3068 msgid "--symmetric --sign --encrypt [filename]" -msgstr "--sign --encrypt [nom du fichier]" +msgstr "--symmetric --sign --encrypt [nom du fichier]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" +"Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n" +"--s2k-mode 0\n" -#: g10/g10.c:3040 -#, fuzzy, c-format +#: g10/g10.c:3073 +#, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" -msgstr "vous ne pouvez pas utiliser %s en mode %s.\n" +msgstr "" +"vous ne pouvez pas utiliser --symmetric --sign --encrypt\n" +"en mode %s.\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom du fichier]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key utilisateur" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key utilisateur" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key utilisateur" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key utilisateur" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'envoi vers le serveur de clés a échoué: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la réception depuis le serveur de clés a échoué: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "l'export de la clé a échoué: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "la recherche au sein du serveur de clés a échoué: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "le rafraîchissement par le serveur de clés a échoué: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "la suppression d'une armure a échoué: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "la construction d'une armure a échoué: %s \n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Vous pouvez taper votre message...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1665,58 +1735,57 @@ "le nom d'une notation ne doit comporter que des caractères imprimables\n" "ou des espaces, et se terminer par un signe '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notation utilisateur doit contenir le caractère '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "l'URL de politique de certification donnée est invalide\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "l'URL de politique de signature donnée est invalide\n" -#: g10/g10.c:3911 -#, fuzzy +#: g10/g10.c:3944 msgid "the given preferred keyserver URL is invalid\n" -msgstr "l'URL de politique de signature donnée est invalide\n" +msgstr "l'URL du serveur de clés favori qui a été donnée est invalide\n" #: g10/getkey.c:150 msgid "too many entries in pk cache - disabled\n" msgstr "trop d'entrées dans le cache pk - désactivé\n" -#: g10/getkey.c:186 g10/getkey.c:2691 -#, fuzzy +#: g10/getkey.c:186 g10/getkey.c:2711 msgid "[User ID not found]" msgstr "[Nom utilisateur introuvable]" -#: g10/getkey.c:1614 -#, fuzzy, c-format +#: g10/getkey.c:1639 +#, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -"La clé invalide %08lX a été rendue valide par --allow-non-selfsigned-uid\n" +"La clé invalide %s a été rendue valide par\n" +"--allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 -#, fuzzy, c-format +#: g10/getkey.c:2189 +#, c-format msgid "no secret subkey for public subkey %s - ignoring\n" -msgstr "pas de sous-clé secrète pour la clé publique %08lX - ignorée\n" +msgstr "pas de sous-clé secrète pour la clé publique %s - ignorée\n" -#: g10/getkey.c:2400 -#, fuzzy, c-format +#: g10/getkey.c:2420 +#, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "" -"utilisation de la clé secondaire %08lX à la place de la clé\n" -"principale %08lX\n" +"utilisation de la clé secondaire %s à la place de la clé\n" +"principale %s\n" -#: g10/getkey.c:2447 -#, fuzzy, c-format +#: g10/getkey.c:2467 +#, c-format msgid "key %s: secret key without public key - skipped\n" -msgstr "clé %08lX: clé secrète sans clé publique - non prise en compte\n" +msgstr "clé %s: clé secrète sans clé publique - non prise en compte\n" #: g10/gpgv.c:68 msgid "be somewhat more quiet" @@ -1795,6 +1864,17 @@ "\n" "The first (primary) key must always be a key which is capable of signing." msgstr "" +"Sélectionnez l'algorithme à utiliser.\n" +"\n" +"DSA (connu également sous le nom de DSS) est un algorithme de signature\n" +"digitale et ne peut être utilisé que pour des signatures.\n" +"\n" +"Elgamal est un algorithme pour le chiffrement seul.\n" +"\n" +"RSA peut être utilisé pour les signatures et le chiffrement.\n" +"\n" +"La première clé (clé principale) doit toujours être une clé capable\n" +"de signer." #: g10/helptext.c:83 msgid "" @@ -1926,7 +2006,6 @@ "Si vous ne savez pas quelle réponse est la bonne, répondez \"0\"." #: g10/helptext.c:185 -#, fuzzy msgid "Answer \"yes\" if you want to sign ALL the user IDs" msgstr "Répondez «oui» si vous voulez signer TOUS les noms d'utilisateurs" @@ -2070,387 +2149,389 @@ msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "un bloc de type %d a été ignoré\n" -#: g10/import.c:256 -#, fuzzy, c-format +#: g10/import.c:258 +#, c-format msgid "%lu keys processed so far\n" msgstr "%lu clés traitées jusqu'ici\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr " Quantité totale traitée: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " nouvelles clés ignorées: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sans nom d'utilisateur: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importée: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " inchangée: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nouveaux noms d'utilisateurs: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nouvelles sous-clés: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nouvelles signatures: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " nouvelles révocations de clés: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " clés secrètes lues: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " clés secrètes importées: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " clés secrètes inchangées: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " non importée: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" -msgstr "" +msgstr "AVERTISSEMENT: la clé %s contient des préferences pour des\n" -#: g10/import.c:545 -#, fuzzy +#: g10/import.c:547 msgid "algorithms on these user IDs:\n" -msgstr "Vous avez signé ces noms d'utilisateurs:\n" +msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" -msgstr "" +msgstr " « %s »: préférence pour l'algorithme de chiffrement %s\n" -#: g10/import.c:594 -#, fuzzy, c-format +#: g10/import.c:596 +#, c-format msgid " \"%s\": preference for digest algorithm %s\n" -msgstr "signature %s, algorithme de hachage %s\n" +msgstr " « %s »: préférence pour l'algorithme de hachage %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" -msgstr "" +msgstr " « %s »: préférence pour l'algorithme de compression %s\n" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" -msgstr "" +msgstr "il est fortement suggéré de mettre à jour vos préférences et\n" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" +"redistribuer cette clé pour éviter les problèmes potentiels qui seraient\n" +"causés par des algorithmes non appropriés\n" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" +"vous pouvez mettre à jour vos préférences avec: \n" +"gpg --edit-key %s updpref save\n" -#: g10/import.c:693 g10/import.c:1047 -#, fuzzy, c-format +#: g10/import.c:695 g10/import.c:1049 +#, c-format msgid "key %s: no user ID\n" -msgstr "clé %08lX: pas de nom d'utilisateur\n" +msgstr "clé %s: pas de nom d'utilisateur\n" -#: g10/import.c:713 -#, fuzzy, c-format +#: g10/import.c:715 +#, c-format msgid "key %s: PKS subkey corruption repaired\n" -msgstr "clé %08lX: corruption de sous-clé HKP réparée\n" +msgstr "clé %s: corruption de sous-clé PKS réparée\n" -#: g10/import.c:728 -#, fuzzy, c-format +#: g10/import.c:730 +#, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" -msgstr "clé %08lX: nom d'utilisateur non auto-signé accepté '%s':\n" +msgstr "clé %s: nom d'utilisateur non auto-signé accepté « %s »\n" -#: g10/import.c:734 -#, fuzzy, c-format +#: g10/import.c:736 +#, c-format msgid "key %s: no valid user IDs\n" -msgstr "clé %08lX: pas de nom d'utilisateur valide\n" +msgstr "clé %s: pas de nom d'utilisateur valide\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "cela peut provenir d'une auto-signature manquante\n" -#: g10/import.c:746 g10/import.c:1168 -#, fuzzy, c-format +#: g10/import.c:748 g10/import.c:1170 +#, c-format msgid "key %s: public key not found: %s\n" -msgstr "clé %08lX: clé publique pas trouvée: %s\n" +msgstr "clé %s: clé publique non trouvée: %s\n" -#: g10/import.c:752 -#, fuzzy, c-format +#: g10/import.c:754 +#, c-format msgid "key %s: new key - skipped\n" -msgstr "clé %08lX: nouvelle clé - ignorée\n" +msgstr "clé %s: nouvelle clé - ignorée\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "aucun porte-clé n'a été trouvé avec des droits d'écriture : %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "écriture de `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erreur durant l'écriture du porte-clés `%s': %s\n" -#: g10/import.c:791 -#, fuzzy, c-format +#: g10/import.c:793 +#, c-format msgid "key %s: public key \"%s\" imported\n" -msgstr "clé %08lX: clé publique \"%s\" importée\n" +msgstr "clé %s: clé publique « %s » importée\n" -#: g10/import.c:815 -#, fuzzy, c-format +#: g10/import.c:817 +#, c-format msgid "key %s: doesn't match our copy\n" -msgstr "clé %08lX: ne ressemble pas à notre copie\n" +msgstr "clé %s: ne ressemble pas à notre copie\n" -#: g10/import.c:832 g10/import.c:1186 -#, fuzzy, c-format +#: g10/import.c:834 g10/import.c:1188 +#, c-format msgid "key %s: can't locate original keyblock: %s\n" -msgstr "clé %08lX: impossible de trouver le bloc de clés original: %s\n" +msgstr "clé %s: impossible de trouver le bloc de clés original: %s\n" -#: g10/import.c:840 g10/import.c:1193 -#, fuzzy, c-format +#: g10/import.c:842 g10/import.c:1195 +#, c-format msgid "key %s: can't read original keyblock: %s\n" -msgstr "clé %08lX: impossible de lire le bloc de clés original: %s\n" +msgstr "clé %s: impossible de lire le bloc de clés original: %s\n" -#: g10/import.c:872 -#, fuzzy, c-format +#: g10/import.c:874 +#, c-format msgid "key %s: \"%s\" 1 new user ID\n" -msgstr "clé %08lX: \"%s\" un nouvel utilisateur\n" +msgstr "clé %s: « %s » un nouvel utilisateur\n" -#: g10/import.c:875 -#, fuzzy, c-format +#: g10/import.c:877 +#, c-format msgid "key %s: \"%s\" %d new user IDs\n" -msgstr "clé %08lX: \"%s\" %d nouveaux utilisateurs\n" +msgstr "clé %s: « %s » %d nouveaux utilisateurs\n" -#: g10/import.c:878 -#, fuzzy, c-format +#: g10/import.c:880 +#, c-format msgid "key %s: \"%s\" 1 new signature\n" -msgstr "clé %08lX: \"%s\" une nouvelle signature\n" +msgstr "clé %s: « %s » une nouvelle signature\n" -#: g10/import.c:881 -#, fuzzy, c-format +#: g10/import.c:883 +#, c-format msgid "key %s: \"%s\" %d new signatures\n" -msgstr "clé %08lX: \"%s\" %d nouvelles signatures\n" +msgstr "clé %s: « %s » %d nouvelles signatures\n" -#: g10/import.c:884 -#, fuzzy, c-format +#: g10/import.c:886 +#, c-format msgid "key %s: \"%s\" 1 new subkey\n" -msgstr "clé %08lX: \"%s\" une nouvelle sous-clé\n" +msgstr "clé %s: « %s » une nouvelle sous-clé\n" -#: g10/import.c:887 -#, fuzzy, c-format +#: g10/import.c:889 +#, c-format msgid "key %s: \"%s\" %d new subkeys\n" -msgstr "clé %08lX: \"%s\" %d nouvelles sous-clés\n" +msgstr "clé %s: « %s » %d nouvelles sous-clés\n" -#: g10/import.c:908 -#, fuzzy, c-format +#: g10/import.c:910 +#, c-format msgid "key %s: \"%s\" not changed\n" -msgstr "clé %08lX: \"%s\" n'a pas changé\n" +msgstr "clé %s: « %s » n'a pas changé\n" -#: g10/import.c:1053 -#, fuzzy, c-format +#: g10/import.c:1055 +#, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "" -"clé %08lX: clé secrète avec le chiffrement invalide %d - non prise\n" +"clé %s: clé secrète avec le chiffrement invalide %d - non prise\n" "en compte\n" -#: g10/import.c:1064 -#, fuzzy +#: g10/import.c:1066 msgid "importing secret keys not allowed\n" -msgstr "écriture de la clé secrète vers `%s'\n" +msgstr "il est interdit d'importer les clé secrètes\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "pas de porte-clés par défaut: %s\n" -#: g10/import.c:1092 -#, fuzzy, c-format +#: g10/import.c:1094 +#, c-format msgid "key %s: secret key imported\n" -msgstr "clé %08lX: clé secrète importée\n" +msgstr "clé %s: clé secrète importée\n" -#: g10/import.c:1121 -#, fuzzy, c-format +#: g10/import.c:1123 +#, c-format msgid "key %s: already in secret keyring\n" -msgstr "clé %08lX: déjà dans le porte-clés secret\n" +msgstr "clé %s: déjà dans le porte-clés secret\n" -#: g10/import.c:1131 -#, fuzzy, c-format +#: g10/import.c:1133 +#, c-format msgid "key %s: secret key not found: %s\n" -msgstr "clé %08lX: clé secrète pas trouvée: %s\n" +msgstr "clé %s: clé secrète non trouvée: %s\n" -#: g10/import.c:1161 -#, fuzzy, c-format +#: g10/import.c:1163 +#, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" -"clé %08lX: pas de clé publique - le certificat de révocation ne peut\n" +"clé %s: pas de clé publique - le certificat de révocation ne peut\n" "être appliqué\n" -#: g10/import.c:1204 -#, fuzzy, c-format +#: g10/import.c:1206 +#, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" -msgstr "clé %08lX: certificat de révocation invalide: %s - rejeté\n" +msgstr "clé %s: certificat de révocation invalide: %s - rejeté\n" -#: g10/import.c:1236 -#, fuzzy, c-format +#: g10/import.c:1238 +#, c-format msgid "key %s: \"%s\" revocation certificate imported\n" -msgstr "clé %08lX: \"%s\" certificat de révocation importé\n" +msgstr "clé %s: « %s » certificat de révocation importé\n" -#: g10/import.c:1301 -#, fuzzy, c-format +#: g10/import.c:1303 +#, c-format msgid "key %s: no user ID for signature\n" -msgstr "clé %08lX: pas d'utilisateur pour la signature\n" +msgstr "clé %s: pas de nom d'utilisateur pour la signature\n" -#: g10/import.c:1316 -#, fuzzy, c-format +#: g10/import.c:1318 +#, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" -"clé %08lX: algorithme de clé publique non supporté avec le nom\n" -"d'utilisateur \"%s\"\n" +"clé %s: algorithme de clé publique non supporté avec le nom\n" +"d'utilisateur « %s »\n" -#: g10/import.c:1318 -#, fuzzy, c-format +#: g10/import.c:1320 +#, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" -msgstr "clé %08lX: auto-signature du nom d'utilisateur \"%s\" invalide\n" +msgstr "clé %s: auto-signature du nom d'utilisateur « %s » invalide\n" -#: g10/import.c:1336 -#, fuzzy, c-format +#: g10/import.c:1338 +#, c-format msgid "key %s: no subkey for key binding\n" -msgstr "clé %08lX: pas de sous-clé pour relier la clé\n" +msgstr "clé %s: pas de sous-clé pour relier la clé\n" -#: g10/import.c:1347 g10/import.c:1397 -#, fuzzy, c-format +#: g10/import.c:1349 g10/import.c:1399 +#, c-format msgid "key %s: unsupported public key algorithm\n" -msgstr "clé %08lX: algorithme de clé publique non supporté\n" +msgstr "clé %s: algorithme de clé publique non supporté\n" -#: g10/import.c:1349 -#, fuzzy, c-format +#: g10/import.c:1351 +#, c-format msgid "key %s: invalid subkey binding\n" -msgstr "clé %08lX: liaison avec la sous-clé invalide\n" +msgstr "clé %s: liaison avec la sous-clé invalide\n" -#: g10/import.c:1364 -#, fuzzy, c-format +#: g10/import.c:1366 +#, c-format msgid "key %s: removed multiple subkey binding\n" -msgstr "clé %08lX: supressions de liaisons multiples avec des sous-clés\n" +msgstr "clé %s: supression de liaisons multiples avec des sous-clés\n" -#: g10/import.c:1386 -#, fuzzy, c-format +#: g10/import.c:1388 +#, c-format msgid "key %s: no subkey for key revocation\n" -msgstr "clé %08lX: pas de sous-clé pour révoquer la clé\n" +msgstr "clé %s: pas de sous-clé pour révoquer la clé\n" -#: g10/import.c:1399 -#, fuzzy, c-format +#: g10/import.c:1401 +#, c-format msgid "key %s: invalid subkey revocation\n" -msgstr "clé %08lX: révocation de sous-clé invalide\n" +msgstr "clé %s: révocation de sous-clé invalide\n" -#: g10/import.c:1414 -#, fuzzy, c-format +#: g10/import.c:1416 +#, c-format msgid "key %s: removed multiple subkey revocation\n" -msgstr "clé %08lX: suppression de la révocation de sous-clé multiples\n" +msgstr "clé %s: suppression de la révocation de sous-clés multiples\n" -#: g10/import.c:1456 -#, fuzzy, c-format +#: g10/import.c:1458 +#, c-format msgid "key %s: skipped user ID \"%s\"\n" -msgstr "clé %08lX: utilisateur non pris en compte: '" +msgstr "clé %s: nom d'utilisateur « %s » non pris en compte\n" -#: g10/import.c:1477 -#, fuzzy, c-format +#: g10/import.c:1479 +#, c-format msgid "key %s: skipped subkey\n" -msgstr "clé %08lX: sous-clé non prise en compte\n" +msgstr "clé %s: sous-clé non prise en compte\n" -#: g10/import.c:1504 -#, fuzzy, c-format +#: g10/import.c:1506 +#, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" -msgstr "clé %08lX: signature non exportable (classe %02x) - ignorée\n" +msgstr "clé %s: signature non exportable (classe 0x%02X) - ignorée\n" -#: g10/import.c:1514 -#, fuzzy, c-format +#: g10/import.c:1516 +#, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" -msgstr "clé %08lX: certificat de révocation au mauvais endroit - ignorée\n" +msgstr "clé %s: certificat de révocation au mauvais endroit - ignorée\n" -#: g10/import.c:1531 -#, fuzzy, c-format +#: g10/import.c:1533 +#, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" -msgstr "clé %08lX: certificat de révocation invalide: %s - ignorée\n" +msgstr "clé %s: certificat de révocation invalide: %s - ignorée\n" -#: g10/import.c:1545 -#, fuzzy, c-format +#: g10/import.c:1547 +#, c-format msgid "key %s: subkey signature in wrong place - skipped\n" -msgstr "clé %08lX: signature de sous-clé au mauvais endroit - ignorée\n" +msgstr "clé %s: signature de sous-clé au mauvais endroit - ignorée\n" -#: g10/import.c:1553 -#, fuzzy, c-format +#: g10/import.c:1555 +#, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" -msgstr "clé %08lX: classe de signature non attendue (0x%02X) - ignorée\n" +msgstr "clé %s: classe de signature non attendue (0x%02X) - ignorée\n" -#: g10/import.c:1653 -#, fuzzy, c-format +#: g10/import.c:1655 +#, c-format msgid "key %s: duplicated user ID detected - merged\n" -msgstr "clé %08lX: nom d'utilisateur en double fusionné\n" +msgstr "clé %s: nom d'utilisateur en double détecté - fusion accomplie\n" -#: g10/import.c:1715 -#, fuzzy, c-format +#: g10/import.c:1717 +#, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" -"AVERTISSEMENT: la clé %08lX est peut-être révoquée: recherche de la clé de\n" -"révocation %08lX\n" +"AVERTISSEMENT: la clé %s est peut-être révoquée: recherche de\n" +"la clé de révocation %s\n" -#: g10/import.c:1729 -#, fuzzy, c-format +#: g10/import.c:1731 +#, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" -"AVERTISSEMENT: la clé %08lX est peut-être révoquée: la clé de révocation\n" -"%08lX est absente.\n" +"AVERTISSEMENT: la clé %s est peut-être révoquée: la clé de\n" +"révocation %s est absente.\n" -#: g10/import.c:1788 -#, fuzzy, c-format +#: g10/import.c:1790 +#, c-format msgid "key %s: \"%s\" revocation certificate added\n" -msgstr "clé: %08lX: \"%s\" certificat de révocation ajouté\n" +msgstr "clé %s: certificat de révocation « %s » ajouté\n" -#: g10/import.c:1822 -#, fuzzy, c-format +#: g10/import.c:1824 +#, c-format msgid "key %s: direct key signature added\n" -msgstr "clé %08lX: ajout de la signature de clé directe\n" +msgstr "clé %s: ajout de la signature de clé directe\n" #: g10/keydb.c:167 #, c-format @@ -2512,26 +2593,26 @@ msgstr "%d nom d'utilisateurs sans auto-signature valide détecté\n" #: g10/keyedit.c:402 g10/pkclist.c:262 -#, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" "(by looking at passports, checking fingerprints from different sources, " "etc.)\n" msgstr "" -"À quel point avez-vous confiance en cet utilisateur pour la vérification\n" -"des clés des autres utilisateurs (vous pouvez vérifier son passeport,\n" -"vérifier les empreintes de diverses sources...) ?\n" +"Décidez maintenant à quel point vous avez confiance en cet utilisateur\n" +"pour qu'il vérifie les clés des autres utilisateurs (vous pouvez\n" +"vérifier son passeport, vérifier les empreintes de plusieurs sources\n" +"différentes, etc.)\n" #: g10/keyedit.c:406 g10/pkclist.c:274 -#, fuzzy, c-format +#, c-format msgid " %d = I trust marginally\n" -msgstr " %d = je crois marginalement\n" +msgstr " %d = je crois marginalement\n" #: g10/keyedit.c:407 g10/pkclist.c:276 -#, fuzzy, c-format +#, c-format msgid " %d = I trust fully\n" -msgstr " %d = je fais entièrement confiance\n" +msgstr " %d = je fais entièrement confiance\n" #: g10/keyedit.c:426 msgid "" @@ -2539,10 +2620,15 @@ "A depth greater than 1 allows the key you are signing to make\n" "trust signatures on your behalf.\n" msgstr "" +"Entrez la profondeur de cette signature de confiance.\n" +"Une profondeur supérieure à 1 permet à la clé que vous signez de faire\n" +"des signatures de confiance de votre part.\n" #: g10/keyedit.c:442 msgid "Please enter a domain to restrict this signature, or enter for none.\n" msgstr "" +"Entrez un domaine pour restreindre cette signature, ou bien appuyez\n" +"sur la touche entrée pour aucun domaine.\n" #: g10/keyedit.c:584 #, c-format @@ -2611,23 +2697,23 @@ msgstr "Voulez vous la rendre complètement exportable ? (o/N) " #: g10/keyedit.c:748 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already locally signed by key %s\n" -msgstr "\"%s\" a déjà été signé localement par la clé %08lX\n" +msgstr "« %s » a déjà été signé localement par la clé %s\n" #: g10/keyedit.c:751 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already signed by key %s\n" -msgstr "\"%s\" a déjà été signé localement par la clé %08lX\n" +msgstr "« %s » a déjà été signé par la clé %s\n" #: g10/keyedit.c:756 msgid "Do you want to sign it again anyway? (y/N) " msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) " #: g10/keyedit.c:778 -#, fuzzy, c-format +#, c-format msgid "Nothing to sign with key %s\n" -msgstr "Rien à signer avec la clé %08lX\n" +msgstr "Rien à signer avec la clé %s\n" #: g10/keyedit.c:793 msgid "This key has expired!" @@ -2685,81 +2771,60 @@ msgstr " (3) J'ai vérifié très soigneusement.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Votre sélection ? (entrer '?' pour plus d'informations): " #: g10/keyedit.c:918 -#, fuzzy, c-format +#, c-format msgid "" "Are you sure that you want to sign this key with your\n" "key \"%s\" (%s)\n" msgstr "" "Etes-vous vraiment sûr(e) que vous voulez signer cette clé\n" -"avec la vôtre: \"" +"avec votre clé « %s » (%s)\n" #: g10/keyedit.c:925 -#, fuzzy msgid "This will be a self-signature.\n" -msgstr "" -"\n" -"cela sera une auto-signature.\n" +msgstr "Ceci sera une auto-signature.\n" #: g10/keyedit.c:931 -#, fuzzy msgid "WARNING: the signature will not be marked as non-exportable.\n" msgstr "" -"\n" -"AVERTISSEMENT: la signature ne sera pas marquée comme non-exportable.\n" +"AVERTISSEMENT: la signature ne sera pas marquée comme\n" +"non-exportable.\n" #: g10/keyedit.c:939 -#, fuzzy msgid "WARNING: the signature will not be marked as non-revocable.\n" msgstr "" -"\n" "AVERTISSEMENT: La signature ne sera pas marquée comme\n" "non-révocable.\n" #: g10/keyedit.c:949 -#, fuzzy msgid "The signature will be marked as non-exportable.\n" -msgstr "" -"\n" -"La signature sera marquée comme non-exportable.\n" +msgstr "La signature sera marquée comme non-exportable.\n" #: g10/keyedit.c:956 -#, fuzzy msgid "The signature will be marked as non-revocable.\n" -msgstr "" -"\n" -"La signature sera marquée comme non-révocable.\n" +msgstr "La signature sera marquée comme non-révocable.\n" #: g10/keyedit.c:963 -#, fuzzy msgid "I have not checked this key at all.\n" -msgstr "" -"\n" -"Je n'ai pas du tout vérifié cette clé.\n" +msgstr "Je n'ai pas du tout vérifié cette clé.\n" #: g10/keyedit.c:968 -#, fuzzy msgid "I have checked this key casually.\n" -msgstr "" -"\n" -"J'ai un peu vérifié cette clé.\n" +msgstr "J'ai un peu vérifié cette clé.\n" #: g10/keyedit.c:973 -#, fuzzy msgid "I have checked this key very carefully.\n" -msgstr "" -"\n" -"J'ai vérifié cette clé avec grand soin.\n" +msgstr "J'ai vérifié cette clé avec grand soin.\n" #: g10/keyedit.c:983 -#, fuzzy msgid "Really sign? (y/N) " -msgstr "Signer réellement ? " +msgstr "Signer réellement ? (o/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2788,7 +2853,7 @@ "\n" msgstr "Entrez le nouveau mot de passe pour cette clé secrète.\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "le mot de passe n'a pas été correctement répété ; recommencez." @@ -2802,9 +2867,8 @@ "\n" #: g10/keyedit.c:1135 -#, fuzzy msgid "Do you really want to do this? (y/N) " -msgstr "Voulez-vous vraiment faire cela ? " +msgstr "Voulez-vous vraiment faire cela ? (o/N) " #: g10/keyedit.c:1201 msgid "moving a key signature to the correct place\n" @@ -2872,14 +2936,12 @@ msgstr "s" #: g10/keyedit.c:1259 -#, fuzzy msgid "tsign" -msgstr "signer" +msgstr "tsigner" #: g10/keyedit.c:1259 -#, fuzzy msgid "make a trust signature" -msgstr "faire une signature détachée" +msgstr "faire une signature de confiance" #: g10/keyedit.c:1260 msgid "lsign" @@ -2942,21 +3004,20 @@ msgstr "ajouter une clé secondaire" #: g10/keyedit.c:1271 -#, fuzzy msgid "addcardkey" -msgstr "aj.clé" +msgstr "ajclécarte" #: g10/keyedit.c:1271 msgid "add a key to a smartcard" -msgstr "" +msgstr "ajouter une clé à une carte à puce" #: g10/keyedit.c:1272 msgid "keytocard" -msgstr "" +msgstr "cléverscarte" #: g10/keyedit.c:1272 msgid "move a key to a smartcard" -msgstr "" +msgstr "déplacer une clé vers une carte à puce" #: g10/keyedit.c:1274 msgid "delkey" @@ -3043,14 +3104,12 @@ msgstr "préférences mises à jour" #: g10/keyedit.c:1286 -#, fuzzy msgid "keyserver" -msgstr "erreur du serveur de clés" +msgstr "servclés" #: g10/keyedit.c:1286 -#, fuzzy msgid "set preferred keyserver URL" -msgstr "impossible d'interpréter l'URI du serveur de clés\n" +msgstr "indiquer l'URL du serveur de clés préféré" #: g10/keyedit.c:1287 msgid "change the passphrase" @@ -3113,9 +3172,9 @@ msgstr "montrer la photo d'identité" #: g10/keyedit.c:1347 -#, fuzzy, c-format +#, c-format msgid "error reading secret keyblock \"%s\": %s\n" -msgstr "erreur pendant la lecture du bloc de clé secrète `%s': %s\n" +msgstr "erreur pendant la lecture du bloc de clé secrète « %s »: %s\n" #: g10/keyedit.c:1365 msgid "Secret key is available.\n" @@ -3134,9 +3193,8 @@ msgstr "La clé est révoquée." #: g10/keyedit.c:1500 -#, fuzzy msgid "Really sign all user IDs? (y/N) " -msgstr "Signer vraiment tous les utilisateurs ? " +msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) " #: g10/keyedit.c:1502 msgid "Hint: Select the user IDs to sign\n" @@ -3156,88 +3214,77 @@ msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n" #: g10/keyedit.c:1553 -#, fuzzy msgid "Really remove all selected user IDs? (y/N) " -msgstr "Enlever réellement tous les utilisateurs sélectionnés ? " +msgstr "Enlever réellement tous les noms d'utilisateurs sélectionnés ? (o/N) " #: g10/keyedit.c:1554 -#, fuzzy msgid "Really remove this user ID? (y/N) " -msgstr "Enlever réellement cet utilisateur ? " +msgstr "Enlever réellement ce nom d'utilisateur ? (o/N) " #: g10/keyedit.c:1604 -#, fuzzy msgid "Really move the primary key? (y/N) " -msgstr "Enlever réellement cet utilisateur ? " +msgstr "Enlever réellement la clé principale ? (o/N) " #: g10/keyedit.c:1616 -#, fuzzy msgid "You must select exactly one key.\n" -msgstr "Vous devez sélectionner au moins une clé.\n" +msgstr "Vous devez sélectionner exactement une clé.\n" #: g10/keyedit.c:1636 g10/keyedit.c:1691 msgid "You must select at least one key.\n" msgstr "Vous devez sélectionner au moins une clé.\n" #: g10/keyedit.c:1639 -#, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " -msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? " +msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? (o/N) " #: g10/keyedit.c:1640 -#, fuzzy msgid "Do you really want to delete this key? (y/N) " -msgstr "Voulez-vous vraiment supprimer cette clé ? " +msgstr "Voulez-vous vraiment supprimer cette clé ? (o/N) " #: g10/keyedit.c:1675 -#, fuzzy msgid "Really revoke all selected user IDs? (y/N) " -msgstr "Révoquer réellement tous les noms d'utilisateurs sélectionnés ? " +msgstr "Révoquer réellement tous les noms d'utilisateurs sélectionnés ? (o/N) " #: g10/keyedit.c:1676 -#, fuzzy msgid "Really revoke this user ID? (y/N) " -msgstr "Révoquer réellement ce nom d'utilisateur ? " +msgstr "Révoquer réellement ce nom d'utilisateur ? (o/N) " #: g10/keyedit.c:1695 -#, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " -msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? " +msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? (o/N) " #: g10/keyedit.c:1696 -#, fuzzy msgid "Do you really want to revoke this key? (y/N) " -msgstr "Voulez-vous vraiment révoquer cette clé ? " +msgstr "Voulez-vous vraiment révoquer cette clé ? (o/N) " #: g10/keyedit.c:1735 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" +"La confiance du propriétaire peut ne pas être positionnée en utilisant\n" +"la base de confiance d'un tiers\n" #: g10/keyedit.c:1767 -#, fuzzy msgid "Set preference list to:\n" -msgstr "donner la liste de préférences" +msgstr "Changer la liste de préférences en :\n" #: g10/keyedit.c:1773 -#, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " -msgstr "Enlever réellement les préférences des utilisateurs sélectionnés ? " +msgstr "" +"Mettre à jour réellement les préférences des noms d'utilisateurs\n" +"sélectionnés ? (o/N) " #: g10/keyedit.c:1775 -#, fuzzy msgid "Really update the preferences? (y/N) " -msgstr "Faut-il vraiment mettre à jour les préférences ? " +msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) " #: g10/keyedit.c:1825 -#, fuzzy msgid "Save changes? (y/N) " -msgstr "Enregistrer les changements? " +msgstr "Enregistrer les changements? (o/N) " #: g10/keyedit.c:1828 -#, fuzzy msgid "Quit without saving? (y/N) " -msgstr "Quitter sans enregistrer? " +msgstr "Quitter sans enregistrer ? (o/N) " #: g10/keyedit.c:1838 #, c-format @@ -3263,91 +3310,74 @@ #: g10/keyedit.c:1987 msgid "Keyserver no-modify" -msgstr "" +msgstr "Serveur de clés: pas-de-modification" #: g10/keyedit.c:2002 g10/keylist.c:244 msgid "Preferred keyserver: " -msgstr "" +msgstr "Serveur de clés préféré: " -#: g10/keyedit.c:2243 +#: g10/keyedit.c:2245 #, c-format -msgid "This key may be revoked by %s key " -msgstr "Cette clé peut être révoquée par la clé %s " +msgid "This key may be revoked by %s key %s" +msgstr "Cette clé peut être révoquée par la clé %s %s" -#: g10/keyedit.c:2247 -msgid " (sensitive)" -msgstr " (sensible)" +#: g10/keyedit.c:2251 +msgid "(sensitive)" +msgstr "(sensible)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 -#, fuzzy, c-format +#, c-format msgid "created: %s" -msgstr "impossible de créer %s: %s\n" +msgstr "créé: %s" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 -#, fuzzy, c-format +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#, c-format msgid "revoked: %s" -msgstr "[revoquée] " +msgstr "revoqué: %s" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 -#, fuzzy, c-format +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#, c-format msgid "expired: %s" -msgstr " [expire: %s]" +msgstr "expiré: %s" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 -#, fuzzy, c-format +#, c-format msgid "expires: %s" -msgstr " [expire: %s]" +msgstr "expire: %s" -#: g10/keyedit.c:2270 -#, fuzzy, c-format +#: g10/keyedit.c:2276 +#, c-format msgid "usage: %s" -msgstr " confiance: %c/%c" +msgstr "utilisation: %s" -#: g10/keyedit.c:2285 -#, fuzzy, c-format +#: g10/keyedit.c:2291 +#, c-format msgid "trust: %s" -msgstr " confiance: %c/%c" +msgstr " confiance: %s" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" -msgstr "" +msgstr "validité: %s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Cette clé a été désactivée" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revoquée] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" +msgstr "n° de carte: " -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" "Il n'y a pas de préférences dans un nom d'utilisateur du style de\n" "PGP 2.x.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3355,7 +3385,17 @@ "Notez que la validité affichée pour la clé n'est pas nécessairement\n" "correcte tant que vous n'avez pas relancé le programme.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +msgid "revoked" +msgstr "revoquée" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +msgid "expired" +msgstr "expirée" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3364,7 +3404,7 @@ "Cette commande risque de rendre un autre nom d'utilisateur principal\n" "par défaut.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3374,46 +3414,46 @@ "d'identité peut empêcher certaines versions de PGP d'accepter\n" "cette clé\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Etes-vous sûr de vouloir l'ajouter ? (y/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Vous ne pouvez pas ajouter de photo d'identité à une clé du style PGP2.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Supprimer cette bonne signature ? (o/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Supprimer cette signature invalide ? (o/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Supprimer cette signature inconnue ? (o/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d signature supprimée.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d signatures supprimées\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Rien n'a été supprimé.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3423,199 +3463,192 @@ "désigné peut empêcher certaines versions de PGP d'accepter\n" "cette clé.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Vous ne pouvez pas ajouter de révocateur désigné à une clé de style PGP2.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Entrez le nom d'utilisateur du révocateur désigné: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "impossible d'utiliser une clé de style PGP 2.x comme révocateur\n" "désigné.\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "vous ne pouvez pas utiliser une clé comme son propre révocateur\n" "désigné\n" -#: g10/keyedit.c:2968 -#, fuzzy +#: g10/keyedit.c:2965 msgid "this key has already been designated as a revoker\n" -msgstr "AVERTISSEMENT: Cette clé à été révoquée par son révocateur désigné !\n" +msgstr "cette clé à déjà été désignée comme un révocateur\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVERTISSEMENT: l'établissement d'une clé comme révocateur désigné\n" "est irréversible !\n" -#: g10/keyedit.c:2993 -#, fuzzy +#: g10/keyedit.c:2990 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Etes-vous sûr de vouloir établir cette clé comme révocateur\n" -"désigné (o/N): " +"désigné ? (o/N) " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Enlevez les sélections des clés secrètes.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Vous devez sélectionner au plus une clé secondaire.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Changer la date d'expiration d'une clé secondaire.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Changer la date d'expiration de la clé principale.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vous ne pouvez pas changer la date d'expiration d'une clé v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-clés secret\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Vous devez sélectionner exactement un utilisateur.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 -#, fuzzy, c-format +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" -msgstr "l'auto-signature v3 du nom d'utilisateur \"%s\" a été ignorée\n" +msgstr "l'auto-signature v3 du nom d'utilisateur « %s » a été ignorée\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " -msgstr "" +msgstr "Entrez l'URL de votre serveur de clés favori: " -#: g10/keyedit.c:3498 -#, fuzzy +#: g10/keyedit.c:3495 msgid "Are you sure you want to replace it? (y/N) " -msgstr "Etes-vous sûr de vouloir l'utiliser ? (o/N) " +msgstr "Etes-vous sûr de vouloir le remplacer ? (o/N) " -#: g10/keyedit.c:3499 -#, fuzzy +#: g10/keyedit.c:3496 msgid "Are you sure you want to delete it? (y/N) " -msgstr "Etes-vous sûr de vouloir l'utiliser ? (o/N) " +msgstr "Etes-vous sûr de vouloir le supprimer ? (o/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Pas de clé secondaire avec l'index %d\n" -#: g10/keyedit.c:3724 -#, fuzzy, c-format +#: g10/keyedit.c:3721 +#, c-format msgid "user ID: \"%s\"\n" -msgstr "nom d'utilisateur: «" +msgstr "nom d'utilisateur: « %s »\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 -#, fuzzy, c-format +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#, c-format msgid "signed by your key %s on %s%s%s\n" -msgstr " signé par %08lX à %s%s%s\n" +msgstr "signé par votre clé %s à %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Cette signature a expiré le %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Etes-vous sûr de vouloir toujours le révoquer ? (y/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Générer un certificat de révocation pour cette signature ? (o/N) " -#: g10/keyedit.c:3768 -#, fuzzy, c-format +#: g10/keyedit.c:3765 +#, c-format msgid "You have signed these user IDs on key %s:\n" -msgstr "Vous avez signé ces noms d'utilisateurs:\n" +msgstr "Vous avez signé ces noms d'utilisateurs sur la clé %s:\n" -#: g10/keyedit.c:3794 -#, fuzzy +#: g10/keyedit.c:3791 msgid " (non-revocable)" -msgstr " (non-exportable)" +msgstr " (non-révocable)" -#: g10/keyedit.c:3801 -#, fuzzy, c-format +#: g10/keyedit.c:3798 +#, c-format msgid "revoked by your key %s on %s\n" -msgstr " révoqué par %08lX à %s\n" +msgstr "révoqué par votre clé %s à %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Vous êtes sur le point de révoquer ces signatures:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Créer réellement les certificats de révocation ? (o/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "pas de clé secrète\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Le nom d'utilisateur \"%s\" est déjà révoqué.\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n" "dans le futur\n" -#: g10/keyedit.c:4129 -#, fuzzy, c-format +#: g10/keyedit.c:4126 +#, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -"Affichage %s photo d'identité de taille %ld pour la clé 0x%08lX (uid %d)\n" +"Affichage %s photo d'identité de taille %ld pour la clé\n" +"0x%s (uid %d)\n" #: g10/keygen.c:293 -#, fuzzy, c-format +#, c-format msgid "preference `%s' duplicated\n" -msgstr "préférence %c%lu dupliquée\n" +msgstr "préférence `%s' dupliquée\n" #: g10/keygen.c:300 -#, fuzzy msgid "too many cipher preferences\n" -msgstr "trop de préférences `%c'\n" +msgstr "trop de préférences de chiffrement\n" #: g10/keygen.c:302 -#, fuzzy msgid "too many digest preferences\n" -msgstr "trop de préférences `%c'\n" +msgstr "trop de préférences de hachage\n" #: g10/keygen.c:304 -#, fuzzy msgid "too many compression preferences\n" -msgstr "trop de préférences `%c'\n" +msgstr "trop de préférences de compression\n" #: g10/keygen.c:401 -#, fuzzy, c-format +#, c-format msgid "invalid item `%s' in preference string\n" -msgstr "Caractère invalide dans la chaîne de préférences\n" +msgstr "élément `%s' invalide dans la chaîne de préférences\n" # g10/keygen.c:123 ??? #: g10/keygen.c:827 @@ -3632,71 +3665,69 @@ msgid "writing key binding signature\n" msgstr "écriture de la signature de liaison\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Taille invalide; utilisation de %u bits\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "taille arrondie à %u bits\n" #: g10/keygen.c:1247 -#, fuzzy msgid "Sign" -msgstr "signer" +msgstr "Signer" #: g10/keygen.c:1250 -#, fuzzy msgid "Encrypt" -msgstr "chiffrer les données" +msgstr "Chiffrer" #: g10/keygen.c:1253 msgid "Authenticate" -msgstr "" +msgstr "Authentifier" #: g10/keygen.c:1261 msgid "SsEeAaQq" -msgstr "" +msgstr "SsCcAaQq" #: g10/keygen.c:1276 #, c-format msgid "Possible actions for a %s key: " -msgstr "" +msgstr "Actions possibles pour une clé %s: " #: g10/keygen.c:1280 msgid "Current allowed actions: " -msgstr "" +msgstr "Actions actuellement permises: " #: g10/keygen.c:1285 #, c-format msgid " (%c) Toggle the sign capability\n" -msgstr "" +msgstr " (%c) Inverser la capacité de signer\n" #: g10/keygen.c:1288 -#, fuzzy, c-format +#, c-format msgid " (%c) Toggle the encrypt capability\n" -msgstr " (%d) ElGamal (chiffrement seul)\n" +msgstr " (%c) Inverser la capacité de chiffrement\n" #: g10/keygen.c:1291 #, c-format msgid " (%c) Toggle the authenticate capability\n" -msgstr "" +msgstr " (%c) Inverser la capacité d'authentifier\n" #: g10/keygen.c:1294 #, c-format msgid " (%c) Finished\n" -msgstr "" +msgstr " (%c) Terminé\n" #: g10/keygen.c:1348 msgid "Please select what kind of key you want:\n" msgstr "Sélectionnez le type de clé désiré:\n" #: g10/keygen.c:1350 -#, fuzzy, c-format +#, c-format msgid " (%d) DSA and Elgamal (default)\n" -msgstr " (%d) DSA et ElGamal (par défaut)\n" +msgstr " (%d) DSA et Elgamal (par défaut)\n" #: g10/keygen.c:1351 #, c-format @@ -3705,90 +3736,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (indiquez vous-même les capacités)\n" + +#: g10/keygen.c:1355 +#, c-format msgid " (%d) Elgamal (encrypt only)\n" -msgstr " (%d) ElGamal (chiffrement seul)\n" +msgstr " (%d) Elgamal (chiffrement seul)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (signature seule)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (chiffrement seul)\n" -#: g10/keygen.c:1358 -#, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (chiffrement seul)\n" - -#: g10/keygen.c:1409 +#: g10/keygen.c:1360 #, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Préparation à la génération d'une nouvelle paire de clés %s.\n" -" la taille minimale est 768 bits\n" -" la taille par défaut est 1024 bits\n" -" la taille maximale conseillée est 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Quelle taille de clé désirez-vous ? (1024) " +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (indiquez vous-même les capacités)\n" -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "taille trop petite; 768 est la plus petite valeur permise.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "La paire de clés DSA fera 1024 bits.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "taille trop importante; %d est la plus grande valeur permise.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Les tailles supérieures à 2048 ne sont pas conseillées car\n" -"les calculs prennent VRAIMENT beaucoup de temps !\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Etes-vous sûr de vouloir cette taille ? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Quelle taille de clé désirez-vous ? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"D'accord, mais n'oubliez pas que les radiations de votre écran et de votre\n" -"clavier sont aussi très vulnérables aux attaques !\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La taille demandée est %u bits\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "arrondie à %u bits\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3804,7 +3805,7 @@ " m = la clé expire dans n mois\n" " y = la clé expire dans n années\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3820,29 +3821,29 @@ " m = la signature expire dans n mois\n" " y = la signature expire dans n années\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "La clé est valide pour ? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "La signature est valide pour ? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "valeur invalide\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s n'expire pas du tout\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s expire le %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3850,13 +3851,11 @@ "Votre système ne sait pas afficher les dates au-delà de 2038.\n" "Cependant la gestion des dates sera correcte jusqu'à 2106.\n" -#: g10/keygen.c:1577 -#, fuzzy +#: g10/keygen.c:1589 msgid "Is this correct? (y/N) " -msgstr "Est-ce correct (o/n) ? " +msgstr "Est-ce correct ? (o/N) " -#: g10/keygen.c:1620 -#, fuzzy +#: g10/keygen.c:1632 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3872,44 +3871,44 @@ " « Heinrich Heine (Der Dichter) »\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nom réel: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Caractère invalide dans le nom\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Le nom ne doit pas commencer par un chiffre\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Le nom doit faire au moins 5 caractères de long\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Adresse e-mail: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Ce n'est pas une adresse e-mail valide\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Commentaire: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Caractère invalide dans le commentaire\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Vous utilisez le jeu de caractères '%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3920,28 +3919,28 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Ne mettez pas d'adresse e-mail dans le nom réel ou dans le commentaire\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Corrigez l'erreur d'abord\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3949,12 +3948,12 @@ "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3966,7 +3965,7 @@ "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3978,56 +3977,52 @@ "pendant la génération de nombres premiers; cela donne au générateur de\n" "nombres aléatoires une meilleure chance d'avoir assez d'entropie.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "La paire de clés DSA fera 1024 bits.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "La génération de clé a été annulée.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "écriture de la clé publique vers `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 -#, fuzzy, c-format +#: g10/keygen.c:2761 g10/keygen.c:2899 +#, c-format msgid "writing secret key stub to `%s'\n" -msgstr "écriture de la clé secrète vers `%s'\n" +msgstr "écriture d'un bout de clé secrète vers `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "écriture de la clé secrète vers `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "" "aucun portes-clés public n'a été trouvé avec des droits d'écriture : %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "" "aucun portes-clés secret n'a été trouvé avec des droits d'écriture : %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erreur durant l'écriture du porte-clés public `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erreur durant l'écriture du porte-clés secret `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "les clés publique et secrète ont été créées et signées.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -4036,13 +4031,13 @@ "utiliser la commande «--edit-key» pour générer une clé secondaire à\n" "cette fin.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "La génération de clé a échoué: %s\n" # on s'amuse comme on peut... -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4050,7 +4045,7 @@ "la clé a été créée %lu seconde dans le futur (rupture spatio-temporelle ou\n" "problème d'horloge)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4058,44 +4053,43 @@ "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n" "problème d'horloge\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "NOTE: créer des sous-clés pour des clés v3 n'est pas conforme à OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 -#, fuzzy +#: g10/keygen.c:3052 g10/keygen.c:3174 msgid "Really create? (y/N) " -msgstr "Créer vraiment ? " +msgstr "Créer vraiment ? (o/N) " -#: g10/keygen.c:3315 -#, fuzzy, c-format +#: g10/keygen.c:3327 +#, c-format msgid "storing key onto card failed: %s\n" -msgstr "la suppression du bloc de clés a échoué : %s\n" +msgstr "le stockage de la clé dans la carte a échoué: %s\n" -#: g10/keygen.c:3362 -#, fuzzy, c-format +#: g10/keygen.c:3374 +#, c-format msgid "can't create backup file `%s': %s\n" -msgstr "impossible de créer `%s': %s\n" +msgstr "impossible de créer le fichier de sauvegarde `%s': %s\n" -#: g10/keygen.c:3385 -#, fuzzy, c-format +#: g10/keygen.c:3397 +#, c-format msgid "NOTE: backup of card key saved to `%s'\n" -msgstr "NOTE: la clé secrète %08lX a expiré le %s\n" +msgstr "NOTE: sauvegarde de la clé de la carte dans `%s'\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" -msgstr "" +msgstr "la longueur du modulo RSA n'est pas %d\n" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" -msgstr "" +msgstr "l'exposant public est trop élevé (plus de 32 bits)\n" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" -msgstr "" +msgstr "la longueur d'un nombre premier RSA n'est pas %d\n" #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533 msgid "never " @@ -4111,7 +4105,7 @@ #: g10/keylist.c:242 msgid "Critical preferred keyserver: " -msgstr "" +msgstr "Serveur de clés critique favori: " #: g10/keylist.c:291 g10/keylist.c:335 msgid "WARNING: invalid notation data found\n" @@ -4134,39 +4128,38 @@ msgstr "Porte-clés" #: g10/keylist.c:729 -#, fuzzy, c-format +#, c-format msgid "expired: %s)" -msgstr " [expire: %s]" +msgstr "expirée: %s)" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Empreinte de clé principale:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Empreinte de la sous-clé:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Empreinte de la clé principale:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Empreinte de la sous-clé:" -#: g10/keylist.c:1446 g10/keylist.c:1450 -#, fuzzy +#: g10/keylist.c:1440 g10/keylist.c:1444 msgid " Key fingerprint =" -msgstr " Empreinte de la clé =" +msgstr " Empreinte de la clé =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" -msgstr "" +msgstr "N° de série de la carte =" #: g10/keyring.c:1245 -#, fuzzy, c-format +#, c-format msgid "renaming `%s' to `%s' failed: %s\n" -msgstr "la construction d'une armure a échoué: %s \n" +msgstr "renommer `%s' en `%s' a échoué: %s \n" #: g10/keyring.c:1251 msgid "WARNING: 2 files with confidential information exists.\n" @@ -4188,19 +4181,19 @@ msgstr "Réparez ce problème de sécurité possible\n" #: g10/keyring.c:1375 -#, fuzzy, c-format +#, c-format msgid "caching keyring `%s'\n" -msgstr "vérification du porte-clés `%s'\n" +msgstr "mise en antémémoire du porte-clés `%s'\n" #: g10/keyring.c:1421 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached so far (%lu signatures)\n" -msgstr "%lu clés vérifiées (%lu signatures)\n" +msgstr "%lu clés en antémémoire vérifiées pour l'instant (%lu signatures)\n" #: g10/keyring.c:1433 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached (%lu signatures)\n" -msgstr "%lu clés vérifiées (%lu signatures)\n" +msgstr "%lu clés en antémémoire (%lu signatures)\n" #: g10/keyring.c:1504 #, c-format @@ -4208,140 +4201,140 @@ msgstr "%s: porte-clés créé\n" #: g10/keyserver.c:98 -#, fuzzy, c-format +#, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "" -"AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n" +"AVERTISSEMENT: les options de serveur de clés `%s' ne sont pas\n" +"utilisées dans cette plateforme\n" #: g10/keyserver.c:378 -#, fuzzy msgid "disabled" -msgstr "désactiver" +msgstr "désactivé" #: g10/keyserver.c:579 msgid "Enter number(s), N)ext, or Q)uit > " -msgstr "" +msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > " #: g10/keyserver.c:662 g10/keyserver.c:1142 -#, fuzzy, c-format +#, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" -msgstr "options d'export invalides\n" +msgstr "protocole serveur de clés invalide (nous %d!=gestionnaire %d)\n" #: g10/keyserver.c:752 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found on keyserver\n" -msgstr "clé '%s' introuvable: %s\n" +msgstr "clé « %s » introuvable dans le serveur de clés\n" #: g10/keyserver.c:754 -#, fuzzy msgid "key not found on keyserver\n" -msgstr "clé '%s' introuvable: %s\n" +msgstr "clé non trouvée dans le serveur de clés\n" #: g10/keyserver.c:896 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s server %s\n" -msgstr "requête de la clé %08lX de %s\n" +msgstr "requête de la clé %s du serveur %s %s\n" #: g10/keyserver.c:900 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s\n" -msgstr "requête de la clé %08lX de %s\n" +msgstr "requête de la clé %s de %s\n" #: g10/keyserver.c:1045 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s server %s\n" -msgstr "recherche de \"%s\" du serveur HKP %s\n" +msgstr "envoi de la clé %s au serveur %s %s\n" #: g10/keyserver.c:1049 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s\n" -msgstr "" -"»\n" -"signé avec votre clé %08lX à %s\n" +msgstr "envoi de la clé %s à %s\n" #: g10/keyserver.c:1092 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s server %s\n" -msgstr "recherche de \"%s\" du serveur HKP %s\n" +msgstr "recherche de « %s » du serveur %s %s\n" #: g10/keyserver.c:1095 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s\n" -msgstr "recherche de \"%s\" du serveur HKP %s\n" +msgstr "recherche de « %s » de %s\n" #: g10/keyserver.c:1102 g10/keyserver.c:1197 -#, fuzzy msgid "no keyserver action!\n" -msgstr "options d'export invalides\n" +msgstr "pas d'action pour le serveur de clés !\n" #: g10/keyserver.c:1150 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" +"AVERTISSEMENT: le gestionnaire de serveurs de clés provient d'une\n" +"version différente de GnuPG (%s)\n" #: g10/keyserver.c:1159 msgid "keyserver did not send VERSION\n" -msgstr "" +msgstr "le serveurs de clés n'a pas envoyé son numéro de VERSION\n" #: g10/keyserver.c:1218 msgid "no keyserver known (use option --keyserver)\n" -msgstr "" +msgstr "pas de serveur de clés connu (utilisez l'option --keyserver)\n" #: g10/keyserver.c:1224 msgid "external keyserver calls are not supported in this build\n" msgstr "" +"les appels externes à un serveur de clé ne sont pas supportés dans\n" +"cette compilation\n" #: g10/keyserver.c:1236 #, c-format msgid "no handler for keyserver scheme `%s'\n" -msgstr "" +msgstr "pas de gestionnaire pour le type de serveurs de clés `%s'\n" #: g10/keyserver.c:1241 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" +"l'action `%s' n'est pas supportée avec le type de serveurs\n" +"de clés `%s'\n" #: g10/keyserver.c:1249 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" -msgstr "" +msgstr "gpgkeys_%s ne supporte pas le gestionnaire de version %d\n" #: g10/keyserver.c:1254 -#, fuzzy msgid "keyserver timed out\n" -msgstr "erreur du serveur de clés" +msgstr "le délai d'attente du serveur de clés a expiré\n" #: g10/keyserver.c:1259 -#, fuzzy msgid "keyserver internal error\n" -msgstr "erreur du serveur de clés" +msgstr "erreur interne du serveur de clés\n" #: g10/keyserver.c:1268 -#, fuzzy, c-format +#, c-format msgid "keyserver communications error: %s\n" -msgstr "la réception depuis le serveur de clés a échoué: %s\n" +msgstr "erreur de communication avec le serveur de clés: %s\n" #: g10/keyserver.c:1293 g10/keyserver.c:1327 #, c-format msgid "\"%s\" not a key ID: skipping\n" -msgstr "" +msgstr "« %s » n'est pas une ID de clé: ignoré\n" #: g10/keyserver.c:1578 -#, fuzzy, c-format +#, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" -"AVERTISSEMENT: impossible d'enlever le fichier temporaire\n" -"(%s) `%s': %s\n" +"AVERTISSEMENT: impossible de rafraîchir la clé %s\n" +"via %s: %s\n" #: g10/keyserver.c:1600 -#, fuzzy, c-format +#, c-format msgid "refreshing 1 key from %s\n" -msgstr "requête de la clé %08lX de %s\n" +msgstr "rafraîchissement d'une clé depuis %s\n" #: g10/keyserver.c:1602 -#, fuzzy, c-format +#, c-format msgid "refreshing %d keys from %s\n" -msgstr "requête de la clé %08lX de %s\n" +msgstr "rafraîchissement de %d clés depuis %s\n" #: g10/mainproc.c:248 #, c-format @@ -4359,33 +4352,33 @@ msgstr "clé de session chiffrée %s\n" #: g10/mainproc.c:309 -#, fuzzy, c-format +#, c-format msgid "passphrase generated with unknown digest algorithm %d\n" -msgstr "chiffré avec l'algorithme inconnu %d\n" +msgstr "phrase de passe générée avec l'algorithme de hachage %d inconnu\n" #: g10/mainproc.c:373 -#, fuzzy, c-format +#, c-format msgid "public key is %s\n" -msgstr "la clé publique est %08lX\n" +msgstr "la clé publique est %s\n" #: g10/mainproc.c:428 msgid "public key encrypted data: good DEK\n" msgstr "données chiffrées par clé publique: bonne clé de chiffrement (DEK)\n" #: g10/mainproc.c:461 -#, fuzzy, c-format +#, c-format msgid "encrypted with %u-bit %s key, ID %s, created %s\n" -msgstr "chiffré avec une clé de %u bits %s, ID %08lX, créée le %s\n" +msgstr "chiffré avec une clé de %u bits %s, ID %s, créée le %s\n" #: g10/mainproc.c:465 g10/pkclist.c:218 -#, fuzzy, c-format +#, c-format msgid " \"%s\"\n" -msgstr " alias \"" +msgstr " « %s »\n" #: g10/mainproc.c:469 -#, fuzzy, c-format +#, c-format msgid "encrypted with %s key, ID %s\n" -msgstr "chiffré avec une clé %s, %08lX\n" +msgstr "chiffré avec une clé %s, ID %s\n" #: g10/mainproc.c:483 #, c-format @@ -4452,47 +4445,47 @@ msgstr "le traitement de ces signatures multiples est impossible\n" #: g10/mainproc.c:1350 -#, fuzzy, c-format +#, c-format msgid "Signature made %s\n" -msgstr "La signature a expiré le %s\n" +msgstr "Signature faite le %s\n" #: g10/mainproc.c:1351 -#, fuzzy, c-format +#, c-format msgid " using %s key %s\n" -msgstr " alias \"" +msgstr " en utilisant la clé %s %s\n" #: g10/mainproc.c:1355 -#, fuzzy, c-format +#, c-format msgid "Signature made %s using %s key ID %s\n" -msgstr "Signature faite %.*s avec la clé %s ID %08lX\n" +msgstr "Signature faite le %s avec la clé %s ID %s\n" #: g10/mainproc.c:1375 msgid "Key available at: " msgstr "Clé disponible sur: " #: g10/mainproc.c:1480 g10/mainproc.c:1528 -#, fuzzy, c-format +#, c-format msgid "BAD signature from \"%s\"" -msgstr "MAUVAISE signature de \"" +msgstr "MAUVAISE signature de « %s »" #: g10/mainproc.c:1482 g10/mainproc.c:1530 -#, fuzzy, c-format +#, c-format msgid "Expired signature from \"%s\"" -msgstr "Signature expirée de \"" +msgstr "Signature expirée de « %s »" #: g10/mainproc.c:1484 g10/mainproc.c:1532 -#, fuzzy, c-format +#, c-format msgid "Good signature from \"%s\"" -msgstr "Bonne signature de \"" +msgstr "Bonne signature de « %s »" #: g10/mainproc.c:1536 msgid "[uncertain]" msgstr "[incertain]" #: g10/mainproc.c:1568 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"" -msgstr " alias \"" +msgstr " alias « %s »" #: g10/mainproc.c:1662 #, c-format @@ -4517,7 +4510,7 @@ msgid "textmode" msgstr "modetexte" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "inconnu" @@ -4551,30 +4544,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "paquet racine invalide détecté dans proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "impossible d'empêcher la génération de fichiers «core»: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 -#, fuzzy, c-format +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 +#, c-format msgid "fstat of `%s' failed in %s: %s\n" -msgstr "impossible d'ouvrir le fichier: %s\n" +msgstr "fstat de `%s' échoué dans %s: %s\n" -#: g10/misc.c:186 -#, fuzzy, c-format +#: g10/misc.c:190 +#, c-format msgid "fstat(%d) failed in %s: %s\n" -msgstr "base de confiance: la lecture a échoué (n=%d): %s\n" +msgstr "fstat(%d) échoué dans %s: %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "impossible de gérer l'algorithme à clé publique %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algorithme de chiffrement non implanté" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "signature %s, algorithme de hachage %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"Cet algorithme de chiffrement est déconseillé; utilisez-en un\n" -"plus standard !\n" +"AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n" +"désaccord avec les préférences du destinataire\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4603,12 +4608,11 @@ #: g10/misc.c:681 msgid "Uncompressed" -msgstr "Décompressé" +msgstr "Non-compressé" #: g10/misc.c:706 -#, fuzzy msgid "uncompressed|none" -msgstr "Décompressé" +msgstr "noncompressé|non" #: g10/misc.c:816 #, c-format @@ -4616,14 +4620,14 @@ msgstr "ce message ne sera pas utilisable par %s\n" #: g10/misc.c:973 -#, fuzzy, c-format +#, c-format msgid "ambiguous option `%s'\n" -msgstr "lire les options de `%s'\n" +msgstr "option ambiguë `%s'\n" #: g10/misc.c:998 -#, fuzzy, c-format +#, c-format msgid "unknown option `%s'\n" -msgstr "récipient par défaut `%s' inconnu\n" +msgstr "option `%s' inconnue\n" #: g10/openfile.c:84 #, c-format @@ -4631,9 +4635,8 @@ msgstr "Le fichier `%s' existe. " #: g10/openfile.c:86 -#, fuzzy msgid "Overwrite? (y/N) " -msgstr "Réécrire (o/N)? " +msgstr "Réécrire par-dessus ? (o/N) " #: g10/openfile.c:119 #, c-format @@ -4665,9 +4668,9 @@ "AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n" #: g10/openfile.c:409 -#, fuzzy, c-format +#, c-format msgid "directory `%s' created\n" -msgstr "%s: répertoire créé\n" +msgstr "répertoire `%s' créé\n" #: g10/parse-packet.c:119 #, c-format @@ -4685,119 +4688,117 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "un sous-paquet de type %d possède un bit critique\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent n'est pas disponible dans cette session\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "impossible d'obtenir le pid du client pour l'agent\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "" "impossible d'obtenir le descripteur de lecture du serveur\n" "pour l'agent\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "" "impossible d'obtenir le descripteur d'écriture du serveur pour l'agent\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "la variable d'environnement GPG_AGENT_INFO est mal définie\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "le protocole gpg-agent version %d n'est pas supporté\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossible de se connecter à `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problème de communication avec ssh-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problème avec l'agent - arrêt d'utilisation de l'agent\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 -#, fuzzy, c-format +#: g10/passphrase.c:698 g10/passphrase.c:1203 +#, c-format msgid " (main key ID %s)" -msgstr " (ID clé principale %08lX)" +msgstr " (ID clé principale %s)" -#: g10/passphrase.c:698 -#, fuzzy, c-format +#: g10/passphrase.c:712 +#, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" "\"%.*s\"\n" "%u-bit %s key, ID %s, created %s%s\n" msgstr "" -"Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n" -"l'utilisateur:\n" +"Vous avez besoin d'un mot de passe pour déverrouiller la clé\n" +"secrète pour l'utilisateur:\n" "\"%.*s\"\n" -"clé %u bits %s, ID %08lX, créée %s%s\n" +"clé %u bits %s, ID %s, créée %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Répétez le mot de passe\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Entrez le mot de passe\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "mot de passe trop long\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "réponse de l'agent invalide\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "annulé par l'utilisateur\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 -#, fuzzy -msgid "can't query password in batch mode\n" -msgstr "impossible de demander un mot de passe en mode automatique\n" +#: g10/passphrase.c:1094 g10/passphrase.c:1256 +msgid "can't query passphrase in batch mode\n" +msgstr "impossible de demander la phrase de passe en mode automatique\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:1141 -#, fuzzy, c-format +#: g10/passphrase.c:1184 +#, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" msgstr "" -"\n" -"Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n" -"l'utilisateur: \"" +"Vous avez besoin d'une phrase de passe pour déverrouiller la\n" +"clé secrète pour l'utilisateur: « %s »\n" -#: g10/passphrase.c:1147 -#, fuzzy, c-format +#: g10/passphrase.c:1190 +#, c-format msgid "%u-bit %s key, ID %s, created %s" -msgstr "clé de %u bits %s, ID %08lX, créée le %s" +msgstr "clé de %u bits %s, ID %s, créée le %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" -msgstr "" +msgstr " (sous-clé de la clé principale ID %s)" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Répétez le mot de passe: " @@ -4821,24 +4822,23 @@ msgstr "Entrez le nom du fichier JPEG pour la photo d'identité: " #: g10/photoid.c:94 -#, fuzzy, c-format +#, c-format msgid "unable to open JPEG file `%s': %s\n" -msgstr "impossible d'ouvrir le fichier: %s\n" +msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n" #: g10/photoid.c:102 #, c-format msgid "This JPEG is really large (%d bytes) !\n" -msgstr "" +msgstr "Ce JPEG est vraiment trés grand (%d octets) !\n" #: g10/photoid.c:104 -#, fuzzy msgid "Are you sure you want to use it? (y/N) " -msgstr "Etes-vous sûr de vouloir l'utiliser ? (o/N) " +msgstr "Êtes-vous sûr de vouloir l'utiliser ? (o/N) " #: g10/photoid.c:119 -#, fuzzy, c-format +#, c-format msgid "`%s' is not a JPEG file\n" -msgstr "« %s » n'est pas un fichier JPEG\n" +msgstr "`%s' n'est pas un fichier JPEG\n" #: g10/photoid.c:136 msgid "Is this photo correct (y/N/q)? " @@ -4881,52 +4881,47 @@ msgstr "iImMqQsS" #: g10/pkclist.c:213 -#, fuzzy msgid "No trust value assigned to:\n" -msgstr "" -"Pas de confiance définie pour :\n" -"%4u%c/%08lX %s \"" +msgstr "Pas de valeur de confiance définie pour :\n" #: g10/pkclist.c:245 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"\n" -msgstr " alias \"" +msgstr " alias « %s »\n" #: g10/pkclist.c:255 -#, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" -msgstr "Cette clé appartient probablement à son propriétaire\n" +msgstr "" +"Jusqu'à quel point avez-vous confiance au fait que cette clé\n" +"appartient rééllement à l'utilisateur nommé ?\n" #: g10/pkclist.c:270 -#, fuzzy, c-format +#, c-format msgid " %d = I don't know or won't say\n" -msgstr " %d = ne sait pas\n" +msgstr " %d = ne sais pas ou ne dirai pas\n" #: g10/pkclist.c:272 -#, fuzzy, c-format +#, c-format msgid " %d = I do NOT trust\n" -msgstr " %d = je ne fais PAS confiance\n" +msgstr " %d = je ne fais PAS confiance\n" #: g10/pkclist.c:278 -#, fuzzy, c-format +#, c-format msgid " %d = I trust ultimately\n" -msgstr " %d = je donne une confiance ultime\n" +msgstr " %d = je donne une confiance ultime\n" #: g10/pkclist.c:284 -#, fuzzy msgid " m = back to the main menu\n" -msgstr " m = retour au menu principal\n" +msgstr " m = retour au menu principal\n" #: g10/pkclist.c:287 -#, fuzzy msgid " s = skip this key\n" -msgstr " s = sauter cette clé\n" +msgstr " s = sauter cette clé\n" #: g10/pkclist.c:288 -#, fuzzy msgid " q = quit\n" -msgstr " q = quitter\n" +msgstr " q = quitter\n" #: g10/pkclist.c:292 #, c-format @@ -4934,55 +4929,57 @@ "The minimum trust level for this key is: %s\n" "\n" msgstr "" +"Le niveau de confiance minimal pour cette clé est: %s\n" +"\n" #: g10/pkclist.c:298 g10/revoke.c:609 msgid "Your decision? " msgstr "Votre décision ? " #: g10/pkclist.c:319 -#, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " -msgstr "Voulez-vous vraiment donner une confiance ultime à cette clé ?" +msgstr "Voulez-vous vraiment donner une confiance ultime à cette clé ? (o/N) " #: g10/pkclist.c:333 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificats conduisant vers une clé à confiance ultime:\n" #: g10/pkclist.c:418 -#, fuzzy, c-format +#, c-format msgid "%s: There is no assurance this key belongs to the named user\n" -msgstr "%08lX: Rien ne dit que la clé appartient vraiment au propriétaire.\n" +msgstr "" +"%s: Rien ne dit que la clé appartient vraiment à l'utilisateur\n" +"nommé.\n" #: g10/pkclist.c:423 -#, fuzzy, c-format +#, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" -msgstr "%08lX: Rien ne dit que la clé appartient vraiment au propriétaire.\n" +msgstr "" +"%s: Il n'est pas vraiment sûr que la clé appartient vraiment\n" +"à l'utilisateur nommé.\n" #: g10/pkclist.c:429 -#, fuzzy msgid "This key probably belongs to the named user\n" -msgstr "Cette clé appartient probablement à son propriétaire\n" +msgstr "Cette clé appartient probablement à l'utilisateur nommé\n" #: g10/pkclist.c:434 msgid "This key belongs to us\n" msgstr "Cette clé nous appartient\n" #: g10/pkclist.c:460 -#, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" "in the user ID. If you *really* know what you are doing,\n" "you may answer the next question with yes.\n" msgstr "" -"Il n'est PAS certain que la clé appartient à sos propriétaire.\n" -"Si vous savez *vraiment* ce que vous faites, vous pouvez répondre\n" -"oui à la prochaine question\n" +"Il n'est PAS certain que la clé appartient à la personne nomée dans\n" +"le nom d'utilisateur. Si vous savez *vraiment* ce que vous faites,\n" +"vous pouvez répondre oui à la prochaine question.\n" "\n" #: g10/pkclist.c:467 -#, fuzzy msgid "Use this key anyway? (y/N) " -msgstr "Utiliser cette clé quand même ? " +msgstr "Utiliser cette clé quand même ? (o/N) " #: g10/pkclist.c:501 msgid "WARNING: Using untrusted key!\n" @@ -5003,7 +5000,7 @@ msgstr "ATTENTION: Cette clé à été révoquée par son propriétaire !\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +msgid " This could mean that the signature is forged.\n" msgstr " Cela pourrait signifier que la signature est fausse.\n" #: g10/pkclist.c:527 @@ -5068,7 +5065,7 @@ #: g10/pkclist.c:802 msgid "Current recipients:\n" -msgstr "" +msgstr "Récipients actuels:\n" #: g10/pkclist.c:828 msgid "" @@ -5084,7 +5081,7 @@ #: g10/pkclist.c:849 g10/pkclist.c:911 msgid "skipped: public key already set as default recipient\n" -msgstr "ignoré: la clé publique est déjà le récipient par défaut\n" +msgstr "ignoré: la clé publique est déjà le destinataire par défaut\n" #: g10/pkclist.c:867 msgid "Public key is disabled.\n" @@ -5095,9 +5092,9 @@ msgstr "ignoré: clé publique déjà activée\n" #: g10/pkclist.c:903 -#, fuzzy, c-format +#, c-format msgid "unknown default recipient \"%s\"\n" -msgstr "récipient par défaut `%s' inconnu\n" +msgstr "destinataire par défaut « %s » inconnu\n" #: g10/pkclist.c:948 #, c-format @@ -5114,40 +5111,40 @@ "les données ne sont pas enregistrées; utilisez l'option «--output» pour\n" "les enregistrer\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "erreur pendant la création de `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Signature détachée.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Entrez le nom du fichier de données: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "lecture de l'entrée standard...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "pas de données signées\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossible d'ouvir les données signées `%s'\n" #: g10/pubkey-enc.c:103 -#, fuzzy, c-format +#, c-format msgid "anonymous recipient; trying secret key %s ...\n" -msgstr "destinataire anonyme; essai de la clé secrète %08lX...\n" +msgstr "destinataire anonyme; essai de la clé secrète %s...\n" #: g10/pubkey-enc.c:119 msgid "okay, we are the anonymous recipient.\n" -msgstr "d'accord, nous sommes le récipient anonyme.\n" +msgstr "d'accord, nous sommes le destinataire anonyme.\n" #: g10/pubkey-enc.c:207 msgid "old encoding of the DEK is not supported\n" @@ -5159,16 +5156,16 @@ msgstr "l'algorithme de chiffrement %d%s est inconnu ou désactivé\n" #: g10/pubkey-enc.c:266 -#, fuzzy, c-format +#, c-format msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" msgstr "" -"NOTE: l'algorithme de chiffrement %d n'a pas été trouvé dans les " -"préférences\n" +"AVERTISSEMENT: l'algorithme de chiffrement %s n'a pas été trouvé\n" +"dans les préférences du destinataire\n" #: g10/pubkey-enc.c:286 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %s expired at %s\n" -msgstr "NOTE: la clé secrète %08lX a expiré le %s\n" +msgstr "NOTE: la clé secrète %s a expiré le %s\n" #: g10/pubkey-enc.c:292 msgid "NOTE: key has been revoked" @@ -5181,9 +5178,9 @@ msgstr "build_packet a échoué: %s\n" #: g10/revoke.c:146 -#, fuzzy, c-format +#, c-format msgid "key %s has no user IDs\n" -msgstr "clé %08lX: pas de nom d'utilisateur\n" +msgstr "clé %s: pas de nom d'utilisateur\n" #: g10/revoke.c:272 msgid "To be revoked by:\n" @@ -5194,9 +5191,8 @@ msgstr "(c'est une clé de révocation sensible)\n" #: g10/revoke.c:280 -#, fuzzy msgid "Create a designated revocation certificate for this key? (y/N) " -msgstr "Générer un certificat de révocation pour cette clé ? " +msgstr "Générer un certificat de révocation désignée pour cette clé ? (o/N) " #: g10/revoke.c:293 g10/revoke.c:511 msgid "ASCII armored output forced.\n" @@ -5212,14 +5208,14 @@ msgstr "Certificat de révocation créé.\n" #: g10/revoke.c:376 -#, fuzzy, c-format +#, c-format msgid "no revocation keys found for \"%s\"\n" -msgstr "aucune clé de révocation trouvée pour `%s'\n" +msgstr "aucune clé de révocation trouvée pour « %s »\n" #: g10/revoke.c:432 -#, fuzzy, c-format +#, c-format msgid "secret key \"%s\" not found: %s\n" -msgstr "la clé secrète `%s' n'a pas été trouvée: %s\n" +msgstr "la clé secrète « %s » n'a pas été trouvée: %s\n" #: g10/revoke.c:461 #, c-format @@ -5231,9 +5227,8 @@ msgstr "la clé publique ne correspond pas à la clé secrète !\n" #: g10/revoke.c:479 -#, fuzzy msgid "Create a revocation certificate for this key? (y/N) " -msgstr "Générer un certificat de révocation pour cette clé ? " +msgstr "Générer un certificat de révocation pour cette clé ? (o/N) " #: g10/revoke.c:496 msgid "unknown protection algorithm\n" @@ -5290,9 +5285,8 @@ msgstr "(Aucune description donnée)\n" #: g10/revoke.c:680 -#, fuzzy msgid "Is this okay? (y/N) " -msgstr "Est-ce d'accord ? " +msgstr "Est-ce d'accord ? (o/N) " #: g10/seckey-cert.c:54 msgid "secret key parts are not available\n" @@ -5304,9 +5298,9 @@ msgstr "l'algorithme de protection %d%s n'est pas supporté\n" #: g10/seckey-cert.c:71 -#, fuzzy, c-format +#, c-format msgid "protection digest %d is not supported\n" -msgstr "l'algorithme de protection %d%s n'est pas supporté\n" +msgstr "le hachage de protection %d n'est pas supporté\n" #: g10/seckey-cert.c:250 msgid "Invalid passphrase; please try again" @@ -5347,70 +5341,68 @@ msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n" #: g10/sig-check.c:99 -#, fuzzy, c-format +#, c-format msgid "WARNING: signing subkey %s is not cross-certified\n" msgstr "" -"AVERTISSEMENT: la sous-clé de signature %08lX n'a pas de certificat\n" +"AVERTISSEMENT: la sous-clé de signature %s n'a pas de certificat\n" "croisé\n" #: g10/sig-check.c:102 -#, fuzzy, c-format +#, c-format msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -"AVERTISSEMENT: la sous-clé de signature %08lX a un certificat croisé\n" +"AVERTISSEMENT: la sous-clé de signature %s a un certificat croisé\n" "invalide\n" #: g10/sig-check.c:168 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu second newer than the signature\n" -msgstr "" -"la clé publique %08lX est plus récente de %lu seconde que la signature\n" +msgstr "la clé publique %s est plus récente de %lu seconde que la signature\n" #: g10/sig-check.c:169 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu seconds newer than the signature\n" -msgstr "" -"la clé publique %08lX est plus récente de %lu secondes que la signature\n" +msgstr "la clé publique %s est plus récente de %lu secondes que la signature\n" # on s'amuse comme on peut... #: g10/sig-check.c:180 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" -"la clé a été créée %lu seconde dans le futur (rupture spatio-temporelle ou\n" -"problème d'horloge)\n" +"la clé %s a été créée %lu seconde dans le futur (rupture\n" +"spatio-temporelle ou problème d'horloge)\n" #: g10/sig-check.c:182 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" -"la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n" -"problème d'horloge\n" +"la clé %s a été créée %lu secondes dans le futur (rupture\n" +"spatio-temporelle ou problème d'horloge)\n" #: g10/sig-check.c:192 -#, fuzzy, c-format +#, c-format msgid "NOTE: signature key %s expired %s\n" -msgstr "NOTE: la clé de signature %08lX a expiré le %s\n" +msgstr "NOTE: la clé de signature %s a expiré le %s\n" #: g10/sig-check.c:275 -#, fuzzy, c-format +#, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "" -"la signature de la clé %08lX est supposée être fausse car un bit\n" +"la signature de la clé %s est supposée être fausse car un bit\n" "critique est inconnu\n" #: g10/sig-check.c:532 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey revocation signature\n" -msgstr "clé %08lX: pas de sous-clé pour le paquet de révocation de sous-clé\n" +msgstr "clé %s: pas de sous-clé pour la signature de révocation de sous-clé\n" #: g10/sig-check.c:558 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "" -"clé %08lX: pas de sous-clé pour la signature de liaison à la\n" +"clé %s: pas de sous-clé pour la signature de liaison à la\n" "sous-clé\n" #: g10/sign.c:85 @@ -5445,20 +5437,20 @@ "(de style PGP 2.x)\n" #: g10/sign.c:159 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n" msgstr "" -"AVERTISSEMENT: impossible de faire une expansion à base de %% de l'url\n" +"AVERTISSEMENT: impossible de faire une expansion à base de %% de l'URL\n" "de politique (trop grande). Utilisation de la version non expansée.\n" #: g10/sign.c:187 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand preferred keyserver URL (too large). Using " "unexpanded.\n" msgstr "" -"AVERTISSEMENT: impossible de faire une expansion à base de %% de l'url\n" +"AVERTISSEMENT: impossible de faire une expansion à base de %% de l'URL\n" "de politique (trop grande). Utilisation de la version non expansée.\n" #: g10/sign.c:364 @@ -5467,9 +5459,9 @@ msgstr "Impossible de vérifier la signature créée: %s\n" #: g10/sign.c:373 -#, fuzzy, c-format +#, c-format msgid "%s/%s signature from: \"%s\"\n" -msgstr "Signature %s de: \"%s\"\n" +msgstr "%s/%s signature de: « %s »\n" #: g10/sign.c:741 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" @@ -5477,60 +5469,54 @@ "il n'est possible générer une signature détachée avec des clés de\n" "style PGP 2.x qu'en mode --pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "écriture de `%s'\n" - -#: g10/sign.c:807 -#, fuzzy, c-format +#: g10/sign.c:808 +#, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" -"forcer l'algorithme de chiffrement %s (%d) entre en désaccord avec\n" -"les préférences du récipient\n" +"AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n" +"désaccord avec les préférences du destinataire\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "signature:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "il n'est possible de faire une signature en texte clair avec des clés\n" "de style PGP 2.x qu'en mode --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "le chiffrement %s sera utilisé\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "la clé n'est pas marquée comme non-sûre; on ne peut pas l'utiliser avec le\n" "pseudo-générateur de nombres aléatiores !\n" -#: g10/skclist.c:158 -#, fuzzy, c-format +#: g10/skclist.c:157 +#, c-format msgid "skipped \"%s\": duplicated\n" -msgstr "`%s' a été ignoré: dupliqué\n" +msgstr "« %s » a été ignoré: dupliqué\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 -#, fuzzy, c-format +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 +#, c-format msgid "skipped \"%s\": %s\n" -msgstr "`%s' a été ignoré: %s\n" +msgstr "« %s » a été ignoré: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "ignoré: clé secrète déjà présente\n" -#: g10/skclist.c:186 -#, fuzzy +#: g10/skclist.c:185 msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" -"`%s' a été ignorée: c'est une clé ElGamal générée par PGP qui n'est pas\n" -"sûre pour les signatures !\n" +"c'est une clé ElGamal générée par PGP qui n'est pas sûre pour\n" +"les signatures !" #: g10/tdbdump.c:59 g10/trustdb.c:365 #, c-format @@ -5547,38 +5533,37 @@ "# (Utilisez « gpg --import-ownertrust » pour les restaurer)\n" #: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177 -#, fuzzy, c-format +#, c-format msgid "error in `%s': %s\n" -msgstr "erreur pendant la lecture de `%s': %s\n" +msgstr "erreur dans `%s': %s\n" #: g10/tdbdump.c:159 -#, fuzzy msgid "line too long" -msgstr "ligne trop longue\n" +msgstr "ligne trop longue" #: g10/tdbdump.c:167 msgid "colon missing" -msgstr "" +msgstr "symbole deux-points manquant" #: g10/tdbdump.c:173 -#, fuzzy msgid "invalid fingerprint" -msgstr "erreur: empreinte invalide\n" +msgstr "empreinte invalide" #: g10/tdbdump.c:178 -#, fuzzy msgid "ownertrust value missing" -msgstr "importer les indices de confiance" +msgstr "valeur de confiance au propriétaire manquante" #: g10/tdbdump.c:214 -#, fuzzy, c-format +#, c-format msgid "error finding trust record in `%s': %s\n" -msgstr "erreur pendant la recherche de l'enregistrement de confiance: %s\n" +msgstr "" +"erreur pendant la recherche de l'enregistrement de confiance\n" +"dans `%s': %s\n" #: g10/tdbdump.c:218 -#, fuzzy, c-format +#, c-format msgid "read error in `%s': %s\n" -msgstr "erreur de lecture: %s\n" +msgstr "erreur de lecture dans `%s': %s\n" #: g10/tdbdump.c:227 g10/trustdb.c:380 #, c-format @@ -5601,9 +5586,9 @@ msgstr "transaction de base de confiance trop volumineuse\n" #: g10/tdbio.c:497 -#, fuzzy, c-format +#, c-format msgid "can't access `%s': %s\n" -msgstr "impossible de fermer `%s': %s\n" +msgstr "impossible d'accéder à `%s': %s\n" #: g10/tdbio.c:512 #, c-format @@ -5611,14 +5596,14 @@ msgstr "%s: le répertoire n'existe pas !\n" #: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588 -#, fuzzy, c-format +#, c-format msgid "can't create lock for `%s'\n" -msgstr "impossible de créer `%s': %s\n" +msgstr "impossible de créer un verrou pour `%s'\n" #: g10/tdbio.c:524 g10/tdbio.c:591 -#, fuzzy, c-format +#, c-format msgid "can't lock `%s'\n" -msgstr "impossible d'ouvrir `%s'\n" +msgstr "impossible de verrouiller `%s'\n" #: g10/tdbio.c:550 #, c-format @@ -5716,12 +5701,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "la base de confiance est corrompue; exécutez «gpg --fix-trustdb».\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossible de traiter les lignes plus longues que %d caractères\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "la ligne d'entrée est plus longue que %d caractères\n" @@ -5732,24 +5717,24 @@ msgstr "`%s' n'est pas une identification de clé longue valide\n" #: g10/trustdb.c:257 -#, fuzzy, c-format +#, c-format msgid "key %s: accepted as trusted key\n" -msgstr "clé %08lX: acceptée comme clé de confiance.\n" +msgstr "clé %s: acceptée comme clé de confiance.\n" #: g10/trustdb.c:295 -#, fuzzy, c-format +#, c-format msgid "key %s occurs more than once in the trustdb\n" -msgstr "la clé %08lX apparaît plusieurs fois dans la base de confiance\n" +msgstr "la clé %s apparaît plusieurs fois dans la base de confiance\n" #: g10/trustdb.c:310 -#, fuzzy, c-format +#, c-format msgid "key %s: no public key for trusted key - skipped\n" -msgstr "clé %08lX: pas de clé publique pour la clé de confiance - ignorée\n" +msgstr "clé %s: pas de clé publique pour la clé de confiance - ignorée\n" #: g10/trustdb.c:320 -#, fuzzy, c-format +#, c-format msgid "key %s marked as ultimately trusted\n" -msgstr "clé marquée comme ayant une confiance ultime.\n" +msgstr "clé %s marquée comme ayant une confiance ultime.\n" #: g10/trustdb.c:344 #, c-format @@ -5767,94 +5752,142 @@ #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "" +"impossible d'utiliser ce modèle de confiance inconnu (%d) -\n" +"on utilise à la place le modèle de confiance %s\n" #: g10/trustdb.c:452 #, c-format msgid "using %s trust model\n" +msgstr "utilisation du modèle de confiance %s\n" + +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:501 -msgid "undefined" +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "revoquée" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "expirée" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "inconnu" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +#, fuzzy +msgid "[marginal]" +msgstr "marginale" + +#: g10/trustdb.c:514 +msgid "[ full ]" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:515 #, fuzzy +msgid "[ultimate]" +msgstr "ultime" + +#: g10/trustdb.c:530 +msgid "undefined" +msgstr "indéfini" + +#: g10/trustdb.c:531 msgid "never" -msgstr "jamais " +msgstr "jamais" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" -msgstr "" +msgstr "marginale" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" -msgstr "" +msgstr "pleine" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" -msgstr "" +msgstr "ultime" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "vérification de la base de confiance inutile\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n" -#: g10/trustdb.c:560 -#, fuzzy, c-format +#: g10/trustdb.c:589 +#, c-format msgid "no need for a trustdb check with `%s' trust model\n" -msgstr "vérification de la base de confiance inutile\n" +msgstr "" +"vérification de la base de confiance inutile avec le modèle de\n" +"confiance `%s'\n" -#: g10/trustdb.c:575 -#, fuzzy, c-format +#: g10/trustdb.c:604 +#, c-format msgid "no need for a trustdb update with `%s' trust model\n" -msgstr "vérification de la base de confiance inutile\n" +msgstr "" +"mise à jour de la base de confiance inutile avec le modèle de\n" +"confiance `%s'\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 -#, fuzzy, c-format +#: g10/trustdb.c:822 g10/trustdb.c:1260 +#, c-format msgid "public key %s not found: %s\n" -msgstr "clé publique %08lX non trouvée : %s\n" +msgstr "clé publique %s non trouvée : %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "faites un --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "vérifier la base de confiance\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d clés traitées (%d comptes de validité réinitialisés)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "aucune clé de confiance ultime n'a été trouvée\n" -#: g10/trustdb.c:1934 -#, fuzzy, c-format +#: g10/trustdb.c:1963 +#, c-format msgid "public key of ultimately trusted key %s not found\n" -msgstr "la clé publique de la clé de confiace ultime %08lX est introuvable\n" +msgstr "la clé publique de la clé de confiance ultime %s est introuvable\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" +"%d marginale(s) nécessaires, %d complète(s) nécessaires, modèle\n" +"de confiance %s\n" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" +"profondeur: %d valide: %3d signé: %3d\n" +"confiance: %d-. %dg. %dn. %dm. %df. %du\n" -#: g10/trustdb.c:2118 -#, fuzzy, c-format +#: g10/trustdb.c:2147 +#, c-format msgid "unable to update trustdb version record: write failed: %s\n" -msgstr "enregistrement de confiance %lu, type %d: l'écriture a échoué: %s\n" +msgstr "" +"impossible de mettre à jour l'enregistrement de version de la\n" +"base de confiance: l'écriture a échoué: %s\n" #: g10/verify.c:116 msgid "" @@ -6082,22 +6115,20 @@ msgstr "erreur du serveur de clés" #: util/errors.c:108 -#, fuzzy msgid "canceled" -msgstr "Annuler" +msgstr "annulé" #: util/errors.c:109 -#, fuzzy msgid "no card" -msgstr "non chiffré" +msgstr "pas de carte" #: util/logger.c:157 msgid "ERROR: " -msgstr "" +msgstr "ERREUR: " #: util/logger.c:160 msgid "WARNING: " -msgstr "" +msgstr "AVERTISSEMENT: " #: util/logger.c:223 #, c-format @@ -6131,20 +6162,19 @@ #: util/miscutil.c:384 msgid "okay|okay" -msgstr "" +msgstr "ok|ok" #: util/miscutil.c:386 msgid "cancel|cancel" -msgstr "" +msgstr "annuler|annuler" #: util/miscutil.c:387 msgid "oO" -msgstr "" +msgstr "oO" #: util/miscutil.c:388 -#, fuzzy msgid "cC" -msgstr "c" +msgstr "aA" #: util/secmem.c:90 msgid "WARNING: using insecure memory!\n" @@ -6164,467 +6194,61 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n" -#~ msgid "sorry, can't do this in batch mode\n" -#~ msgstr "désolé, impossible de faire cela en mode automatique\n" - -#~ msgid "key `%s' not found: %s\n" -#~ msgstr "clé '%s' introuvable: %s\n" - -#, fuzzy -#~ msgid "can't create file `%s': %s\n" -#~ msgstr "impossible de créer `%s': %s\n" - -#, fuzzy -#~ msgid "can't open file `%s': %s\n" -#~ msgstr "impossible d'ouvrir le fichier: %s\n" - -#, fuzzy -#~ msgid " \"" -#~ msgstr " alias \"" - -#~ msgid " i = please show me more information\n" -#~ msgstr " i = donnez-moi plus d'informations\n" - -#~ msgid "key %08lX: key has been revoked!\n" -#~ msgstr "clé %08lX: la clé a été révoquée !\n" - -#~ msgid "key %08lX: subkey has been revoked!\n" -#~ msgstr "clé %08lX: la sous-clé a été révoquée !\n" - -#~ msgid "%08lX: key has expired\n" -#~ msgstr "%08lX: la clé a expiré\n" - -#~ msgid "%08lX: We do NOT trust this key\n" -#~ msgstr "%08lX: Nous ne faisons PAS confiance à cette clé\n" - -#~ msgid " (%d) RSA (sign and encrypt)\n" -#~ msgstr " (%d) RSA (signature et chiffrement)\n" - -#, fuzzy -#~ msgid " (%d) RSA (auth only)\n" -#~ msgstr " (%d) RSA (signature seule)\n" - -#, fuzzy -#~ msgid " (%d) RSA (sign and auth)\n" -#~ msgstr " (%d) RSA (signature et chiffrement)\n" - -#, fuzzy -#~ msgid " (%d) RSA (encrypt and auth)\n" -#~ msgstr " (%d) RSA (chiffrement seul)\n" - -#, fuzzy -#~ msgid " (%d) RSA (sign, encrypt and auth)\n" -#~ msgstr " (%d) RSA (signature et chiffrement)\n" - -#~ msgid "%s: can't open: %s\n" -#~ msgstr "%s: impossible d'ouvrir: %s\n" - -#~ msgid "%s: WARNING: empty file\n" -#~ msgstr "%s: ATTENTION: fichier vide\n" - -#~ msgid "can't open %s: %s\n" -#~ msgstr "impossible d'ouvrir %s: %s\n" - -#, fuzzy -#~ msgid " (%d) I trust marginally\n" -#~ msgstr " %d = je crois marginalement\n" - -#, fuzzy -#~ msgid " (%d) I trust fully\n" -#~ msgstr " %d = je fais entièrement confiance\n" - -#, fuzzy -#~ msgid "expires" -#~ msgstr "expire" - -#, fuzzy -#~ msgid "" -#~ "\"\n" -#~ "locally signed with your key %s at %s\n" -#~ msgstr "" -#~ "\"\n" -#~ "signé localement avec votre clé %08lX à %s\n" - -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " signé par %08lX à %s%s\n" - -#~ msgid "%s: can't access: %s\n" -#~ msgstr "%s: impossible d'accéder: %s\n" - -#~ msgid "%s: can't create lock\n" -#~ msgstr "%s: impossible de créer le verrouillage\n" - -#~ msgid "%s: can't make lock\n" -#~ msgstr "%s: impossible de créer le verrou\n" - -#~ msgid "%s: can't create: %s\n" -#~ msgstr "%s: impossible de créer: %s\n" - -#~ msgid "%s: can't create directory: %s\n" -#~ msgstr "%s: impossible de créer le répertoire: %s\n" - -#~ msgid "If you want to use this revoked key anyway, answer \"yes\"." +#~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "" -#~ "Si vous voulez utiliser cette clé révoquée quand-même, répondez «oui»." - -#~ msgid "Unable to open photo \"%s\": %s\n" -#~ msgstr "Impossible d'ouvrir la photo « %s »: %s\n" - -#~ msgid "can't open file: %s\n" -#~ msgstr "impossible d'ouvrir le fichier: %s\n" - -#~ msgid "error: missing colon\n" -#~ msgstr "erreur: symbole deux-points manquant\n" - -#~ msgid "error: no ownertrust value\n" -#~ msgstr "erreur: pas de valeur de confiance au propriétaire\n" - -#~ msgid " (main key ID %08lX)" -#~ msgstr " (ID clé principale %08lX)" +#~ "l'algorithme de hachage `%s' ne marche qu'en lecture seule dans cette\n" +#~ "version\n" -#~ msgid "rev! subkey has been revoked: %s\n" -#~ msgstr "rev! la sous-clé a été révoquée: %s\n" - -#~ msgid "rev- faked revocation found\n" -#~ msgstr "rev- une révocation truquée a été trouvée\n" - -#~ msgid "rev? problem checking revocation: %s\n" -#~ msgstr "rev? problème de vérification de la révocation: %s\n" - -#~ msgid "[revoked] " -#~ msgstr "[revoquée] " - -#~ msgid "[expired] " -#~ msgstr "[expirée] " - -#, fuzzy -#~ msgid " [expired: %s]" -#~ msgstr " [expire: %s]" - -#~ msgid " [expires: %s]" -#~ msgstr " [expire: %s]" - -#, fuzzy -#~ msgid " [revoked: %s]" -#~ msgstr "[revoquée] " - -#~ msgid "can't create %s: %s\n" -#~ msgstr "impossible de créer %s: %s\n" +#~ msgid "[%8.8s] " +#~ msgstr "[%8.8s] " #~ msgid "" -#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" #~ msgstr "" -#~ "AVERTISSEMENT: l'algorithme de hachage `%s' ne fait pas partie\n" -#~ "d'OpenPGP. Son utilisation est à vos risques et périls !\n" - -#~ msgid "|[files]|encrypt files" -#~ msgstr "|[fichiers]|chiffrer les fichiers" - -#~ msgid "store only" -#~ msgstr "pas d'action" - -#~ msgid "|[files]|decrypt files" -#~ msgstr "|[fich.]|déchiffrer les fichiers" - -#~ msgid "sign a key non-revocably" -#~ msgstr "signer une clé irrévocablement" - -#~ msgid "sign a key locally and non-revocably" -#~ msgstr "signer une clé localement et irrévocablement" - -#~ msgid "list only the sequence of packets" -#~ msgstr "ne lister que les paquets" - -#~ msgid "export the ownertrust values" -#~ msgstr "exporter les indices de confiance" +#~ "Préparation à la génération d'une nouvelle paire de clés %s.\n" +#~ " la taille minimale est 768 bits\n" +#~ " la taille par défaut est 1024 bits\n" +#~ " la taille maximale conseillée est 2048 bits\n" -#~ msgid "unattended trust database update" -#~ msgstr "mise à jour inattendue de la base de confiance" +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n" -#~ msgid "fix a corrupted trust database" -#~ msgstr "réparer une base de confiance corrompue" - -#~ msgid "De-Armor a file or stdin" -#~ msgstr "" -#~ "Enlever l'armure d'un fichier ou de\n" -#~ "l'entrée standard" - -#~ msgid "En-Armor a file or stdin" +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" #~ msgstr "" -#~ "Mettre une armure à un fichier ou à\n" -#~ "l'entrée standard" - -#~ msgid "|NAME|use NAME as default recipient" -#~ msgstr "|NOM|utiliser NOM comme récipient par défaut" - -#~ msgid "use the default key as default recipient" -#~ msgstr "utiliser la clé par déf. comme récipient" - -#~ msgid "don't use the terminal at all" -#~ msgstr "ne pas utiliser du tout le terminal" - -#~ msgid "force v3 signatures" -#~ msgstr "forcer les signatures en v3" - -#~ msgid "do not force v3 signatures" -#~ msgstr "ne pas forcer les signatures en v3" - -#~ msgid "force v4 key signatures" -#~ msgstr "forcer les signatures en v4" - -#~ msgid "do not force v4 key signatures" -#~ msgstr "ne pas forcer les signatures en v4" - -#~ msgid "always use a MDC for encryption" -#~ msgstr "toujours utiliser un sceau pour le chiffrement" - -#~ msgid "never use a MDC for encryption" -#~ msgstr "" -#~ "ne jamais utiliser de sceau pour le\n" -#~ "chiffrement" - -#~ msgid "use the gpg-agent" -#~ msgstr "utiliser gpg-agent" - -#~ msgid "batch mode: never ask" -#~ msgstr "mode automatique: ne jamais rien demander" - -#~ msgid "assume yes on most questions" -#~ msgstr "répondre oui à la plupart des questions" - -#~ msgid "assume no on most questions" -#~ msgstr "répondre non à la plupart des questions" - -#~ msgid "add this keyring to the list of keyrings" -#~ msgstr "ajouter ce porte-clés à la liste" - -#~ msgid "add this secret keyring to the list" -#~ msgstr "ajouter ce porte-clés secret à la liste" - -#~ msgid "show which keyring a listed key is on" -#~ msgstr "indiquer où est une clé listée" - -#~ msgid "|NAME|use NAME as default secret key" -#~ msgstr "|NOM|utiliser NOM comme clé secrète par défaut" - -#~ msgid "|HOST|use this keyserver to lookup keys" -#~ msgstr "|HÔTE|utiliser ce serveur pour chercher des clés" - -#~ msgid "|NAME|set terminal charset to NAME" -#~ msgstr "|NOM|le terminal utilise la table de caractères NOM" - -#~ msgid "read options from file" -#~ msgstr "lire les options du fichier" - -#~ msgid "|[file]|write status info to file" -#~ msgstr "|[fichier]|écrire les informations d'état vers ce fichier" - -#~ msgid "|KEYID|ultimately trust this key" -#~ msgstr "|IDCLÉ|donner une confiance ultime à cette clé" - -#~ msgid "|FILE|load extension module FILE" -#~ msgstr "|FICH|charger le module d'extension FICH" - -#~ msgid "emulate the mode described in RFC1991" -#~ msgstr "imiter le mode décrit dans la RFC1991" - -#~ msgid "set all packet, cipher and digest options to OpenPGP behavior" -#~ msgstr "utiliser le comportement défini par OpenPGP" - -#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior" -#~ msgstr "" -#~ "utiliser le comportement de PGP 2.x\n" -#~ "pour toutes les options de paquets,\n" -#~ "de hachage et de chiffrement" - -#~ msgid "|N|use passphrase mode N" -#~ msgstr "|N|coder les mots de passe suivant le mode N" - -#~ msgid "|NAME|use message digest algorithm NAME for passphrases" -#~ msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" +#~ "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n" -#~ msgid "|NAME|use cipher algorithm NAME for passphrases" -#~ msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe" +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "taille trop petite; 768 est la plus petite valeur permise.\n" -#~ msgid "|NAME|use cipher algorithm NAME" -#~ msgstr "|NOM|utiliser l'algorithme de chiffrement NOM" - -#~ msgid "|NAME|use message digest algorithm NAME" -#~ msgstr "|NOM|utiliser la fonction de hachage NOM" - -#~ msgid "|N|use compress algorithm N" -#~ msgstr "|N|utiliser l'algorithme de compression N" - -#~ msgid "throw keyid field of encrypted packets" -#~ msgstr "supprimer l'ident. des paquets chiffrés" - -#~ msgid "Show Photo IDs" -#~ msgstr "Montrer les photos d'identité" - -#~ msgid "Don't show Photo IDs" -#~ msgstr "Ne pas montrer les photos d'identité" - -#~ msgid "Set command line to view Photo IDs" -#~ msgstr "" -#~ "Choisir la ligne de commande servant à\n" -#~ "afficher les photos d'identité" - -#~ msgid "compress algorithm `%s' is read-only in this release\n" -#~ msgstr "" -#~ "l'algorithme de compression `%s' ne fonctionne qu'en lecture pour\n" -#~ "cette version\n" - -#~ msgid "compress algorithm must be in range %d..%d\n" -#~ msgstr "" -#~ "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n" - -#~ msgid "" -#~ "%08lX: It is not sure that this key really belongs to the owner\n" -#~ "but it is accepted anyway\n" -#~ msgstr "" -#~ "%08lX: Il n'est pas sûr que cette clé appartient vraiment à son\n" -#~ "propriétaire mais elle est quand même acceptée\n" - -#~ msgid "preference %c%lu is not valid\n" -#~ msgstr "la préférence %c%lu n'est pas valide\n" - -#~ msgid "key %08lX: not a rfc2440 key - skipped\n" -#~ msgstr "clé %08lX: ce n'est pas une clé rfc2440 - ignorée\n" - -#~ msgid "" -#~ "NOTE: Elgamal primary key detected - this may take some time to import\n" -#~ msgstr "" -#~ "NOTE: Clé principale Elgamal détectée - l'importation peut prendre un\n" -#~ "certain temps\n" - -#~ msgid " (default)" -#~ msgstr " (par défaut)" - -#~ msgid "%s%c %4u%c/%08lX created: %s expires: %s" -#~ msgstr "%s%c %4u%c/%08lX créée: %s expire: %s" - -#~ msgid "Notation: " -#~ msgstr "Notation: " - -#~ msgid "Policy: " -#~ msgstr "Politique: " - -#~ msgid "can't get key from keyserver: %s\n" -#~ msgstr "impossible d'obtenir les clés du serveur: %s\n" - -#~ msgid "error sending to `%s': %s\n" -#~ msgstr "erreur pendant l'envoi de `%s': %s\n" - -#~ msgid "success sending to `%s' (status=%u)\n" -#~ msgstr "l'envoi à `%s' s'est déroulé avec succès (résultat=%u)\n" - -#~ msgid "failed sending to `%s': status=%u\n" -#~ msgstr "l'envoi à `%s' a échoué: le résultat est %u\n" - -#~ msgid "this keyserver does not support --search-keys\n" -#~ msgstr "ce serveur de clés ne supporte pas --search-keys\n" - -#~ msgid "can't search keyserver: %s\n" -#~ msgstr "impossible de chercher une clé dans le serveur : %s\n" +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "taille trop importante; %d est la plus grande valeur permise.\n" #~ msgid "" -#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " -#~ "signatures!\n" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" #~ msgstr "" -#~ "clé %08lX: ceci est une clé ElGamal générée par PGP qui n'est PAS\n" -#~ "sûre pour les signatures !\n" +#~ "Les tailles supérieures à 2048 ne sont pas conseillées car\n" +#~ "les calculs prennent VRAIMENT beaucoup de temps !\n" -# on s'amuse comme on peut... -#~ msgid "" -#~ "key %08lX has been created %lu second in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "" -#~ "la clé %08lX a été créée %lu seconde dans le futur (rupture\n" -#~ "spatio-temporelle ou problème d'horloge)\n" +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Etes-vous sûr de vouloir cette taille de clé ? (o/N) " #~ msgid "" -#~ "key %08lX has been created %lu seconds in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "" -#~ "la clé %08lX a été créée %lu secondes dans le futur (rupture\n" -#~ "spatio-temporelle ou problème d'horloge\n" - -#~ msgid "key %08lX marked as ultimately trusted\n" -#~ msgstr "clé %08lX marquée comme ayant une confiance ultime.\n" - -#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n" -#~ msgstr "" -#~ "la signature de la clé de signature Elgamal %08lX pour %08lX a été\n" -#~ "ignorée\n" - -#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" #~ msgstr "" -#~ "la signature de %08lX pour la clé de signature Elgamal %08lX a été\n" -#~ "ignorée\n" +#~ "D'accord, mais n'oubliez pas que les radiations de votre écran et de " +#~ "votre\n" +#~ "clavier sont aussi très vulnérables aux attaques !\n" -#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" -#~ msgstr "" -#~ "vérification à la profondeur %d signé=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%" -#~ "d\n" +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n" #~ msgid "" -#~ "Select the algorithm to use.\n" -#~ "\n" -#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n" -#~ "for signatures. This is the suggested algorithm because verification of\n" -#~ "DSA signatures are much faster than those of ElGamal.\n" -#~ "\n" -#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n" -#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt " -#~ "only\n" -#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n" -#~ "selected in a special way to create a safe key for signatures: this " -#~ "program\n" -#~ "does this but other OpenPGP implementations are not required to " -#~ "understand\n" -#~ "the signature+encryption flavor.\n" -#~ "\n" -#~ "The first (primary) key must always be a key which is capable of " -#~ "signing;\n" -#~ "this is the reason why the encryption only ElGamal key is not available " -#~ "in\n" -#~ "this menu." +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" #~ msgstr "" -#~ "Sélectionnez l'algorithme à utiliser.\n" -#~ "DSA (alias DSS) est l'algorithme de signatures électroniques qui ne peut\n" -#~ "être utilisé que pour les signatures. C'est l'algorithme recommandé car\n" -#~ "la vérification des signatures DSA est beaucoup plus rapide que celle " -#~ "des\n" -#~ "signatures ElGamal.\n" -#~ "\n" -#~ "ElGamal est un algorithme pouvant à la fois être utilisé pour les\n" -#~ "signatures et le chiffrement. OpenPGP en distingue deux sortes:\n" -#~ "l'une destinée uniquement au chiffrement et l'autre pouvant aussi bien\n" -#~ "servir aux signatures ; elles sont en fait identiques mais certains\n" -#~ "paramètres doivent être spécialement choisis pour que la clé génère des\n" -#~ "signatures sûres: ce programme est capable de le faire mais les autres\n" -#~ "implantations de OpenPGP ne sont pas obligées d'accepter cette forme de\n" -#~ "clé.\n" -#~ "\n" -#~ "La première clé (clé principale) doit toujours être capable de signer ;\n" -#~ "c'est pourquoi la clé ElGamal de chiffrement seul est alors désactivée." - -#~ msgid "" -#~ "Although these keys are defined in RFC2440 they are not suggested\n" -#~ "because they are not supported by all programs and signatures created\n" -#~ "with them are quite large and very slow to verify." -#~ msgstr "" -#~ "Bien que ces clés soient définies dans la RFC2440 elles ne sont pas\n" -#~ "conseillées car tous les programmes ne les supportent pas et les\n" -#~ "signatures créées avec elles sont plutôt longues et très lentes à " -#~ "vérifier." - -#~ msgid "%lu keys so far checked (%lu signatures)\n" -#~ msgstr "%lu clés traitées jusqu'ici (%lu signatures)\n" - -#~ msgid "key incomplete\n" -#~ msgstr "clé incomplète\n" - -#~ msgid "key %08lX incomplete\n" -#~ msgstr "clé %08lX incomplète\n" +#~ "Cet algorithme de chiffrement est déconseillé; utilisez-en un\n" +#~ "plus standard !\n" Index: gnupg/po/gl.po diff -u gnupg/po/gl.po:1.12 gnupg/po/gl.po:1.13 --- gnupg/po/gl.po:1.12 Thu Oct 28 11:06:49 2004 +++ gnupg/po/gl.po Fri Dec 10 23:20:52 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -14,11 +14,6 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "o algoritmo de resumo `%s' é de só lectura nesta versión\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -33,11 +28,12 @@ msgid "no entropy gathering module detected\n" msgstr "non se detectou un módulo de acumulación de entropía\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -70,9 +66,9 @@ msgid "note: random_seed file not updated\n" msgstr "nota: o ficheiro random_seed non se actualiza\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "non se pode crear `%s': %s\n" @@ -128,90 +124,150 @@ "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n" "máis entropía (Precísanse %d bytes máis)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "o envío ao servidor de chaves fallou: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "erro ao crea-lo contrasinal: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "erro ao le-lo bloque de chaves: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: erro ao ler un rexistro libre: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' xa está comprimido\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "xerar un novo par de chaves" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "fallou o borrado do bloque de chaves: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "A xeración da chave fallou: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "non se atoparon datos OpenPGP válidos.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "erro ao crea-lo contrasinal: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "fallou o borrado do bloque de chaves: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -299,15 +355,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "non se pode facer iso no modo por lotes\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "¿A súa selección? " @@ -315,141 +371,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Non se especificou un motivo" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "non procesado" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "non hai unha chave pública correspondente: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "erro lendo `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "preferencias actualizadas" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "caracter non válido na cadea de preferencias\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "caracter non válido na cadea de preferencias\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "erro: pegada dactilar non válida\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Pegada dactilar:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "erro: pegada dactilar non válida\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "A xeración da chave fallou: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "non se atoparon datos OpenPGP válidos.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "erro escribindo no chaveiro secreto `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -457,233 +522,257 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Por favor, seleccione o tipo de chave que quere:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "A sinatura caducou o %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (só cifrar)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Selección non válida.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Por favor, escolla o motivo da revocación:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo de protección descoñecido\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "as partes secretas da chave primaria non están dispoñibles.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "omítese: a chave secreta xa está presente\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "abandonar" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "saír deste menú" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "s" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "axuda" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "amosar esta axuda" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "listar" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Chave dispoñible en: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "depurar" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "cambia-la fecha de expiración" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "cambia-la confianza sobre o dono" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "amosar fingerprint" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "erro xeral" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "xerar un novo par de chaves" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Comando incorrecto (tente \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Introduza o ID de usuario: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Introduza o ID de usuario: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Introduza o ID de usuario: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Repita o contrasinal: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "o contrasinal non se repetiu correctamente; ténteo de novo" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -693,13 +782,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output non traballa con este comando\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "non se atopou a chave `%s': %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -743,7 +832,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "empregue a opción \"--delete-secret-keys\" para borrala primeiro.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "erro ao crea-lo contrasinal: %s\n" @@ -762,7 +851,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' xa está comprimido\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' é un ficheiro baleiro\n" @@ -790,7 +879,7 @@ msgstr "" "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -895,28 +984,28 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "chave %08lX: non está protexida - omitida\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" "AVISO: a chave secreta %08lX non ten unha suma de comprobación SK simple\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "AVISO: non se exportou nada\n" @@ -1095,15 +1184,15 @@ msgid "prompt before overwriting" msgstr "avisar antes de sobrescribir" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1111,7 +1200,7 @@ "@\n" "(Vexa a páxina man para un listado completo de comandos e opcións)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1131,17 +1220,17 @@ " --list-keys [nomes] amosa-las chaves\n" " --fingerprint [nomes] amosa-las pegadas dactilares\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "Por favor, informe dos erros no programa a ,\n" "e dos erros na traducción a .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1151,7 +1240,7 @@ "asinar, verificar, cifrar ou descifrar\n" "a operación por defecto depende dos datos de entrada\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1159,465 +1248,465 @@ "\n" "Algoritmos soportados:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Pública: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Cifra: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Compresión: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "uso: gpg [opcións] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "comandos conflictivos\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "non se atopou un signo = na definición do grupo \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "AVISO: propiedade insegura en %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "AVISO: propiedade insegura en %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "AVISO: propiedade insegura en %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "AVISO: permisos inseguros en %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "AVISO: permisos inseguros en %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "AVISO: permisos inseguros en %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr " creouse un novo ficheiro de configuración `%s'\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opcións `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "lendo as opcións de `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s non é para uso normal!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "non se cargou a extensión de cifrado \"%s\" debido a permisos inseguros\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "opcións de importación non válidas\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "opcións de importación non válidas\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "non se puido estabrecer exec-path a %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s fai que se ignore %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s non se admite con %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s non ten sentido empregándoo con %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode crear sinaturas separadas ou en claro no modo --pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "debe empregar ficheiros (e non canalizacións) ao traballar con --pgp2 " "activado.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "para cifrar unha mensaxe en modo --pgp2 precísase da cifra IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de resumo seleccionado non é válido\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser superior a 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser superior a 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth debe valer entre 1 e 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "preferencias por defecto non válidas\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "preferencias de cifrado personais non válidas\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "preferencias de resumo personais non válidas\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "preferencias de compresión personais non válidas\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "¡%s aínda non traballa con %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [ficheiro]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [ficheiro]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "o descifrado fallou: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [ficheiro]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [ficheiro]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ficheiro]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [ficheiro]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [ficheiro]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id-de-usuario" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id-de-usuario" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-de-usuario" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-de-usuario" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-de-usuario [comandos]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "o envío ao servidor de chaves fallou: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "a recepción do servidor de chaves fallou: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "a exportación da chave fallou: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "a busca no servidor de chaves fallou fallou: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "a actualización no servidor de chaves fallou: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "non se puido quita-la armadura: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "non se puido poñe-la armadura: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash non válido `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[ficheiro]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Escriba a súa mensaxe ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1625,23 +1714,23 @@ "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe " "rematar en '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación non pode empregar ningún carácter de control\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "o URL de normativa de certificación dado non é válido\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non é válido\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non é válido\n" @@ -1650,29 +1739,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "demasiadas entradas na caché de chaves públicas - desactivada\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Non se atopou o id de usuario]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "non hai unha sub-chave secreta para a sub-chave pública %08lX - ignórase\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sen chave pública - omitida\n" @@ -2024,389 +2113,389 @@ msgid "No help available for `%s'" msgstr "Non hai axuda dispoñible para `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "pasando por alto un bloque de tipo %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu chaves procesadas hasta polo momento\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Número total procesado: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr "novas chaves omitidas: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sin IDs de usuario: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importadas: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " sin cambios: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de usuario: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " novas sub-chaves: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " novas sinaturas: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revocacións de chaves: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr "chaves secretas lidas: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "chaves secretas importadas: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "chaves secretas sin cambios: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " non importadas: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Asinou estes IDs de usuario: \n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "Sinatura %s, algoritmo de resumo %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "chave %08lX: non hai ID de usuario\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "chave %08lX: arranxouse a corrupción da sub-chave HKP\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "chave %08lX: non hai IDs de usuario válidos\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por unha auto-sinatura que falta\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "chave %08lX: chave pública non atopada: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "chave %08lX: nova chave - omitida\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "non se atopou un chaveiro no que se poida escribir: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "escribindo a `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erro escribindo no chaveiro `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "chave %08lX: chave pública \"%s\" importada\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "chave %08lX: non coincide coa nosa copia\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "" "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n" "%s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "" "chave %08lX: non foi posible le-lo bloque de chaves original:\n" "%s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "chave %08lX: \"%s\" 1 nova sinatura\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "chave %08lX: \"%s\" %d novas sinaturas\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "chave %08lX: \"%s\" sen cambios\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "non hai un chaveiro privado por defecto: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "chave %08lX: xa estaba no chaveiro secreto\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "chave %08lX: chave secreta non atopada: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: non hai chave pública - non se pode aplica-lo\n" "certificado de revocación\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "" "chave %08lX: certificado de revocación incorrecto:\n" "%s - rechazado\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "chave %08lX: \"%s\" certificado de revocación importado\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "chave %08lX: non hai ID de usuario para a sinatura\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s" "\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "" "chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pública non soportado\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "chave %08lX: ligazón de sub-chave incorrecta\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "chave %08lX: eliminouse unha ligazón de sub-chave múltiple\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "chave %08lX: non hai unha sub-chave para a revocación da chave\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "chave %08lX: revocación de sub-chave non válida\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "chave %08lX: eliminouse a revocación de sub-chaves múltiples\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "chave %08lX: omitido o ID de usuario '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "chave %08lX: omitida a sub-chave\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revocación no lugar erróneo - omitido\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revocación incorrecto: %s - omitido\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocación %" "08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX " "ausente.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n" @@ -2640,7 +2729,8 @@ msgstr " (3) Fixen comprobacións moi exhaustivas.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "¿A súa elección? (introduza '?' para ter máis información): " #: g10/keyedit.c:918 @@ -2713,7 +2803,7 @@ msgid "Really sign? (y/N) " msgstr "¿Asinar de verdade? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2744,7 +2834,7 @@ "Introduza o novo contrasinal para esta chave secreta.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "o contrasinal non se repetiu correctamente; ténteo de novo" @@ -3225,83 +3315,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Esta chave pode estar revocada por %s chave " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "non foi posible crear %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Esta chave está desactivada" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revocada] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3309,7 +3383,19 @@ "Teña en conta que a validez da chave amosada non é necesariamente\n" "correcta a menos que reinicie o programa.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[revocada] " + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3317,7 +3403,7 @@ "AVISO: non se marcou ningún ID de usuario coma primario. Esta orde pode\n" " facer que un ID de usuario diferente se converta no primario.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3326,47 +3412,47 @@ "AVISO: Esta é unha chave de estilo PGP2. Se engade unha identificación\n" " fotográfica algunhas versións de PGP han rexeitar esta chave.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de que quere engadila? (s/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Non pode engadir unha identificación fotográfica a unha chave de estilo " "PGP2.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta sinatura correcta? (s/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Borrada %d sinatura.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Borradas %d sinaturas.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Non se borrou nada.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3376,165 +3462,165 @@ "designado\n" " pode facer que algunhas versións de PGP rexeiten esta chave.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Introduza o ID de usuario do revocador designado: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non " "se pode desfacer!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite as seleccións das chaves secretas.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo unha chave secundaria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando a data de expiración para a chave secundaria.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando a data de expiración da chave primaria.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Non pode cambia-la data de expiración dunha chave v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Escolla exactamente un ID de usuario.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Non hai ID de usuario con índice %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Non hai chave secundaria con índice %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " asinada por %08lX no %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (non exportable)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta sinatura caducou o %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿Está seguro de que quere revocala? (s/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Asinou estes IDs de usuario: \n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (non exportable)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocada por %08lX no %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Está a punto de revocar estas sinaturas:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "non hai chave secreta\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3577,12 +3663,12 @@ msgid "writing key binding signature\n" msgstr "escribindo unha sinatura que liga a chave\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamaño de chave non válido; empregando %u bits\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamaño de chave redondeado a %u bits\n" @@ -3650,90 +3736,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (só cifrar)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (só cifrar)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (só asinar)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (só cifrar)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (só cifrar)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Hase crear unh novo par de chaves %s.\n" -" tamaño de chave mínimo: 768 bits\n" -" tamaño de chave por defecto: 1024 bits\n" -" tamaño de chave máximo recomendado: 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "¿Qué tamaño de chave quere? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA só admite tamaños entre 512 e 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "chave pequena de máis; 1024 é o menor valor admitido para RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "chave pequena de máis; 768 é o menor valor admitido\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "O par de chaves DSA ha ter 1024 bits.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "chave grande de máis; %d é o maior tamaño admitido.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"¡As chaves maiores de 2048 bits non se aconsellan porque\n" -"os cálculos levan MOITO tempo!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "¿Está seguro de que quere este tamaño de chave? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "¿Qué tamaño de chave quere? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"De acordo, ¡pero teña en conta que a radiación do monitor e o teclado tamén " -"son vulnerables a ataques!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamaño de chave requerido son %u bits\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "redondeado a %u bits\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3749,7 +3805,7 @@ " m = a chave caduca en n meses\n" " y = a chave caduca en n anos\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3765,29 +3821,29 @@ " m = a sinatura caduca en n meses\n" " y = a sinatura caduca en n anos\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "¿Por canto tempo é válida a chave? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "¿Por canto tempo é válida a sinatura? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "valor non válido\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s non caduca nunca\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s caduca o %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3795,12 +3851,12 @@ "O seu sistema non pode amosar datas máis aló do 2038.\n" "Aínda así, hase tratar correctamente ata o 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "¿Isto é correcto? (s/n) " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3817,44 +3873,44 @@ " \"Heinrich Heime (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nome: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Caracter non válido no nome\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "O nome non pode comezar cun díxito\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "O nome debe ter alomenos 5 caracteres\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Enderezo de E-mail: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Non é un enderezo de e-mail válido\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Comentario: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Carácter non válido no comentario\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Está a usa-lo xogo de caracteres `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3865,28 +3921,28 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Por favor, non poña o enderezo de correo no nome real ou no comentario\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeAaSs" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Por favor, corrixa antes o erro\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3894,12 +3950,12 @@ "Necesita un contrasinal para protexe-la súa chave secreta.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3911,7 +3967,7 @@ "momento, empregando este programa coa opción \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3923,54 +3979,50 @@ "mentres se xeran os números primos; isto proporciónalle ao xerador de\n" "números aleatorios unha opoertunidade de acumular entropía de abondo.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "O par de chaves DSA ha ter 1024 bits.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Cancelouse a xeración de chaves.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "gravando a chave pública en `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "non se atopou un chaveiro público no que se poida escribir: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erro escribindo no chaveiro público `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro escribindo no chaveiro secreto `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "creáronse e asináronse as chaves pública e secreta.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3979,12 +4031,12 @@ "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n" "con esa finalidade.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "A xeración da chave fallou: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3992,7 +4044,7 @@ "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4000,40 +4052,40 @@ "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co " "reloxo)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTA: a creación de subchaves para chaves v3 non cumpre OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "¿Crear realmente? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "fallou o borrado do bloque de chaves: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "non se pode crear `%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: a chave secreta %08lX caducou o %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4079,28 +4131,28 @@ msgid "expired: %s)" msgstr " [caduca: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Pegada dactilar da chave primaria:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Pegada dactilar da sub-chave:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr "Pegada dactilar da chave primaria:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Pegada dactilar da sub-chave:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Pegada dactilar =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4453,7 +4505,7 @@ msgid "textmode" msgstr "modo texto" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "descoñecido" @@ -4485,32 +4537,43 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "paquete raíz incorrecto detectado en proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "non é posible deshabilita-los volcados de 'core': %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "" "a actualización da base de datos de confianza fallou:\n" "%s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "¡Os algoritmos experimentais non deberían ser usados!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "non é posible manexa-lo algoritmo de chave pública %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algoritmo de cifrado non implementado" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "Sinatura %s, algoritmo de resumo %s\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"este algoritmo de cifrado está obsoleto; por favor, empregue un máis " -"estándar!\n" +"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4619,50 +4682,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "un subpaquete de tipo %d ten o bit crítico posto\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent non está dispoñible nesta sesión\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "non se pode estabrece-lo pid do cliente para o axente\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versión %d do protocolo de gpg-agent non está soportada\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "non se puido conectar a `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problema co axente - desactivando o emprego do axente\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4673,41 +4736,41 @@ "\"%.*s\"\n" "Chave de %u bits, %s, ID %08lX, creada o %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Repita o contrasinal\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Introduza o contrasinal\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "contrasinal demasiado longo\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "resposta do axente non válida\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "cancelado polo usuario\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Introduza o contrasinal: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4717,17 +4780,17 @@ "Necesita un contrasinal para desbloquea-la chave secreta para\n" "o usuario \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bits, chave %s, ID %08lX, creada %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Repita o contrasinal: " @@ -4936,7 +4999,8 @@ msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Isto pode significar que a sinatura está falsificada.\n" #: g10/pkclist.c:527 @@ -5041,28 +5105,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "os datos non foron gardados; use a opción \"--output\" para gardalos\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "erro ao crear `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Sinatura non adxunta.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Por favor, introduza o nome do ficheiro de datos: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "lendo de stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "non hai datos asinados\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "non foi posible abri-los datos asinados `%s'\n" @@ -5391,52 +5455,47 @@ "só pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --" "pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "escribindo a `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "asinando:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "só pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "hase empregar cifrado %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "a chave non está marcada coma insegura - non se pode empregar co xerador de " "números aleatorios falso\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "omítese `%s': duplicada\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "omítese `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "omítese: a chave secreta xa está presente\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5627,12 +5686,12 @@ "a base de datos de confianza está corrompida; execute \"gpg --fix-trustdb" "\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "non é posible manexar liñas de texto maiores que %d caracteres\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "a liña de entrada contén máis de %d caracteres\n" @@ -5683,85 +5742,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[revocada] " + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[caducada ]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "descoñecido" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "nunca " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "hase comproba-la base de datos de confianza o %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "non se atopou a chave pública %08lX: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "por favor, execute con --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "comprobando a base de datos de confianza\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "procesáronse %d chaves (marcáronse %d contas de validez)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "non se atoparon chaves de confianza absoluta\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n" @@ -6071,6 +6165,63 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(pode que usara o programa equivocado para esta tarefa)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "o algoritmo de resumo `%s' é de só lectura nesta versión\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Hase crear unh novo par de chaves %s.\n" +#~ " tamaño de chave mínimo: 768 bits\n" +#~ " tamaño de chave por defecto: 1024 bits\n" +#~ " tamaño de chave máximo recomendado: 2048 bits\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA só admite tamaños entre 512 e 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "chave pequena de máis; 1024 é o menor valor admitido para RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "chave pequena de máis; 768 é o menor valor admitido\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "chave grande de máis; %d é o maior tamaño admitido.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "¡As chaves maiores de 2048 bits non se aconsellan porque\n" +#~ "os cálculos levan MOITO tempo!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "¿Está seguro de que quere este tamaño de chave? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "De acordo, ¡pero teña en conta que a radiación do monitor e o teclado " +#~ "tamén son vulnerables a ataques!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "¡Os algoritmos experimentais non deberían ser usados!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "este algoritmo de cifrado está obsoleto; por favor, empregue un máis " +#~ "estándar!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "escribindo a `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "sentímolo, non se pode facer isto no modo por lotes\n" @@ -6198,12 +6349,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? problema ao comproba-la revocación: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[revocada] " - -#~ msgid "[expired] " -#~ msgstr "[caducada ]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [caduca: %s]" Index: gnupg/po/hu.po diff -u gnupg/po/hu.po:1.7 gnupg/po/hu.po:1.8 --- gnupg/po/hu.po:1.7 Thu Oct 28 11:06:49 2004 +++ gnupg/po/hu.po Fri Dec 10 23:20:52 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Hungarian \n" @@ -14,11 +14,6 @@ "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "\"%s\" kivonatoló algoritmus csak olvasható ebben a kiadásban\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -33,11 +28,12 @@ msgid "no entropy gathering module detected\n" msgstr "Nem észleltem entrópiagyûjtõ modult.\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -71,9 +67,9 @@ msgid "note: random_seed file not updated\n" msgstr "Megjegyzés: random_seed állományt nem frissítettem.\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n" @@ -127,90 +123,150 @@ "mást, hogy az operációs rendszer entrópiát gyûjthessen!\n" "(Még %d bájt szükséges.)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Küldés a kulcsszerverre sikertelen: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "Hiba a jelszó létrehozásakor: %s.\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "Hiba a kulcsblokk olvasásakor: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "\"%s\" már tömörített.\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "új kulcspár létrehozása" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "A kulcsblokk törlése sikertelen: %s.\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Kulcsgenerálás sikertelen: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "Nem találtam érvényes OpenPGP adatot.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "Hiba a jelszó létrehozásakor: %s.\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "A kulcsblokk törlése sikertelen: %s.\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -297,15 +353,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Mit választ? " @@ -313,141 +369,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Nincs megadva ok." -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "nem feldolgozott" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "Hiba \"%s\" olvasásakor: %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "preferenciák frissítése" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Érvénytelen karakter a preferenciák között!\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Érvénytelen karakter a preferenciák között!\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "Hiba: Érvénytelen ujjlenyomat.\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "megmutatja az ujjlenyomatot" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "Hiba: Érvénytelen ujjlenyomat.\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Kulcsgenerálás sikertelen: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "Nem találtam érvényes OpenPGP adatot.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -455,232 +520,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Kérem, adja meg, milyen kulcsot kíván:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Az aláírás lejárt: %s.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Érvénytelen választás.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Kérem, válassza ki a visszavonás okát:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "Ismeretlen védelmi algoritmus!\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Az elsõdleges kulcs titkos részei nem elérhetõk.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "Kihagytam: titkos kulcs már jelen van.\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "kilépés|kilepes" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "kilépés ebbõl a menübõl" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "megmutatja ezt a súgót" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Kulcs található: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "lejárat megváltoztatása" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "kulcstulajdonos megbízhatóságának beállítása" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "megmutatja az ujjlenyomatot" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "általános hiba" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "új kulcspár létrehozása" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Parancs> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Ismételje meg a jelszót: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -690,13 +777,13 @@ msgid "--output doesn't work for this command\n" msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "\"%s\" kulcs nem található: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -739,7 +826,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "Elõször azt törölje a \"--delete-secret-keys\" opcióval!\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "Hiba a jelszó létrehozásakor: %s.\n" @@ -758,7 +845,7 @@ msgid "`%s' already compressed\n" msgstr "\"%s\" már tömörített.\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "FIGYELEM: A(z) \"%s\" állomány üres.\n" @@ -784,7 +871,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "A %s (%d) rejtjelezõ használata sérti a címzett preferenciáit!\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -887,27 +974,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "FIGYELEM: nem tudom törölni a \"%s\" átmeneti könyvtárat: %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "%08lX kulcs: nem védett - kihagytam.\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszerû SK ellenõrzõösszege.\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "FIGYELEM: Semmit sem exportáltam.\n" @@ -1086,15 +1173,15 @@ msgid "prompt before overwriting" msgstr "felülírás elõtt rákérdezés" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1102,7 +1189,7 @@ "@\n" "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1122,15 +1209,15 @@ " --list-keys [nevek] kulcsok kiíratása\n" " --fingerprint [nevek] ujjlenyomatok kiíratása\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "A hibákat (angolul) a címre írja meg!\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1140,7 +1227,7 @@ "Aláírás, ellenõrzés, titkosítás vagy visszafejtés.\n" "Az alapértelmezett mûvelet a bemeneti adattól függ.\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1148,462 +1235,462 @@ "\n" "Támogatott algoritmusok:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Nyilvános kulcsú (pubkey): " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Rejtjelezõ (cipher): " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Kivonatoló (hash): " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Tömörítõ (compression): " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "Használat: gpg [opciók] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "\"%s\": ismeretlen konfigurációs elem.\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "\"%s\" opciós fájl: %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "Az opciókat a \"%s\" állományból olvasom.\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "A \"%s\" rejtjelezõ bõvítést rossz engedélyek miatt töltöm be.\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "FIGYELEM: A program core állományt hozhat létre!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "FIGYELEM: %s hatástalanítja %s-t!\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s és %s nem használható együtt!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s értelmetlen %s mellett!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "Csak különálló és olvashatószöveg-aláírást készíthet --pgp2 módban!\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Nem írhat alá és titkosíthat egyszerre --pgp2 módban!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Csak állományokat (pipe-ot nem) használhat --pgp2 módban!\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Üzenet titkosítása --pgp2 módban IDEA rejtjelezõt igényel!\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed nagyobb kell legyen 0-nál!\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed nagyobb kell legyen 1-nél!\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth 1 és 255 közé kell essen!\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "Érvénytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "Érvénytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MEGJEGYZÉS: Egyszerû S2K mód (0) erõsen ellenjavallt!\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "Érvénytelen alapértelmezett preferenciák!\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "Érvénytelen személyes rejtjelezõ-preferenciák!\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "Érvénytelen személyes kivonatolópreferenciák!\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "Érvénytelen személyes tömörítõpreferenciák!\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s és %s egyelõre nem használható együtt!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "Lehet, hogy nem használhatja \"%s\" rejtjelezõ algoritmust %s módban!\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Lehet, hogy nem használhatja \"%s\" tömörítõ algoritmust %s módban!\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [fájlnév]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [fájlnév]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Visszafejtés sikertelen: %s.\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [fájlnév]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [fájlnév]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [fájlnév]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [fájlnév]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [fájlnév]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key felh-azonosító" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key felh-azonosító" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key felh-azonosító" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key felh-azonosító" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key felh-azonosító [parancsok]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [felh-azonosító] [kulcskarika]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "Küldés a kulcsszerverre sikertelen: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "Kulcsexportálás sikertelen: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "Keresés a kulcsszerveren sikertelen: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Frissítés a kulcsszerverrõl sikertelen: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "Páncél eltávolítása nem sikerült: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "Páncélozás nem sikerült: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Érvénytelen kivonatoló algoritmus: %s\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[fájlnév]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Kezdheti gépelni az üzenetet...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1611,23 +1698,23 @@ "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = " "jellel kell befejezõdjön.\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "Egy jelölés értékében nem szerepelhet vezérlõkarakter!\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" @@ -1636,30 +1723,30 @@ msgid "too many entries in pk cache - disabled\n" msgstr "Túl sok bejegyzés van a nyilvánoskulcs-gyorsítótárban - letiltom.\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[ismeretlen kulcs]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "%08lX érvénytelen kulcsot érvényesítettük az\n" "--allow-non-selfsigned-uid opcióval.\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "Nincs titkos alkulcs a %08lX nyilvános alkulcshoz - figyelmen kívül hagyom.\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsõdleges helyett.\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "%08lX kulcs: titkos kulcs nyilvános kulcs nélkül - kihagytam.\n" @@ -2018,381 +2105,381 @@ msgid "No help available for `%s'" msgstr "Nem áll rendelkezésre segítség \"%s\" témához." -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "%d típusú blokkot kihagyom.\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "Eddig %lu kulcsot dolgoztam fel.\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr " Összesen feldolgoztam: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " új kulcsok kihagyva: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " felh. azonosító nélkül: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importálva: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " változatlan: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " új felh. azonosítók: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " új alkulcsok: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " új aláírások: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " új kulcsvisszavonások: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " olvasott titkos kulcsok: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " importált titkos kulcsok: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "változatlan titkos kulcsok: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " nem importált: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Ön aláírta a következõ felhasználóazonosítókat:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s aláírás, %s kivonatoló algoritmus.\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "%08lX kulcs: HKP alkulcssérülés kijavítva.\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "%08lX kulcs: Nem önaláírt felh. azonosító (\"%s\") elfogadva.\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "%08lX kulcs: Nincs érvényes felhasználói azonosító.\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "Ezt okozhatja egy hiányzó önaláírás.\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "%08lX kulcs: új kulcs - kihagytam.\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "Nem írható kulcskarikát találtam: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "Írok a \"%s\" állományba.\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "%08lX kulcs: \"%s\" nyilvános kulcs importálva.\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "%08lX kulcs: \"%s\" 1 új aláírás.\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "%08lX kulcs: \"%s\" 1 új alkulcs.\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "%08lX kulcs: \"%s\" %d új alkulcs.\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "%08lX kulcs: \"%s\" nem változott.\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "" "%08lX kulcs: Titkos kulcs érvénytelen (%d) rejtjelezõvel - kihagytam.\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "Nincs alapértelmezett titkoskulcs-karika: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "%08lX kulcs: Titkos kulcs importálva.\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "%08lX kulcs: Már szerepel a titkoskulcs-karikán.\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "%08lX kulcs: Titkos kulcs nem található: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "%08lX kulcs: Nincs felhasználói azonosító ehhez az aláíráshoz!\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "%08lX kulcs: Nem támogatott nyilvános kulcsú alg. a \"%s\" felh. " "azonosítón!\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "%08lX kulcs: Érvénytelen önaláírás a \"%s\" felh. azonosítón!\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "%08lX kulcs: Nincs alkulcs a kulcskötéshez!\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcskötést.\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcsvisszavonást.\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "%08lX kulcs: Alkulcsot kihagytam.\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "%08lX kulcs: Nem exportálható aláírás (%02x. osztály) - kihagytam.\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "%08lX kulcs: Visszavonó igazolás rossz helyen - kihagytam.\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - kihagytam.\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "%08lX kulcs: Váratlan aláírásosztály (0x%02X) - kihagytam.\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefûztem.\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "FIGYELEM: %08lX kulcsot visszavonhatták:\n" "lehívom a %08lX visszavonó kulcsot.\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "FIGYELEM: %08lX kulcsot visszavonhatták:\n" "visszavonó kulcs (%08lX) nincs jelen.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n" @@ -2627,7 +2714,8 @@ msgstr " (3) Nagyon alaposan ellenõriztem.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Mi a válasza? (Adjon meg \"?\"-et magyarázathoz!): " #: g10/keyedit.c:918 @@ -2700,7 +2788,7 @@ msgid "Really sign? (y/N) " msgstr "Valóban aláírja? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2731,7 +2819,7 @@ "Írja be az új jelszót ehhez a titkos kulcshoz!\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!" @@ -3210,83 +3298,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Ezt a kulcsot a következõ %s kulcs visszavonhatja: " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (érzékeny)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s nem hozható létre: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[visszavont] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Ez a kulcs tiltott." -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[visszavont] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3294,7 +3366,19 @@ "Kérem, vegye figyelembe, hogy az itt látható kulcs érvényessége nem\n" "feltétlenül helyes, amíg újra nem indítja a programot!\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[visszavont] " + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3302,7 +3386,7 @@ "FIGYELEM: Nincs kijelölt elsõdleges felhasználóazonosító. Ez a parancs\n" " azt okozhatja, hogy egy másik azonosító lesz elsõdlegesként használva.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3312,45 +3396,45 @@ "okozhatja,\n" " hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Továbbra is hozzá akarja adni? (i/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Törli ezt a jó aláírást? (i/N/k)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Valóban törli ezt az önaláírást? (i/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nem töröltem semmit.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3360,162 +3444,162 @@ " azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a " "kulcsot!\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Kérem, távolítsa el a kijelöléseket a titkos kulcsokról!\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Másodlagos kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Elsõdleges kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Kérem, válasszon ki pontosan egy felhasználóazonosítót!\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Nincs %d indexû felhasználóazonosító!\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Nincs %d indexû másodlagos kulcs!\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Felhasználóazonosító: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " aláírva %08lX által %s%s%s idõpontban.\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Ez az aláírás lejárt %s idõpontban.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Biztos benne, hogy mégis visszavonja? (i/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ön aláírta a következõ felhasználóazonosítókat:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " visszavonva %08lX által %s idõpontban.\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "A következõ aláírásokat fogja visszavonni:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "Nincs titkos kulcs.\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "FIGYELEM: A felhasználóazonosítót %d másodperccel a jövõben írták alá.\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n" @@ -3557,12 +3641,12 @@ msgid "writing key binding signature\n" msgstr "Összefûzõ aláírást írok.\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "Kulcsméret érvénytelen; %u bitet használok.\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "Kulcsméretet felkerekítettem %u bitre.\n" @@ -3630,90 +3714,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (csak titkosítás)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (csak titkosítás)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (csak aláírás)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (csak titkosítás)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Most egy új %s kulcspárt hozunk létre.\n" -" minimális kulcsméret: 768 bit\n" -" alapértelmezett kulcsméret: 1024 bit\n" -" legnagyobb ajánlott kulcsméret: 2048 bit\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Milyen kulcsméretet szeretne? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "A DSA csak 512 és 1024 közötti kulcsméretet támogat.\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "Kulcsméret túl kicsi; 1024 a legkisebb megengedett érték RSA-hoz.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "Kulcsméret túl kicsi; 768 a legkisebb megengedett érték.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "A DSA kulcspár 1024 bites lesz.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "Kulcsméret túl nagy; %d a legnagyobb megengedett érték.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"2048-nál nagyobb kulcsméret nem ajánlott, mert a számítások\n" -"NAGYON sokáig fognak tartani!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Biztos benne, hogy akarja ezt a kulcsméretet? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Milyen kulcsméretet szeretne? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Rendben, de vegye figyelembe, hogy a támadók a monitorának vagy\n" -"a billentyûzetének a sugárzását is felhasználhatják!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "A kívánt kulcsméret %u bit.\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "Felkerekítve %u bitre.\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3729,7 +3783,7 @@ " m = a kulcs n hónapig érvényes\n" " y = a kulcs n évig érvényes\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3745,29 +3799,29 @@ " m = az aláírás n hónapig érvényes\n" " y = az aláírás n évig érvényes\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Meddig érvényes a kulcs? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Meddig érvényes az aláírás? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "Érvénytelen érték!\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s soha nem jár le.\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s lejár: %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3775,12 +3829,12 @@ "Az Ön rendszere nem tud megjeleníteni 2038 utáni dátumokat.\n" "Azonban kezelni helyesen tudja õket egészen 2106-ig.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Ez így helyes (i/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3797,44 +3851,44 @@ " \"Heinrich Heine (a költõ) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Teljes név: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Érvénytelen karakter a névben!\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "A név lehet, hogy nem kezdõdhet számmal!\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "A név legalább 5 karakter kell legyen!\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "E-mail cím: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Ez nem érvényes e-mail cím.\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Megjegyzés: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Érvénytelen karakter a megjegyzésben!\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Ön a(z) %s karakterkódolást használja.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3845,28 +3899,28 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnMmEeRrKk" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Kérem, elõbb javítsa ki a hibát!\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3874,12 +3928,12 @@ "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3891,7 +3945,7 @@ "az \"--edit-key\" opcióval.\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3903,54 +3957,50 @@ "a lemezeket) a prímszám generálása alatt. Ez segíti a véletlenszám-\n" "generátort, hogy entrópiát tudjon gyûjteni.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "A DSA kulcspár 1024 bites lesz.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Kulcs létrehozása megszakítva.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "Írom a kulcsot a %s állományba.\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "Nem írható titkoskulcs-karikát találtam: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "A nyilvános és titkos kulcsokat létrehoztam és aláírtam.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3959,60 +4009,60 @@ "kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n" "teheti meg.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Kulcsgenerálás sikertelen: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "A kulcs %lu másodperccel a jövõben készült. (Idõugrás vagy óraprobléma.)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" "A kulcs %lu másodperccel a jövõben készült. (Idõugrás vagy óraprobléma.)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "MEGJEGYZÉS: Alkulcsok létrehozása v3 kulcsokhoz nem OpenPGP-megfelelõ.\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Valóban létrehozzam? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "A kulcsblokk törlése sikertelen: %s.\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4058,28 +4108,28 @@ msgid "expired: %s)" msgstr " [lejár: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Elsõdlegeskulcs-ujjlenyomat:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Alkulcsujjlenyomat:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr "Elsõdlegeskulcs-ujjlenyomat:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Alkulcsujjlenyomat:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Kulcs ujjlenyomata =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4436,7 +4486,7 @@ msgid "textmode" msgstr "Szövegmódú" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "Ismeretlen módú" @@ -4467,29 +4517,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "Érvénytelen gyökércsomagot találtam a proc_tree() függvényben!\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "Nem tudom letiltani a core fájlokat: %s.\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "Nem tudom megnyitni az állományt: %s.\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Nem szabadna kísérleti algoritmusokat használni!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "Nem tudom kezelni a(z) %d. számú nyilvános kulcsú algoritmust!\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "nem megvalósított rejtjelezõ algoritmus" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s aláírás, %s kivonatoló algoritmus.\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"Ez a rejtjelezõ algoritmus nem ajánlott. Kérem, használjon szabványosabbat!\n" +"%s (%d) kivonatoló algoritmus használatának erõltetése ellentétes\n" +"a címzett preferenciáival.\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4599,52 +4662,52 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "A %d típusú alcsomag kritikus bitje beállított.\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "GPG ügynök nem elérhetõ ebben a munkafolyamatban.\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "Nem tudom beállítani a kliens pid-et az ügynöknek.\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "Nem tudom lekérni a szerver olvasási állományleíróját az ügynöknek.\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "Nem tudom lekérni a szerver írási állományleíróját az ügynöknek.\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "Nem megfelelõ formájú GPG_AGENT_INFO környezeti változó!\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "%d gpg-agent protokollverzió nem támogatott!\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "Kommunikációs probléma a gpg ügynökkel!\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "Probléma van az ügynökkel. Letiltom a használatát.\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr "" " \n" " (fõ kulcsazonosító: %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4656,41 +4719,41 @@ "\"%.*s\"\n" "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Ismételje meg a jelszót!\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Írja be a jelszót!\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "A jelszó túl hosszú!\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "Érvénytelen válasz az ügynöktõl!\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "A felhasználó megszakította a mûveletet.\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "Nem tudok jelszót bekérni kötegelt módban!\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Írja be a jelszót: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4701,17 +4764,17 @@ "használatához:\n" "\"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s." -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Ismételje meg a jelszót: " @@ -4916,7 +4979,8 @@ msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Ez jelentheti azt, hogy az aláírás hamis.\n" #: g10/pkclist.c:527 @@ -5022,28 +5086,28 @@ msgstr "" "Az adatot nem mentettem el. Használja az \"--output\" opciót a mentéshez!\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "Hiba \"%s\" létrehozásakor: %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Különálló aláírás.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Kérem, adja meg az adatállomány nevét: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "Olvasom a szabványos bemenetet...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "Nincs aláírt adat.\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n" @@ -5364,12 +5428,7 @@ msgstr "" "Különálló aláírást PGP 2.x stílusú kulcsokkal csak --pgp2 módban készíthet!\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "Írok a \"%s\" állományba.\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" @@ -5377,41 +5436,41 @@ "%s (%d) kivonatoló algoritmus használatának erõltetése ellentétes\n" "a címzett preferenciáival.\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "Aláírom:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "Olvasható szöveget PGP 2.x stílusú kulccsal csak --pgp2 módban írhat alá!\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s titkosítást fogok használni.\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "A kulcs nincs \"nem biztonságosnak\" jelölve,\n" "nem tudom a pótló véletlenszám-generátorral használni!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "\"%s\"-t kihagytam: másodpéldány.\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "Kihagytam \"%s\"-t: %s.\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "Kihagytam: titkos kulcs már jelen van.\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5599,12 +5658,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "Bizalmi adatbázis sérült. Kérem, futtassa: \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "Nem tudok %d karakternél hosszabb szövegsorokat kezelni!\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "A bemeneti sor hosszabb, mint %d karakter.\n" @@ -5655,85 +5714,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[visszavont] " + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[lejárt] " + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "Ismeretlen módú" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "soha " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "A bizalmi adatbázis következõ ellenõrzése: %s.\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "Ellenõrzöm a bizalmi adatbázist.\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "Nem találtam alapvetõen megbízható kulcsot.\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "Nem találom az alapvetõen megbízható %08lX kulcs nyilvános kulcsát!\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n" @@ -6042,6 +6136,63 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(Lehet, hogy nem a megfelelõ programot használja a feladatra.)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "\"%s\" kivonatoló algoritmus csak olvasható ebben a kiadásban\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Most egy új %s kulcspárt hozunk létre.\n" +#~ " minimális kulcsméret: 768 bit\n" +#~ " alapértelmezett kulcsméret: 1024 bit\n" +#~ " legnagyobb ajánlott kulcsméret: 2048 bit\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "A DSA csak 512 és 1024 közötti kulcsméretet támogat.\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "Kulcsméret túl kicsi; 1024 a legkisebb megengedett érték RSA-hoz.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "Kulcsméret túl kicsi; 768 a legkisebb megengedett érték.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "Kulcsméret túl nagy; %d a legnagyobb megengedett érték.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "2048-nál nagyobb kulcsméret nem ajánlott, mert a számítások\n" +#~ "NAGYON sokáig fognak tartani!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Biztos benne, hogy akarja ezt a kulcsméretet? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Rendben, de vegye figyelembe, hogy a támadók a monitorának vagy\n" +#~ "a billentyûzetének a sugárzását is felhasználhatják!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Nem szabadna kísérleti algoritmusokat használni!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "Ez a rejtjelezõ algoritmus nem ajánlott. Kérem, használjon " +#~ "szabványosabbat!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "Írok a \"%s\" állományba.\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "Sajnálom, ezt nem tudom megcsinálni kötegelt módban!\n" @@ -6173,12 +6324,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? Nem tudom ellenõrizni a visszavonást: %s.\n" -#~ msgid "[revoked] " -#~ msgstr "[visszavont] " - -#~ msgid "[expired] " -#~ msgstr "[lejárt] " - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [lejár: %s]" Index: gnupg/po/id.po diff -u gnupg/po/id.po:1.17 gnupg/po/id.po:1.18 --- gnupg/po/id.po:1.17 Thu Oct 28 11:06:49 2004 +++ gnupg/po/id.po Fri Dec 10 23:20:51 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -16,11 +16,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -35,11 +30,12 @@ msgid "no entropy gathering module detected\n" msgstr "modul entropi gathering tidak terdeteksi\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -72,9 +68,9 @@ msgid "note: random_seed file not updated\n" msgstr "catatan: file random_seed tidak diupdate\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "tidak dapat membuat %s: %s\n" @@ -128,90 +124,150 @@ "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n" "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "gagal membuat kembali cache keyring: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Pengiriman keyserver gagal: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "kesalahan penciptaan passphrase: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "gagal membaca keyblock: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: kesalahan membaca record bebas: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' sudah dikompresi\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "buat sepasang kunci baru" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "gagal menghapus keyblok: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Pembuatan kunci gagal: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "tidak ditemukan data OpenPGP yang valid.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "kesalahan penciptaan passphrase: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "gagal menghapus keyblok: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -299,15 +355,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "tidak dapat melakukan hal itu dalam mode batch\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Pilihan anda? " @@ -315,141 +371,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Tidak ada alasan diberikan" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "tidak diproses" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "tidak ada kunci publik yang sesuai: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "kesalahan membaca `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "perbarui preferensi" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Karakter tidak valid dalam string preferensi\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Karakter tidak valid dalam string preferensi\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "kesalahan: fingerprint tidak valid\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "tampilkan fingerprint" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "kesalahan: fingerprint tidak valid\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Pembuatan kunci gagal: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "tidak ditemukan data OpenPGP yang valid.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "kesalahan menulis keyring rahasia `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -457,232 +522,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Silakan pilih kunci yang anda inginkan:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Signature kadaluwarsa %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Pilihan tidak valid.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Silakan pilih alasan untuk pembatalan:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritma proteksi tidak dikenal\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Bagian rahasia kunci primer tidak tersedia.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "dilewati: kunci pribadi telah ada\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "q|k|keluar" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "berhenti dari menu ini" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "bantuan" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "tampilkan bantuan" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "tampilkan" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Kunci tersedia di:" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "ubah tanggal kadaluarsa" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "ubah ownertrust" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "tampilkan fingerprint" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "Kesalahan umum" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "buat sepasang kunci baru" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Perintah> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Perintah tidak valid (coba \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Ulangi passphrase: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "passphrase tidak diulang dengan benar; coba lagi" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -692,13 +779,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output tidak berfungsi untuk perintah ini\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "kunci '%s' tidak ditemukan: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -741,7 +828,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "kesalahan penciptaan passphrase: %s\n" @@ -760,7 +847,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' sudah dikompresi\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "PERINGATAN: `%s' adalah file kosong\n" @@ -788,7 +875,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -890,28 +977,28 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "kunci %08lX: tidak diproteksi - dilewati\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "PERINGATAN: tidak ada yang diekspor\n" @@ -1090,15 +1177,15 @@ msgid "prompt before overwriting" msgstr "tanya sebelum menimpa" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1106,7 +1193,7 @@ "@\n" "(Lihat man page untuk daftar lengkap semua perintah dan option)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1126,15 +1213,15 @@ " --list-keys [nama] tampilkan kunci\n" " --fingerprint [nama] tampilkan fingerprint\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Laporkan bug ke .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1144,7 +1231,7 @@ "tandai, cek, enkripsi atau dekripsi\n" "operasi baku tergantung pada data input\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1152,470 +1239,470 @@ "\n" "Algoritma yang didukung:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Cipher: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Kompresi: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "pemakaian: gpg [pilihan] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "perintah saling konflik\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "Item Konfigurasi tidak dikenal \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "CATATAN: tidak ada file pilihan baku `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "file pilihan `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "CATATAN: %s tidak untuk pemakaian normal!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "tidak dapat menset path exec ke %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "PERINGATAN: program mungkin membuat file core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "PERINGATAN: %s menimpa %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s tidak dibolehkan dengan %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s tidak masuk akal dengan %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "anda hanya dapat membuat signature detached atau clear saat dalam mode --" "pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --" "pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --" "pgpg2\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "algoritma digest yang dipilih tidak valid\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed harus lebih dari 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed harus lebih dari 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth harus di antara 1 hingga 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "preferensi baku tidak valid\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "preferensi cipher personal tidak valid\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "preferensi digest personal tidak valid\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "preferensi kompresi personal tidak valid\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s belum dapat dipakai dengan %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public " "key \n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [namafile]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [namafile]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "dekripsi gagal: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [namafile]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [namafile]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [namafile]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [namafile]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [namafile]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id-user" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id-user" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-user [perintah]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-user] [keyring]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "Pengiriman keyserver gagal: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Penerimaan keyserver gagal: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "Ekspor kunci gagal: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "Pencarian keyserver gagal: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh keyserver gagal: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "gagal dearmoring: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritma hash tidak valid `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[namafile]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Teruskan dan ketikkan pesan anda ....\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1623,23 +1710,23 @@ "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, " "dan diakhiri dengan sebuah '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" @@ -1648,27 +1735,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[User id tidak ditemukan]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n" @@ -2033,378 +2120,378 @@ msgid "No help available for `%s'" msgstr "Tidak tersedia bantuan untuk `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "melewati blok tipe %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu kunci telah diproses\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Jumlah yang telah diproses: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " lewati kunci baru: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " tanpa ID user: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " diimpor: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " tidak berubah: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " ID user baru: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " subkey baru: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " signature baru: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " pembatalan kunci baru: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " kunci rahasia dibaca: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " kunci rahasia diimpor: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " kunci rahasia tidak berubah: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " tidak diimpor: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Anda telah menandai ID user ini:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s signature, algoritma digest %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "kunci %08lX: tidak ada ID user\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "kunci %08lX: tidak ada ID user yang valid\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "kunci %08lX: kunci baru - dilewati\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "menulis ke `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "kesalahan menulis keyring `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "kunci %08lX: 1 user ID baru \"%s\"\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "kunci %08lX: \"%s\" %d user ID baru\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "kunci %08lX: \"%s\" 1 signature baru\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "kunci %08lX: \"%s\" %d signature baru\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "kunci %08lX: \"%s\" 1 subkey baru\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "kunci %08lX: \"%s\" %d subkey baru\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "kunci %08lX: \"%s\" tidak berubah\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "tidak ada keyring rahasia baku: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "kunci %08lX: kunci rahasia diimpor\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "kunci %08lX: sudah ada di keyring rahasia\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat " "pembatalan\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "kunci %08lX: tidak ada ID user untuk signature\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "kunci %08lX: tidak ada subkey untuk key binding\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "kunci %08lX: algoritma publik key tidak didukung\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "kunci %08lX: subkey binding tidak valid\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "kunci %08lX: hapus subkey binding ganda\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "kunci %08lX: pembatalan subkey tidak valid\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "kunci %08lX: hapus pembatalan subkey ganda\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "kunci %08lX: melewati ID user " -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "kunci %08lX: melewati subkey\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "kunci %08lX: signature kunci langsung ditambahkan\n" @@ -2643,7 +2730,8 @@ msgstr " (3) Saya telah melakukan pemeriksaan hati-hati.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):" #: g10/keyedit.c:918 @@ -2716,7 +2804,7 @@ msgid "Really sign? (y/N) " msgstr "Ditandai? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2747,7 +2835,7 @@ "Masukkan passphrase baru untuk kunci rahasia ini.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "passphrase tidak diulang dengan benar; coba lagi" @@ -3226,83 +3314,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Kunci ini dapat dibatalkan oleh kunci %s" -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "tidak dapat membuat %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revoked] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Kunci ini telah ditiadakan" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revoked] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3310,7 +3382,19 @@ "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n" "kecuali anda memulai kembali program.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[revoked] " + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3318,7 +3402,7 @@ "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3328,45 +3412,45 @@ "dapat menyebabkan beberapa versi\n" " PGP menolak kunci ini.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Anda tetap ingin menambahkannya? (y/n) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Hapus signature baik ini? (y/T/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Hapus signature tidak valid ini? (y/T/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Hapus signature tidak dikenal ini? (y/T/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Yakin ingin menghapus self-signature ini? (y/T)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Tidak ada yang dihapus.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3376,165 +3460,165 @@ "designated dapat\n" "............menyebabkan beberapa versi PGP menolak kunci ini.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Masukkan user ID pihak yang ingin dibatalkan: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan " "sendiri\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat " "dilakukan\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):" -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Silakan hapus pilihan dari kunci rahasia.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Silakan pilih maksimum satu kunci sekunder.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Merubah batas waktu untuk kunci sekunder.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Merubah batas waktu untuk kunci primer.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Anda tidak dapat merubah batas waktu kunci v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Tidak ada signature koresponden di ring rahasia\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "melewati self-signature v3 pada user id \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Tidak ada ID user dengan index %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Tidak ada kunci sekunder dengan index %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID user: " -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " ditandai oleh %08lX pada %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Anda tetap ingin membatalkannya? (y/n) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Anda telah menandai ID user ini:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " dibatalkan oleh %08lX pada %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Anda akan membatalkan signature ini:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Ingin membuat sertifikat pembatalan? (y/T)" -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "tidak ada kunci rahasia\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n" @@ -3576,12 +3660,12 @@ msgid "writing key binding signature\n" msgstr "menulis key binding signature\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "keysize tidak valid; menggunakan %u bit\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "keysize dibulatkan hingga %u bit\n" @@ -3649,91 +3733,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (hanya enkripsi)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (hanya enkripsi)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (hanya menandai)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (hanya enkripsi)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Akan dibuat satu pasang kunci baru %s.\n" -" keysize minimum adalah 768 bit\n" -" keysize default adalah 1024 bit\n" -" keysize tertinggi dianjurkan 2048 bit\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Keysize yang anda inginkan? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Keypair DSA akan memiliki 1024 bit.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Keysize lebih besar dari 2048 tidak dianjurkan karena\n" -"komputasi akan sangat lama!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Apakah anda yakin memerlukan keysize ini? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Keysize yang anda inginkan? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah " -"diserang!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Keysize yang diminta adalah %u bit\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "dibulatkan hingga %u bit\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3749,7 +3802,7 @@ " m = kunci berakhir dalam n bulan\n" " y = kunci berakhir dalam n tahun\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3765,29 +3818,29 @@ " m = signature berakhir dalam n bulan\n" " y = signature berakhir dalam n tahun\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Kunci valid untuk? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Signature valid untuk? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "nilai yang tidak valid\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s tidak pernah berakhir\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s berakhir pada %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3795,12 +3848,12 @@ "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n" "Namun, ia dapat menanganinya secara benar hingga 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Benar (y/t)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3816,44 +3869,44 @@ "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n" " \"Heinrich Heine (Der Dichter) \"\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nama sebenarnya: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Karakter tidak valid dalam nama\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Nama tidak boleh dimulai dengan digit\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Nama harus berukuran minimum 5 karakter\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Alamat email: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Bukan alamat email yang valid\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Komentar: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Karakter tidak valid dalam komentar\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Anda menggunakan set karakter `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3863,27 +3916,27 @@ "Anda memilih USER-ID ini:\n" " \"%s\"\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnKkEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Silakan perbaiki kesalahan ini dulu\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3891,12 +3944,12 @@ "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3909,7 +3962,7 @@ "menggunakan program ini dengan pilihan \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3921,54 +3974,50 @@ "selama pembuatan prima; ini akan memberi random number generator kesempatan\n" "yang baik untuk memperoleh entropi.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Keypair DSA akan memiliki 1024 bit.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Pembuatan kunci dibatalkan.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "menulis kunci publik ke `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "kesalahan menulis keyring publik `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "kesalahan menulis keyring rahasia `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "kunci publik dan rahasia dibuat dan ditandai.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3977,59 +4026,59 @@ "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua " "untuk tujuan ini.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Pembuatan kunci gagal: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Ingin diciptakan? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "gagal menghapus keyblok: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "tidak dapat membuat %s: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4075,28 +4124,28 @@ msgid "expired: %s)" msgstr " [berakhir: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Fingerprint kunci primer:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Fingerprint subkunci =" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Fingerprint kunci primer =" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Fingerprint subkunci =" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Fingerprint kunci =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4448,7 +4497,7 @@ msgid "textmode" msgstr "modeteks" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "tidak dikenal" @@ -4480,29 +4529,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "tidak dapat meniadakan core dump: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "tidak dapat membuka file: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "tidak dapat menangani algoritma kunci publik %d\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" -"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n" +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algoritma cipher belum diimplementasikan" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s signature, algoritma digest %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4611,50 +4671,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpaket tipe %d memiliki bit kritis terset\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent tidak tersedia untuk sesi ini\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "tidak dapat menset pid client untuk agen\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "tidak dapat membuat server membaca FD untuk agen\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "tidak dapat membuat server menulis FD untuk agen\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokol gpg-agent versi %d tidak didukung\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "tidak dapat terkoneksi ke `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "masalah komunikasi dengan gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "masalah dengan agen - tiadakan penggunaan agen\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID kunci utama %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4665,41 +4725,41 @@ "\"%.*s\"\n" "%u-bit %s key, ID %08lX, tercipta %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Ulangi passphrase\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Masukkan passphrase\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "passphrase terlalu panjang\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "respon tidak valid dari agen\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "dibatalkan oleh user\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "tidak dapat meminta password dalam mode batch\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Masukkan passphrase: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4709,17 +4769,17 @@ "Anda perlu passphrase untuk membuka kunci rahasia untuk\n" "pemakai: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bit kunci %s, ID %08lX, tercipta %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " @@ -4927,7 +4987,8 @@ msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Hal ini dapat berarti bahwa signature adalah palsu.\n" #: g10/pkclist.c:527 @@ -5030,28 +5091,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "kesalahan penciptaan : `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Menghapus signature.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Silakan masukkan nama file data: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "membaca stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "tidak ada data tertandai\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "tidak dapat membuka data tertandai `%s'\n" @@ -5374,53 +5435,48 @@ "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --" "pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "menulis ke `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "menandai:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --" "pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s enkripsi akan digunakan\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG " "palsu!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "lewati `%s': terduplikasi\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "melewati `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "dilewati: kunci pribadi telah ada\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5608,12 +5664,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "baris input lebih dari %d karakter\n" @@ -5663,85 +5719,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[revoked] " + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[expired] " + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "tidak dikenal" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "tidak pernah..." -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "pemeriksaan trustdb berikutnya pada %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "kunci publik %08lX tidak ditemukan: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "lakukanlah --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "memeriksa trustdb\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "trust record %lu, tipe %d: gagal menulis: %s\n" @@ -6051,6 +6142,64 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Akan dibuat satu pasang kunci baru %s.\n" +#~ " keysize minimum adalah 768 bit\n" +#~ " keysize default adalah 1024 bit\n" +#~ " keysize tertinggi dianjurkan 2048 bit\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk " +#~ "RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Keysize lebih besar dari 2048 tidak dianjurkan karena\n" +#~ "komputasi akan sangat lama!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Apakah anda yakin memerlukan keysize ini? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat " +#~ "mudah diserang!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "menulis ke `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n" @@ -6178,12 +6327,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? masalah memeriksa pembatalan: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[revoked] " - -#~ msgid "[expired] " -#~ msgstr "[expired] " - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [berakhir: %s]" Index: gnupg/po/it.po diff -u gnupg/po/it.po:1.70 gnupg/po/it.po:1.71 --- gnupg/po/it.po:1.70 Thu Oct 28 11:06:49 2004 +++ gnupg/po/it.po Fri Dec 10 23:20:50 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -14,11 +14,6 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "in questa versione l'algoritmo digest `%s' è in sola lettura\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -33,11 +28,12 @@ msgid "no entropy gathering module detected\n" msgstr "non è stato trovato il modulo per raccogliere l'entropia\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -71,9 +67,9 @@ msgid "note: random_seed file not updated\n" msgstr "nota: il file random_seed non è stato aggiornato\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "impossibile creare `%s': %s\n" @@ -129,90 +125,150 @@ "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n" "(Servono altri %d byte)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "rebuild della cache del portachiavi fallito: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "invio al keyserver fallito: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "errore nella creazione della passhprase: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "errore leggendo il keyblock: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: errore durante la lettura del record libero: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' è già compresso\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "genera una nuova coppia di chiavi" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "cancellazione del keyblock fallita: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Generazione della chiave fallita: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "Non sono stati trovati dati OpenPGP validi.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "errore nella creazione della passhprase: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "cancellazione del keyblock fallita: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -300,15 +356,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "impossibile fare questo in modo batch\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Cosa scegli? " @@ -316,142 +372,151 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "abilita" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "abilita" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Nessuna ragione specificata" # ??? (Md) -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "non esaminato" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "non c'è una chiave pubblica corrispondente: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "errore leggendo `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "preferenze aggiornate" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "carattere non valido nella stringa delle preferenze\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "carattere non valido nella stringa delle preferenze\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "errore: impronta digitale non valida\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "mostra le impronte digitali" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "errore: impronta digitale non valida\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "Non sono stati trovati dati OpenPGP validi.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "errore scrivendo il portachiavi segreto `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -459,232 +524,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Per favore scegli che tipo di chiave vuoi:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Firma scaduta il %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (cifra solo)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Scelta non valida.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Per favore scegli il motivo della revoca:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo di protezione sconosciuto\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Parti della chiave segreta non sono disponibili.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "saltata: chiave pubblica già presente\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quit" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "abbandona questo menù" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra questo aiuto" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Chiave disponibile presso: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "abilita" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "cambia la data di scadenza" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "cambia il valore di fiducia" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra le impronte digitali" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "errore generale" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "genera una nuova coppia di chiavi" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Ripeti la passphrase: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "passphrase non ripetuta correttamente; prova ancora" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -694,13 +781,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output non funziona con questo comando\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "chiave `%s' non trovata: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -743,7 +830,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "errore nella creazione della passhprase: %s\n" @@ -763,7 +850,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' è già compresso\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENZIONE: `%s' è un file vuoto\n" @@ -794,7 +881,7 @@ "forzare il cifrario simmetrico %s (%d) viola le preferenze\n" "del destinatario\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -902,27 +989,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "chiave %08lX: non protetta - saltata\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "ATTENZIONE: non è stato esportato nulla\n" @@ -1101,15 +1188,15 @@ msgid "prompt before overwriting" msgstr "chiede prima di sovrascrivere" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1117,7 +1204,7 @@ "@\n" "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1137,15 +1224,15 @@ " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Per favore segnala i bug a .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1155,7 +1242,7 @@ "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1163,467 +1250,467 @@ "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "A chiave pubblica: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Cifrari: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Compressione: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "uso: gpg [opzioni] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "non è stato trovato il segno = nella definizione del gruppo \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "ATTENZIONE: il proprietario \"%s\" di %s è insicuro\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "elemento della configurazione sconosciuto \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" "NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s normalmente non deve essere usato!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "l'estensione crittografica \"%s\" non è stata caricata a causa dei\n" "permessi insicuri.\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossibile impostare exec-path a %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENZIONE: %s ha la precedenza su %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "Non è permesso usare %s con %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "Non ha senso usare %s con %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nella modalità --pgp2 puoi fare solo firme in chiaro o separate\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "nella modalità --pgp2 non puoi firmare e cifrare contemporaneamente\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "nella modalità --pgp2 è richiesto il cifrario IDEA per cifrare un messaggio\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "preferenze predefinite non valide\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "preferenze personali del cifrario non valide\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "preferenze personali del digest non valide\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "preferenze personali di compressione non valide\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s non funziona ancora con %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "non è possibile usare l'algoritmo di cifratura \"%s\" in modalità %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "non è possibile usare l'algoritmo di digest \"%s\" in modalità %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "non è possibile usare l'algoritmo di compressione \"%s\" in modalità %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n" "crittografia a chiave pubblica\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifratura fallita: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nomefile]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [portachiavi]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "invio al keyserver fallito: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "ricezione dal keyserver fallita: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "esportazione della chiave fallita: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "ricerca nel keyserver fallita: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aggiornamento del keyserver fallito: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1631,23 +1718,23 @@ "il nome di una nota deve essere formato solo da caratteri stampabili o\n" "spazi e terminare con un '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "l'URL della politica di certificazione indicato non è valido\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "l'URL della politica di firma indicato non è valido\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "l'URL della politica di firma indicato non è valido\n" @@ -1656,28 +1743,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "troppe voci nella pk cache - disabilitata\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[User ID non trovato]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" @@ -2043,381 +2130,381 @@ msgid "No help available for `%s'" msgstr "Non è disponibile un aiuto per `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "salto un blocco di tipo %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "Per ora sono state esaminate %lu chiavi\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Numero totale esaminato: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " nuove chiavi saltate: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " senza user ID: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importate: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " non modificate: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nuovi user ID: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nuove subchiavi: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nuove firme: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr "nuove revoche di chiavi: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " chiavi segrete lette: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "chiavi segrete importate: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "chiavi segrete non cambiate: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " importate: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "Firma %s, algoritmo di digest %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "chiave %08lX: nessun user ID\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "chiave %08lX: nessun user ID valido\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "questo può essere causato da una autofirma mancante\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "chiave %08lX: nuova chiave - saltata\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "non è stato trovato un portachiavi scrivibile: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "chiave %08lX: non corrisponde alla nostra copia\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "chiave %08lX: \"%s\" una nuova firma\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "chiave %08lX: \"%s\" %d nuove firme\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "chiave %08lX: \"%s\" una nuova subchiave\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "chiave %08lX: \"%s\" non cambiata\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "nessun portachiavi segreto predefinito: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "chiave %08lX: chiave segreta importata\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "chiave %08lX: già nel portachiavi segreto\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "chiave %08lX: chiave segreta non trovata: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n" "certificato di revoca\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "chiave %08lX: nessun user ID per la firma\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "chiave %08lX: legame con la subchiave non valido:\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "chiave %08lX: revoca della subchiave non valida\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "chiave %08lX: saltato l'user ID '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "chiave %08lX: saltata la subchiave\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "chiave %08lX: trovato un user ID duplicato - unito\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "ATTENZIONE: la chiave %08lX può essere stata revocata: scarico la chiave\n" "di revoca %08lX.\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "ATTENZIONE: la chiave %08lX può essere stata revocata: la chiave di\n" "revoca %08lX non è presente.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n" @@ -2654,7 +2741,8 @@ msgstr " (3) L'ho controllata molto attentamente.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): " #: g10/keyedit.c:918 @@ -2727,7 +2815,7 @@ msgid "Really sign? (y/N) " msgstr "Firmo davvero? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2758,7 +2846,7 @@ "Inserisci la nuova passphrase per questa chiave segreta.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "passphrase non ripetuta correttamente; prova ancora" @@ -3237,83 +3325,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Questa chiave può essere revocata dalla chiave %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (sensibile)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossibile creare %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocata]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Questa chiave è stata disabilitata" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revocata]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3322,7 +3394,19 @@ "corretta\n" "finchè non eseguirai di nuovo il programma.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[revocata]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3331,7 +3415,7 @@ " potrebbe fare diventare un altro user ID il primario " "predefinito.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3340,46 +3424,46 @@ "ATTENZIONE: Questa è una chiave in stile PGP2. Aggiungere un ID fotografico\n" " può causarne il rifiuto da parte di alcune versioni di PGP.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Cancellare questa firma corretta? (s/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Cancellare questa firma non valida? (s/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Cancellare questa firma sconosciuta? (s/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Cancellare davvero questa autofirma? (s/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Cancellata %d firma.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Cancellate %d firme.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Non è stato cancellato nulla.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3389,168 +3473,168 @@ " designato può causarne il rifiuto da parte di alcune versioni\n" " di PGP.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Non è possibile aggiungere un revocatore designato a una chiave in stile\n" "PGP 2.x.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Inserisci l'user ID del revocatore designato: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "impossibile nominare una chiave come revocatore designato di sè stessa\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n" "annullata.\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):" -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Togli le selezioni dalle chiavi segrete.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Seleziona al massimo una chiave secondaria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambio la data di scadenza per una chiave secondaria.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Cambio la data di scadenza per la chiave primaria.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Devi selezionare esattamente un user ID.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "salto una autofirma v3 sull'user ID \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Nessun user ID con l'indice %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " firmata da %08lX il %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (non esportabile)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Questa chiave è scaduta il %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creare un certificato di revoca per questa firma? (s/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (non esportabile)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocata da %08lX il %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Stai per revocare queste firme:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Creare davvero i certificati di revoca? (s/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "manca la chiave segreta\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3593,12 +3677,12 @@ msgid "writing key binding signature\n" msgstr "scrittura della firma di collegamento alla chiave\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "dimensione della chiave non valida; uso %u bit\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "dimensioni della chiave arrotondate a %u bit\n" @@ -3666,90 +3750,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (cifra solo)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (cifra solo)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (firma solo)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (cifra solo)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (cifra solo)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Sto per generare una nuova coppia di chiavi %s.\n" -" la dimensione minima è 768 bit\n" -" la dimensione predefinita è 1024 bit\n" -" la dimensione massima consigliata è 2048 bit\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Di che dimensioni vuoi la chiave? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "la chiave è troppo corta; 1024 è il minimo valore permesso per RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "La coppia DSA avrà 1024 bit.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n" -"VERAMENTE lunghi!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Sei sicuro di volere una chiave di queste dimensioni? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Di che dimensioni vuoi la chiave? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla " -"tua tastiera sono molto vulnerabili ad attacchi!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "La dimensione richiesta della chiave è %u bit\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "arrotondate a %u bit\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3765,7 +3819,7 @@ " m = la chiave scadrà dopo n mesi\n" " y = la chiave scadrà dopo n anni\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3781,29 +3835,29 @@ " m = la chiave scadrà dopo n mesi\n" " y = la chiave scadrà dopo n anni\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Chiave valida per? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Firma valida per? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "valore non valido\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s non ha scadenza\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s scadrà il %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3811,12 +3865,12 @@ "Il tuo sistema non può mostrare date oltre il 2038.\n" "Comunque, sarà gestita correttamente fino al 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "È giusto (s/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3833,44 +3887,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nome e Cognome: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Carattere non valido nel nome\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Il nome non può iniziare con una cifra\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Il nome deve essere lungo almeno 5 caratteri\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Indirizzo di Email: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "L'indirizzo di email non è valido\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Commento: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Carattere non valido nel commento\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Stai usando il set di caratteri `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3881,27 +3935,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Per favore correggi prima l'errore\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3909,12 +3963,12 @@ "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3926,7 +3980,7 @@ "programma con l'opzione \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3938,54 +3992,50 @@ "dischi) durante la generazione dei numeri primi; questo da al generatore di\n" "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "La coppia DSA avrà 1024 bit.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Generazione della chiave annullata.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "scrittura della chiave pubblica in `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "non è stato trovato un portachiavi segreto scrivibile: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "errore scrivendo il portachiavi segreto `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "chiavi pubbliche e segrete create e firmate.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3994,12 +4044,12 @@ "il comando \"--edit-key\" per generare una chiave secondaria per questo " "scopo.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4007,7 +4057,7 @@ "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4015,40 +4065,40 @@ "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n" "con l'orologio)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NB: la creazione di subchiavi per chiavi v3 non rispetta OpenPGP.\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Crea davvero? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "cancellazione del keyblock fallita: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "impossibile creare `%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: chiave %08lX scaduta il %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4094,28 +4144,28 @@ msgid "expired: %s)" msgstr "[scadenza: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Impronta digitale della chiave primaria:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Impronta digitale della subchiave:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Impronta digitale della chiave primaria:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Impronta digitale della subchiave:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Impronta digitale =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4470,7 +4520,7 @@ msgid "textmode" msgstr "modo testo" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "sconosciuto" @@ -4501,28 +4551,41 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "individuato un pacchetto radice non valido in proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "impossibile disabilitare i core dump: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "impossibile aprire il file: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: read fallita (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n" - -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algoritmo di cifratura non implementato" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "Firma %s, algoritmo di digest %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "" +"forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4635,50 +4698,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent non è disponibile in questa sessione\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "impossibile impostare il pid del client dell'agent\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "impossibile ottenere il FD di lettura dell'agent\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "impossibile ottenere il FD di scrittura dell'agent\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versione %d del protocollo di gpg-agent non è gestita\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossibile connettersi a `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problema di comunicazione con gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problema con l'agent - uso dell'agent disattivato\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (key ID principale %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4689,41 +4752,41 @@ "\"%.*s\"\n" "%u-bit %s key, ID %08lX, created %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Ripeti la passphrase\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Inserisci la passphrase\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "passphrase troppo lunga\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "risposta non valida dall'agent\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "interrotto dall'utente\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con l'agent: ha restituito 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "impossibile chiedere la password in modo batch\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4733,17 +4796,17 @@ "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " @@ -4954,7 +5017,8 @@ msgstr "ATTENZIONE: questa chiave è stata revocata dal suo proprietario!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Questo può significare che la firma è stata falsificata.\n" #: g10/pkclist.c:527 @@ -5058,28 +5122,28 @@ msgstr "" "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "errore creando `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Firma separata.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Inserisci il nome del file di dati: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "viene letto stdin...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "non ci sono dati firmati\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossibile aprire i dati firmati `%s'\n" @@ -5419,53 +5483,48 @@ "nella modalità --pgp2 puoi fare firme separate solo con chiavi in stile PGP " "2.x\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "scrittura in `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "firma:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "In modalità -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "sarà usato il cifrario %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "la chiave non è indicata come insicura - impossibile usarla con il RNG " "finto!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "saltata `%s': doppia\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "saltata `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "saltata: chiave pubblica già presente\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5653,12 +5712,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossibile gestire linee di testo più lunghe di %d caratteri\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "linea di input più lunga di %d caratteri\n" @@ -5709,85 +5768,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[revocata]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[scaduta]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "sconosciuto" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "il prossimoi controllo del trustdb sarà fatto il %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chiave pubblica %08lX non trovata: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "per favore usa --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "controllo il trustdb\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d chiavi processate (%d conteggi di validità azzerati)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "trust record %lu, req type %d: write fallita: %s\n" @@ -6097,6 +6191,63 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "in questa versione l'algoritmo digest `%s' è in sola lettura\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Sto per generare una nuova coppia di chiavi %s.\n" +#~ " la dimensione minima è 768 bit\n" +#~ " la dimensione predefinita è 1024 bit\n" +#~ " la dimensione massima consigliata è 2048 bit\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "la chiave è troppo corta; 1024 è il minimo valore permesso per RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n" +#~ "VERAMENTE lunghi!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Sei sicuro di volere una chiave di queste dimensioni? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e " +#~ "dalla tua tastiera sono molto vulnerabili ad attacchi!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "questo algoritmo di cifratura è deprecato; usane uno più standard!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "scrittura in `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "mi dispiace, non è possibile fare questo in modo batch\n" @@ -6225,12 +6376,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? problema controllando la revoca: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[revocata]" - -#~ msgid "[expired] " -#~ msgstr "[scaduta]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr "[scadenza: %s]" Index: gnupg/po/ja.po diff -u gnupg/po/ja.po:1.17 gnupg/po/ja.po:1.18 --- gnupg/po/ja.po:1.17 Thu Oct 28 11:06:49 2004 +++ gnupg/po/ja.po Fri Dec 10 23:20:45 2004 @@ -1,31 +1,26 @@ # Japanese messages for GnuPG -# Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. -# IIDA Yosiaki , 1999, 2000, 2002, 2003. +# Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. +# IIDA Yosiaki , 1999, 2000, 2002, 2003, 2004. # Yoshihiro Kajiki , 1999. # This file is distributed under the same license as the GnuPG package. # Special thanks to "Takashi P.KATOH". # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.1\n" +"Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" -"PO-Revision-Date: 2003-12-06 00:44+0900\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤Ï¡¢¤³¤ÎÈǤÀ¤ÈÆɽФ·¤À¤±¤Ç¤¹\n" - #: cipher/primegen.c:120 -#, fuzzy, c-format +#, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" -msgstr "%d ¥Ó¥Ã¥È̤Ëþ¤ÎÁÇ¿ô¤ÏÀ¸À®¤Ç¤­¤Þ¤»¤ó\n" +msgstr "pbits=%u qbits=%u¤ÎÁÇ¿ô¤ÏÀ¸À®¤Ç¤­¤Þ¤»¤ó\n" #: cipher/primegen.c:311 #, c-format @@ -36,11 +31,12 @@ msgid "no entropy gathering module detected\n" msgstr "¥¨¥ó¥È¥í¥Ô¡¼¼ý½¸¥â¥¸¥å¡¼¥ë¤¬¡¢¸¡½Ð¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -62,7 +58,7 @@ #: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" -msgstr "·Ù¹ð: ̵¸ú¤Ê¥µ¥¤¥º¤Î random_seed ¥Õ¥¡¥¤¥ë - »È¤¤¤Þ¤»¤ó\n" +msgstr "·Ù¹ð: ̵¸ú¤ÊŤµ¤Î random_seed ¥Õ¥¡¥¤¥ë - »È¤¤¤Þ¤»¤ó\n" #: cipher/random.c:415 #, c-format @@ -73,17 +69,17 @@ msgid "note: random_seed file not updated\n" msgstr "Ãí°Õ: random_seed ¥Õ¥¡¥¤¥ë¤Î¹¹¿·¤ò¤·¤Þ¤»¤ó\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" -msgstr "¡Ö%s¡×¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" #: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" -msgstr "¡Ö%s¡×¤Ë½ñ¤±¤Þ¤»¤ó: %s\n" +msgstr "¡Ö%s¡×¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n" #: cipher/random.c:483 #, c-format @@ -105,7 +101,7 @@ "ÅëºÜ¤µ¤ì¤Æ¤¤¤ëÍð¿ôÀ¸À®»Ò¤Ï¡¢°Å¹æÍѤȤ·¤Æ¤Ï¤ª¤½¤Þ¤Ä¤Ç¡¢\n" "¶¯¤¤Íð¿ô¤¬¤Ç¤­¤Þ¤»¤ó!\n" "\n" -"¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n" +"¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀڻȤäƤϤ¤¤±¤Þ¤»¤ó!!\n" "\n" #: cipher/rndegd.c:204 @@ -128,89 +124,145 @@ "½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£OS¤¬¤â¤Ã¤ÈÍ𻨤µ¤ò¼ý½¸\n" "¤Ç¤­¤ë¤è¤¦¡¢²¿¤«¤·¤Æ¤¯¤À¤µ¤¤! (¤¢¤È%d¥Ð¥¤¥È¤¤¤ê¤Þ¤¹)\n" -#: g10/app-openpgp.c:534 -#, fuzzy, c-format +#: g10/app-openpgp.c:539 +#, c-format msgid "failed to store the fingerprint: %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "»ØÌæ¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:547 -#, fuzzy, c-format +#: g10/app-openpgp.c:552 +#, c-format msgid "failed to store the creation date: %s\n" -msgstr "¸°ÎØ¥­¥ã¥Ã¥·¥å¤ÎºÆ¹½Ãۤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "À¸À®Æü¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" -msgstr "" +msgstr "PIN¥³¡¼¥ë¥Ð¥Ã¥¯¤¬¥¨¥é¡¼¤òÌᤷ¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" -msgstr "" +msgstr "CHV%d¤ÎPIN¤¬Ã»¤¹¤®¤Þ¤¹¡£ºÇû¤Ç%d\n" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 -#, fuzzy, c-format +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 +#, c-format msgid "verify CHV%d failed: %s\n" -msgstr "¸°¥µ¡¼¥Ð¡¼¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "CHV%d¤Î¸¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" -msgstr "" +msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ø¤Î¥¢¥¯¥»¥¹¤¬½é´üÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" -msgstr "" +msgstr "¥«¡¼¥É¤«¤é¤ÎCHV¾õÂ֤θ¡º÷¤Ç¥¨¥é¡¼\n" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" -msgstr "" +msgstr "¥«¡¼¥É¤¬±Êµ×¤Ë¥í¥Ã¥¯¤µ¤ì¤Þ¤¹!\n" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" -msgstr "" +msgstr "¥«¡¼¥É¤Î±Êµ×¥í¥Ã¥¯Á°¤Ë%d¤ÎAdmin PIN¤¬»î¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" -msgstr "" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "|A|Admin PIN" + +#: g10/app-openpgp.c:1021 +#, fuzzy +msgid "|AN|New Admin PIN" +msgstr "|A|¿·¤·¤¤Admin PIN" + +#: g10/app-openpgp.c:1021 +#, fuzzy +msgid "|N|New PIN" +msgstr "¿·¤·¤¤PIN" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1025 #, c-format -msgid "PIN [sigs done: %lu]" -msgstr "" +msgid "error getting new PIN: %s\n" +msgstr "¿·¤·¤¤PIN¤Î¼èÆÀ¥¨¥é¡¼: %s\n" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 -#, fuzzy, c-format -msgid "can't access %s - invalid OpenPGP card?\n" -msgstr "Í­¸ú¤ÊOpenPGP¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n" +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +msgid "error reading application data\n" +msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¡¦¥Ç¡¼¥¿¤ÎÆɽФ·¥¨¥é¡¼\n" -#: g10/app-openpgp.c:1668 -#, fuzzy, c-format -msgid "error getting serial number: %s\n" -msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n" +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +msgid "error reading fingerprint DO\n" +msgstr "»ØÌæ¥Ç¡¼¥¿¡¦¥ª¥Ö¥¸¥§¥¯¥È¤ÎÆɽФ·¥¨¥é¡¼\n" -#: g10/app-openpgp.c:1763 -#, fuzzy, c-format -msgid "failed to store the key: %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +#: g10/app-openpgp.c:1107 +msgid "key already exists\n" +msgstr "¸°¤Ï¤â¤¦¤¢¤ê¤Þ¤¹\n" -#: g10/app-openpgp.c:1805 -#, fuzzy -msgid "reading the key failed\n" -msgstr "¸°¥Ö¥í¥Ã¥¯¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "´û¸¤Î¸°¤Ï¸ò´¹¤µ¤ì¤Þ¤¹\n" + +#: g10/app-openpgp.c:1113 +msgid "generating new key\n" +msgstr "¿·¤·¤¤¸°¤òÀ¸À®\n" -#: g10/app-openpgp.c:1812 +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "¸°À¸À®¤Î´Ö¡¢¤ªÂÔ¤Á¤¯¤À¤µ¤¤ ...\n" + +#: g10/app-openpgp.c:1138 +msgid "generating key failed\n" +msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" + +#: g10/app-openpgp.c:1141 +#, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "¸°¤ÎÀ¸À®¤¬´°Î»¤·¤Þ¤·¤¿ (%dÉÃ)\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 msgid "response does not contain the public key data\n" -msgstr "" +msgstr "±þÅú¤Ë¸ø³«¸°¥Ç¡¼¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/app-openpgp.c:1820 +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 msgid "response does not contain the RSA modulus\n" -msgstr "" +msgstr "±þÅú¤ËRSA¤ÎË¡(modulus)¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/app-openpgp.c:1831 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 msgid "response does not contain the RSA public exponent\n" -msgstr "" +msgstr "±þÅú¤ËRSA¸ø³«»Ø¿ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó\n" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "OpenPGP¥«¡¼¥É¤Ë̵¸ú¤Ê¹½Â¤ (¥Ç¡¼¥¿¡¦¥ª¥Ö¥¸¥§¥¯¥È 0x93)\n" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "¤³¤ì¤Þ¤Ç¤ËºîÀ®¤µ¤ì¤¿½ð̾: %lu\n" + +#: g10/app-openpgp.c:1367 +#, c-format +msgid "PIN [sigs done: %lu]" +msgstr "PIN [½ð̾ºÑ: %lu]" + +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 +#, c-format +msgid "can't access %s - invalid OpenPGP card?\n" +msgstr "%s¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó - ̵¸ú¤ÊOpenPGP¥«¡¼¥É?\n" + +#: g10/app-openpgp.c:1734 +#, c-format +msgid "error getting serial number: %s\n" +msgstr "ÄÌÈ֤μèÆÀ¥¨¥é¡¼: %s\n" + +#: g10/app-openpgp.c:1829 +#, c-format +msgid "failed to store the key: %s\n" +msgstr "¸°¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" + +#: g10/app-openpgp.c:1871 +msgid "reading the key failed\n" +msgstr "¸°¤ÎÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/armor.c:317 #, c-format @@ -234,18 +286,17 @@ msgstr "Æþ¤ì»Ò¤Î¥¯¥ê¥¢½ð̾\n" #: g10/armor.c:551 -#, fuzzy msgid "unexpected armor: " -msgstr "ͽ´ü¤»¤ÌÊñÁõ:" +msgstr "ͽ´ü¤»¤ÌÊñÁõ: " #: g10/armor.c:563 msgid "invalid dash escaped line: " msgstr "̵¸ú¤Ê¥À¥Ã¥·¥å¤Ç¥¨¥¹¥±¡¼¥×¤µ¤ì¤¿¹Ô: " #: g10/armor.c:715 g10/armor.c:1300 -#, fuzzy, c-format +#, c-format msgid "invalid radix64 character %02X skipped\n" -msgstr "̵¸ú¤Ê64¿Êʸ»ú%02x¤ò¤È¤Ð¤·¤Þ¤¹\n" +msgstr "̵¸ú¤Ê64¿Êʸ»ú%02X¤ò¤È¤Ð¤·¤Þ¤·¤¿\n" #: g10/armor.c:758 msgid "premature eof (no CRC)\n" @@ -260,12 +311,11 @@ msgstr "CRC¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n" #: g10/armor.c:804 g10/armor.c:1337 -#, fuzzy, c-format +#, c-format msgid "CRC error; %06lX - %06lX\n" -msgstr "CRC¥¨¥é¡¼¡£%06lx - %06lx\n" +msgstr "CRC¥¨¥é¡¼¡£%06lX - %06lX\n" #: g10/armor.c:824 -#, fuzzy msgid "premature eof (in trailer)\n" msgstr "¥Õ¥¡¥¤¥ëËöÈø¤¬Á᤹¤®¤Þ¤¹ (¸åÈøÉô¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹)\n" @@ -286,403 +336,405 @@ msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" -"ÊñÁõ¤ÎÃæ¤Ë quoted printable ʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£¤ª¤½¤é¤¯¥Ð¥°¤Î¤¢¤ë\n" -"MTA¤ò»ÈÍѤ·¤¿¤Î¤Ç¤·¤ç¤¦\n" +"ÊñÁõ¤ÎÃæ¤Ëquoted printableʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£¤ª¤½¤é¤¯¥Ð¥°¤Î¤¢¤ë\n" +"MTA¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦\n" #: g10/card-util.c:58 g10/card-util.c:282 -#, fuzzy, c-format +#, c-format msgid "OpenPGP card not available: %s\n" -msgstr "ÈëÌ©¸°¤¬ÆÀ¤é¤ì¤Þ¤»¤ó" +msgstr "OpenPGP¥«¡¼¥É¤¬Ìµ¸ú¤Ç¤¹: %s\n" #: g10/card-util.c:63 #, c-format msgid "OpenPGP card no. %s detected\n" -msgstr "" +msgstr "OpenPGP¥«¡¼¥Éno. %s¤ò¸¡½Ð\n" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 -#, fuzzy +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" -msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " -msgstr "¤É¤ì¤Ë¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤Ï? " #: g10/card-util.c:194 g10/card-util.c:244 msgid "[not set]" -msgstr "" +msgstr "[̤ÀßÄê]" -#: g10/card-util.c:376 -#, fuzzy +#: g10/card-util.c:378 msgid "male" -msgstr "enable" +msgstr "ÃË" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "female" -msgstr "enable" +msgstr "½÷" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "unspecified" -msgstr "Íýͳ¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" +msgstr "̵»ØÄê" -#: g10/card-util.c:396 -#, fuzzy +#: g10/card-util.c:406 msgid "not forced" msgstr "̤½èÍý" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" -msgstr "" +msgstr "¶¯À©" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" -msgstr "" +msgstr "¥¨¥é¡¼¡§ ¤Î¤Ù¤¿¤ó¤ÎASCII¤À¤±¤¬º£¡¢µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" -msgstr "" +msgstr "¥¨¥é¡¼: ¡È<¡Éʸ»ú¤Ï»È¤¨¤Þ¤»¤ó¡£\n" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" -msgstr "" +msgstr "¥¨¥é¡¼: Æó½Å¤Î¶õÇò¤Ï¶Ø»ß¤Ç¤¹¡£\n" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " -msgstr "" +msgstr "¥«¡¼¥É½êÍ­¼Ô¤ÎÀ« (surname): " -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " -msgstr "" +msgstr "¥«¡¼¥É½êÍ­¼Ô¤Î̾ (given name): " -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" -msgstr "" +msgstr "¥¨¥é¡¼: ¤Ä¤Ê¤¤¤À̾Á°¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" -#: g10/card-util.c:502 -#, fuzzy +#: g10/card-util.c:521 msgid "URL to retrieve public key: " -msgstr "Âбþ¤¹¤ë¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸ø³«¸°¤òõº÷¤¹¤ëURL: " -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" -msgstr "" +msgstr "¥¨¥é¡¼: URL¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" -msgstr "`%s'¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" +msgstr "¡Ö%s¡×¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " -msgstr "" +msgstr "¥í¥°¥¤¥ó¡¦¥Ç¡¼¥¿ (¥¢¥«¥¦¥ó¥È̾): " -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" +msgstr "¥¨¥é¡¼: ¥í¥°¥¤¥ó¡¦¥Ç¡¼¥¿¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" + +#: g10/card-util.c:699 +msgid "Private DO data: " msgstr "" -#: g10/card-util.c:641 -#, fuzzy +#: g10/card-util.c:709 +#, fuzzy, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "¥¨¥é¡¼: URL¤¬Ä¹¤¹¤®¤Þ¤¹ (¾å¸Â%dʸ»ú)¡£\n" + +#: g10/card-util.c:729 msgid "Language preferences: " -msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·" +msgstr "¸À¸ì¤ÎÁª¹¥: " -#: g10/card-util.c:649 -#, fuzzy +#: g10/card-util.c:737 msgid "Error: invalid length of preference string.\n" -msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" +msgstr "¥¨¥é¡¼: Áª¹¥Ê¸»úÎó¤ÎŤµ¤¬Ìµ¸ú¤Ç¤¹¡£\n" -#: g10/card-util.c:658 -#, fuzzy +#: g10/card-util.c:746 msgid "Error: invalid characters in preference string.\n" -msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" +msgstr "¥¨¥é¡¼: Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹¡£\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " -msgstr "" +msgstr "À­ÊÌ ((M)ÃË¡¢(F)½÷¡¢¶õÇò): " -#: g10/card-util.c:693 -#, fuzzy +#: g10/card-util.c:781 msgid "Error: invalid response.\n" -msgstr "¥¨¥é¡¼: ̵¸ú¤Ê»ØÌæ\n" +msgstr "¥¨¥é¡¼: ̵¸ú¤Ê±þÅú¡£\n" -#: g10/card-util.c:714 -#, fuzzy +#: g10/card-util.c:802 msgid "CA fingerprint: " -msgstr "»ØÌæ¤òɽ¼¨" +msgstr "CA¤Î»ØÌæ: " -#: g10/card-util.c:737 -#, fuzzy +#: g10/card-util.c:825 msgid "Error: invalid formatted fingerprint.\n" -msgstr "¥¨¥é¡¼: ̵¸ú¤Ê»ØÌæ\n" +msgstr "¥¨¥é¡¼: ̵¸ú¤Ê·Á¼°¤Î»ØÌæ¡£\n" -#: g10/card-util.c:785 -#, fuzzy, c-format +#: g10/card-util.c:873 +#, c-format msgid "key operation not possible: %s\n" -msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "¸°¤ÏÁàºî¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/card-util.c:786 -#, fuzzy +#: g10/card-util.c:874 msgid "not an OpenPGP card" -msgstr "Í­¸ú¤ÊOpenPGP¥Ç¡¼¥¿¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£\n" +msgstr "OpenPGP¥«¡¼¥É¤Ç¤¢¤ê¤Þ¤»¤ó" -#: g10/card-util.c:795 -#, fuzzy, c-format +#: g10/card-util.c:883 +#, c-format msgid "error getting current key info: %s\n" -msgstr "ÈëÌ©¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" +msgstr "¸½¹Ô¸°¾ðÊó¤Î¼èÆÀ¥¨¥é¡¼: %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " -msgstr "" +msgstr "´û¸¤Î¸°¤ò¸ò´¹¤·¤Þ¤¹¤«? (y/N) " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " -msgstr "" +msgstr "°Å¹æ¸°¤ò¥«¡¼¥É³°¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Þ¤¹¤«? (Y/n) " -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " -msgstr "" +msgstr "´û¸¤Î¸°·²¤ò¸ò´¹¤·¤Þ¤¹¤«? (y/N) " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" " PIN = `%s' Admin PIN = `%s'\n" "You should change them using the command --change-pin\n" msgstr "" +"½Ð²Ù»þ¤ÎPINÀßÄê¤Ï\n" +" PIN = `%s' Admin PIN = `%s'\n" +"¼¡¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤ÆÊѹ¹¤¹¤Ù¤­¤Ç¤¹ --change-pin\n" -#: g10/card-util.c:968 -#, fuzzy +#: g10/card-util.c:1056 msgid "Please select the type of key to generate:\n" -msgstr "¤¹¤­¤Ê¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" +msgstr "À¸À®¤¹¤ë¸°¤Î·¿¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 -#, fuzzy +#: g10/card-util.c:1058 g10/card-util.c:1138 msgid " (1) Signature key\n" -msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾ %s\n" +msgstr " (1) ½ð̾¸°\n" -#: g10/card-util.c:971 g10/card-util.c:1052 -#, fuzzy +#: g10/card-util.c:1059 g10/card-util.c:1140 msgid " (2) Encryption key\n" -msgstr " (%d) RSA (°Å¹æ²½¤Î¤ß)\n" +msgstr " (2) °Å¹æ²½¸°\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" -msgstr "" +msgstr " (3) ǧ¾Ú¸°\n" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n" -#: g10/card-util.c:1047 -#, fuzzy +#: g10/card-util.c:1135 msgid "Please select where to store the key:\n" -msgstr "¼º¸ú¤ÎÍýͳ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" +msgstr "¸°¤ÎÊݴɾì½ê¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" -#: g10/card-util.c:1082 -#, fuzzy +#: g10/card-util.c:1170 msgid "unknown key protection algorithm\n" -msgstr "̤ÃΤÎÊݸ¥ë¥´¥ê¥º¥à¤Ç¤¹\n" +msgstr "̤ÃΤθ°Êݸ¥ë¥´¥ê¥º¥à¤Ç¤¹\n" -#: g10/card-util.c:1087 -#, fuzzy +#: g10/card-util.c:1175 msgid "secret parts of key are not available\n" -msgstr "¼ç¸°¤ÎÈëÌ©Éôʬ¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£\n" +msgstr "¸°¤ÎÈëÌ©Éôʬ¤¬Ìµ¸ú¤Ç¤¹\n" -#: g10/card-util.c:1092 -#, fuzzy +#: g10/card-util.c:1180 msgid "secret key already stored on a card\n" -msgstr "¥¹¥­¥Ã¥×: ÈëÌ©¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n" +msgstr "ÈëÌ©¸°¤Ï¤â¤¦¥«¡¼¥É¤ËÊݴɤ·¤Æ¤¢¤ê¤Þ¤¹\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quit" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" -msgstr "" +msgstr "admin" -#: g10/card-util.c:1164 -#, fuzzy +#: g10/card-util.c:1252 msgid "show admin commands" -msgstr "ÂÐΩ¤¹¤ë¥³¥Þ¥ó¥É\n" +msgstr "´ÉÍý¥³¥Þ¥ó¥É¤òɽ¼¨" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "¤³¤Î¥Ø¥ë¥×¤òɽ¼¨" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 -#, fuzzy +#: g10/card-util.c:1255 msgid "list all available data" -msgstr "°Ê²¼¤Ë¸°¤¬¤¢¤ê¤Þ¤¹: " +msgstr "Á´Í­¸ú¥Ç¡¼¥¿¤òɽ¼¨" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 -#, fuzzy +#: g10/card-util.c:1258 msgid "name" -msgstr "enable" +msgstr "name" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" -msgstr "" +msgstr "¥«¡¼¥É½êÍ­¼Ô¤Î̾Á°¤ÎÊѹ¹" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" -msgstr "" +msgstr "url" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" -msgstr "" +msgstr "¸°¤òõº÷¤¹¤ëURL¤ÎÊѹ¹" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" -msgstr "" +msgstr "fetch" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" -msgstr "" +msgstr "¥«¡¼¥ÉURL¤Ç»ØÄꤵ¤ì¤¿¸°¤Î°ú¤­½Ð¤·" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "login" -msgstr "lsign" +msgstr "login" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "change the login name" -msgstr "Í­¸ú´ü¸Â¤ÎÊѹ¹" +msgstr "¥í¥°¥¤¥ó̾¤ÎÊѹ¹" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" -msgstr "" +msgstr "lang" -#: g10/card-util.c:1175 -#, fuzzy +#: g10/card-util.c:1263 msgid "change the language preferences" -msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹" +msgstr "¸À¸ìÁª¹¥¤ÎÊѹ¹" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" -msgstr "" +msgstr "sex" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" -msgstr "" +msgstr "¥«¡¼¥É½êÍ­¼Ô¤ÎÀ­Ê̤ÎÊѹ¹" -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "cafpr" -msgstr "fpr" +msgstr "cafpr" -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "change a CA fingerprint" -msgstr "»ØÌæ¤òɽ¼¨" +msgstr "CA»ØÌæ¤ÎÊѹ¹" -#: g10/card-util.c:1178 -#, fuzzy +#: g10/card-util.c:1266 msgid "forcesig" -msgstr "revsig" +msgstr "forcesig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" -msgstr "" +msgstr "½ð̾¶¯À©PIN¥Õ¥é¥°¤òȿž" -#: g10/card-util.c:1180 -#, fuzzy +#: g10/card-util.c:1268 msgid "generate" -msgstr "°ìÈÌŪ¤Ê¥¨¥é¡¼" +msgstr "generate" -#: g10/card-util.c:1181 -#, fuzzy +#: g10/card-util.c:1269 msgid "generate new keys" -msgstr "¿·¤·¤¤¸°ÂФòÀ¸À®" +msgstr "¿·¤·¤¤¸°·²¤òÀ¸À®" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" +msgstr "PIN¥Ö¥í¥Ã¥¯¤Î²ò½ü¤äÊѹ¹¤Î¥á¥Ë¥å¡¼" + +#: g10/card-util.c:1272 +msgid "privatedo" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "¥³¥Þ¥ó¥É> " -#: g10/card-util.c:1281 -#, fuzzy +#: g10/card-util.c:1371 msgid "Admin-only command\n" -msgstr "ÂÐΩ¤¹¤ë¥³¥Þ¥ó¥É\n" +msgstr "´ÉÍýÀìÍÑ¥³¥Þ¥ó¥É\n" -#: g10/card-util.c:1297 -#, fuzzy +#: g10/card-util.c:1387 msgid "Admin commands are allowed\n" -msgstr "ÂÐΩ¤¹¤ë¥³¥Þ¥ó¥É\n" +msgstr "´ÉÍý¥³¥Þ¥ó¥É¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/card-util.c:1299 -#, fuzzy +#: g10/card-util.c:1389 msgid "Admin commands are not allowed\n" -msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" +msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" -msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Öhelp¡×¤ò»²¾È)\n" +msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Èhelp¡É¤ò»²¾È)\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " -msgstr "" +msgstr "¥«¡¼¥É¤òÁÞÆþ¤·return¤òÂǤĤ«¡¢'c'¤Ç¼è¾Ã¤·: " -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" +"º£¤Î¥«¡¼¥É¤òÈ´¤­¡¢¼¡¤ÎÄÌÈ֤Τ½¤ì¤òÆþ¤ì¤Æ¤¯¤À¤µ¤¤:\n" +" %.*s\n" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " -msgstr "" +msgstr "ÍÑ°Õ¤·¤Æreturn¤òÂǤĤ«¡¢'c'¤Ç¼è¾Ã¤·: " + +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Admin PIN¤ÎÆþÎÏ: " -#: g10/cardglue.c:638 +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "PIN¤ÎÆþÎÏ: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " -msgstr "" +msgstr "Admin PIN¤ÎÆþÎÏ: " -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " -msgstr "" +msgstr "PIN¤ÎÆþÎÏ: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +msgid "Repeat this PIN: " +msgstr "PIN¤òºÆÆþÎÏ: " + +#: g10/cardglue.c:718 +msgid "PIN not correctly repeated; try again" +msgstr "PIN¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -692,36 +744,33 @@ msgid "--output doesn't work for this command\n" msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found: %s\n" -msgstr "¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸°¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" -msgstr "¸°¥Ö¥í¥Ã¥¯¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" +msgstr "¸°¥Ö¥í¥Ã¥¯¤ÎÆɽФ·¥¨¥é¡¼: %s\n" #: g10/delkey.c:121 g10/delkey.c:128 msgid "(unless you specify the key by fingerprint)\n" msgstr "(¤¢¤ë¤¤¤Ï¡¢»ØÌæ¤Ç¸°¤ò»ØÄê)\n" #: g10/delkey.c:127 -#, fuzzy msgid "can't do this in batch mode without \"--yes\"\n" -msgstr "¡Ö--yes¡×¤Î¤Ê¤¤¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "¡È--yes¡É¤Î¤Ê¤¤¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" #: g10/delkey.c:139 -#, fuzzy msgid "Delete this key from the keyring? (y/N) " -msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤ò¸°Îؤ«¤éºï½ü¤·¤Þ¤¹¤«? (y/N) " #: g10/delkey.c:147 -#, fuzzy msgid "This is a secret key! - really delete? (y/N) " -msgstr "¤³¤ì¤ÏÈëÌ©¸°¤Ç¤¹! ËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤ì¤ÏÈëÌ©¸°¤Ç¤¹! ËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " #: g10/delkey.c:157 #, c-format @@ -735,13 +784,13 @@ #: g10/delkey.c:195 #, c-format msgid "there is a secret key for public key \"%s\"!\n" -msgstr "¤³¤Î¸ø³«¸°¤Ë¤¿¤¤¤¹¤ëÈëÌ©¸°¡Ö%s¡×¤¬¤¢¤ê¤Þ¤¹!\n" +msgstr "¤³¤Î¸ø³«¸°¤Ë¤¿¤¤¤¹¤ëÈëÌ©¸°¡È%s¡É¤¬¤¢¤ê¤Þ¤¹!\n" #: g10/delkey.c:197 msgid "use option \"--delete-secret-keys\" to delete it first.\n" -msgstr "¤Þ¤º¡Ö--delete-secret-keys¡×¥ª¥×¥·¥ç¥ó¤Ç¤³¤ì¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +msgstr "¤Þ¤º¡È--delete-secret-keys¡É¥ª¥×¥·¥ç¥ó¤Ç¤³¤ì¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎºîÀ®¥¨¥é¡¼: %s\n" @@ -751,19 +800,19 @@ msgstr "S2K¥â¡¼¥É¤Î¤¿¤á¡¢ÂоÎESK¥Ñ¥±¥Ã¥È¤ò»È¤¨¤Þ¤»¤ó\n" #: g10/encode.c:228 -#, fuzzy, c-format +#, c-format msgid "using cipher %s\n" -msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "%s°Å¹æË¡¤ò»È¤¤¤Þ¤¹\n" #: g10/encode.c:238 g10/encode.c:558 #, c-format msgid "`%s' already compressed\n" -msgstr "`%s'¤Ï´û¤Ë°µ½ÌºÑ¤ß¤Ç¤¹\n" +msgstr "¡Ö%s¡×¤Ï¤â¤¦°µ½ÌºÑ¤ß¤Ç¤¹\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "·Ù¹ð: `%s'¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n" +msgstr "·Ù¹ð: ¡Ö%s¡×¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n" #: g10/encode.c:472 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" @@ -772,7 +821,7 @@ #: g10/encode.c:494 #, c-format msgid "reading from `%s'\n" -msgstr "`%s'¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n" +msgstr "¡Ö%s¡×¤«¤éÆɤ߽Ф·¤Þ¤¹\n" #: g10/encode.c:530 msgid "" @@ -780,32 +829,32 @@ msgstr "°Å¹æ²½¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤ÏÁ´ÉôIDEA°Å¹æ¤ò»È¤¨¤Þ¤»¤ó¡£\n" #: g10/encode.c:540 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "ÂоΰŹ楢¥ë¥´¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" +msgstr "·Ù¹ð: ÂоΰŹæË¡ %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" -#: g10/encode.c:648 g10/sign.c:876 -#, fuzzy, c-format +#: g10/encode.c:648 g10/sign.c:877 +#, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " "preferences\n" -msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" +msgstr "·Ù¹ð: °µ½Ì¥¢¥ë¥´¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" #: g10/encode.c:735 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "ÂоΰŹ楢¥ë¥´¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" +msgstr "ÂоΰŹæË¡ %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757 #, c-format msgid "you may not use %s while in %s mode\n" -msgstr "%s¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "%s¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" #: g10/encode.c:832 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" -msgstr "%s/%s°Å¹æ²½ ¼õ¿®¼Ô: \"%s\"\n" +msgstr "%s/%s°Å¹æ²½ ¼õ¿®¼Ô:¡È%s¡É\n" #: g10/encr-data.c:66 g10/mainproc.c:301 #, c-format @@ -815,7 +864,7 @@ #: g10/encr-data.c:68 g10/mainproc.c:305 #, c-format msgid "encrypted with unknown algorithm %d\n" -msgstr "̤ÃΤΥ¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n" +msgstr "̤ÃΤΥ¢¥ë¥´¥ê¥º¥à%d¤Ë¤è¤ë°Å¹æ²½\n" #: g10/encr-data.c:92 msgid "" @@ -824,7 +873,7 @@ #: g10/encr-data.c:103 msgid "problem handling encrypted packet\n" -msgstr "°Å¹æ¥Ñ¥±¥Ã¥È¤Î¼è¤ê°·¤¤¤Ç¾ã³²\n" +msgstr "°Å¹æ²½¥Ñ¥±¥Ã¥È¤Î¼è°·¤¤¤Ç¾ã³²\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" @@ -833,7 +882,7 @@ #: g10/exec.c:184 g10/openfile.c:406 #, c-format msgid "can't create directory `%s': %s\n" -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/exec.c:325 msgid "" @@ -843,20 +892,19 @@ "³°Éô¥×¥í¥°¥é¥à¤Î¸Æ½Ð¤·¤Ï¡¢»ÈÍѶػߤǤ¹¡£\n" #: g10/exec.c:355 -#, fuzzy msgid "this platform requires temporary files when calling external programs\n" msgstr "" "¤³¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤À¤È¡¢³°Éô¥×¥í¥°¥é¥à¤Î¸Æ½Ð¤·¤Ë¤Ï¡¢°ì»þ¥Õ¥¡¥¤¥ë¤¬É¬ÍפǤ¹\n" #: g10/exec.c:433 -#, fuzzy, c-format +#, c-format msgid "unable to execute program `%s': %s\n" -msgstr "¼Â¹Ô¤Ç¤­¤Þ¤»¤ó %s \"%s\": %s\n" +msgstr "¡Ö%s¡×¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/exec.c:436 -#, fuzzy, c-format +#, c-format msgid "unable to execute shell `%s': %s\n" -msgstr "¼Â¹Ô¤Ç¤­¤Þ¤»¤ó %s \"%s\": %s\n" +msgstr "¥·¥§¥ë¡Ö%s¡×¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/exec.c:521 #, c-format @@ -874,39 +922,38 @@ #: g10/exec.c:563 #, c-format msgid "unable to read external program response: %s\n" -msgstr "³°Éô¥×¥í¥°¥é¥à¤Î±þÅú¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" +msgstr "³°Éô¥×¥í¥°¥é¥à¤Î±þÅú¤òÆɤ߽Ф»¤Þ¤»¤ó: %s\n" #: g10/exec.c:609 g10/exec.c:616 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" -msgstr "·Ù¹ð: °ì»þ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Þ¤»¤ó (%s) `%s': %s\n" +msgstr "·Ù¹ð: °ì»þ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Þ¤»¤ó (%s) ¡Ö%s¡×: %s\n" #: g10/exec.c:621 #, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "·Ù¹ð: °ì»þ¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/export.c:176 -#, fuzzy +#: g10/export.c:182 msgid "exporting secret keys not allowed\n" -msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" +msgstr "ÈëÌ©¸°¤Î½ñ½Ð¤·¤Ï¶Ø»ß¤Ç¤¹\n" -#: g10/export.c:206 -#, fuzzy, c-format +#: g10/export.c:211 +#, c-format msgid "key %s: not protected - skipped\n" -msgstr "¸° %08lX: Êݸ¤ì¤Æ¤¤¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: Êݸ¤ì¤Æ¤¤¤Þ¤»¤ó - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/export.c:214 -#, fuzzy, c-format +#: g10/export.c:219 +#, c-format msgid "key %s: PGP 2.x style key - skipped\n" -msgstr "¸° %08lX: PGP 2.x·Á¼°¤Î¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: PGP 2.x·Á¼°¤Î¸°¤Ç¤¹ - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/export.c:361 -#, fuzzy, c-format +#: g10/export.c:384 +#, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" -msgstr "·Ù¹ð: ÈëÌ©¸°%08lX¤Ë¤Ï¡¢Ã±½ã¤ÊSK¥Á¥§¥Ã¥¯¥µ¥à¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "·Ù¹ð: ÈëÌ©¸°%s¤Ë¤Ï¡¢Ã±½ã¤ÊSK¥Á¥§¥Ã¥¯¥µ¥à¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "·Ù¹ð: ²¿¤â½ñ¤­½Ð¤·¤Æ¤¤¤Þ¤»¤ó\n" @@ -955,9 +1002,8 @@ msgstr "¸°¤È½ð̾¤Î°ìÍ÷" #: g10/g10.c:374 -#, fuzzy msgid "list and check key signatures" -msgstr "¸°¤Î½ð̾¤ò¸¡ºº" +msgstr "¸°½ð̾¤Î¸¡ºº¤È°ìÍ÷" #: g10/g10.c:375 msgid "list keys and fingerprints" @@ -1021,15 +1067,15 @@ #: g10/g10.c:400 msgid "print the card status" -msgstr "" +msgstr "¥«¡¼¥É¾õÂÖ¤òɽ¼¨" #: g10/g10.c:401 msgid "change data on a card" -msgstr "" +msgstr "¥«¡¼¥É¤Î¥Ç¡¼¥¿¤òÊѹ¹" #: g10/g10.c:402 msgid "change a card's PIN" -msgstr "" +msgstr "¥«¡¼¥É¤ÎPIN¤òÊѹ¹" #: g10/g10.c:410 msgid "update the trust database" @@ -1037,7 +1083,7 @@ #: g10/g10.c:417 msgid "|algo [files]|print message digests" -msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ" +msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤òɽ¼¨" #: g10/g10.c:421 g10/gpgv.c:65 msgid "" @@ -1089,15 +1135,15 @@ msgid "prompt before overwriting" msgstr "¾å½ñ¤­Á°¤Ë³Îǧ" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" -msgstr "" +msgstr "¸·Ì©¤ÊOpenPGP¤Î¿¶Éñ¤òºÎÍÑ" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" -msgstr "" +msgstr "PGP 2.x¸ß´¹¤Î¥á¥Ã¥»¡¼¥¸¤òÀ¸À®" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1106,7 +1152,7 @@ "(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n" "¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1126,15 +1172,15 @@ " --list-keys [̾Á°] ¸°¤òɽ¼¨\n" " --fingerprint [̾Á°] »ØÌæ¤òɽ¼¨\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1142,9 +1188,9 @@ msgstr "" "½ñ¼°: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n" "½ð̾¡¢¸¡ºº¡¢°Å¹æ²½¤äÉü¹æ\n" -"´ûÄê¤ÎÆ°ºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n" +"´ûÄê¤ÎÁàºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1152,516 +1198,504 @@ "\n" "¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥¢¥ë¥´¥ê¥º¥à:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "¸ø³«¸°: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " -msgstr "°Å¹æ: " +msgstr "°Å¹æË¡: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "¥Ï¥Ã¥·¥å: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "°µ½Ì: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "ÂÐΩ¤¹¤ë¥³¥Þ¥ó¥É\n" -#: g10/g10.c:982 -#, fuzzy, c-format +#: g10/g10.c:1017 +#, c-format msgid "no = sign found in group definition `%s'\n" msgstr "=µ­¹æ¤¬¡¢¥°¥ë¡¼¥×ÄêµÁ¡Ö%s¡×Æâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1179 -#, fuzzy, c-format +#: g10/g10.c:1214 +#, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n" +msgstr "·Ù¹ð: homedir ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n" -#: g10/g10.c:1182 -#, fuzzy, c-format +#: g10/g10.c:1217 +#, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n" +msgstr "·Ù¹ð: ¹½À®¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n" -#: g10/g10.c:1185 -#, fuzzy, c-format +#: g10/g10.c:1220 +#, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n" +msgstr "·Ù¹ð: ³ÈÄ¥¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤½êÍ­¼Ô\n" -#: g10/g10.c:1191 -#, fuzzy, c-format +#: g10/g10.c:1226 +#, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n" +msgstr "·Ù¹ð: homedir ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n" -#: g10/g10.c:1194 -#, fuzzy, c-format +#: g10/g10.c:1229 +#, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n" +msgstr "·Ù¹ð: ¹½À®¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n" -#: g10/g10.c:1197 -#, fuzzy, c-format +#: g10/g10.c:1232 +#, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n" +msgstr "·Ù¹ð: ³ÈÄ¥¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤µö²Ä\n" -#: g10/g10.c:1203 -#, fuzzy, c-format +#: g10/g10.c:1238 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" +msgstr "·Ù¹ð: homedir ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" -#: g10/g10.c:1206 -#, fuzzy, c-format +#: g10/g10.c:1241 +#, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" +msgstr "·Ù¹ð: ¹½À®¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" -#: g10/g10.c:1209 -#, fuzzy, c-format +#: g10/g10.c:1244 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" +msgstr "·Ù¹ð: ³ÈÄ¥¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼½êÍ­¼Ô\n" -#: g10/g10.c:1215 -#, fuzzy, c-format +#: g10/g10.c:1250 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼µö²Ä\n" +msgstr "·Ù¹ð: homedir ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼µö²Ä\n" -#: g10/g10.c:1218 -#, fuzzy, c-format +#: g10/g10.c:1253 +#, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼µö²Ä\n" +msgstr "·Ù¹ð: ¹½À®¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼µö²Ä\n" -#: g10/g10.c:1221 -#, fuzzy, c-format +#: g10/g10.c:1256 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" -msgstr "·Ù¹ð: %s ¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼µö²Ä\n" +msgstr "·Ù¹ð: ³ÈÄ¥¡Ö%s¡×¤Î°ÂÁ´¤Ç¤Ê¤¤¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¡¼µö²Ä\n" -#: g10/g10.c:1362 -#, fuzzy, c-format +#: g10/g10.c:1397 +#, c-format msgid "unknown configuration item `%s'\n" -msgstr "¿·¤·¤¤¹½À®¥Õ¥¡¥¤¥ë`%s'¤¬¤Ç¤­¤Þ¤·¤¿\n" +msgstr "̤ÃΤι½À®¹àÌÜ¡Ö%s¡×\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Ãí°Õ: ÀΡ¢´ûÄê¤À¤Ã¤¿¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Ï¡¢Ìµ»ë¤µ¤ì¤Þ¤¹\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×: %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" -msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n" +msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" -msgstr "Ãí°Õ: ÉáÄÌ%s¤ÏÍѤ¤¤Þ¤»¤ó!\n" +msgstr "Ãí°Õ: ÉáÄÌ%s¤Ï»È¤¤¤Þ¤»¤ó!\n" -#: g10/g10.c:2048 -#, fuzzy, c-format +#: g10/g10.c:2079 +#, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" -msgstr "°ÂÁ´¤Ç¤Ê¤¤µö²Ä¤Î¤¿¤á¡¢°Å¹æ³ÈÄ¥¡Ö%s¡×¤ò¥í¡¼¥É¤·¤Þ¤»¤ó\n" +msgstr "°ÂÁ´¤Ç¤Ê¤¤µö²Ä¤Î¤¿¤á¡¢°Å¹æË¡³ÈÄ¥¡Ö%s¡×¤ò¥í¡¼¥É¤·¤Þ¤»¤ó\n" -#: g10/g10.c:2260 -#, fuzzy, c-format +#: g10/g10.c:2293 +#, c-format msgid "`%s' is not a valid character set\n" -msgstr "%s¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 -#, fuzzy +#: g10/g10.c:2312 g10/keyedit.c:3434 msgid "could not parse keyserver URL\n" -msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURI¤ò²òÀÏÉÔǽ\n" +msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURL¤ò²òÀÏÉÔǽ\n" -#: g10/g10.c:2285 -#, fuzzy, c-format +#: g10/g10.c:2318 +#, c-format msgid "%s:%d: invalid keyserver options\n" -msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó\n" +msgstr "%s:%d: ̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2288 -#, fuzzy +#: g10/g10.c:2321 msgid "invalid keyserver options\n" -msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" +msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" -msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó\n" +msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" -msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó\n" +msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2315 -#, fuzzy, c-format +#: g10/g10.c:2348 +#, c-format msgid "%s:%d: invalid list options\n" -msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó\n" +msgstr "%s:%d: ̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2318 -#, fuzzy +#: g10/g10.c:2351 msgid "invalid list options\n" -msgstr "̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" +msgstr "̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2340 -#, fuzzy, c-format +#: g10/g10.c:2373 +#, c-format msgid "%s:%d: invalid verify options\n" -msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó\n" +msgstr "%s:%d: ̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2343 -#, fuzzy +#: g10/g10.c:2376 msgid "invalid verify options\n" -msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" +msgstr "̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" -msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" +msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" -msgstr "%s¤Ï%s¤È¤È¤â¤ËÍѤ¤¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n" +msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤Ã¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" -msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n" +msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ²½¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" -msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æ¤¬É¬ÍפǤ¹ \n" +msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æË¡¤¬É¬ÍפǤ¹\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" -msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n" +msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2684 -#, fuzzy +#: g10/g10.c:2717 msgid "selected compression algorithm is invalid\n" -msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n" +msgstr "ÁªÂò¤µ¤ì¤¿°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿¾ÚÌÀ½ñÍ×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:2709 -#, fuzzy +#: g10/g10.c:2742 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2711 -#, fuzzy +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" -msgstr "̵¸ú¤Êdefault-check-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "̵¸ú¤Êdefault-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2713 -#, fuzzy +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" -msgstr "̵¸ú¤Êdefault-check-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "̵¸ú¤Êmin-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "̵¸ú¤Ê´ûÄê¤ÎÁª¹¥\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" -msgstr "̵¸ú¤Ê¸Ä¿ÍÍѰŹæ¤ÎÁª¹¥\n" +msgstr "̵¸ú¤Ê¸Ä¿ÍÍѰŹæË¡¤ÎÁª¹¥\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑÍ×Ìó¤ÎÁª¹¥\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑ°µ½Ì¤ÎÁª¹¥\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s¤Ï%s¤Çµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/g10.c:2824 -#, fuzzy, c-format +#: g10/g10.c:2857 +#, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" -msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2829 -#, fuzzy, c-format +#: g10/g10.c:2862 +#, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" -msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2834 -#, fuzzy, c-format +#: g10/g10.c:2867 +#, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" -msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "·Ù¹ð: ¸ø³«¸°°Å¹æ¤ò»È¤ï¤º¤Ë¡¢¼õ¼è¿Í (-r) ¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2961 -#, fuzzy, c-format +#: g10/g10.c:2994 +#, c-format msgid "symmetric encryption of `%s' failed: %s\n" -msgstr "Éü¹æ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "¡Ö%s¡×¤ÎÂоΰŹæ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2984 -#, fuzzy +#: g10/g10.c:3017 msgid "--symmetric --encrypt [filename]" -msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]" +msgstr "--symmetric --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" -msgstr "" +msgstr "--symmetric --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2989 -#, fuzzy, c-format +#: g10/g10.c:3022 +#, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" -msgstr "%s¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "--symmetric --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3035 -#, fuzzy +#: g10/g10.c:3068 msgid "--symmetric --sign --encrypt [filename]" -msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]" +msgstr "--symmetric --sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" -msgstr "" +msgstr "--symmetric --sign --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3040 -#, fuzzy, c-format +#: g10/g10.c:3073 +#, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" -msgstr "%s¤ò%s¥â¡¼¥É¤ÇÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" +msgstr "--symmetric --sign --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¤Î¼õ¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "¸°¤Î½ñ½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î²óÉü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" -msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à`%s'¤Ç¤¹\n" +msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤Ç¤¹\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" -msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤ ...\n" +msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤òÂǤäƤ¯¤À¤µ¤¤ ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -"Ãí¼á̾¤Ë¤Ï°õ»ú²Äǽ¤Êʸ»ú¤«¶õÇò¤Î¤ß¤òÍѤ¤¡¢'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +"Ãí¼á̾¤Ë¤Ï°õ»ú²Äǽ¤Êʸ»ú¤«¶õÇò¤Î¤ß¤ò»È¤¤¡¢'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "¥æ¡¼¥¶¡¼Ãí¼á̾¤Ï¡¢'@'ʸ»ú¤ò´Þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" -msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" +msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤ò»È¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:3911 -#, fuzzy +#: g10/g10.c:3944 msgid "the given preferred keyserver URL is invalid\n" -msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" +msgstr "»ØÄꤵ¤ì¤¿Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤Ï̵¸ú¤Ç¤¹\n" #: g10/getkey.c:150 msgid "too many entries in pk cache - disabled\n" msgstr "pk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n" -#: g10/getkey.c:186 g10/getkey.c:2691 -#, fuzzy +#: g10/getkey.c:186 g10/getkey.c:2711 msgid "[User ID not found]" -msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]" +msgstr "[¥æ¡¼¥¶¡¼ID¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]" -#: g10/getkey.c:1614 -#, fuzzy, c-format +#: g10/getkey.c:1639 +#, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" -msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%08lX¤Ç¤¹\n" +msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%s¤Ç¤¹\n" -#: g10/getkey.c:2169 -#, fuzzy, c-format +#: g10/getkey.c:2189 +#, c-format msgid "no secret subkey for public subkey %s - ignoring\n" -msgstr "¸ø³«Éû¸°%08lX¤Ë¤¿¤¤¤¹¤ëÈëÌ©Éû¸°¤¬¤¢¤ê¤Þ¤»¤ó - ̵»ë\n" +msgstr "¸ø³«Éû¸°%s¤Ë¤¿¤¤¤¹¤ëÈëÌ©Éû¸°¤¬¤¢¤ê¤Þ¤»¤ó - ̵»ë\n" -#: g10/getkey.c:2400 -#, fuzzy, c-format +#: g10/getkey.c:2420 +#, c-format msgid "using secondary key %s instead of primary key %s\n" -msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n" +msgstr "Éû¸°%s¤ò¼ç¸°%s¤ËÂåÍѤ·¤Þ¤¹\n" -#: g10/getkey.c:2447 -#, fuzzy, c-format +#: g10/getkey.c:2467 +#, c-format msgid "key %s: secret key without public key - skipped\n" -msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹ - ¤È¤Ð¤·¤Þ¤¹\n" #: g10/gpgv.c:68 msgid "be somewhat more quiet" @@ -1679,7 +1713,7 @@ msgid "|FD|write status info to this FD" msgstr "" "|¥Õ¥¡¥¤¥ëµ­½Ò»Ò|¤³¤Î¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë¾õÂÖ¤ò\n" -"½ñ¤­½Ð¤¹" +"½ñ¤­¹þ¤à" #: g10/gpgv.c:96 msgid "Usage: gpgv [options] [files] (-h for help)" @@ -1691,7 +1725,7 @@ "Check signatures against known trusted keys\n" msgstr "" "¹½Ê¸: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n" -"¿®ÍѤ·¤¿¸°¤Ç½ð̾¤ò¸¡ºº\n" +"´ûÃΤο®ÍѤ·¤¿¸°¤Ç½ð̾¤ò¸¡ºº\n" #: g10/helptext.c:48 msgid "" @@ -1699,7 +1733,7 @@ "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" "to do with the (implicitly created) web-of-certificates." msgstr "" -"¤³¤ÎÃͤÎÀßÄê¤Ï¡¢¤¢¤Ê¤¿¼¡Âè¤Ç¤¹¡£¤³¤ÎÃͤϡ¢Âè»°¼Ô¤Ë·è¤·\n" +"¤³¤ÎÃͤλØÄê¤Ï¡¢¤¢¤Ê¤¿¼¡Âè¤Ç¤¹¡£¤³¤ÎÃͤϡ¢Âè»°¼Ô¤Ë·è¤·\n" "¤ÆÄ󶡤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢web-of-trust ¤Î¼ÂÁõ¤ËɬÍפǡ¢\n" "(°ÅÌÛŪ¤Ë¤Ç¤­¤¿) web-of-certificates ¤È¤Ï̵´Ø·¸¤Ç¤¹¡£" @@ -1713,16 +1747,16 @@ "Web-of-Trust¤ò¹½ÃÛ¤¹¤ë¤¿¤áGnuPG¤Ï¡¢¤É¤Î¸°¤òÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë\n" "¤Î¤«¤òÃΤëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ï¤Õ¤Ä¤¦¡¢ÈëÌ©¸°¤Ë¥¢¥¯¥»¥¹¤Ç¤­\n" "¤ë¸°¤Î¤³¤È¤Ç¤¹¡£¤³¤Î¸°¤òÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¤³¤È¤Ë¤¹¤ë¤Ê¤é¡¢\n" -"¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" +"¡Èyes¡É¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/helptext.c:61 msgid "If you want to use this untrusted key anyway, answer \"yes\"." -msgstr "¤³¤Î¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" +msgstr "¤³¤Î¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Èno¡É¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:65 msgid "" "Enter the user ID of the addressee to whom you want to send the message." -msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ëÁê¼ê¥¢¥É¥ì¥¹¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£" +msgstr "¤¢¤Ê¤¿¤ÎÁ÷¤ë¥á¥Ã¥»¡¼¥¸°¸Àè¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:69 msgid "" @@ -1737,6 +1771,15 @@ "\n" "The first (primary) key must always be a key which is capable of signing." msgstr "" +"»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +"\n" +"DSA (ÊÌ̾DSS) ¤Ï¡¢½ð̾ÀìÍѤÎÅŻҽð̾¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" +"\n" +"Elgamal¤Ï¡¢°Å¹æ²½¤Î¤ß¤Î¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" +"\n" +"RSA¤Ï¡¢½ð̾¤Ë¤â°Å¹æ²½¤Ë¤â»È¤¨¤Þ¤¹¡£\n" +"\n" +"ºÇ½é¤Î¸°(¼ç¸°)¤Ï¡¢½ð̾¤Ë»ÈÍѤǤ­¤ë¸°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£" #: g10/helptext.c:83 msgid "" @@ -1744,7 +1787,7 @@ "encryption. This algorithm should only be used in certain domains.\n" "Please consult your security expert first." msgstr "" -"°ìÈ̤ˡ¢½ð̾¤È°Å¹æ¤ËƱ¤¸¸°¤ò»È¤¦¤Î¤Ï¡¢¤è¤í¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£\n" +"°ìÈ̤ˡ¢½ð̾¤È°Å¹æ²½¤ËƱ¤¸¸°¤ò»È¤¦¤Î¤Ï¡¢¤è¤í¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£\n" "¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢°ìÄê¤ÎÈÏ°ÏÆâ¤À¤±¤Ç»È¤ï¤ì¤ë¤Ù¤­¤Ç¤¹¡£\n" "¤Þ¤º¡¢¥»¥­¥å¥ê¥Æ¥£¡¼¤ÎÀìÌç²È¤Ë¤´ÁêÃ̤¯¤À¤µ¤¤¡£" @@ -1755,7 +1798,7 @@ #: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143 #: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181 msgid "Answer \"yes\" or \"no\"" -msgstr "¡Öyes¡×¤«¡Öno¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤" +msgstr "¡Èyes¡É¤«¡Èno¡É¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:104 msgid "" @@ -1766,12 +1809,12 @@ msgstr "" "¥×¥í¥ó¥×¥È¤Ë¼¨¤¹½ñ¼°¤ÇÃͤòÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" "ISO¤ÎÆüÉդνñ¼° (YYYY-MM-DD) ¤Ç¤âÆþÎϤǤ­¤Þ¤¹¤¬¡¢Àµ¤·¤¤¥¨¥é¡¼¤Ï\n" -"ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤½¤ÎÂå¤ê¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´ü´Ö¤ØÊÑ´¹¤¹¤ë\n" -"¤è¤¦¤Ë»î¤ß¤Þ¤¹¡£" +"ɽ¼¨¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤½¤ÎÂå¤ï¤ê¡¢¥·¥¹¥Æ¥à¤ÏÆþÎÏÃͤò´ü´Ö¤ØÊÑ´¹\n" +"¤¹¤ë¤è¤¦¤Ë»î¤ß¤Þ¤¹¡£" #: g10/helptext.c:116 msgid "Enter the name of the key holder" -msgstr "¸°¥Û¥ë¥À¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" +msgstr "¸°½êÍ­¼Ô¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:121 msgid "please enter an optional but highly suggested email address" @@ -1791,13 +1834,13 @@ msgstr "" "N ̾Á°¤ÎÊѹ¹¡£\n" "C ¥³¥á¥ó¥È¤ÎÊѹ¹¡£\n" -"E ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤ÎÊѹ¹¡£\n" -"O ¸°¤ÎÀ¸À®¤Î³¹Ô¡£\n" -"Q ¸°¤ÎÀ¸À®¤ÎÃæ»ß¡£" +"E ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤ÎÊѹ¹¡£\n" +"O ¸°À¸À®¤Î³¹Ô¡£\n" +"Q ¸°À¸À®¤Î½ªÎ»¡£" #: g10/helptext.c:139 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." -msgstr "Éû¸°¤òÀ¸À®¤¹¤ë¾ì¹ç¡¢¡Öyes¡×(¤Þ¤¿¤Ï¡¢Ã±¤Ë¡Öy¡×) ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" +msgstr "Éû¸°¤òÀ¸À®¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Èyes¡É(¤Þ¤¿¤Ï¡¢Ã±¤Ë¡Èy¡É) ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:147 msgid "" @@ -1840,14 +1883,14 @@ "If you don't know what the right answer is, answer \"0\"." msgstr "" "¸°¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤¹¤ë¤È¤­¤Ï¡¢¸°¤Î¥æ¡¼¥¶¡¼ID¤Î̾Á°¤Î¿Í¤¬¸°\n" -"¤ò½êÍ­¤·¤Æ¤¤¤ë¡¢¤È¤¤¤¦¤³¤È¤ò³Îǧ¤¹¤ë¤Ù¤­¤Ç¤¹¡£¤¢¤Ê¤¿¤¬¤É¤ÎÄø\n" +"¤ò½êÍ­¤·¤Æ¤¤¤ë¡¢¤È¤¤¤¦¤³¤È¤ò¸¡¾Ú¤¹¤ë¤Ù¤­¤Ç¤¹¡£¤¢¤Ê¤¿¤¬¤É¤ÎÄø\n" "ÅÙÃí°Õ¿¼¤¯³Îǧ¤·¤¿¤Î¤«¤ò¾¤Î¿Í¤¿¤Á¤ËÃΤ餻¤ë¤È¡¢ÊØÍø¤Ç¤¹¡£\n" "\n" "\"0\" ¤Ï¡¢¤¢¤Ê¤¿¤¬¤É¤ÎÄøÅÙÃí°Õ¿¼¤¯³Îǧ¤·¤¿¤Î¤«¤ò¡¢Æä˼çÄ¥¤·¤Ê\n" " ¤¤¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£\n" "\n" "\"1\" ¤Ï¡¢¸°¤Î½êÍ­¼Ô¤È¼çÄ¥¤·¤Æ¤¤¤ë¿Í¤¬¤½¤Î¸°¤ò½êÍ­¤·¤Æ¤¤¤ë¡¢¤È\n" -" ¤¢¤Ê¤¿¤Ï¿®¤¸¤Æ¤Ï¤¤¤ë¤â¤Î¤Î¡¢³Îǧ¤ÏÁ´Á³¤·¤Æ¤Ê¤«¤Ã¤¿¡¢¤Þ¤¿\n" +" ¤¢¤Ê¤¿¤Ï¿®¤¸¤Æ¤Ï¤¤¤ë¤â¤Î¤Î¡¢¸¡¾Ú¤ÏÁ´Á³¤·¤Æ¤Ê¤«¤Ã¤¿¡¢¤Þ¤¿\n" " ¤Ï¤Ç¤­¤Ê¤«¤Ã¤¿¡¢¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥Ú¥ó¥Í¡¼¥à¤ò»È¤¦\n" " ¥æ¡¼¥¶¡¼¤Î¸°¤Ë½ð̾¤¹¤ë¾ì¹ç¤Î¡¢¡Ö¥Ú¥ë¥½¥Ê¡×³Îǧ¤ËÊØÍø¤Ç¤¹¡£\n" "\n" @@ -1862,28 +1905,27 @@ " ¤Æ¡¢(ÅŻҥ᡼¥ë¤Î¸ò´¹¤Ê¤É¤Ç) ¸°¤ÎÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤¬\n" " ¸°¤Î½êÍ­¼Ô¤Ë°¤·¤Æ¤¤¤ë¤³¤È¤ò¸¡¾Ú¤·¤¿¾ì¹ç¤¬¤½¤¦¤Ç¤¹¡£\n" "\n" -"¾åµ­2¤È3¤ÎÎã¤Ï¡¢*ñ¤Ê¤ë*Îã¤Ë¤¹¤®¤Ê¤¤¡¢¤È¤¤¤¦¤³¤È¤òǰƬ¤ËÃÖ¤¤\n" -"¤Æ¤¯¤À¤µ¤¤¡£Â¾¤Î¸°¤Ë½ð̾¤¹¤ëºÝ¡¢¡Ö°ì±þ¡×¤ä¡Ö¹­Èϰϡפ¬²¿¤ò°Õ\n" +"¾åµ­2¤È3¤ÎÎã¤Ï¡¢*ñ¤Ê¤ë*Îã¤Ë¤¹¤®¤Ê¤¤¡¢¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª¤¤\n" +"¤Æ¤¯¤À¤µ¤¤¡£Â¾¤Î¸°¤Ë½ð̾¤¹¤ëºÝ¡¢¡Ø°ì±þ¡Ù¤ä¡Ø¹­ÈÏ°Ï¡Ù¤¬²¿¤ò°Õ\n" "Ì£¤¹¤ë¤«¤òºÇ½ªÅª¤Ë·è¤á¤ë¤Î¤Ï¡¢¤¢¤Ê¤¿¤Ç¤¹¡£\n" "\n" "Àµ¤·¤¤Åú¤Î¤ï¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¡Ö0¡×¤ÇÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" #: g10/helptext.c:185 -#, fuzzy msgid "Answer \"yes\" if you want to sign ALL the user IDs" -msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" +msgstr "Á´¤Æ¤Î ¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤¿¤±¤ì¤Ð¡¢¡Èyes¡É¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:189 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -"¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤¿¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" -"¾ÚÌÀ½ñ¤âÁ´ÉôƱ»þ¤Ëºï½ü¤·¤Þ¤¹!" +"¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤¿¤±¤ì¤Ð¡¢¡Èyes¡É¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" +"¾ÚÌÀ½ñ¤âÁ´ÉôƱ»þ¤Ë¾Ãµî¤·¤Þ¤¹!" #: g10/helptext.c:194 msgid "Answer \"yes\" if it is okay to delete the subkey" -msgstr "¤³¤ÎÉû¸°¤òºï½ü¤¹¤ë¾ì¹ç¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" +msgstr "¤³¤ÎÉû¸°¤òºï½ü¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Èyes¡É¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:199 msgid "" @@ -1904,8 +1946,8 @@ msgstr "" "¤³¤Î½ð̾¤È°ìÃפ¹¤ë¸°¤òÊÝÍ­¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢¤³¤Î½ð̾¤Ï¸¡ºº¤Ç¤­¤Þ¤»¤ó¡£\n" "¤½¤Î¸°¤¬»ÈÍѤµ¤ì¤ë¤Þ¤Ç¤Ï¡¢¤¢¤Ê¤¿¤Ï¤³¤Î½ð̾¤Îºï½ü¤òÊÝα¤¹¤ë¤Ù¤­¤Ç¤¹¡£\n" -"¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n" -"¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£" +"¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢¤â¤¦¾ÚÌÀ¤µ¤ì¤¿Â¾¤Î¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë\n" +"¤«¤â¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£" #: g10/helptext.c:210 msgid "" @@ -1934,7 +1976,7 @@ "to the current list of preferences. The timestamp of all affected\n" "self-signatures will be advanced by one second.\n" msgstr "" -"Á´Éô (¤Þ¤¿¤ÏÁªÂò¤·¤¿) ¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤ò¡¢¸½ºß¤ÎÁª¹¥°ìÍ÷¤ËÊѹ¹\n" +"Á´Éô (¤Þ¤¿¤ÏÁªÂò¤·¤¿) ¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤ò¡¢º£¤ÎÁª¹¥°ìÍ÷¤ËÊѹ¹\n" "¤·¤Þ¤¹¡£´Ø·¸¤¹¤ë¼«¸Ê½ð̾¤ÎÆü»þ¤Ï¡¢1É乤¹¤ß¤Þ¤¹¡£\n" #: g10/helptext.c:229 @@ -1951,14 +1993,14 @@ #: g10/helptext.c:244 msgid "Answer \"yes\" if it is okay to overwrite the file" -msgstr "¾å½ñ¤­¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Öyes¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" +msgstr "¾å½ñ¤­¤·¤Æ¤è¤±¤ì¤Ð¡¢¡Èyes¡É¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤" #: g10/helptext.c:249 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -"¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£Ã±¤Ë¥ê¥¿¡¼¥ó¡¦¥­¡¼¤ò²¡¤¹¤È¡¢\n" +"¿·¤·¤¤¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£Ã±¤ËRETURN¤òÂǤĤȡ¢\n" "(³ç¸Ì¤Ç¼¨¤·¤¿) ´ûÄê¤Î¥Õ¥¡¥¤¥ë̾¤ò»ÈÍѤ·¤Þ¤¹¡£" #: g10/helptext.c:255 @@ -1976,16 +2018,16 @@ " Use this to state that the user ID should not longer be used;\n" " this is normally used to mark an email address invalid.\n" msgstr "" -"¾ÚÌÀ½ñ¤ËÍýͳ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Á°¸å´Ø·¸¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢\n" -"°Ê²¼¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n" +"¾ÚÌÀÍýͳ¤ò»ØÄꤹ¤Ù¤­¤Ç¤¹¡£Á°¸å´Ø·¸¤Ë¤·¤¿¤¬¤Ã¤Æ¡¢\n" +"°Ê²¼¤Î°ìÍ÷¤«¤éÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n" " ¡Ö¸°¤¬¥Ñ¥¯¤é¤ì¤Þ¤·¤¿¡×\n" " ǧ¾Ú¤µ¤ì¤Æ¤¤¤Ê¤¤¿Í¤¬ÈëÌ©¸°¤Ø¤Î¥¢¥¯¥»¥¹¤òÆÀ¤¿¡¢¤È¿®¤º¤ë\n" " ¤Ë­¤ëÍýͳ¤Î¤¢¤ë¤È¤­¤Ë¡¢¤³¤ì¤ò»È¤¤¤Þ¤¹¡£\n" " ¡Ö¸°¤¬¤È¤ê¤«¤ï¤Ã¤Æ¤¤¤Þ¤¹¡×\n" -" ¤³¤Î¸°¤ò¼«Ê¬¤Ç¿·¤·¤¤¸°¤È¤È¤ê¤«¤¨¤¿¤È¤­¤Ë»È¤¤¤Þ¤¹¡£\n" -" ¡Ö¸°¤Ï¤â¤¦»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó¡×\n" +" ¤³¤Î¸°¤ò¼«Ê¬¤Ç¿·¤·¤¤¸°¤È¸ò´¹¤·¤¿¤È¤­¤Ë»È¤¤¤Þ¤¹¡£\n" +" ¡Ö¸°¤Ï¤â¤¦ÉÔÍѤǤ¹¡×\n" " ¤³¤Î¸°¤ò»È¤¦¤Î¤ò¤ä¤á¤¿¤È¤­¤Ë»È¤¤¤Þ¤¹¡£\n" -" ¡Ö¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Í­¸ú¤Ç¤¢¤ê¤Þ¤»¤ó¡×\n" +" ¡Ö¥æ¡¼¥¶¡¼ID¤¬¤â¤¦Ìµ¸ú¤Ç¤¹¡×\n" " ¤â¤¦¤½¤Î¥æ¡¼¥¶¡¼ID¤Ï»È¤¦¤Ù¤­¤Ç¤Ê¤¤¡¢¤È¤¤¤¦¤È¤­¤Ë»È¤¤\n" " ¤Þ¤¹¡£¤³¤ì¤ÏÉáÄÌ¡¢ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤¿¤È\n" " ¤­¤Ë»È¤¤¤Þ¤¹¡£\n" @@ -1996,8 +2038,8 @@ "revocation certificate. Please keep this text concise.\n" "An empty line ends the text.\n" msgstr "" -"¤â¤·¤½¤¦¤·¤¿¤±¤ì¤Ð¡¢¤Ê¤¼¼º¸ú¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤Î¤«¤òÀâÌÀ¤¹¤ë¥Æ\n" -"¥­¥¹¥È¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Æ¥­¥¹¥È¤Ï´Ê·é¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +"¤â¤·¤½¤¦¤·¤¿¤±¤ì¤Ð¡¢¤Ê¤¼¼º¸ú¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤Î¤«¤òÀâÌÀ¤¹¤ë\n" +"ʸ¾Ï¤òÆþÎϤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Ê¸¾Ï¤Ï´Ê·é¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¶õ¹Ô¤Ç½ª¤ï¤ê¤Ë¤Ê¤ê¤Þ¤¹¡£\n" #: g10/helptext.c:286 @@ -2009,377 +2051,376 @@ msgid "No help available for `%s'" msgstr "¡Ö%s¡×¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" -msgstr "¥¿¥¤¥×%d¤Î¥Ö¥í¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n" +msgstr "·¿%d¤Î¥Ö¥í¥Ã¥¯¤ò¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:256 -#, fuzzy, c-format +#: g10/import.c:258 +#, c-format msgid "%lu keys processed so far\n" msgstr "%lu¸°¤Þ¤Ç½èÍý\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" -msgstr " ½èÍý¿ô¤Î¹ç·×: %lu\n" +msgstr " ½èÍý¿ô¤Î¹ç·×: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" -msgstr " ¥¹¥­¥Ã¥×¤·¤¿¿·¤·¤¤¸°: %lu\n" +msgstr "¤È¤Ð¤·¤¿¿·¤·¤¤¸°: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" -msgstr " ¥æ¡¼¥¶¡¼ID¤Ê¤·: %lu\n" +msgstr " ¥æ¡¼¥¶¡¼ID¤Ê¤·: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" -msgstr " Æɹþ¤ß: %lu" +msgstr " Æɹþ¤ß: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" -msgstr " Êѹ¹¤Ê¤·: %lu\n" +msgstr " Êѹ¹¤Ê¤·: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" -msgstr " ¿·¤·¤¤¥æ¡¼¥¶¡¼ID: %lu\n" +msgstr "¿·¤·¤¤¥æ¡¼¥¶¡¼ID: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" -msgstr " ¿·¤·¤¤Éû¸°: %lu\n" +msgstr " ¿·¤·¤¤Éû¸°: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" -msgstr " ¿·¤·¤¤½ð̾: %lu\n" +msgstr " ¿·¤·¤¤½ð̾: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" -msgstr " ¿·¤·¤¤¸°¤Î¼º¸ú: %lu\n" +msgstr " ¿·¤·¤¤¸°¤Î¼º¸ú: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" -msgstr " ÈëÌ©¸°¤ÎÆɽФ·: %lu\n" +msgstr " ÈëÌ©¸°¤ÎÆɽФ·: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" -msgstr " ÈëÌ©¸°¤ÎÆɹþ¤ß: %lu\n" +msgstr " ÈëÌ©¸°¤ÎÆɹþ¤ß: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" -msgstr " ̵Êѹ¹¤ÎÈëÌ©¸°: %lu\n" +msgstr " ̵Êѹ¹¤ÎÈëÌ©¸°: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" -msgstr " ̤Æɹþ¤ß: %lu\n" +msgstr " ̤Æɹþ¤ß: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" -msgstr "" +msgstr "·Ù¹ð: ¸°%s¤Ë¤Ï¡¢»ÈÍÑÉԲĤȤ¤¤¦Áª¹¥¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/import.c:545 -#, fuzzy +#: g10/import.c:547 msgid "algorithms on these user IDs:\n" -msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤·¤¿:\n" +msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Î¥¢¥ë¥´¥ê¥º¥à:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" -msgstr "" +msgstr " \"%s\": °Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÎÁª¹¥ %s\n" -#: g10/import.c:594 -#, fuzzy, c-format +#: g10/import.c:596 +#, c-format msgid " \"%s\": preference for digest algorithm %s\n" -msgstr "%s½ð̾¡¢Í×Ì󥢥르¥ê¥º¥à %s\n" +msgstr " \"%s\": Í×Ì󥢥르¥ê¥º¥à¤ÎÁª¹¥ %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" -msgstr "" +msgstr " \"%s\": °µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ÎÁª¹¥ %s\n" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" -msgstr "" +msgstr "it is strongly suggested that you update your preferences and\n" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" +"ÀøºßŪ¤Ê¥¢¥ë¥´¥ê¥º¥àÉÔ°ìÃ×ÌäÂê¤òÈò¤±¤ë¤¿¤á¡¢¤³¤Î¸°¤òºÆÇÛÉÛ¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" -msgstr "" +msgstr "°Ê²¼¤Ç¡¢Áª¹¥¤¬¹¹¿·¤Ç¤­¤Þ¤¹: gpg --edit-key %s updpref save\n" -#: g10/import.c:693 g10/import.c:1047 -#, fuzzy, c-format +#: g10/import.c:695 g10/import.c:1049 +#, c-format msgid "key %s: no user ID\n" -msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:713 -#, fuzzy, c-format +#: g10/import.c:715 +#, c-format msgid "key %s: PKS subkey corruption repaired\n" -msgstr "¸°%08lX: HKP¤ÎÉû¸°ÊѤ¤ò½¤Éü\n" +msgstr "¸°%s: PKS¤ÎÉû¸°ÊѤ¤ò½¤Éü\n" -#: g10/import.c:728 -#, fuzzy, c-format +#: g10/import.c:730 +#, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" -msgstr "¸°%08lX: ¼õÍý¤·¤¿Ì¤¼«¸Ê½ð̾¤Î¥æ¡¼¥¶¡¼ID '%s'\n" +msgstr "¸°%s: ¼õÍý¤·¤¿Ì¤¼«¸Ê½ð̾¤Î¥æ¡¼¥¶¡¼ID¡È%s¡É\n" -#: g10/import.c:734 -#, fuzzy, c-format +#: g10/import.c:736 +#, c-format msgid "key %s: no valid user IDs\n" -msgstr "¸°%08lX: Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s: Í­¸ú¤Ê¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "¼«¸Ê½ð̾¤Î¤Ê¤¤¤»¤¤¤Ç¤·¤ç¤¦\n" -#: g10/import.c:746 g10/import.c:1168 -#, fuzzy, c-format +#: g10/import.c:748 g10/import.c:1170 +#, c-format msgid "key %s: public key not found: %s\n" -msgstr "¸°%08lX: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸°%s: ¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:752 -#, fuzzy, c-format +#: g10/import.c:754 +#, c-format msgid "key %s: new key - skipped\n" -msgstr "¸° %08lX: ¿·¤·¤¤¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ¿·¤·¤¤¸°¤Ç¤¹ - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" -msgstr "¡Ö%s¡×¤Ø¤Î½ñ½Ð¤·\n" +msgstr "¡Ö%s¡×¤Ø¤Î½ñ¹þ¤ß\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/import.c:791 -#, fuzzy, c-format +#: g10/import.c:793 +#, c-format msgid "key %s: public key \"%s\" imported\n" -msgstr "¸°%08lX: ¸ø³«¸°¡Ö%s¡×¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" +msgstr "¸°%s: ¸ø³«¸°¡È%s¡É¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" -#: g10/import.c:815 -#, fuzzy, c-format +#: g10/import.c:817 +#, c-format msgid "key %s: doesn't match our copy\n" -msgstr "¸°%08lX: ¤³¤Á¤é¤ÎÊ£À½¤È¹ç¤¤¤Þ¤»¤ó\n" +msgstr "¸°%s: ¤³¤Á¤é¤ÎÊ£À½¤È¹ç¤¤¤Þ¤»¤ó\n" -#: g10/import.c:832 g10/import.c:1186 -#, fuzzy, c-format +#: g10/import.c:834 g10/import.c:1188 +#, c-format msgid "key %s: can't locate original keyblock: %s\n" -msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ť±¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¸°%s: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤Ë°ÌÃ֤Ť±¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/import.c:840 g10/import.c:1193 -#, fuzzy, c-format +#: g10/import.c:842 g10/import.c:1195 +#, c-format msgid "key %s: can't read original keyblock: %s\n" -msgstr "¸°%08lX: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" +msgstr "¸°%s: ¸µ¤Î¸°¥Ö¥í¥Ã¥¯¤òÆɤ߽Ф»¤Þ¤»¤ó: %s\n" -#: g10/import.c:872 -#, fuzzy, c-format +#: g10/import.c:874 +#, c-format msgid "key %s: \"%s\" 1 new user ID\n" -msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä\n" +msgstr "¸°%s:¡È%s¡É¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò1¸Ä\n" -#: g10/import.c:875 -#, fuzzy, c-format +#: g10/import.c:877 +#, c-format msgid "key %s: \"%s\" %d new user IDs\n" -msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä\n" +msgstr "¸°%s:¡È%s¡É¿·¤·¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä\n" -#: g10/import.c:878 -#, fuzzy, c-format +#: g10/import.c:880 +#, c-format msgid "key %s: \"%s\" 1 new signature\n" -msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤½ð̾¤ò1¸Ä\n" +msgstr "¸°%s:¡È%s¡É¿·¤·¤¤½ð̾¤ò1¸Ä\n" -#: g10/import.c:881 -#, fuzzy, c-format +#: g10/import.c:883 +#, c-format msgid "key %s: \"%s\" %d new signatures\n" -msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤½ð̾¤ò%d¸Ä\n" +msgstr "¸°%s:¡È%s¡É¿·¤·¤¤½ð̾¤ò%d¸Ä\n" -#: g10/import.c:884 -#, fuzzy, c-format +#: g10/import.c:886 +#, c-format msgid "key %s: \"%s\" 1 new subkey\n" -msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤Éû¸°¤ò1¸Ä\n" +msgstr "¸°%s:¡È%s¡É¿·¤·¤¤Éû¸°¤ò1¸Ä\n" -#: g10/import.c:887 -#, fuzzy, c-format +#: g10/import.c:889 +#, c-format msgid "key %s: \"%s\" %d new subkeys\n" -msgstr "¸°%08lX: ¡Ö%s¡×¿·¤·¤¤Éû¸°¤ò%d¸Ä\n" +msgstr "¸°%s:¡È%s¡É¿·¤·¤¤Éû¸°¤ò%d¸Ä\n" -#: g10/import.c:908 -#, fuzzy, c-format +#: g10/import.c:910 +#, c-format msgid "key %s: \"%s\" not changed\n" -msgstr "¸°%08lX: ¡Ö%s¡×Êѹ¹¤Ê¤·\n" +msgstr "¸°%s:¡È%s¡ÉÊѹ¹¤Ê¤·\n" -#: g10/import.c:1053 -#, fuzzy, c-format +#: g10/import.c:1055 +#, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" -msgstr "¸°%08lX: ̵¸ú¤Ê°Å¹æ%d¤ÎÈëÌ©¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ̵¸ú¤Ê°Å¹æË¡%d¤ÎÈëÌ©¸°¤Ç¤¹ - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:1064 -#, fuzzy +#: g10/import.c:1066 msgid "importing secret keys not allowed\n" -msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" +msgstr "ÈëÌ©¸°¤ÎÆɹþ¤ß¤Ï¶Ø»ß¤Ç¤¹\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "´ûÄê¤ÎÈëÌ©¸°Îؤ¬¤¢¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:1092 -#, fuzzy, c-format +#: g10/import.c:1094 +#, c-format msgid "key %s: secret key imported\n" -msgstr "¸°%08lX: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" +msgstr "¸°%s: ÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" -#: g10/import.c:1121 -#, fuzzy, c-format +#: g10/import.c:1123 +#, c-format msgid "key %s: already in secret keyring\n" -msgstr "¸°%08lX: ´û¤ËÈëÌ©¸°Îؤˤ¢¤ê¤Þ¤¹\n" +msgstr "¸°%s: ¤â¤¦ÈëÌ©¸°Îؤˤ¢¤ê¤Þ¤¹\n" -#: g10/import.c:1131 -#, fuzzy, c-format +#: g10/import.c:1133 +#, c-format msgid "key %s: secret key not found: %s\n" -msgstr "¸°%08lX: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸°%s: ÈëÌ©¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/import.c:1161 -#, fuzzy, c-format +#: g10/import.c:1163 +#, c-format msgid "key %s: no public key - can't apply revocation certificate\n" -msgstr "¸°%08lX: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ¼º¸ú¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n" +msgstr "¸°%s: ¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ¼º¸ú¾ÚÌÀ½ñ¤òŬÍѤǤ­¤Þ¤»¤ó\n" -#: g10/import.c:1204 -#, fuzzy, c-format +#: g10/import.c:1206 +#, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" -msgstr "¸°%08lX: ̵¸ú¤Ê¼º¸ú¾ÚÌÀ½ñ: %s - µñÈÝ\n" +msgstr "¸°%s: ̵¸ú¤Ê¼º¸ú¾ÚÌÀ½ñ: %s - µñÈÝ\n" -#: g10/import.c:1236 -#, fuzzy, c-format +#: g10/import.c:1238 +#, c-format msgid "key %s: \"%s\" revocation certificate imported\n" -msgstr "¸°%08lX: ¡Ö%s¡×¼º¸ú¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" +msgstr "¸°%s:¡È%s¡É¼º¸ú¾ÚÌÀ½ñ¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n" -#: g10/import.c:1301 -#, fuzzy, c-format +#: g10/import.c:1303 +#, c-format msgid "key %s: no user ID for signature\n" -msgstr "¸°%08lX: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s: ½ð̾¤ËÂбþ¤¹¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:1316 -#, fuzzy, c-format +#: g10/import.c:1318 +#, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" -msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id¡Ö%s¡×¤Î¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" +msgstr "¸°%s: ¥æ¡¼¥¶¡¼ID¡È%s¡É¤Î¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" -#: g10/import.c:1318 -#, fuzzy, c-format +#: g10/import.c:1320 +#, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" -msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼id¡Ö%s¡×¤Î¼«¸Ê½ð̾¤¬¡¢Ìµ¸ú¤Ç¤¹\n" +msgstr "¸°%s: ¥æ¡¼¥¶¡¼ID¡È%s¡É¤Î¼«¸Ê½ð̾¤¬¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/import.c:1336 -#, fuzzy, c-format +#: g10/import.c:1338 +#, c-format msgid "key %s: no subkey for key binding\n" -msgstr "¸°%08lX: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s: ¸°¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:1347 g10/import.c:1397 -#, fuzzy, c-format +#: g10/import.c:1349 g10/import.c:1399 +#, c-format msgid "key %s: unsupported public key algorithm\n" -msgstr "¸°%08lX: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" +msgstr "¸°%s: ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹\n" -#: g10/import.c:1349 -#, fuzzy, c-format +#: g10/import.c:1351 +#, c-format msgid "key %s: invalid subkey binding\n" -msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n" +msgstr "¸°%s: ̵¸ú¤ÊÉû¸°¤ÎÂбþ¤Ç¤¹\n" -#: g10/import.c:1364 -#, fuzzy, c-format +#: g10/import.c:1366 +#, c-format msgid "key %s: removed multiple subkey binding\n" -msgstr "¸°%08lX: ¿½ÅÉû¸°¤ÎÂбþ¤òºï½ü¤·¤Þ¤¹\n" +msgstr "¸°%s: ¿½ÅÉû¸°¤ÎÂбþ¤òºï½ü¤·¤Þ¤¹\n" -#: g10/import.c:1386 -#, fuzzy, c-format +#: g10/import.c:1388 +#, c-format msgid "key %s: no subkey for key revocation\n" -msgstr "¸°%08lX: ¸°¼º¸ú¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s: ¸°¼º¸ú¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/import.c:1399 -#, fuzzy, c-format +#: g10/import.c:1401 +#, c-format msgid "key %s: invalid subkey revocation\n" -msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¼º¸ú¤Ç¤¹\n" +msgstr "¸°%s: ̵¸ú¤ÊÉû¸°¼º¸ú¤Ç¤¹\n" -#: g10/import.c:1414 -#, fuzzy, c-format +#: g10/import.c:1416 +#, c-format msgid "key %s: removed multiple subkey revocation\n" -msgstr "¸°%08lX: ̵¸ú¤ÊÉû¸°¤Î¼º¸ú¤òºï½ü¤·¤Þ¤¹\n" +msgstr "¸°%s: ̵¸ú¤ÊÉû¸°¤Î¿½Å¼º¸ú¤òºï½ü¤·¤Þ¤¹\n" -#: g10/import.c:1456 -#, fuzzy, c-format +#: g10/import.c:1458 +#, c-format msgid "key %s: skipped user ID \"%s\"\n" -msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿¥æ¡¼¥¶¡¼ID '" +msgstr "¸°%s: ¤È¤Ð¤·¤¿¥æ¡¼¥¶¡¼ID¡È%s¡É\n" -#: g10/import.c:1477 -#, fuzzy, c-format +#: g10/import.c:1479 +#, c-format msgid "key %s: skipped subkey\n" -msgstr "¸°%08lX: ¥¹¥­¥Ã¥×¤·¤¿Éû¸°\n" +msgstr "¸°%s: ¤È¤Ð¤·¤¿Éû¸°\n" -#: g10/import.c:1504 -#, fuzzy, c-format +#: g10/import.c:1506 +#, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" -msgstr "¸°%08lX: ½ñ½Ð¤·ÉԲĤʽð̾ (¥¯¥é¥¹%02x) - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ½ñ½Ð¤·ÉԲĤʽð̾ (¥¯¥é¥¹%02X) - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:1514 -#, fuzzy, c-format +#: g10/import.c:1516 +#, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" -msgstr "¸°%08lX: ¼º¸ú¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ¼º¸ú¾ÚÌÀ½ñ¤¬¸í¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹ - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:1531 -#, fuzzy, c-format +#: g10/import.c:1533 +#, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" -msgstr "¸°%08lX: ̵¸ú¤Ê¼º¸ú¾ÚÌÀ½ñ: %s - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ̵¸ú¤Ê¼º¸ú¾ÚÌÀ½ñ: %s - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:1545 -#, fuzzy, c-format +#: g10/import.c:1547 +#, c-format msgid "key %s: subkey signature in wrong place - skipped\n" -msgstr "¸°%08lX: Éû¸°½ð̾¤Î¾ì½ê¤¬¡¢¸í¤Ã¤Æ¤¤¤Þ¤¹ - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: Éû¸°½ð̾¤Î¾ì½ê¤¬¡¢¸í¤Ã¤Æ¤¤¤Þ¤¹ - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:1553 -#, fuzzy, c-format +#: g10/import.c:1555 +#, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" -msgstr "¸°%08lX: ͽ´ü¤»¤Ì½ð̾¥¯¥é¥¹ (0x%02X) - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ͽ´ü¤»¤Ì½ð̾¥¯¥é¥¹ (0x%02X) - ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/import.c:1653 -#, fuzzy, c-format +#: g10/import.c:1655 +#, c-format msgid "key %s: duplicated user ID detected - merged\n" -msgstr "¸°%08lX: ½ÅÊ£¤·¤¿¥æ¡¼¥¶¡¼ID¤Î¸¡½Ð - Ê»¹ç\n" +msgstr "¸°%s: ½ÅÊ£¤·¤¿¥æ¡¼¥¶¡¼ID¤Î¸¡½Ð - Ê»¹ç\n" -#: g10/import.c:1715 -#, fuzzy, c-format +#: g10/import.c:1717 +#, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" -msgstr "·Ù¹ð: ¸°%08lX¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ¼º¸ú¸°%08lX¤Î°ú¤­½Ð¤·\n" +msgstr "·Ù¹ð: ¸°%s¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ¼º¸ú¸°%s¤Î°ú¤­½Ð¤·\n" -#: g10/import.c:1729 -#, fuzzy, c-format +#: g10/import.c:1731 +#, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" -msgstr "·Ù¹ð: ¸°%08lX¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ¼º¸ú¸°%08lX¤ÏÉԺߡ£\n" +msgstr "·Ù¹ð: ¸°%s¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ¼º¸ú¸°%s¤ÏÉԺߡ£\n" -#: g10/import.c:1788 -#, fuzzy, c-format +#: g10/import.c:1790 +#, c-format msgid "key %s: \"%s\" revocation certificate added\n" -msgstr "¸°%08lX: ¡Ö%s¡×¼º¸ú¾ÚÌÀ½ñ¤ÎÄɲÃ\n" +msgstr "¸°%s:¡È%s¡É¼º¸ú¾ÚÌÀ½ñ¤ÎÄɲÃ\n" -#: g10/import.c:1822 -#, fuzzy, c-format +#: g10/import.c:1824 +#, c-format msgid "key %s: direct key signature added\n" -msgstr "¸°%08lX: ľÀܸ°½ð̾¤òÄɲÃ\n" +msgstr "¸°%s: ľÀܸ°½ð̾¤òÄɲÃ\n" #: g10/keydb.c:167 #, c-format @@ -2406,12 +2447,12 @@ #: g10/keyedit.c:332 g10/keylist.c:342 msgid "1 bad signature\n" -msgstr "̵¸ú¤Ê½ð̾1¸Ä\n" +msgstr "ÉÔÀµ¤Ê½ð̾1¸Ä\n" #: g10/keyedit.c:334 g10/keylist.c:344 #, c-format msgid "%d bad signatures\n" -msgstr "̵¸ú¤Ê½ð̾%d¸Ä\n" +msgstr "ÉÔÀµ¤Ê½ð̾%d¸Ä\n" #: g10/keyedit.c:336 g10/keylist.c:346 msgid "1 signature not checked due to a missing key\n" @@ -2441,26 +2482,25 @@ msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾¤Î¤Ê¤¤¥æ¡¼¥¶¡¼ID¤ò%d¸Ä¸¡½Ð\n" #: g10/keyedit.c:402 g10/pkclist.c:262 -#, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" "(by looking at passports, checking fingerprints from different sources, " "etc.)\n" msgstr "" -"¾¤Î¥æ¡¼¥¶¡¼¤Î¸°¤òÀµ¤·¤¯¸¡¾Ú¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥æ¡¼¥¶¡¼¤Î¿®ÍÑÅÙ¤ò·è¤á¤Æ\n" -"¤¯¤À¤µ¤¤(¥Ñ¥¹¥Ý¡¼¥È¤ò¸«¤»¤Æ¤â¤é¤Ã¤¿¤ê¡¢Â¾¤«¤éÆÀ¤¿»ØÌæ¤ò¸¡ºº¤·¤¿¤ê...)?\n" -"\n" +"¾¤Î¥æ¡¼¥¶¡¼¤Î¸°¤òÀµ¤·¤¯¸¡¾Ú¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¥æ¡¼¥¶¡¼¤Î¿®ÍÑÅÙ¤ò·è¤á¤Æ¤¯¤À¤µ" +"¤¤\n" +"(¥Ñ¥¹¥Ý¡¼¥È¤ò¸«¤»¤Æ¤â¤é¤Ã¤¿¤ê¡¢Â¾¤«¤éÆÀ¤¿»ØÌæ¤ò¸¡ºº¤·¤¿¤ê¡¢¤Ê¤É¤Ê¤É)\n" #: g10/keyedit.c:406 g10/pkclist.c:274 -#, fuzzy, c-format +#, c-format msgid " %d = I trust marginally\n" -msgstr " %d = ¤¢¤ëÄøÅÙ¿®ÍѤ¹¤ë\n" +msgstr " %d = ¤¢¤ëÄøÅÙ¿®ÍѤ¹¤ë\n" #: g10/keyedit.c:407 g10/pkclist.c:276 -#, fuzzy, c-format +#, c-format msgid " %d = I trust fully\n" -msgstr " %d = ´°Á´¤Ë¿®ÍѤ¹¤ë\n" +msgstr " %d = ´°Á´¤Ë¿®ÍѤ¹¤ë\n" #: g10/keyedit.c:426 msgid "" @@ -2468,15 +2508,17 @@ "A depth greater than 1 allows the key you are signing to make\n" "trust signatures on your behalf.\n" msgstr "" +"¿®Íѽð̾¤Î¿¼¤µ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" +"¿¼¤µ¤¬1¤è¤êÂ礭¤¤¤È¡¢½ð̾¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤Ç¿®Íѽð̾¤òºî¤ì¤Þ¤¹¡£\n" #: g10/keyedit.c:442 msgid "Please enter a domain to restrict this signature, or enter for none.\n" -msgstr "" +msgstr "½ð̾¤òÀ©¸Â¤¹¤ë¥É¥á¡¼¥ó¤«¡¢¤½¤ì¤Î¤Ê¤¤¾ì¹ç¤Ïenter¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:584 #, c-format msgid "User ID \"%s\" is revoked." -msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" +msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 #: g10/keyedit.c:857 g10/keyedit.c:1486 @@ -2491,12 +2533,12 @@ #: g10/keyedit.c:610 #, c-format msgid "User ID \"%s\" is expired." -msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢´ü¸ÂÀÚ¤ì¤Ç¤¹¡£" +msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢Ëþλ¤Ç¤¹¡£" #: g10/keyedit.c:636 #, c-format msgid "User ID \"%s\" is not self-signed." -msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£" +msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£" #: g10/keyedit.c:675 #, c-format @@ -2504,7 +2546,7 @@ "The self-signature on \"%s\"\n" "is a PGP 2.x-style signature.\n" msgstr "" -"\"%s\" ¤Ë¤¿¤¤¤¹¤ë¼«¸Ê½ð̾¤Ï¡¢\n" +"¡È%s¡É¤Ë¤¿¤¤¤¹¤ë¼«¸Ê½ð̾¤Ï¡¢\n" "PGP 2.x·Á¼°¤Î½ð̾¤Ç¤¹¡£\n" #: g10/keyedit.c:684 @@ -2517,12 +2559,12 @@ "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -"¡Ö%s¡×¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n" -"´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n" +"¡È%s¡É¤Ë¤¿¤¤¤¹¤ë¤¢¤Ê¤¿¤Îº£¤Î½ð̾\n" +"¤ÏËþλ¤Ç¤¹¡£\n" #: g10/keyedit.c:702 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " -msgstr "´ü¸ÂÀÚ¤ì½ð̾¤ò¿·¤·¤¤½ð̾¤È¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " +msgstr "¿·¤·¤¤½ð̾¤òȯ¹Ô¤·¡¢´ü¸ÂÀÚ¤ì½ð̾¤È¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " #: g10/keyedit.c:723 #, c-format @@ -2530,50 +2572,50 @@ "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -"\"%s\" ¤Ë¤¿¤¤¤¹¤ëº£¤Î¤¢¤Ê¤¿¤Î½ð̾¤Ï\n" -"ÆâÉô½ð̾¤Ç¤¹¡£\n" +"¡È%s¡É¤Ë¤¿¤¤¤¹¤ë¤¢¤Ê¤¿¤Îº£¤Î½ð̾\n" +"¤ÏÆâÉô½ð̾¤Ç¤¹¡£\n" #: g10/keyedit.c:727 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "½ñ½Ð¤·²Äǽ¤Ê½ð̾¤Ë³Ê¾å¤²¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " #: g10/keyedit.c:748 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already locally signed by key %s\n" -msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦ÆâÉô½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n" +msgstr "¡È%s¡É¤Ï¸°%s¤Ç¤â¤¦ÆâÉô½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n" #: g10/keyedit.c:751 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already signed by key %s\n" -msgstr "\"%s\" ¤Ï¸°%08lX¤Ç¤â¤¦½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n" +msgstr "¡È%s¡É¤Ï¸°%s¤Ç¤â¤¦½ð̾¤·¤Æ¤¢¤ê¤Þ¤¹\n" #: g10/keyedit.c:756 msgid "Do you want to sign it again anyway? (y/N) " -msgstr "¤½¤ì¤Ç¤â½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " +msgstr "¤½¤ì¤Ç¤âºÆ½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " #: g10/keyedit.c:778 -#, fuzzy, c-format +#, c-format msgid "Nothing to sign with key %s\n" -msgstr "¸°%08lX¤Ç½ð̾¤¹¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s¤Ç½ð̾¤¹¤Ù¤­¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó\n" #: g10/keyedit.c:793 msgid "This key has expired!" -msgstr "¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!" +msgstr "¤³¤Î¸°¤ÏËþλ¤Ç¤¹!" #: g10/keyedit.c:813 #, c-format msgid "This key is due to expire on %s.\n" -msgstr "¤³¤Î¸°¤Ï%s¤Ç´ü¸Â¤¬ÀÚ¤ì¤Þ¤¹¡£\n" +msgstr "¤³¤Î¸°¤Ï%s¤ÇËþλ¤·¤Þ¤¹¡£\n" #: g10/keyedit.c:817 msgid "Do you want your signature to expire at the same time? (Y/n) " -msgstr "Ʊ»þ¤Ë½ð̾¤â´ü¸ÂÀÚ¤ì¤Ë¤·¤¿¤¤¤Ç¤¹¤«? (Y/n) " +msgstr "Ʊ»þ¤Ë½ð̾¤âËþλ¤Ë¤·¤¿¤¤¤Ç¤¹¤«? (Y/n) " #: g10/keyedit.c:850 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" -msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x¸°¤ÇOpenPGP½ð̾¤¬¤Ç¤­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" +msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x¸°¤ÇOpenPGP½ð̾¤¬¤Ç¤­¤Þ¤»¤ó¡£\n" #: g10/keyedit.c:852 msgid "This would make the key unusable in PGP 2.x.\n" @@ -2586,7 +2628,7 @@ "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" "½ð̾¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¸°¤¬¼ÂºÝ¤Ë¾åµ­¤Î̾Á°¤Î¿Í¤Î¤â¤Î¤«¤É¤¦¤«¡¢¤É¤ÎÄøÅÙ\n" -"Ãí°Õ¤·¤Æ¸¡¾Ú¤·¤Þ¤·¤¿¤«? Åú¤¬¤ï¤«¤é¤Ê¤±¤ì¤Ð¡¢¡Ö0¡×¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" +"Ãí°Õ¤·¤Æ¸¡¾Ú¤·¤Þ¤·¤¿¤«? Åú¤¬¤ï¤«¤é¤Ê¤±¤ì¤Ð¡¢¡È0¡É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:882 #, c-format @@ -2609,78 +2651,56 @@ msgstr " (3) ¤«¤Ê¤êÃí°Õ¤·¤Æ¸¡ºº¤·¤Þ¤·¤¿¡£%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " -msgstr "ÁªÂò¤Ï? (¾ÜºÙ¤Ï¡Ö?¡×¤Ç): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " +msgstr "ÁªÂò¤Ï? (¾ÜºÙ¤Ï '?' ¤Ç): " #: g10/keyedit.c:918 -#, fuzzy, c-format +#, c-format msgid "" "Are you sure that you want to sign this key with your\n" "key \"%s\" (%s)\n" -msgstr "ËÜÅö¤Ë¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¤Ç½ð̾¤·¤Æ¤è¤¤¤Ç¤¹¤«: \"" +msgstr "" +"ËÜÅö¤Ë¤³¤Î¸°¤Ë¤¢¤Ê¤¿¤Î¸°¡È%s¡É¤Ç½ð̾¤·¤Æ¤è¤¤¤Ç¤¹¤«\n" +"(%s)\n" #: g10/keyedit.c:925 -#, fuzzy msgid "This will be a self-signature.\n" -msgstr "" -"\n" -"¼«¸Ê½ð̾¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£\n" +msgstr "¼«¸Ê½ð̾¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£\n" #: g10/keyedit.c:931 -#, fuzzy msgid "WARNING: the signature will not be marked as non-exportable.\n" -msgstr "" -"\n" -"·Ù¹ð: ½ð̾¤Ï¡¢½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤»¤ó¡£\n" +msgstr "·Ù¹ð: ½ð̾¤Ï¡¢½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤»¤ó¡£\n" #: g10/keyedit.c:939 -#, fuzzy msgid "WARNING: the signature will not be marked as non-revocable.\n" -msgstr "" -"\n" -"·Ù¹ð: ½ð̾¤Ï¡¢¼º¸úÉԲĤËÀßÄꤵ¤ì¤Þ¤»¤ó¡£\n" +msgstr "·Ù¹ð: ½ð̾¤Ï¡¢¼º¸úÉԲĤËÀßÄꤵ¤ì¤Þ¤»¤ó¡£\n" #: g10/keyedit.c:949 -#, fuzzy msgid "The signature will be marked as non-exportable.\n" -msgstr "" -"\n" -"½ð̾¤Ï¡¢½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" +msgstr "½ð̾¤Ï¡¢½ñ½Ð¤·ÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" #: g10/keyedit.c:956 -#, fuzzy msgid "The signature will be marked as non-revocable.\n" -msgstr "" -"\n" -"½ð̾¤Ï¼º¸úÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" +msgstr "½ð̾¤Ï¡¢¼º¸úÉԲĤËÀßÄꤵ¤ì¤Þ¤¹¡£\n" #: g10/keyedit.c:963 -#, fuzzy msgid "I have not checked this key at all.\n" -msgstr "" -"\n" -"¤³¤Î¸°¤ÏÁ´Á³¡¢¸¡ºº¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" +msgstr "¤³¤Î¸°¤ÏÁ´Á³¡¢¸¡ºº¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" #: g10/keyedit.c:968 -#, fuzzy msgid "I have checked this key casually.\n" -msgstr "" -"\n" -"¤³¤Î¸°¤Ï°ì±þ¡¢¸¡ºº¤·¤Þ¤·¤¿¡£\n" +msgstr "¤³¤Î¸°¤Ï°ì±þ¡¢¸¡ºº¤·¤Þ¤·¤¿¡£\n" #: g10/keyedit.c:973 -#, fuzzy msgid "I have checked this key very carefully.\n" -msgstr "" -"\n" -"¤³¤Î¸°¤Ï¡¢¤«¤Ê¤êÃí°Õ¤·¤Æ¸¡ºº¤·¤Þ¤·¤¿¡£\n" +msgstr "¤³¤Î¸°¤Ï¡¢¤«¤Ê¤êÃí°Õ¤·¤Æ¸¡ºº¤·¤Þ¤·¤¿¡£\n" #: g10/keyedit.c:983 -#, fuzzy msgid "Really sign? (y/N) " -msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? " +msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2711,7 +2731,7 @@ "¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" @@ -2721,13 +2741,12 @@ "\n" msgstr "" "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢\n" -"¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" +"¤ª¤½¤é¤¯¤½¤ì¤Ï¡ö¤í¤¯¤Ç¤â¤Ê¤¤¡ö¹Í¤¨¤Ç¤¹!\n" "\n" #: g10/keyedit.c:1135 -#, fuzzy msgid "Do you really want to do this? (y/N) " -msgstr "ËÜÅö¤Ë¼Â¹Ô¤·¤Þ¤¹¤«? " +msgstr "ËÜÅö¤Ë¼Â¹Ô¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1201 msgid "moving a key signature to the correct place\n" @@ -2794,14 +2813,12 @@ msgstr "s" #: g10/keyedit.c:1259 -#, fuzzy msgid "tsign" -msgstr "sign" +msgstr "tsign" #: g10/keyedit.c:1259 -#, fuzzy msgid "make a trust signature" -msgstr "ʬΥ½ð̾¤òºîÀ®" +msgstr "¿®Íѽð̾¤òºîÀ®" #: g10/keyedit.c:1260 msgid "lsign" @@ -2864,21 +2881,20 @@ msgstr "Éû¸°¤ÎÄɲÃ" #: g10/keyedit.c:1271 -#, fuzzy msgid "addcardkey" -msgstr "addkey" +msgstr "addcardkey" #: g10/keyedit.c:1271 msgid "add a key to a smartcard" -msgstr "" +msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Ø¸°¤ÎÄɲÃ" #: g10/keyedit.c:1272 msgid "keytocard" -msgstr "" +msgstr "keytocard" #: g10/keyedit.c:1272 msgid "move a key to a smartcard" -msgstr "" +msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Î¸°¤Ø¤Î°ÜÆ°" #: g10/keyedit.c:1274 msgid "delkey" @@ -2910,7 +2926,7 @@ #: g10/keyedit.c:1277 msgid "change the expire date" -msgstr "Í­¸ú´ü¸Â¤ÎÊѹ¹" +msgstr "ËþλÆü¤ÎÊѹ¹" #: g10/keyedit.c:1278 msgid "primary" @@ -2926,7 +2942,7 @@ #: g10/keyedit.c:1279 msgid "toggle between secret and public key listing" -msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤ÎÀÚÂؤ¨" +msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤Îȿž" #: g10/keyedit.c:1281 msgid "t" @@ -2965,14 +2981,12 @@ msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·" #: g10/keyedit.c:1286 -#, fuzzy msgid "keyserver" -msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¨¥é¡¼" +msgstr "keyserver" #: g10/keyedit.c:1286 -#, fuzzy msgid "set preferred keyserver URL" -msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURI¤ò²òÀÏÉÔǽ\n" +msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼¤ÎURI¤òÀßÄê" #: g10/keyedit.c:1287 msgid "change the passphrase" @@ -3035,9 +3049,9 @@ msgstr "¥Õ¥©¥ÈID¤òɽ¼¨" #: g10/keyedit.c:1347 -#, fuzzy, c-format +#, c-format msgid "error reading secret keyblock \"%s\": %s\n" -msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯¡Ö%s¡×¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" +msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯¡È%s¡É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" #: g10/keyedit.c:1365 msgid "Secret key is available.\n" @@ -3049,16 +3063,15 @@ #: g10/keyedit.c:1432 msgid "Please use the command \"toggle\" first.\n" -msgstr "¤Þ¤º¡Ötoggle¡×¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" +msgstr "¤Þ¤º¡Ètoggle¡É¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:1480 msgid "Key is revoked." msgstr "¸°¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" #: g10/keyedit.c:1500 -#, fuzzy msgid "Really sign all user IDs? (y/N) " -msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? " +msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1502 msgid "Hint: Select the user IDs to sign\n" @@ -3067,7 +3080,7 @@ #: g10/keyedit.c:1527 #, c-format msgid "This command is not allowed while in %s mode.\n" -msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤òÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£\n" +msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤Ç¤¹¡£\n" #: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 msgid "You must select at least one user ID.\n" @@ -3078,88 +3091,75 @@ msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n" #: g10/keyedit.c:1553 -#, fuzzy msgid "Really remove all selected user IDs? (y/N) " -msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1554 -#, fuzzy msgid "Really remove this user ID? (y/N) " -msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1604 -#, fuzzy msgid "Really move the primary key? (y/N) " -msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¼ç¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1616 -#, fuzzy msgid "You must select exactly one key.\n" -msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +msgstr "¸°¤ò¤­¤Ã¤«¤ê1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:1636 g10/keyedit.c:1691 msgid "You must select at least one key.\n" -msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" #: g10/keyedit.c:1639 -#, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " -msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1640 -#, fuzzy msgid "Do you really want to delete this key? (y/N) " -msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1675 -#, fuzzy msgid "Really revoke all selected user IDs? (y/N) " -msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1676 -#, fuzzy msgid "Really revoke this user ID? (y/N) " -msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1695 -#, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " -msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1696 -#, fuzzy msgid "Do you really want to revoke this key? (y/N) " -msgstr "¤³¤Î¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1735 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" +"ÍøÍѼԻØÄê¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ÎÍøÍÑÃæ¡¢½êÍ­¼Ô¿®ÍѤÏÀßÄꤵ¤ì¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ" +"¤¹¡£\n" #: g10/keyedit.c:1767 -#, fuzzy msgid "Set preference list to:\n" -msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê" +msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê:\n" #: g10/keyedit.c:1773 -#, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " -msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? " +msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1775 -#, fuzzy msgid "Really update the preferences? (y/N) " -msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? " +msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1825 -#, fuzzy msgid "Save changes? (y/N) " -msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? " +msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1828 -#, fuzzy msgid "Quit without saving? (y/N) " -msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? " +msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? (y/N) " #: g10/keyedit.c:1838 #, c-format @@ -3169,11 +3169,11 @@ #: g10/keyedit.c:1845 #, c-format msgid "update secret failed: %s\n" -msgstr "ÈëÌ©¸°¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "ÈëÌ©¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/keyedit.c:1852 msgid "Key not changed so no update needed.\n" -msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤Ï¤¤¤ê¤Þ¤»¤ó¡£\n" +msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤ÏÉÔÍפǤ¹¡£\n" #: g10/keyedit.c:1924 msgid "Digest: " @@ -3185,105 +3185,98 @@ #: g10/keyedit.c:1987 msgid "Keyserver no-modify" -msgstr "" +msgstr "̵½¤Àµ¸°¥µ¡¼¥Ð¡¼" #: g10/keyedit.c:2002 g10/keylist.c:244 msgid "Preferred keyserver: " -msgstr "" +msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼: " -#: g10/keyedit.c:2243 +#: g10/keyedit.c:2245 #, c-format -msgid "This key may be revoked by %s key " -msgstr "¤³¤Î¸°¤Ï¡¢%s¸°¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹ " +msgid "This key may be revoked by %s key %s" +msgstr "¤³¤Î¸°¤Ï¡¢%s¸°%s¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹" -#: g10/keyedit.c:2247 -msgid " (sensitive)" -msgstr " (¥Ç¥ê¥±¡¼¥È)" +#: g10/keyedit.c:2251 +msgid "(sensitive)" +msgstr "(¥Ç¥ê¥±¡¼¥È)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 -#, fuzzy, c-format +#, c-format msgid "created: %s" -msgstr "%s¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "ºîÀ®: %s" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 -#, fuzzy, c-format +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#, c-format msgid "revoked: %s" -msgstr "[¼º¸ú] " +msgstr "¼º¸ú: %s" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 -#, fuzzy, c-format +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#, c-format msgid "expired: %s" -msgstr " [Í­¸ú´ü¸Â: %s]" +msgstr "Ëþλ: %s" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 -#, fuzzy, c-format +#, c-format msgid "expires: %s" -msgstr " [Í­¸ú´ü¸Â: %s]" +msgstr "Ëþλ: %s" -#: g10/keyedit.c:2270 -#, fuzzy, c-format +#: g10/keyedit.c:2276 +#, c-format msgid "usage: %s" -msgstr " trust: %c/%c" +msgstr "ÍøÍÑË¡: %s" -#: g10/keyedit.c:2285 -#, fuzzy, c-format +#: g10/keyedit.c:2291 +#, c-format msgid "trust: %s" -msgstr " trust: %c/%c" +msgstr "¿®ÍÑ: %s" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" -msgstr "" +msgstr "Í­¸úÀ­: %s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[¼º¸ú] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" +msgstr "¥«¡¼¥ÉÈÖ¹æ: " -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x·Á¼°¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤¬¡¢¤¢¤ê¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n" -"¤È¤¤¤¦¤³¤È¤òǰƬ¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" +"¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +msgid "revoked" +msgstr "¼º¸ú" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +msgid "expired" +msgstr "Ëþλ" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -"·Ù¹ð: ¼ç¤È¤Ê¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ê̤Ê\n" +"·Ù¹ð: ¼ç¤¿¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ê̤Ê\n" " ¥æ¡¼¥¶¡¼ID¤¬¼ç¤Ë¤Ê¤ë¤È²¾Äꤹ¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3292,45 +3285,45 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" -msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" +msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3339,187 +3332,179 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¤¹¡£»Ø̾¼º¸ú¼Ô¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" -msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾¼º¸ú¼Ô¤òÄɲäǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" +msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾¼º¸ú¼Ô¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "»Ø̾¼º¸ú¼Ô¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾¼º¸ú¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "»Ø̾¼º¸ú¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2968 -#, fuzzy +#: g10/keyedit.c:2965 msgid "this key has already been designated as a revoker\n" -msgstr "·Ù¹ð: ¤³¤Î¸°¤ÏËܿͤˤè¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" +msgstr "¤³¤Î¸°¤Ï¼º¸ú¼Ô¤È¤·¤Æ¤â¤¦»Ø̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "·Ù¹ð: ¤¢¤ë¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤹ¤ë¤È¡¢¸µ¤ËÌ᤻¤Þ¤»¤ó!\n" -#: g10/keyedit.c:2993 -#, fuzzy +#: g10/keyedit.c:2990 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " -msgstr "ËÜÅö¤Ë¤³¤Î¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤷ¤Þ¤¹¤«? (y/N): " +msgstr "ËÜÅö¤Ë¤³¤Î¸°¤ò»Ø̾¼º¸ú¼Ô¤ËǤ̿¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 -#, fuzzy, c-format +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" -msgstr "¥æ¡¼¥¶¡¼id¡Ö%s¡×¤Îv3¼«¸Ê½ð̾¤ò¤È¤Ð¤·¤Þ¤¹\n" +msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Îv3¼«¸Ê½ð̾¤ò¤È¤Ð¤·¤Þ¤¹\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " -msgstr "" +msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:3498 -#, fuzzy +#: g10/keyedit.c:3495 msgid "Are you sure you want to replace it? (y/N) " -msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë»ÈÍѤ·¤¿¤¤¤Ç¤¹¤« (y/N)? " +msgstr "ËÜÅö¤Ë¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3499 -#, fuzzy +#: g10/keyedit.c:3496 msgid "Are you sure you want to delete it? (y/N) " -msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë»ÈÍѤ·¤¿¤¤¤Ç¤¹¤« (y/N)? " +msgstr "ËÜÅö¤Ëºï½ü¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3724 -#, fuzzy, c-format +#: g10/keyedit.c:3721 +#, c-format msgid "user ID: \"%s\"\n" -msgstr "¥æ¡¼¥¶¡¼ID: \"" +msgstr "¥æ¡¼¥¶¡¼ID:¡È%s¡É\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 -#, fuzzy, c-format +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#, c-format msgid "signed by your key %s on %s%s%s\n" -msgstr " %08lX¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "%s¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (½ñ½Ð¤·ÉÔ²Ä)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" -msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹¡£\n" +msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹¡£\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë¼º¸ú¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " -msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? (y/N) " +msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3768 -#, fuzzy, c-format +#: g10/keyedit.c:3765 +#, c-format msgid "You have signed these user IDs on key %s:\n" -msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤·¤¿:\n" +msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë¸°%s¤Ç½ð̾¤·¤Þ¤·¤¿:\n" -#: g10/keyedit.c:3794 -#, fuzzy +#: g10/keyedit.c:3791 msgid " (non-revocable)" -msgstr " (½ñ½Ð¤·ÉÔ²Ä)" +msgstr " (¼º¸úÉÔ²Ä)" -#: g10/keyedit.c:3801 -#, fuzzy, c-format +#: g10/keyedit.c:3798 +#, c-format msgid "revoked by your key %s on %s\n" -msgstr " %08lX¤Ç%s¤Ë¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¤¢¤Ê¤¿¤Î¸°%s¤Ç%s¤Ë¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "¤³¤ì¤é¤Î½ð̾¤ò¼º¸ú¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " -msgstr "¼º¸ú¾ÚÌÀ½ñ¤òËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? (y/N) " +msgstr "¼º¸ú¾ÚÌÀ½ñ¤òËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" -msgstr "¥æ¡¼¥¶¡¼ID¡Ö%s¡×¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "·Ù¹ð: ¥æ¡¼¥¶¡¼ID½ð̾¤¬¡¢%dÉÃ̤Íè¤Ç¤¹\n" -#: g10/keyedit.c:4129 -#, fuzzy, c-format +#: g10/keyedit.c:4126 +#, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" -msgstr "%s¤ò¥µ¥¤¥º%ld¤Î¸°0x%08lX (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n" +msgstr "%s (Â礭¤µ%ld) ¤Î¸°%s (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n" #: g10/keygen.c:293 -#, fuzzy, c-format +#, c-format msgid "preference `%s' duplicated\n" -msgstr "Áª¹¥%c%lu¤Î½ÅÊ£\n" +msgstr "Áª¹¥¡Ö%s¡×¤Î½ÅÊ£\n" #: g10/keygen.c:300 -#, fuzzy msgid "too many cipher preferences\n" -msgstr "¿¤¹¤®¤ë¡Ö%c¡×Áª¹¥\n" +msgstr "¿¤¹¤®¤ë°Å¹æË¡Áª¹¥\n" #: g10/keygen.c:302 -#, fuzzy msgid "too many digest preferences\n" -msgstr "¿¤¹¤®¤ë¡Ö%c¡×Áª¹¥\n" +msgstr "¿¤¹¤®¤ëÍ×ÌóÁª¹¥\n" #: g10/keygen.c:304 -#, fuzzy msgid "too many compression preferences\n" -msgstr "¿¤¹¤®¤ë¡Ö%c¡×Áª¹¥\n" +msgstr "¿¤¹¤®¤ë°µ½ÌÁª¹¥\n" #: g10/keygen.c:401 -#, fuzzy, c-format +#, c-format msgid "invalid item `%s' in preference string\n" -msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" +msgstr "Áª¹¥Ê¸»úÎó¤Ë̵¸ú¤Ê¹àÌÜ¡Ö%s¡×¤¬¤¢¤ê¤Þ¤¹\n" #: g10/keygen.c:827 msgid "writing direct signature\n" @@ -3533,71 +3518,69 @@ msgid "writing key binding signature\n" msgstr "¸°Âбþ¤Ø¤Î½ð̾¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" -msgstr "̵¸ú¤Ê¸°¥µ¥¤¥º¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n" +msgstr "̵¸ú¤Ê¸°Ä¹¡£%u¥Ó¥Ã¥È¤Ë¤·¤Þ¤¹\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" -msgstr "¸°¥µ¥¤¥º¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" +msgstr "¸°Ä¹¤ò%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" #: g10/keygen.c:1247 -#, fuzzy msgid "Sign" -msgstr "sign" +msgstr "Sign" #: g10/keygen.c:1250 -#, fuzzy msgid "Encrypt" -msgstr "¥Ç¡¼¥¿¤ò°Å¹æ²½" +msgstr "Encrypt" #: g10/keygen.c:1253 msgid "Authenticate" -msgstr "" +msgstr "Authenticate" #: g10/keygen.c:1261 msgid "SsEeAaQq" -msgstr "" +msgstr "SsEeAaQq" #: g10/keygen.c:1276 #, c-format msgid "Possible actions for a %s key: " -msgstr "" +msgstr "¸°%s¤Ë²Äǽ¤ÊÁàºî: " #: g10/keygen.c:1280 msgid "Current allowed actions: " -msgstr "" +msgstr "º£¡¢²Äǽ¤ÊÁàºî: " #: g10/keygen.c:1285 #, c-format msgid " (%c) Toggle the sign capability\n" -msgstr "" +msgstr " (%c) ½ð̾ÎϤÎȿž\n" #: g10/keygen.c:1288 -#, fuzzy, c-format +#, c-format msgid " (%c) Toggle the encrypt capability\n" -msgstr " (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n" +msgstr " (%c) °Å¹æÎϤÎȿž\n" #: g10/keygen.c:1291 #, c-format msgid " (%c) Toggle the authenticate capability\n" -msgstr "" +msgstr " (%c) ǧ¾ÚÎϤÎȿž\n" #: g10/keygen.c:1294 #, c-format msgid " (%c) Finished\n" -msgstr "" +msgstr " (%c) ´°Î»\n" #: g10/keygen.c:1348 msgid "Please select what kind of key you want:\n" -msgstr "¤¹¤­¤Ê¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" +msgstr "¤´´õ˾¤Î¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤:\n" #: g10/keygen.c:1350 -#, fuzzy, c-format +#, c-format msgid " (%d) DSA and Elgamal (default)\n" -msgstr " (%d) DSA¤ÈElGamal (´ûÄê)\n" +msgstr " (%d) DSA¤ÈElgamal (´ûÄê)\n" #: g10/keygen.c:1351 #, c-format @@ -3606,90 +3589,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (Æȼ«Ç½ÎϤòÀßÄê)\n" + +#: g10/keygen.c:1355 +#, c-format msgid " (%d) Elgamal (encrypt only)\n" -msgstr " (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n" +msgstr " (%d) Elgamal (°Å¹æ²½¤Î¤ß)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (½ð̾¤Î¤ß)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (°Å¹æ²½¤Î¤ß)\n" -#: g10/keygen.c:1358 -#, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (°Å¹æ²½¤Î¤ß)\n" - -#: g10/keygen.c:1409 +#: g10/keygen.c:1360 #, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"¿·¤·¤¤%s¸°ÂФòÀ¸À®¤·¤Þ¤¹¡£\n" -" ºÇ¾®¤Î¸°Ä¹¤Ï 768 ¥Ó¥Ã¥È\n" -" ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n" -" ºÇÂç¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (Æȼ«Ç½ÎϤòÀßÄê)\n" -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "¸°Ä¹¤¬Â礭¤¹¤®¤Þ¤¹¡£%d¤¬ºÇÂç¤Ç¤¹¡£\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n" -"¿ä¾©¤·¤Þ¤»¤ó!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤¤¤¤¤Ç¤¹¤«? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "¤É¤Î¸°Ä¹¤Ë¤·¤Þ¤¹¤«? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢\n" -"¹¶·â¤Ë¤¿¤¤¤·¤ÆÀȼå¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Í׵ᤵ¤ì¤¿¸°Ä¹¤Ï%u¥Ó¥Ã¥È\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "%u¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3698,14 +3651,14 @@ " m = key expires in n months\n" " y = key expires in n years\n" msgstr "" -"¸°¤ÎÍ­¸ú´ü¸Â¤ò·è¤á¤Æ¤¯¤À¤µ¤¤¡£\n" -" 0 = ̵´ü¸Â\n" -" = Í­¸ú´ü¸Â n Æü´Ö\n" -" w = Í­¸ú´ü¸Â n ½µ´Ö\n" -" m = Í­¸ú´ü¸Â n ¤«·î´Ö\n" -" y = Í­¸ú´ü¸Â n ǯ´Ö\n" +"¸°¤ÎÍ­¸ú´ü¸Â¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n" +" 0 = ¸°¤Ï̵´ü¸Â\n" +" = ¸°¤Ï n Æü´Ö¤ÇËþλ\n" +" w = ¸°¤Ï n ½µ´Ö¤ÇËþλ\n" +" m = ¸°¤Ï n ¤«·î´Ö¤ÇËþλ\n" +" y = ¸°¤Ï n ǯ´Ö¤ÇËþλ\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3714,50 +3667,48 @@ " m = signature expires in n months\n" " y = signature expires in n years\n" msgstr "" -"½ð̾¤ÎÍ­¸ú´ü¸Â¤ò·è¤á¤Æ¤¯¤À¤µ¤¤¡£\n" -" 0 = ̵´ü¸Â\n" -" = Í­¸ú´ü¸Â n Æü´Ö\n" -" w = Í­¸ú´ü¸Â n ½µ´Ö\n" -" m = Í­¸ú´ü¸Â n ¤«·î´Ö\n" -" y = Í­¸ú´ü¸Â n ǯ´Ö\n" +"½ð̾¤ÎÍ­¸ú´ü¸Â¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n" +" 0 = ½ð̾¤Ï̵´ü¸Â\n" +" = ½ð̾¤Ï n Æü´Ö¤ÇËþλ\n" +" w = ½ð̾¤Ï n ½µ´Ö¤ÇËþλ\n" +" m = ½ð̾¤Ï n ¤«·î´Ö¤ÇËþλ\n" +" y = ½ð̾¤Ï n ǯ´Ö¤ÇËþλ\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "¸°¤ÎÍ­¸ú´ü´Ö¤Ï? (0)" -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "½ð̾¤ÎÍ­¸ú´ü´Ö¤Ï? (0)" -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "̵¸ú¤ÊÃÍ\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s¤Ï̵´ü¸Â¤Ç¤¹\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" -msgstr "%s¤Ï%s¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n" +msgstr "%s¤Ï%s¤ÇËþλ¤·¤Þ¤¹\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n" -"2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n" +"2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯¼è¤ê°·¤¨¤Þ¤¹¡£\n" -#: g10/keygen.c:1577 -#, fuzzy +#: g10/keygen.c:1589 msgid "Is this correct? (y/N) " -msgstr "¤³¤ì¤Ç¤¤¤¤¤Ç¤¹¤« (y/n)? " +msgstr "¤³¤ì¤ÇÀµ¤·¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keygen.c:1620 -#, fuzzy +#: g10/keygen.c:1632 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3773,44 +3724,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "ËÜ̾: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "̾Á°¤ò¿ô»ú¤Ç»Ï¤á¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "̾Á°¤Ï5ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "ÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "¥³¥á¥ó¥È: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "¥³¥á¥ó¥È¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç`%s'¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n" +msgstr "¤¢¤Ê¤¿¤Ïʸ»ú½¸¹ç¡Ö%s¡×¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3818,30 +3769,30 @@ "\n" msgstr "" "¼¡¤Î¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤·¤¿:\n" -" \"%s\"\n" +" ¡È%s¡É\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "ÅŻҥ᡼¥ë¤Î¥¢¥É¥ì¥¹¤òËÜ̾¤ä¥³¥á¥ó¥È¤ËÆþ¤ì¤Ê¤¤¤è¤¦¤Ë\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤Ï½ªÎ»(Q)? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "̾Á°(N)¡¢¥³¥á¥ó¥È(C)¡¢ÅŻҥ᡼¥ë(E)¤ÎÊѹ¹¡¢¤Þ¤¿¤ÏOK(O)¤«½ªÎ»(Q)? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "¤Þ¤º¥¨¥é¡¼¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3849,24 +3800,24 @@ "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" "using this program with the option \"--edit-key\".\n" "\n" msgstr "" -"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ê¹Í¤¨¤Ç¤Ï\n" -"¤¢¤ê¤Þ¤»¤ó! ¤¤¤Á¤ª¤¦Â³¹Ô¤·¤Þ¤¹¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à\n" -"¤Î¡Ö--edit-key¡×¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n" +"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬ÉÔɬÍפʤ褦¤Ç¤¹¤¬¡¢¤ª¤½¤é¤¯¤½¤ì¤Ï¤í¤¯¤Ç¤â¤Ê¤¤\n" +"¹Í¤¨¤Ç¤¹! ¤¤¤Á¤ª¤¦Â³¹Ô¤·¤Þ¤¹¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à\n" +"¤Î¡È--edit-key¡É¥ª¥×¥·¥ç¥ó¤Ç¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3875,117 +3826,112 @@ msgstr "" "º£¤«¤éŤ¤Íð¿ô¤òÀ¸À®¤·¤Þ¤¹¡£¥­¡¼¥Ü¡¼¥É¤òÂǤĤȤ«¡¢¥Þ¥¦¥¹¤òÆ°¤«¤¹\n" "¤È¤«¡¢¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤«¤Î¾¤Î¤³¤È¤ò¤¹¤ë¤È¡¢Íð¿ôÀ¸À®»Ò¤Ç\n" -"Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n" - -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA¸°ÂФÏ1024¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹¡£\n" +"Í𻨤µ¤ÎÂ礭¤Ê¤¤¤¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ë¤Î¤Ç¡¢¤ª´«¤á¤¤¤¿¤·¤Þ¤¹¡£\n" -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" -msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n" +msgstr "¸°¤ÎÀ¸À®¤¬¼è¤ê¾Ã¤µ¤ì¤Þ¤·¤¿¡£\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "¡Ö%s¡×¤Ø¸ø³«¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 -#, fuzzy, c-format +#: g10/keygen.c:2761 g10/keygen.c:2899 +#, c-format msgid "writing secret key stub to `%s'\n" -msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" +msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¥¹¥¿¥Ö¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "¡Ö%s¡×¤ØÈëÌ©¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤Ê¸ø³«¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "½ñ¹þ¤ß²Äǽ¤ÊÈëÌ©¸°Îؤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" -msgstr "¸ø³«¸°ÎØ`%s'¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" +msgstr "¸ø³«¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "ÈëÌ©¸°ÎØ¡Ö%s¡×¤Î½ñ¹þ¤ß¥¨¥é¡¼: %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" -msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºî¤ê¡¢½ð̾¤·¤Þ¤·¤¿¡£\n" +msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤òºîÀ®¤·¡¢½ð̾¤·¤Þ¤·¤¿¡£\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n" -"¡Ö--edit-key¡×¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +"¡È--edit-key¡É¥³¥Þ¥ó¥É¤ò»È¤Ã¤ÆÉû¸°¤òÀ¸À®¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "¸°¤ÎÀ¸À®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" -msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" +msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" -msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" +msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "Ãí°Õ: v3¸°¤ÎÉû¸°¤ÎºîÀ®¤Ï¡¢OpenPGP¤ËŬ¹ç¤·¤Þ¤»¤ó\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 -#, fuzzy +#: g10/keygen.c:3052 g10/keygen.c:3174 msgid "Really create? (y/N) " -msgstr "ËÜÅö¤Ëºî¤ê¤Þ¤¹¤«? " +msgstr "ËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keygen.c:3315 -#, fuzzy, c-format +#: g10/keygen.c:3327 +#, c-format msgid "storing key onto card failed: %s\n" -msgstr "¸°¥Ö¥í¥Ã¥¯¤Îºï½ü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "¥«¡¼¥É¤Ø¤Î¸°¤ÎÊݴɤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keygen.c:3362 -#, fuzzy, c-format +#: g10/keygen.c:3374 +#, c-format msgid "can't create backup file `%s': %s\n" -msgstr "¡Ö%s¡×¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/keygen.c:3385 -#, fuzzy, c-format +#: g10/keygen.c:3397 +#, c-format msgid "NOTE: backup of card key saved to `%s'\n" -msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n" +msgstr "Ãí°Õ: ¥«¡¼¥É¸°¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬¡Ö%s¡×¤ØÊݸ¤µ¤ì¤Þ¤¹\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" -msgstr "" +msgstr "RSA¤ÎË¡(modulus)¤ÎŤµ¤¬%d¤Ç¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" -msgstr "" +msgstr "¸ø³«»Ø¿ô¤¬Â礭¤¹¤®¤Þ¤¹ (32¥Ó¥Ã¥È¤è¤êÂç)\n" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" -msgstr "" +msgstr "RSA¤ÎÁÇ¿ô¤¬%d¤Ç¤¢¤ê¤Þ¤»¤ó\n" #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533 msgid "never " @@ -4001,11 +3947,11 @@ #: g10/keylist.c:242 msgid "Critical preferred keyserver: " -msgstr "" +msgstr "º£¤ÎÁª¹¥¸°¥µ¡¼¥Ð¡¼: " #: g10/keylist.c:291 g10/keylist.c:335 msgid "WARNING: invalid notation data found\n" -msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹\n" +msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤òȯ¸«\n" #: g10/keylist.c:309 msgid "Critical signature notation: " @@ -4024,39 +3970,38 @@ msgstr "¸°ÎØ" #: g10/keylist.c:729 -#, fuzzy, c-format +#, c-format msgid "expired: %s)" -msgstr " [Í­¸ú´ü¸Â: %s]" +msgstr "Ëþλ: %s)" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "¼ç¸°¤Î»ØÌæ:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr "Éû¸°¤Î»ØÌæ:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " ¼ç¸°¤Î»ØÌæ:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Éû¸°¤Î»ØÌæ:" -#: g10/keylist.c:1446 g10/keylist.c:1450 -#, fuzzy +#: g10/keylist.c:1440 g10/keylist.c:1444 msgid " Key fingerprint =" -msgstr " »ØÌæ =" +msgstr " »ØÌæ =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" -msgstr "" +msgstr " ¥«¡¼¥É¤ÎÄÌÈÖ =" #: g10/keyring.c:1245 -#, fuzzy, c-format +#, c-format msgid "renaming `%s' to `%s' failed: %s\n" -msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "¡Ö%s¡×¤«¤é¡Ö%s¡×¤Ø¤Î°ÜÆ°¤Ë¼ºÇÔ: %s\n" #: g10/keyring.c:1251 msgid "WARNING: 2 files with confidential information exists.\n" @@ -4074,22 +4019,22 @@ #: g10/keyring.c:1255 msgid "Please fix this possible security flaw\n" -msgstr "¤³¤Î°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" +msgstr "¤³¤ÎÀøºßŪ¤Ê°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤\n" #: g10/keyring.c:1375 -#, fuzzy, c-format +#, c-format msgid "caching keyring `%s'\n" -msgstr "¸°ÎØ¡Ö%s¡×¤ò¸¡ºº¤·¤Æ¤¤¤Þ¤¹\n" +msgstr "¸°ÎØ¡Ö%s¡×¤ò¥­¥ã¥Ã¥·¥å¤·¤Þ¤¹\n" #: g10/keyring.c:1421 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached so far (%lu signatures)\n" -msgstr "%lu¸Ä¤Î¸°¤Þ¤Ç¸¡ºº (%lu¸Ä¤Î½ð̾)\n" +msgstr "%lu¸Ä¤Î¸°¤Þ¤Ç¥­¥ã¥Ã¥·¥åºÑ (%lu¸Ä¤Î½ð̾)\n" #: g10/keyring.c:1433 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached (%lu signatures)\n" -msgstr "%lu¸Ä¤Î¸°¤Þ¤Ç¸¡ºº (%lu¸Ä¤Î½ð̾)\n" +msgstr "%lu¸Ä¤Î¸°¤ò¥­¥ã¥Ã¥·¥åºÑ (%lu¸Ä¤Î½ð̾)\n" #: g10/keyring.c:1504 #, c-format @@ -4097,137 +4042,131 @@ msgstr "%s: ¸°Îؤ¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/keyserver.c:98 -#, fuzzy, c-format +#, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" -msgstr "·Ù¹ð: ¡Ö%s¡×¤Î¥ª¥×¥·¥ç¥ó¤Ïµ¯Æ°¤·¤Æ¤¤¤ë´Ö¡¢Í­¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó\n" +msgstr "" +"·Ù¹ð: ¸°¥µ¡¼¥Ð¡¼¤Î¥ª¥×¥·¥ç¥ó¡Ö%s¡×¤Ï¡¢¤³¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï»È¤¨¤Þ¤»¤ó\n" #: g10/keyserver.c:378 -#, fuzzy msgid "disabled" -msgstr "disable" +msgstr "disabled" #: g10/keyserver.c:579 msgid "Enter number(s), N)ext, or Q)uit > " -msgstr "" +msgstr "ÈÖ¹æ(s)¡¢N)¼¡¡¢¤Þ¤¿¤ÏQ)Ãæ»ß¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ >" #: g10/keyserver.c:662 g10/keyserver.c:1142 -#, fuzzy, c-format +#, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" -msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" +msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥×¥í¥È¥³¥ë¤Ç¤¹ (us %d!=handler %d)\n" #: g10/keyserver.c:752 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found on keyserver\n" -msgstr "¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸°¡È%s¡É¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" #: g10/keyserver.c:754 -#, fuzzy msgid "key not found on keyserver\n" -msgstr "¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸°¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" #: g10/keyserver.c:896 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s server %s\n" -msgstr "¸°%08lX¤ò%s¤ËÍ×µá\n" +msgstr "¸°%s¤ò%s¤«¤é¥µ¡¼¥Ð¡¼%s¤ËÍ×µá\n" #: g10/keyserver.c:900 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s\n" -msgstr "¸°%08lX¤ò%s¤ËÍ×µá\n" +msgstr "¸°%s¤ò%s¤ËÍ×µá\n" #: g10/keyserver.c:1045 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s server %s\n" -msgstr "¡Ö%s¡×¤òHKP¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" +msgstr "¸°%s¤ò%s¥µ¡¼¥Ð¡¼%s¤ØÁ÷¿®\n" #: g10/keyserver.c:1049 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s\n" -msgstr "" -"\"\n" -"¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" +msgstr "¸°%s¤ò%s¤ØÁ÷¿®\n" #: g10/keyserver.c:1092 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s server %s\n" -msgstr "¡Ö%s¡×¤òHKP¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" +msgstr "¡È%s¡É¤ò%s¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" #: g10/keyserver.c:1095 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s\n" -msgstr "¡Ö%s¡×¤òHKP¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" +msgstr "¡È%s¡É¤ò¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" #: g10/keyserver.c:1102 g10/keyserver.c:1197 -#, fuzzy msgid "no keyserver action!\n" -msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" +msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¢¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤»¤ó!\n" #: g10/keyserver.c:1150 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" -msgstr "" +msgstr "·Ù¹ð: ÊÌÈÇ (%s) ¤ÎGnuPG¤Î¸°¥µ¡¼¥Ð¡¼¡¦¥Ï¥ó¥É¥é\n" #: g10/keyserver.c:1159 msgid "keyserver did not send VERSION\n" -msgstr "" +msgstr "¸°¥µ¡¼¥Ð¡¼¤ÏVERSION¤òÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿\n" #: g10/keyserver.c:1218 msgid "no keyserver known (use option --keyserver)\n" -msgstr "" +msgstr "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤¬¤¢¤ê¤Þ¤»¤ó (¥ª¥×¥·¥ç¥ó--keyserver¤ò»È¤¤¤Þ¤·¤ç¤¦)\n" #: g10/keyserver.c:1224 msgid "external keyserver calls are not supported in this build\n" -msgstr "" +msgstr "¤³¤Î¹½ÃۤǤϡ¢³°Éô¸°¥µ¡¼¥Ð¡¼¤Î¸Æ½Ð¤·¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/keyserver.c:1236 #, c-format msgid "no handler for keyserver scheme `%s'\n" -msgstr "" +msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×ÍѤΥϥó¥É¥é¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/keyserver.c:1241 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" -msgstr "" +msgstr "Áàºî¡Ö%s¡×¤Ï¡¢¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" #: g10/keyserver.c:1249 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" -msgstr "" +msgstr "gpgkeys_%s¤Ï¡¢¥Ï¥ó¥É¥é%dÈǤò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó\n" #: g10/keyserver.c:1254 -#, fuzzy msgid "keyserver timed out\n" -msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¨¥é¡¼" +msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¿¥¤¥à¥¢¥¦¥È\n" #: g10/keyserver.c:1259 -#, fuzzy msgid "keyserver internal error\n" -msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¨¥é¡¼" +msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎÆâÉô¥¨¥é¡¼\n" #: g10/keyserver.c:1268 -#, fuzzy, c-format +#, c-format msgid "keyserver communications error: %s\n" -msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¤Î¼õ¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "¸°¥µ¡¼¥Ð¡¼ÄÌ¿®¥¨¥é¡¼: %s\n" #: g10/keyserver.c:1293 g10/keyserver.c:1327 #, c-format msgid "\"%s\" not a key ID: skipping\n" -msgstr "" +msgstr "¡È%s¡É¸°ID¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: ¤È¤Ð¤·¤Þ¤¹\n" #: g10/keyserver.c:1578 -#, fuzzy, c-format +#, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" -msgstr "·Ù¹ð: °ì»þ¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤­¤Þ¤»¤ó (%s) `%s': %s\n" +msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/keyserver.c:1600 -#, fuzzy, c-format +#, c-format msgid "refreshing 1 key from %s\n" -msgstr "¸°%08lX¤ò%s¤ËÍ×µá\n" +msgstr "1Ëܤθ°¤ò%s¤«¤é²óÉü\n" #: g10/keyserver.c:1602 -#, fuzzy, c-format +#, c-format msgid "refreshing %d keys from %s\n" -msgstr "¸°%08lX¤ò%s¤ËÍ×µá\n" +msgstr "%dËܤθ°¤ò%s¤«¤é²óÉü\n" #: g10/mainproc.c:248 #, c-format @@ -4245,33 +4184,33 @@ msgstr "%s °Å¹æ²½ºÑ¤ß¥»¥Ã¥·¥ç¥ó¸°\n" #: g10/mainproc.c:309 -#, fuzzy, c-format +#, c-format msgid "passphrase generated with unknown digest algorithm %d\n" -msgstr "̤ÃΤΥ¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n" +msgstr "̤ÃΤÎÍ×Ì󥢥르¥ê¥º¥à¤ÇÀ¸À®¤µ¤ì¤¿¥Ñ¥¹¥Õ¥ì¡¼¥º %d\n" #: g10/mainproc.c:373 -#, fuzzy, c-format +#, c-format msgid "public key is %s\n" -msgstr "¸ø³«¸°¤Ï%08lX¤Ç¤¹\n" +msgstr "¸ø³«¸°¤Ï%s¤Ç¤¹\n" #: g10/mainproc.c:428 msgid "public key encrypted data: good DEK\n" -msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤DEK¤Ç¤¹\n" +msgstr "¸ø³«¸°¤Ë¤è¤ë°Å¹æ²½ºÑ¤ß¥Ç¡¼¥¿: Àµ¤·¤¤DEK¤Ç¤¹\n" #: g10/mainproc.c:461 -#, fuzzy, c-format +#, c-format msgid "encrypted with %u-bit %s key, ID %s, created %s\n" -msgstr "%u-¥Ó¥Ã¥È%s¸°, ID %08lX¤Ç°Å¹æ²½%s¤Ë¤Ç¤­¤Þ¤·¤¿\n" +msgstr "%u-¥Ó¥Ã¥È%s¸°, ID %s, ÆüÉÕ%s¤Ë°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n" #: g10/mainproc.c:465 g10/pkclist.c:218 -#, fuzzy, c-format +#, c-format msgid " \"%s\"\n" -msgstr " ÊÌ̾ \"" +msgstr " ¡È%s¡É\n" #: g10/mainproc.c:469 -#, fuzzy, c-format +#, c-format msgid "encrypted with %s key, ID %s\n" -msgstr "%s¸°, ID %08lX¤Ç°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n" +msgstr "%s¸°, ID %s¤Ç°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n" #: g10/mainproc.c:483 #, c-format @@ -4290,12 +4229,12 @@ #: g10/mainproc.c:527 g10/mainproc.c:549 #, c-format msgid "assuming %s encrypted data\n" -msgstr "%s°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿¤ò²¾Äê\n" +msgstr "%s°Å¹æ²½ºÑ¤ß¥Ç¡¼¥¿¤ò²¾Äê\n" #: g10/mainproc.c:535 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" -msgstr "IDEA°Å¹æ¤ÏÍøÍÑÉÔǽ¤Ê¤Î¤Ç¡¢³ÚŷŪ¤Ç¤¹¤¬%s¤ÇÂåÍѤ·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" +msgstr "IDEA°Å¹æË¡¤ÏÍøÍÑÉÔǽ¤Ê¤Î¤Ç¡¢³ÚŷŪ¤Ç¤¹¤¬%s¤ÇÂåÍѤ·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" #: g10/mainproc.c:567 msgid "decryption okay\n" @@ -4316,7 +4255,7 @@ #: g10/mainproc.c:610 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆâ½ï¤Ë¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n" +msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÈÆâ½ï¤Ë¤¹¤ë¡É¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n" #: g10/mainproc.c:612 #, c-format @@ -4325,7 +4264,7 @@ #: g10/mainproc.c:784 msgid "standalone revocation - use \"gpg --import\" to apply\n" -msgstr "ÆÈΩ¼º¸ú¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n" +msgstr "ÆÈΩ¼º¸ú¡£¡Ègpg --import¡É¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n" #: g10/mainproc.c:1288 msgid "signature verification suppressed\n" @@ -4336,47 +4275,47 @@ msgstr "¤³¤Î¿½Å½ð̾¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n" #: g10/mainproc.c:1350 -#, fuzzy, c-format +#, c-format msgid "Signature made %s\n" -msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾ %s\n" +msgstr "%s¤Ë»Ü¤µ¤ì¤¿½ð̾\n" #: g10/mainproc.c:1351 -#, fuzzy, c-format +#, c-format msgid " using %s key %s\n" -msgstr " ÊÌ̾ \"" +msgstr " %s¸°%s¤ò»ÈÍÑ\n" #: g10/mainproc.c:1355 -#, fuzzy, c-format +#, c-format msgid "Signature made %s using %s key ID %s\n" -msgstr "%.*s ¤Î%s¸°ID %08lX¤Ë¤è¤ë½ð̾\n" +msgstr "%s¤Ë%s¸°ID %s¤Ç»Ü¤µ¤ì¤¿½ð̾\n" #: g10/mainproc.c:1375 msgid "Key available at: " msgstr "°Ê²¼¤Ë¸°¤¬¤¢¤ê¤Þ¤¹: " #: g10/mainproc.c:1480 g10/mainproc.c:1528 -#, fuzzy, c-format +#, c-format msgid "BAD signature from \"%s\"" -msgstr "ÉÔÀµ¤Ê ½ð̾: \"" +msgstr "¡È%s¡É¤«¤é¤Î ÉÔÀµ¤Ê ½ð̾" #: g10/mainproc.c:1482 g10/mainproc.c:1530 -#, fuzzy, c-format +#, c-format msgid "Expired signature from \"%s\"" -msgstr "´ü¸ÂÀÚ¤ì¤Î½ð̾: \"" +msgstr "¡È%s¡É¤«¤é¤Î´ü¸ÂÀÚ¤ì¤Î½ð̾" #: g10/mainproc.c:1484 g10/mainproc.c:1532 -#, fuzzy, c-format +#, c-format msgid "Good signature from \"%s\"" -msgstr "Àµ¤·¤¤½ð̾: \"" +msgstr "¡È%s¡É¤«¤é¤ÎÀµ¤·¤¤½ð̾" #: g10/mainproc.c:1536 msgid "[uncertain]" msgstr "[ÉÔ³ÎÄê]" #: g10/mainproc.c:1568 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"" -msgstr " ÊÌ̾ \"" +msgstr " ÊÌ̾¡È%s¡É" #: g10/mainproc.c:1662 #, c-format @@ -4386,7 +4325,7 @@ #: g10/mainproc.c:1667 #, c-format msgid "Signature expires %s\n" -msgstr "¤³¤Î½ð̾¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n" +msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹\n" #: g10/mainproc.c:1670 #, c-format @@ -4401,7 +4340,7 @@ msgid "textmode" msgstr "¥Æ¥­¥¹¥È¥â¡¼¥É" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "̤ÃΤÎ" @@ -4430,36 +4369,46 @@ #: g10/mainproc.c:1878 msgid "invalid root packet detected in proc_tree()\n" -msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n" +msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥ë¡¼¥È¡¦¥Ñ¥±¥Ã¥È¤ò¸¡½Ð¤·¤Þ¤·¤¿\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" -msgstr "¥³¥¢¡¦¥À¥ó¥×¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¥³¥¢¡¦¥À¥ó¥×¤ò»ÈÍѶػߤˤǤ­¤Þ¤»¤ó: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 -#, fuzzy, c-format +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 +#, c-format msgid "fstat of `%s' failed in %s: %s\n" -msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "¡Ö%s¡×¤Îfstat¤¬%s¤Ç¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/misc.c:186 -#, fuzzy, c-format +#: g10/misc.c:190 +#, c-format msgid "fstat(%d) failed in %s: %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ÆɽФ·¤Ë¼ºÇÔ (n=%d): %s\n" +msgstr "fstat(%d)¤¬%s¤Ç¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" + +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï¡¢¼è¤ê°·¤¨¤Þ¤»¤ó\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "̤¼ÂÁõ¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" -"¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" -"¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤!\n" +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s½ð̾¡¢Í×Ì󥢥르¥ê¥º¥à %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "·Ù¹ð: Í×Ì󥢥르¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" -msgstr "IDEA°Å¹æ¤Î¥×¥é¥°¥¤¥ó¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "IDEA°Å¹æË¡¤Î¥×¥é¥°¥¤¥ó¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/misc.c:431 msgid "" @@ -4469,41 +4418,40 @@ #: g10/misc.c:664 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" -msgstr "%s:%d: ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¡Ö%s¡×\n" +msgstr "%s:%d: ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¡È%s¡É\n" #: g10/misc.c:668 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" -msgstr "·Ù¹ð: ¡Ö%s¡×¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" +msgstr "·Ù¹ð:¡È%s¡É¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤ë¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" #: g10/misc.c:670 #, c-format msgid "please use \"%s%s\" instead\n" -msgstr "¡Ö%s%s¡×¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" +msgstr "¡È%s%s¡É¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" #: g10/misc.c:681 msgid "Uncompressed" -msgstr "̤°µ½Ì" +msgstr "̵°µ½Ì" #: g10/misc.c:706 -#, fuzzy msgid "uncompressed|none" -msgstr "̤°µ½Ì" +msgstr "̵°µ½Ì|¤Ê¤·" #: g10/misc.c:816 #, c-format msgid "this message may not be usable by %s\n" -msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¡¢%s¤Ç¤Ï»ÈÍѤǤ­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó\n" +msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤Ï¡¢%s¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" #: g10/misc.c:973 -#, fuzzy, c-format +#, c-format msgid "ambiguous option `%s'\n" -msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n" +msgstr "¤¢¤¤¤Þ¤¤¤Ê¥ª¥×¥·¥ç¥ó¡Ö%s¡×\n" #: g10/misc.c:998 -#, fuzzy, c-format +#, c-format msgid "unknown option `%s'\n" -msgstr "´ûÄê¤Î¼õ¼è¿Í¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "̤ÃΤΥª¥×¥·¥ç¥ó¡Ö%s¡×\n" #: g10/openfile.c:84 #, c-format @@ -4511,9 +4459,8 @@ msgstr "¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Ï´û¤Ë¸ºß¤·¤Þ¤¹¡£" #: g10/openfile.c:86 -#, fuzzy msgid "Overwrite? (y/N) " -msgstr "¾å½ñ¤­¤·¤Þ¤¹¤« (y/N)? " +msgstr "¾å½ñ¤­¤·¤Þ¤¹¤«? (y/N) " #: g10/openfile.c:119 #, c-format @@ -4526,17 +4473,17 @@ #: g10/openfile.c:184 msgid "writing to stdout\n" -msgstr "ɸ½à½ÐÎϤ˽ñ¤­½Ð¤·¤Þ¤¹\n" +msgstr "ɸ½à½ÐÎϤ˽ñ¤­¹þ¤ß¤Þ¤¹\n" #: g10/openfile.c:296 #, c-format msgid "assuming signed data in `%s'\n" -msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬`%s'¤Ë¤¢¤ë¤ÈÁÛÄꤷ¤Þ¤¹\n" +msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬¡Ö%s¡×¤Ë¤¢¤ë¤ÈÁÛÄꤷ¤Þ¤¹\n" #: g10/openfile.c:375 #, c-format msgid "new configuration file `%s' created\n" -msgstr "¿·¤·¤¤¹½À®¥Õ¥¡¥¤¥ë`%s'¤¬¤Ç¤­¤Þ¤·¤¿\n" +msgstr "¿·¤·¤¤¹½À®¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/openfile.c:377 #, c-format @@ -4544,69 +4491,69 @@ msgstr "·Ù¹ð: ¡Ö%s¡×¤Î¥ª¥×¥·¥ç¥ó¤Ïµ¯Æ°¤·¤Æ¤¤¤ë´Ö¡¢Í­¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó\n" #: g10/openfile.c:409 -#, fuzzy, c-format +#, c-format msgid "directory `%s' created\n" -msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬¤Ç¤­¤Þ¤·¤¿\n" +msgstr "¥Ç¥£¥ì¥¯¥È¥ê¡¼¡Ö%s¡×¤¬¤Ç¤­¤Þ¤·¤¿\n" #: g10/parse-packet.c:119 #, c-format msgid "can't handle public key algorithm %d\n" -msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" +msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à%d¤Ï¡¢¼è¤ê°·¤¨¤Þ¤»¤ó\n" #: g10/parse-packet.c:688 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" -msgstr "·Ù¹ð: ÀøºßŪ¤Ë·õÆݤÊÂоΰŹ楻¥Ã¥·¥ç¥ó¸°¤Ç¤¹\n" +msgstr "·Ù¹ð: ÀøºßŪ¤Ë·õÆݤÊÂоΰŹ沽¥»¥Ã¥·¥ç¥ó¸°¤Ç¤¹\n" #: g10/parse-packet.c:1112 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "¥¿¥¤¥×%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n" +msgstr "·¿%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" -msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg¥¨¡¼¥¸¥§¥ó¥È¤Ï̵¸ú¤Ç¤¹\n" +msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg-agent¤Ï̵¸ú¤Ç¤¹\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Î¥¯¥é¥¤¥¢¥ó¥Èpid¤òÀßÄê¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼ÆɽФ·FD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼½ñ¹þ¤ßFD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO´Ä¶­ÊÑ¿ô¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" -msgstr "`%s'¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¡Ö%s¡×¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent¤È¤ÎÄÌ¿®¾ã³²\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 -#, fuzzy, c-format +#: g10/passphrase.c:698 g10/passphrase.c:1203 +#, c-format msgid " (main key ID %s)" -msgstr " (¼ç¸°ID %08lX)" +msgstr " (¼ç¸°ID %s)" -#: g10/passphrase.c:698 -#, fuzzy, c-format +#: g10/passphrase.c:712 +#, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" "\"%.*s\"\n" @@ -4614,63 +4561,61 @@ msgstr "" "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹:\n" "\"%.*s\"\n" -"%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s%s\n" +"%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" -msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹²á¤®¤Þ¤¹\n" +msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹¤¹¤®¤Þ¤¹\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤«¤é¤Î̵¸ú¤Ê±þÅú\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "¥æ¡¼¥¶¡¼¤Ë¤è¤ë¼è¾Ã¤·\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥È¤¬0x%lx¤òÊÖµÑ\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 -#, fuzzy -msgid "can't query password in batch mode\n" -msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌä¹ç¤»¤¬¤Ç¤­¤Þ¤»¤ó\n" +#: g10/passphrase.c:1094 g10/passphrase.c:1256 +msgid "can't query passphrase in batch mode\n" +msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÌä¹ç¤»¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: " -#: g10/passphrase.c:1141 -#, fuzzy, c-format +#: g10/passphrase.c:1184 +#, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" msgstr "" -"\n" "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" -"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \"" +"¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹:¡È%s¡É\n" -#: g10/passphrase.c:1147 -#, fuzzy, c-format +#: g10/passphrase.c:1190 +#, c-format msgid "%u-bit %s key, ID %s, created %s" -msgstr "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s" +msgstr "%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" -msgstr "" +msgstr " (¼ç¸°ID %s ¤ÎÉû¸°)" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: " @@ -4686,29 +4631,28 @@ "¤¢¤Ê¤¿¤Î¥Õ¥©¥ÈID¤Ë»È¤¦²èÁü¤ò·è¤á¤Æ¤¯¤À¤µ¤¤¡£²èÁü¤ÏJPEG¥Õ¥¡¥¤¥ë¤Ç¤¢¤ëɬ\n" "Íפ¬¤¢¤ê¤Þ¤¹¡£²èÁü¤Ï¸ø³«¸°¤È¤¤¤Ã¤·¤ç¤Ë³ÊǼ¤µ¤ì¤ë¡¢¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª\n" "¤¤¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£¤â¤·Â礭¤Ê¼Ì¿¿¤ò»È¤¦¤È¡¢¤¢¤Ê¤¿¤Î¸°¤âƱÍͤËÂ礭¤¯¤Ê¤ê\n" -"¤Þ¤¹! ¤¯¤é¤¤¤Ë¤ª¤µ¤Þ¤ëÂ礭¤µ¤Î²èÁü¤Ï¡¢»È¤¤¤è¤¤¤Ç¤·¤ç¤¦¡£\n" +"¤Þ¤¹! 240x288¤¯¤é¤¤¤Ë¤ª¤µ¤Þ¤ëÂ礭¤µ¤Î²èÁü¤Ï¡¢»È¤¤¤è¤¤¤Ç¤·¤ç¤¦¡£\n" #: g10/photoid.c:80 msgid "Enter JPEG filename for photo ID: " msgstr "¥Õ¥©¥ÈIDÍѤÎJPEG¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " #: g10/photoid.c:94 -#, fuzzy, c-format +#, c-format msgid "unable to open JPEG file `%s': %s\n" -msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó: %s\n" +msgstr "JPEG¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó: %s\n" #: g10/photoid.c:102 #, c-format msgid "This JPEG is really large (%d bytes) !\n" -msgstr "" +msgstr "¤³¤ÎJPEG¤Ï¡¢ËÜÅö¤ËÂ礭¤¤ (%d¥Ð¥¤¥È) !\n" #: g10/photoid.c:104 -#, fuzzy msgid "Are you sure you want to use it? (y/N) " -msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë»ÈÍѤ·¤¿¤¤¤Ç¤¹¤« (y/N)? " +msgstr "ËÜÅö¤Ë»È¤¤¤¿¤¤¤Ç¤¹¤«? (y/N) " #: g10/photoid.c:119 -#, fuzzy, c-format +#, c-format msgid "`%s' is not a JPEG file\n" msgstr "¡Ö%s¡×¤Ï¡¢JPEG¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" @@ -4734,7 +4678,7 @@ #: g10/pkclist.c:67 g10/revoke.c:583 msgid "Key is no longer used" -msgstr "¸°¤Ï¤â¤¦»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó" +msgstr "¸°¤Ï¤â¤¦ÉÔÍѤǤ¹" #: g10/pkclist.c:69 g10/revoke.c:584 msgid "User ID is no longer valid" @@ -4746,92 +4690,84 @@ #: g10/pkclist.c:90 msgid "revocation comment: " -msgstr "¼º¸ú¤ÎŬÍ×: " +msgstr "¼º¸ú¤Î¥³¥á¥ó¥È: " #: g10/pkclist.c:205 msgid "iImMqQsS" msgstr "iImMqQsS" #: g10/pkclist.c:213 -#, fuzzy msgid "No trust value assigned to:\n" -msgstr "" -"¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n" -"%4u%c/%08lX %s \"" +msgstr "¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n" #: g10/pkclist.c:245 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"\n" -msgstr " ÊÌ̾ \"" +msgstr " ÊÌ̾¡È%s¡É\n" #: g10/pkclist.c:255 -#, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" -msgstr "¤³¤Î¸°¤Ï¤¿¤Ö¤óËܿͤΤâ¤Î¤Ç¤¹\n" +msgstr "" +"¤³¤Î¸°¤¬¤³¤Î¥æ¡¼¥¶¡¼¤ò¤Ê¤Î¤ëËܿͤΤâ¤Î¤«¤É¤¦¤«¡¢¤É¤ì¤¯¤é¤¤¿®ÍѤǤ­¤Þ¤¹¤«?\n" #: g10/pkclist.c:270 -#, fuzzy, c-format +#, c-format msgid " %d = I don't know or won't say\n" -msgstr " %d = ̤ÃÎ\n" +msgstr " %d = ÃΤé¤Ê¤¤¡¢¤Þ¤¿¤Ï²¿¤È¤â¸À¤¨¤Ê¤¤\n" #: g10/pkclist.c:272 -#, fuzzy, c-format +#, c-format msgid " %d = I do NOT trust\n" -msgstr " %d = ¿®ÍѤ· ¤Ê¤¤\n" +msgstr " %d = ¿®ÍѤ· ¤Ê¤¤\n" #: g10/pkclist.c:278 -#, fuzzy, c-format +#, c-format msgid " %d = I trust ultimately\n" -msgstr " %d = ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë\n" +msgstr " %d = ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë\n" #: g10/pkclist.c:284 -#, fuzzy msgid " m = back to the main menu\n" -msgstr " m = ¥á¡¼¥ó¡¦¥á¥Ë¥å¡¼¤ËÌá¤ë\n" +msgstr " m = ¥á¡¼¥ó¡¦¥á¥Ë¥å¡¼¤ËÌá¤ë\n" #: g10/pkclist.c:287 -#, fuzzy msgid " s = skip this key\n" -msgstr " s = ¤³¤Î¸°¤Ï¤È¤Ð¤¹\n" +msgstr " s = ¤³¤Î¸°¤Ï¤È¤Ð¤¹\n" #: g10/pkclist.c:288 -#, fuzzy msgid " q = quit\n" -msgstr " q = ½ªÎ»\n" +msgstr " q = ½ªÎ»\n" #: g10/pkclist.c:292 #, c-format msgid "" "The minimum trust level for this key is: %s\n" "\n" -msgstr "" +msgstr "¤³¤Î¸°¤ÎºÇ¾®¿®ÍÑ¥ì¥Ù¥ë: %s\n" #: g10/pkclist.c:298 g10/revoke.c:609 msgid "Your decision? " msgstr "¤¢¤Ê¤¿¤Î·èÄê¤Ï? " #: g10/pkclist.c:319 -#, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " -msgstr "ËÜÅö¤Ë¤³¤Î¸°¤òÀäÂÐŪ¤Ë¿®ÍѤ·¤Þ¤¹¤«? " +msgstr "ËÜÅö¤Ë¤³¤Î¸°¤òÀäÂÐŪ¤Ë¿®ÍѤ·¤Þ¤¹¤«? (y/N) " #: g10/pkclist.c:333 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤Ø¤Î¾ÚÌÀ½ñ:\n" #: g10/pkclist.c:418 -#, fuzzy, c-format +#, c-format msgid "%s: There is no assurance this key belongs to the named user\n" -msgstr "%08lX: ¤³¤Î¸°¤¬ËÜÅö¤ËËܿͤΤâ¤Î¤Ç¤¢¤ë¡¢¤È¤¤¤¦Ãû¸õ¤¬¡¢¤¢¤ê¤Þ¤»¤ó\n" +msgstr "%s: ¤³¤Î¸°¤¬ËÜÅö¤ËËܿͤΤâ¤Î¤Ç¤¢¤ë¡¢¤È¤¤¤¦Ãû¸õ¤¬¡¢¤¢¤ê¤Þ¤»¤ó\n" #: g10/pkclist.c:423 -#, fuzzy, c-format +#, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" -msgstr "%08lX: ¤³¤Î¸°¤¬ËÜÅö¤ËËܿͤΤâ¤Î¤Ç¤¢¤ë¡¢¤È¤¤¤¦Ãû¸õ¤¬¡¢¤¢¤ê¤Þ¤»¤ó\n" +msgstr "%s: ¤³¤Î¸°¤¬ËÜÅö¤ËËܿͤΤâ¤Î¤Ç¤¢¤ë¡¢¤È¤¤¤¦Ãû¸õ¤¬¡¢¾¯¤·¤·¤«¤¢¤ê¤Þ¤»¤ó\n" #: g10/pkclist.c:429 -#, fuzzy msgid "This key probably belongs to the named user\n" msgstr "¤³¤Î¸°¤Ï¤¿¤Ö¤óËܿͤΤâ¤Î¤Ç¤¹\n" @@ -4840,47 +4776,42 @@ msgstr "¤³¤Î¸°¤Ï¼«Ê¬¤Î¤â¤Î¤Ç¤¹\n" #: g10/pkclist.c:460 -#, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" "in the user ID. If you *really* know what you are doing,\n" "you may answer the next question with yes.\n" msgstr "" -"¤³¤Î¸°¤Ï¡¢¤³¤Î¥æ¡¼¥¶¡¼ID¤ò¤Ê¤Î¤ëËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ\n" -"¤»¤ó¡£º£¤«¤é¹Ô¤¦¤³¤È¤ò *³Î¼Â¤Ë* Íý²ò¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢\n" +"¤³¤Î¸°¤Ï¡¢¤³¤Î¥æ¡¼¥¶¡¼ID¤ò¤Ê¤Î¤ëËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­\n" +"¤Þ¤»¤ó¡£º£¤«¤é¹Ô¤¦¤³¤È¤ò¡öËÜÅö¤Ë¡öÍý²ò¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢\n" "¼¡¤Î¼ÁÌä¤Ë¤Ïno¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n" -"\n" #: g10/pkclist.c:467 -#, fuzzy msgid "Use this key anyway? (y/N) " -msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? " +msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? (y/N) " #: g10/pkclist.c:501 msgid "WARNING: Using untrusted key!\n" -msgstr "·Ù¹ð: ¿®ÍѤǤ­¤Ê¤¤¸°¤òÍѤ¤¤Æ¤¤¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¿®ÍѤǤ­¤Ê¤¤¸°¤ò»È¤Ã¤Æ¤¤¤Þ¤¹!\n" #: g10/pkclist.c:508 -#, fuzzy msgid "WARNING: this key might be revoked (revocation key not present)\n" -msgstr "·Ù¹ð: ¸°%08lX¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹: ¼º¸ú¸°%08lX¤ÏÉԺߡ£\n" +msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹ (¼º¸ú¸°¤ÏÉÔºß)\n" #: g10/pkclist.c:517 -#, fuzzy msgid "WARNING: This key has been revoked by its designated revoker!\n" -msgstr "·Ù¹ð: ¤³¤Î¸°¤ÏËܿͤˤè¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï»Ø̾¼º¸ú¼Ô¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" #: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its owner!\n" -msgstr "·Ù¹ð: ¤³¤Î¸°¤ÏËܿͤˤè¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½êÍ­¼Ô¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +msgid " This could mean that the signature is forged.\n" msgstr " ½ð̾¤¬µ¶Êª¤Ê¤³¤È¤â¤¢¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£\n" #: g10/pkclist.c:527 msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "·Ù¹ð: ¤³¤ÎÉû¸°¤ÏËܿͤˤè¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" +msgstr "·Ù¹ð: ¤³¤ÎÉû¸°¤Ï½êÍ­¼Ô¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹!\n" #: g10/pkclist.c:532 msgid "Note: This key has been disabled.\n" @@ -4888,7 +4819,7 @@ #: g10/pkclist.c:537 msgid "Note: This key has expired!\n" -msgstr "Ãí°Õ: ¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!\n" +msgstr "Ãí°Õ: ¤³¤Î¸°¤ÏËþλ¤Ç¤¹!\n" #: g10/pkclist.c:548 msgid "WARNING: This key is not certified with a trusted signature!\n" @@ -4897,7 +4828,7 @@ #: g10/pkclist.c:550 msgid "" " There is no indication that the signature belongs to the owner.\n" -msgstr " ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n" +msgstr " ¤³¤Î½ð̾¤¬½êÍ­¼Ô¤Î¤â¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n" #: g10/pkclist.c:558 msgid "WARNING: We do NOT trust this key!\n" @@ -4914,7 +4845,7 @@ #: g10/pkclist.c:569 msgid " It is not certain that the signature belongs to the owner.\n" -msgstr " ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n" +msgstr " ¤³¤Î½ð̾¤¬½êÍ­¼Ô¤Î¤â¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n" #: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996 #, c-format @@ -4924,15 +4855,15 @@ #: g10/pkclist.c:744 g10/pkclist.c:968 #, c-format msgid "%s: skipped: public key already present\n" -msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n" +msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï¤â¤¦¤¢¤ê¤Þ¤¹\n" #: g10/pkclist.c:786 msgid "You did not specify a user ID. (you may use \"-r\")\n" -msgstr "¥æ¡¼¥¶¡¼ID¤ò»ØÄꤷ¤Æ¤¤¤Þ¤»¤ó (¡Ö-r¡×¤òÍѤ¤¤Þ¤·¤ç¤¦) ¡£\n" +msgstr "¥æ¡¼¥¶¡¼ID¤ò»ØÄꤷ¤Æ¤¤¤Þ¤»¤ó (¡È-r¡É¤ò»È¤¤¤Þ¤·¤ç¤¦) ¡£\n" #: g10/pkclist.c:802 msgid "Current recipients:\n" -msgstr "" +msgstr "º£¤Î¼õ¼è¿Í:\n" #: g10/pkclist.c:828 msgid "" @@ -4948,7 +4879,7 @@ #: g10/pkclist.c:849 g10/pkclist.c:911 msgid "skipped: public key already set as default recipient\n" -msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¼è¿Í¤È¤·¤ÆÀßÄêºÑ¤ß¤Ç¤¹\n" +msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´ûÄê¤Î¼õ¼è¿Í¤È¤·¤Æ¤â¤¦ÀßÄêºÑ¤ß¤Ç¤¹\n" #: g10/pkclist.c:867 msgid "Public key is disabled.\n" @@ -4956,12 +4887,12 @@ #: g10/pkclist.c:874 msgid "skipped: public key already set\n" -msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤ÏÀßÄêºÑ¤ß¤Ç¤¹\n" +msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï¤â¤¦ÀßÄêºÑ¤ß¤Ç¤¹\n" #: g10/pkclist.c:903 -#, fuzzy, c-format +#, c-format msgid "unknown default recipient \"%s\"\n" -msgstr "´ûÄê¤Î¼õ¼è¿Í¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "´ûÄê¤Î¼õ¼è¿Í¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" #: g10/pkclist.c:948 #, c-format @@ -4970,44 +4901,44 @@ #: g10/pkclist.c:1003 msgid "no valid addressees\n" -msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "Í­¸ú¤Ê°¸À褬¤¢¤ê¤Þ¤»¤ó\n" #: g10/plaintext.c:90 msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "¥Ç¡¼¥¿¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" -"Êݸ¤¹¤ë¤Ë¤Ï¡Ö--output¡×¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤\n" +"Êݸ¤¹¤ë¤Ë¤Ï¡È--output¡É¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" -msgstr "`%s'¤ÎºîÀ®¥¨¥é¡¼: %s\n" +msgstr "¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "ʬΥ½ð̾¡£\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "¥Ç¡¼¥¿¡¦¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎÏ: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" -msgstr "ɸ½àÆþÎϤè¤êÆɹþ¤ßÃæ ...\n" +msgstr "ɸ½àÆþÎϤè¤êÆɽФ·Ãæ ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" -msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿`%s'¤¬³«¤±¤Þ¤»¤ó\n" +msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó\n" #: g10/pubkey-enc.c:103 -#, fuzzy, c-format +#, c-format msgid "anonymous recipient; trying secret key %s ...\n" -msgstr "ƿ̾¤Î¼õ¼è¿ÍÍѤǤ¹¡£ÈëÌ©¸°%08lX¤òÍѤ¤¤Þ¤¹ ...\n" +msgstr "ƿ̾¤Î¼õ¼è¿ÍÍѤǤ¹¡£ÈëÌ©¸°%s¤ò»î¤·¤Þ¤¹ ...\n" #: g10/pubkey-enc.c:119 msgid "okay, we are the anonymous recipient.\n" @@ -5015,22 +4946,22 @@ #: g10/pubkey-enc.c:207 msgid "old encoding of the DEK is not supported\n" -msgstr "DEK¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "µì¼°¤ÎDEKÉä¹æ¤Ï¡¢¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/pubkey-enc.c:228 #, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" -msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à%d%s¤Ï̤ÃΤ«»ÈÍÑÉԲĤǤ¹\n" +msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à%d%s¤Ï̤ÃΤ«»ÈÍѶػߤǤ¹\n" #: g10/pubkey-enc.c:266 -#, fuzzy, c-format +#, c-format msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" -msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%d¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "·Ù¹ð: °Å¹æ¥¢¥ë¥´¥ê¥º¥à%s¤Ï¼õ¼è¿Í¤ÎÁª¹¥¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n" #: g10/pubkey-enc.c:286 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %s expired at %s\n" -msgstr "Ãí°Õ: ÈëÌ©¸°%08lX¤Ï%s¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n" +msgstr "Ãí°Õ: ÈëÌ©¸°%s¤Ï%s¤ÇËþλ¤Ç¤¹\n" #: g10/pubkey-enc.c:292 msgid "NOTE: key has been revoked" @@ -5043,9 +4974,9 @@ msgstr "build_packet ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/revoke.c:146 -#, fuzzy, c-format +#, c-format msgid "key %s has no user IDs\n" -msgstr "¸°%08lX: ¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s¤Ë¤Ï¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/revoke.c:272 msgid "To be revoked by:\n" @@ -5056,9 +4987,8 @@ msgstr "(¤³¤ì¤Ï¡¢¥Ç¥ê¥±¡¼¥È¤Ê¼º¸ú¸°¤Ç¤¹)\n" #: g10/revoke.c:280 -#, fuzzy msgid "Create a designated revocation certificate for this key? (y/N) " -msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤Ë¤¿¤¤¤¹¤ë»Ø̾¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " #: g10/revoke.c:293 g10/revoke.c:511 msgid "ASCII armored output forced.\n" @@ -5074,14 +5004,14 @@ msgstr "¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¡£\n" #: g10/revoke.c:376 -#, fuzzy, c-format +#, c-format msgid "no revocation keys found for \"%s\"\n" -msgstr "¡Ö%s¡×ÍѤμº¸ú¸°¤Ï¡¢¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¡È%s¡ÉÍѤμº¸ú¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" #: g10/revoke.c:432 -#, fuzzy, c-format +#, c-format msgid "secret key \"%s\" not found: %s\n" -msgstr "ÈëÌ©¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "ÈëÌ©¸°¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" #: g10/revoke.c:461 #, c-format @@ -5093,9 +5023,8 @@ msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬¾È¹ç¤·¤Þ¤»¤ó!\n" #: g10/revoke.c:479 -#, fuzzy msgid "Create a revocation certificate for this key? (y/N) " -msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºî¤ê¤Þ¤¹¤«? " +msgstr "¤³¤Î¸°¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " #: g10/revoke.c:496 msgid "unknown protection algorithm\n" @@ -5117,10 +5046,10 @@ msgstr "" "¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤·¤¿¡£\n" "\n" -"¸«¤Ä¤«¤é¤Ê¤¤¤è¤¦¤ÊÇÞÂΤ˰ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£¤â¤·¥ï¥ë¤¬¤³¤Î¾ÚÌÀ½ñ¤Ø¤Î¥¢\n" -"¥¯¥»¥¹¤òÆÀ¤ë¤È¡¢¤½¤¤¤Ä¤¬¤¢¤Ê¤¿¤Î¾ÚÌÀ½ñ¤ò»È¤¨¤Ê¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n" +"¸«¤Ä¤«¤é¤Ê¤¤¤è¤¦¤ÊÇÞÂΤ˰ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£¤â¤·¥ï¥ë¤¬¤³¤Î¾ÚÌÀ½ñ¤Ø¤Î\n" +"¥¢¥¯¥»¥¹¤òÆÀ¤ë¤È¡¢¤½¤¤¤Ä¤Ï¤¢¤Ê¤¿¤Î¸°¤ò»È¤¨¤Ê¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n" "ÇÞÂΤ¬ÆɽФ·ÉÔǽ¤Ë¤Ê¤Ã¤¿¾ì¹ç¤ËÈ÷¤¨¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò°õºþ¤·¤ÆÊݴɤ¹¤ë¤Î\n" -"¤¬¸­ÌÀ¤Ç¤¹¡£¤·¤«¤·¡¢Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Î°õ»ú¥·¥¹¥Æ¥à¤Ï¡¢\n" +"¤¬¸­ÌÀ¤Ç¤¹¡£¤·¤«¤·¡¢¤´Ãí°Õ¤¯¤À¤µ¤¤¡£¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Î°õ»ú¥·¥¹¥Æ¥à¤Ï¡¢\n" "¤À¤ì¤Ç¤â¸«¤¨¤ë¾ì½ê¤Ë¥Ç¡¼¥¿¤ò¤ª¤¯¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" #: g10/revoke.c:592 @@ -5134,7 +5063,7 @@ #: g10/revoke.c:604 #, c-format msgid "(Probably you want to select %d here)\n" -msgstr "(¤³¤³¤Ç¤Ï¤­¤Ã¤È%d¤òÁª¤Ó¤Þ¤¹)\n" +msgstr "(¤³¤³¤Ç¤Ï¤¿¤Ö¤ó%d¤òÁª¤Ó¤Þ¤¹)\n" #: g10/revoke.c:645 msgid "Enter an optional description; end it with an empty line:\n" @@ -5150,9 +5079,8 @@ msgstr "(ÀâÌÀ¤Ï¤¢¤ê¤Þ¤»¤ó)\n" #: g10/revoke.c:680 -#, fuzzy msgid "Is this okay? (y/N) " -msgstr "¤è¤í¤·¤¤¤Ç¤¹¤«? " +msgstr "¤è¤í¤·¤¤¤Ç¤¹¤«? (y/N) " #: g10/seckey-cert.c:54 msgid "secret key parts are not available\n" @@ -5164,9 +5092,9 @@ msgstr "Êݸ¥ë¥´¥ê¥º¥à%d%s¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/seckey-cert.c:71 -#, fuzzy, c-format +#, c-format msgid "protection digest %d is not supported\n" -msgstr "Êݸ¥ë¥´¥ê¥º¥à%d%s¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" +msgstr "ÊݸîÍ×Ìó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" #: g10/seckey-cert.c:250 msgid "Invalid passphrase; please try again" @@ -5205,54 +5133,54 @@ #: g10/sig-check.c:99 #, c-format msgid "WARNING: signing subkey %s is not cross-certified\n" -msgstr "" +msgstr "·Ù¹ð: ½ð̾Éû¸°%s¤Ï¡¢Áê¸ß¾ÚÌÀ¤Ç¤¢¤ê¤Þ¤»¤ó\n" #: g10/sig-check.c:102 -#, fuzzy, c-format +#, c-format msgid "WARNING: signing subkey %s has an invalid cross-certification\n" -msgstr "·Ù¹ð: ¤¢¤ë¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤹ¤ë¤È¡¢¸µ¤ËÌ᤻¤Þ¤»¤ó!\n" +msgstr "·Ù¹ð: ̵¸ú¤ÊÁê¸ß¾ÚÌÀ¤¬¡¢½ð̾Éû¸°%s¤Ë¤¢¤ê¤Þ¤¹\n" #: g10/sig-check.c:168 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu second newer than the signature\n" -msgstr "¸ø³«¸°%08lX¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" +msgstr "¸ø³«¸°%s¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" #: g10/sig-check.c:169 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu seconds newer than the signature\n" -msgstr "¸ø³«¸°%08lX¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" +msgstr "¸ø³«¸°%s¤Ï¡¢½ð̾¤Î%luÉÃÁ°¤Ç¤¹\n" #: g10/sig-check.c:180 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" -msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" +msgstr "¸°%s¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" #: g10/sig-check.c:182 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" -msgstr "¸°¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" +msgstr "¸°%s¤Ï%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¾ã³²¤Ç¤·¤ç¤¦)\n" #: g10/sig-check.c:192 -#, fuzzy, c-format +#, c-format msgid "NOTE: signature key %s expired %s\n" -msgstr "Ãí°Õ: ½ð̾¸°%08lX¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹%s\n" +msgstr "Ãí°Õ: ½ð̾¸°%s¤Ï%s¤ËËþλ¤Ç¤¹\n" #: g10/sig-check.c:275 -#, fuzzy, c-format +#, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" -msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤Ë¤è¤ê¡¢¸°%08lX¤Î½ð̾¤òÉÔÀµ¤È¤ß¤Ê¤·¤Þ¤¹\n" +msgstr "̤ÃΤΥ¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤Ë¤è¤ê¡¢¸°%s¤Î½ð̾¤òÉÔÀµ¤È¤ß¤Ê¤·¤Þ¤¹\n" #: g10/sig-check.c:532 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey revocation signature\n" -msgstr "¸°%08lX: ¸°¼º¸ú¥Ñ¥±¥Ã¥È¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s: Éû¸°¼º¸ú½ð̾¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/sig-check.c:558 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey binding signature\n" -msgstr "¸°%08lX: ¸°Âбþ¤Ø¤Î½ð̾¤ËÂбþ¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" +msgstr "¸°%s: Éû¸°Âбþ¤Ø¤Î½ð̾¤Ë¤¿¤¤¤¹¤ëÉû¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" #: g10/sign.c:85 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" @@ -5276,87 +5204,79 @@ msgstr "¥Ý¥ê¥·¡¼URL¤Ï¡¢(PGP 2.x·Á¼°¤Î) v3¸°½ð̾¤Ë¤ÏÆþ¤ê¤Þ¤»¤ó\n" #: g10/sign.c:159 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n" -msgstr "·Ù¹ð: ¥Ý¥ê¥·¡¼url¤ò%%³ÈÄ¥ÉÔǽ (Â礭¤¹¤®)¡£Èó³ÈÄ¥¤ò»ÈÍÑ¡£\n" +msgstr "·Ù¹ð: ¥Ý¥ê¥·¡¼URL¤ò%%³ÈÄ¥ÉÔǽ (Â礭¤¹¤®)¡£Èó³ÈÄ¥¤ò»ÈÍÑ¡£\n" #: g10/sign.c:187 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand preferred keyserver URL (too large). Using " "unexpanded.\n" -msgstr "·Ù¹ð: ¥Ý¥ê¥·¡¼url¤ò%%³ÈÄ¥ÉÔǽ (Â礭¤¹¤®)¡£Èó³ÈÄ¥¤ò»ÈÍÑ¡£\n" +msgstr "·Ù¹ð: Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤ò%%³ÈÄ¥ÉÔǽ (Â礭¤¹¤®)¡£Èó³ÈÄ¥¤ò»ÈÍÑ¡£\n" #: g10/sign.c:364 #, c-format msgid "checking created signature failed: %s\n" -msgstr "ºîÀ®¤µ¤ì¤¿½ð̾¤Î¸¡ºº¤Ë¼ºÇÔ: %s\n" +msgstr "ºîÀ®¤µ¤ì¤¿½ð̾¤Î¸¡ºº¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/sign.c:373 -#, fuzzy, c-format +#, c-format msgid "%s/%s signature from: \"%s\"\n" -msgstr "%s½ð̾¡£½ð̾¼Ô: \"%s\"\n" +msgstr "%s/%s½ð̾¡£½ð̾¼Ô:¡È%s¡É\n" #: g10/sign.c:741 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï¡¢PGP 2.x·Á¼°¤Î¸°¤ÇʬΥ½ð̾¤Ç¤­¤ë¤À¤±¤Ç¤¹\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "¡Ö%s¡×¤Ø¤Î½ñ½Ð¤·\n" - -#: g10/sign.c:807 -#, fuzzy, c-format +#: g10/sign.c:808 +#, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" -msgstr "Í×Ì󥢥르¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" +msgstr "·Ù¹ð: Í×Ì󥢥르¥ê¥º¥à %s (%d) ¤Î¶¯À©¤¬¡¢¼õ¼è¿Í¤ÎÁª¹¥¤ÈÂÐΩ¤·¤Þ¤¹\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "½ð̾:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¥¯¥ê¥¢½ð̾¤·¤«¤Ç¤­¤Þ¤»¤ó\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s°Å¹æ²½¤ò»ÈÍѤ·¤Þ¤¹\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "·õÆݤǤ¢¤ë¤È¤¤¤¦¥Õ¥é¥°¤¬¸°¤Ë¤ÏÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" "µ¶ÊªÍð¿ôÀ¸À®»Ò¤È¤Ï¤¤¤Ã¤·¤ç¤Ë»È¤¨¤Þ¤»¤ó!\n" -#: g10/skclist.c:158 -#, fuzzy, c-format +#: g10/skclist.c:157 +#, c-format msgid "skipped \"%s\": duplicated\n" -msgstr "¡Ö%s¡×¤ò¥¹¥­¥Ã¥×: ½ÅÊ£\n" +msgstr "¡È%s¡É¤ò¤È¤Ð¤·¤Þ¤¹: ½ÅÊ£\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 -#, fuzzy, c-format +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 +#, c-format msgid "skipped \"%s\": %s\n" -msgstr "¡Ö%s¡×¤ò¥¹¥­¥Ã¥×: %s\n" +msgstr "¡È%s¡É¤ò¤È¤Ð¤·¤Þ¤¹: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" -msgstr "¥¹¥­¥Ã¥×: ÈëÌ©¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n" +msgstr "¥¹¥­¥Ã¥×: ÈëÌ©¸°¤Ï¤â¤¦¤¢¤ê¤Þ¤¹\n" -#: g10/skclist.c:186 -#, fuzzy +#: g10/skclist.c:185 msgid "this is a PGP generated Elgamal key which is not secure for signatures!" -msgstr "" -"¡Ö%s¡×¤ò¥¹¥­¥Ã¥×: ¤³¤ì¤ÏPGP¤ÎÀ¸À®¤·¤¿ElGamal¸°¤Ç¤¹¡£\n" -"½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" +msgstr "¤³¤ì¤ÏPGP¤ÎÀ¸À®¤·¤¿Elgamal¸°¤Ç¡¢½ð̾ÍѤˤϰÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!" #: g10/tdbdump.c:59 g10/trustdb.c:365 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" -msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥¿¥¤¥×%d: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "¿®Íѥ쥳¡¼¥É%lu, ·¿%d: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/tdbdump.c:104 #, c-format @@ -5364,42 +5284,39 @@ "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" -"# Sitei sareta sin'you no atai itiran %s\n" +"# Sitei sareta sin'youdo itiran %s\n" "# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n" #: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177 -#, fuzzy, c-format +#, c-format msgid "error in `%s': %s\n" -msgstr "`%s'¤ÎÆɹþ¤ß¥¨¥é¡¼: %s\n" +msgstr "¡Ö%s¡×¤Ç¥¨¥é¡¼: %s\n" #: g10/tdbdump.c:159 -#, fuzzy msgid "line too long" -msgstr "¹Ô¤¬Ä¹²á¤®¤Þ¤¹\n" +msgstr "¹Ô¤¬Ä¹¤¹¤®¤Þ¤¹" #: g10/tdbdump.c:167 msgid "colon missing" -msgstr "" +msgstr "¥³¥í¥ó¤¬¤¢¤ê¤Þ¤»¤ó" #: g10/tdbdump.c:173 -#, fuzzy msgid "invalid fingerprint" -msgstr "¥¨¥é¡¼: ̵¸ú¤Ê»ØÌæ\n" +msgstr "̵¸ú¤Ê»ØÌæ" #: g10/tdbdump.c:178 -#, fuzzy msgid "ownertrust value missing" -msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿ÃͤòÆɤ߹þ¤à" +msgstr "½êÍ­¼Ô¿®ÍÑÅÙ¤¬¤¢¤ê¤Þ¤»¤ó" #: g10/tdbdump.c:214 -#, fuzzy, c-format +#, c-format msgid "error finding trust record in `%s': %s\n" -msgstr "¿®Íѥ쥳¡¼¥É¤Î¸¡º÷¥¨¥é¡¼: %s\n" +msgstr "¡Ö%s¡×¤Ç¿®Íѥ쥳¡¼¥É¤Î¸¡º÷¥¨¥é¡¼: %s\n" #: g10/tdbdump.c:218 -#, fuzzy, c-format +#, c-format msgid "read error in `%s': %s\n" -msgstr "Æɹþ¤ß¥¨¥é¡¼: %s\n" +msgstr "¡Ö%s¡×¤ÇÆɽФ·¥¨¥é¡¼: %s\n" #: g10/tdbdump.c:227 g10/trustdb.c:380 #, c-format @@ -5414,16 +5331,16 @@ #: g10/tdbio.c:134 g10/tdbio.c:1447 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ½ñ¹þ¤ß¤Ë¼ºÇÔ (n=%d): %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹ ¥ì¥³¡¼¥É%lu: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (n=%d): %s\n" #: g10/tdbio.c:244 msgid "trustdb transaction too large\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¤¬Â礭¤¹¤®¤Þ¤¹\n" #: g10/tdbio.c:497 -#, fuzzy, c-format +#, c-format msgid "can't access `%s': %s\n" -msgstr "¡Ö%s¡×¤òÊĤ¸¤é¤ì¤Þ¤»¤ó: %s\n" +msgstr "¡Ö%s¡×¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó: %s\n" #: g10/tdbio.c:512 #, c-format @@ -5431,14 +5348,14 @@ msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬¤¢¤ê¤Þ¤»¤ó!\n" #: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588 -#, fuzzy, c-format +#, c-format msgid "can't create lock for `%s'\n" -msgstr "¡Ö%s¡×¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "¡Ö%s¡×¤Î¥í¥Ã¥¯¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n" #: g10/tdbio.c:524 g10/tdbio.c:591 -#, fuzzy, c-format +#, c-format msgid "can't lock `%s'\n" -msgstr "¡Ö%s¡×¤¬³«¤±¤Þ¤»¤ó\n" +msgstr "¡Ö%s¡×¤¬¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó\n" #: g10/tdbio.c:550 #, c-format @@ -5457,7 +5374,7 @@ #: g10/tdbio.c:597 msgid "NOTE: trustdb not writable\n" -msgstr "·Ù¹ð: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¡¢½ñ¹þ¤ßÉÔǽ¤Ç¤¹\n" +msgstr "Ãí°Õ: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¡¢½ñ¹þ¤ßÉÔǽ¤Ç¤¹\n" #: g10/tdbio.c:614 #, c-format @@ -5493,7 +5410,7 @@ #: g10/tdbio.c:1177 #, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ÆɽФ·¤Ë¼ºÇÔ (n=%d): %s\n" +msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹: ÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (n=%d): %s\n" #: g10/tdbio.c:1198 #, c-format @@ -5533,14 +5450,14 @@ #: g10/tdbio.c:1499 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ögpg --fix-trustdb¡×¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" +"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ègpg --fix-trustdb¡É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" -msgstr "%dʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n" +msgstr "%dʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï¡¢¼è¤ê°·¤¨¤Þ¤»¤ó\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "ÆþÎϹԤÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n" @@ -5551,29 +5468,29 @@ msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤ÊÂç·¿¸°ID¤Ç¤¢¤ê¤Þ¤»¤ó\n" #: g10/trustdb.c:257 -#, fuzzy, c-format +#, c-format msgid "key %s: accepted as trusted key\n" -msgstr "¸°%08lX: ¿®ÍѤ¹¤ë¸°¤È¤·¤Æ¼õÍý¤·¤Þ¤·¤¿\n" +msgstr "¸°%s: ¿®ÍѤ¹¤ë¸°¤È¤·¤Æ¼õÍý¤·¤Þ¤·¤¿\n" #: g10/trustdb.c:295 -#, fuzzy, c-format +#, c-format msgid "key %s occurs more than once in the trustdb\n" -msgstr "¸°%08lX¤¬¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÊ£¿ô¤¢¤ê¤Þ¤¹\n" +msgstr "¸°%s¤¬¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÊ£¿ô¤¢¤ê¤Þ¤¹\n" #: g10/trustdb.c:310 -#, fuzzy, c-format +#, c-format msgid "key %s: no public key for trusted key - skipped\n" -msgstr "¸° %08lX: ¿®ÍѤ¹¤ë¸°¤Î¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" +msgstr "¸°%s: ¿®ÍѤµ¤ì¤ë¸°¤Î¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó - ¤È¤Ð¤·¤Þ¤¹\n" #: g10/trustdb.c:320 -#, fuzzy, c-format +#, c-format msgid "key %s marked as ultimately trusted\n" -msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤È¤·¤Æµ­Ï¿¤·¤Þ¤·¤¿¡£\n" +msgstr "¸°%s¤òÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¤è¤¦µ­Ï¿¤·¤Þ¤·¤¿\n" #: g10/trustdb.c:344 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥ê¥¯¥¨¥¹¥È¡¦¥¿¥¤¥×%d: ÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥ê¥¯¥¨¥¹¥È·¿%d: ÆɽФ·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" #: g10/trustdb.c:350 #, c-format @@ -5583,95 +5500,133 @@ #: g10/trustdb.c:446 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" -msgstr "" +msgstr "̤ÃΤο®ÍÑ¥â¥Ç¥ë (%d) ¤Ï»È¤¨¤Þ¤»¤ó - %s¿®ÍÑ¥â¥Ç¥ë¤ò²¾Äê\n" #: g10/trustdb.c:452 #, c-format msgid "using %s trust model\n" +msgstr "%s¿®ÍÑ¥â¥Ç¥ë¤ò»ÈÍÑ\n" + +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:501 -msgid "undefined" +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "¼º¸ú" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "Ëþλ" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "̤ÃΤÎ" + +#: g10/trustdb.c:512 +msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:513 #, fuzzy +msgid "[marginal]" +msgstr "¤¢¤ëÄøÅÙ" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +#, fuzzy +msgid "[ultimate]" +msgstr "ÀäÂÐŪ" + +#: g10/trustdb.c:530 +msgid "undefined" +msgstr "̤ÄêµÁ" + +#: g10/trustdb.c:531 msgid "never" -msgstr "̵´ü¸Â " +msgstr "̵´ü¸Â" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" -msgstr "" +msgstr "¤¢¤ëÄøÅÙ" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" -msgstr "" +msgstr "´°Á´" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" -msgstr "" +msgstr "ÀäÂÐŪ" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¼¡²ó¤Î¸¡ºº¤Ï¡¢%s¤Ç¤¹\n" +msgstr "¼¡²ó¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¸¡ºº¤Ï¡¢%s¤Ç¤¹\n" -#: g10/trustdb.c:560 -#, fuzzy, c-format +#: g10/trustdb.c:589 +#, c-format msgid "no need for a trustdb check with `%s' trust model\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" +msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:575 -#, fuzzy, c-format +#: g10/trustdb.c:604 +#, c-format msgid "no need for a trustdb update with `%s' trust model\n" -msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" +msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 -#, fuzzy, c-format +#: g10/trustdb.c:822 g10/trustdb.c:1260 +#, c-format msgid "public key %s not found: %s\n" -msgstr "¸ø³«¸°%08lX¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" +msgstr "¸ø³«¸°%s¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "--check-trustdb¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%dËܤθ°¤ò½èÍý (¤¦¤Á%dËܤÎÍ­¸úÀ­¿ô¤ò¥¯¥ê¥¢)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:1934 -#, fuzzy, c-format +#: g10/trustdb.c:1963 +#, c-format msgid "public key of ultimately trusted key %s not found\n" -msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%08lX¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" +msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%s¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" -msgstr "" +msgstr "ºÇ¾®¤Î¡Ö¤¢¤ëÄøÅ٤ο®ÍÑ¡×%d¡¢ºÇ¾®¤Î¡ÖÁ´ÌÌŪ¿®ÍÑ¡×%d¡¢%s¿®ÍÑ¥â¥Ç¥ë\n" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" -msgstr "" +msgstr "¿¼¤µ: %d Í­¸úÀ­: %3d ½ð̾: %3d ¿®ÍÑ: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2118 -#, fuzzy, c-format +#: g10/trustdb.c:2147 +#, c-format msgid "unable to update trustdb version record: write failed: %s\n" -msgstr "¿®Íѥ쥳¡¼¥É%lu, ¥¿¥¤¥×%d: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" +msgstr "" +"¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¥Ð¡¼¥¸¥ç¥ó¡¦¥ì¥³¡¼¥É¤¬¹¹¿·¤Ç¤­¤Þ¤»¤ó: ½ñ¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·" +"¤¿: %s\n" #: g10/verify.c:116 msgid "" @@ -5694,7 +5649,7 @@ #: util/errors.c:55 msgid "unknown packet type" -msgstr "̤ÃΤΥѥ±¥Ã¥È¡¦¥¿¥¤¥×¤Ç¤¹" +msgstr "̤ÃΤΥѥ±¥Ã¥È·¿¤Ç¤¹" #: util/errors.c:56 msgid "unknown version" @@ -5758,7 +5713,7 @@ #: util/errors.c:71 msgid "wrong secret key used" -msgstr "¸í¤Ã¤¿ÈëÌ©¸°¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹" +msgstr "¸í¤Ã¤¿ÈëÌ©¸°¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹" #: util/errors.c:72 msgid "not supported" @@ -5782,7 +5737,7 @@ #: util/errors.c:77 msgid "file open error" -msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó" +msgstr "¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥×¥ó¡¦¥¨¥é¡¼" #: util/errors.c:78 msgid "file create error" @@ -5818,11 +5773,11 @@ #: util/errors.c:86 msgid "invalid keyring" -msgstr "¸°Îؤ¬Ìµ¸ú¤Ç¤¹" +msgstr "̵¸ú¤Ê¸°ÎؤǤ¹" #: util/errors.c:87 msgid "bad certificate" -msgstr "¾ÚÌÀ½ñ¤¬ÉÔÀµ¤Ç¤¹" +msgstr "ÉÔÀµ¤Ê¾ÚÌÀ½ñ¤Ç¤¹" #: util/errors.c:88 msgid "malformed user id" @@ -5830,7 +5785,7 @@ #: util/errors.c:89 msgid "file close error" -msgstr "¥Õ¥¡¥¤¥ë¤¬ÊĤ¸¤é¤ì¤Þ¤»¤ó" +msgstr "¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º¡¦¥¨¥é¡¼" #: util/errors.c:90 msgid "file rename error" @@ -5854,7 +5809,7 @@ #: util/errors.c:95 msgid "file exists" -msgstr "¥Õ¥¡¥¤¥ë¤¬´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹" +msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤Þ¤¹" #: util/errors.c:96 msgid "weak key" @@ -5897,22 +5852,20 @@ msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¨¥é¡¼" #: util/errors.c:108 -#, fuzzy msgid "canceled" msgstr "¥­¥ã¥ó¥»¥ë" #: util/errors.c:109 -#, fuzzy msgid "no card" -msgstr "°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" +msgstr "¥«¡¼¥É¤¬¤¢¤ê¤Þ¤»¤ó" #: util/logger.c:157 msgid "ERROR: " -msgstr "" +msgstr "¥¨¥é¡¼: " #: util/logger.c:160 msgid "WARNING: " -msgstr "" +msgstr "·Ù¹ð: " #: util/logger.c:223 #, c-format @@ -5922,7 +5875,7 @@ #: util/logger.c:229 #, c-format msgid "you found a bug ... (%s:%d)\n" -msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤è¤¦¤Ç¤¹ ... (%s:%d)\n" +msgstr "¥Ð¥°¤òȯ¸« ... (%s:%d)\n" #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" @@ -5946,20 +5899,19 @@ #: util/miscutil.c:384 msgid "okay|okay" -msgstr "" +msgstr "okay|okay" #: util/miscutil.c:386 msgid "cancel|cancel" -msgstr "" +msgstr "cancel|cancel" #: util/miscutil.c:387 msgid "oO" -msgstr "" +msgstr "oO" #: util/miscutil.c:388 -#, fuzzy msgid "cC" -msgstr "c" +msgstr "cC" #: util/secmem.c:90 msgid "WARNING: using insecure memory!\n" @@ -5971,479 +5923,63 @@ #: util/secmem.c:340 msgid "operation is not possible without initialized secure memory\n" -msgstr "½é´ü²½ºÑ¤ß¤Î°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n" +msgstr "½é´ü²½ºÑ¤ß¤Î°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤ÏÁàºî¤Ç¤­¤Þ¤»¤ó\n" #: util/secmem.c:341 msgid "(you may have used the wrong program for this task)\n" -msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n" - -#~ msgid "sorry, can't do this in batch mode\n" -#~ msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" - -#~ msgid "key `%s' not found: %s\n" -#~ msgstr "¸°¡Ö%s¡×¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" - -#, fuzzy -#~ msgid "can't create file `%s': %s\n" -#~ msgstr "¡Ö%s¡×¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦)\n" -#, fuzzy -#~ msgid "can't open file `%s': %s\n" -#~ msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó: %s\n" - -#, fuzzy -#~ msgid " \"" -#~ msgstr " ÊÌ̾ \"" - -#~ msgid " i = please show me more information\n" -#~ msgstr " i = ¤è¤ê¾Ü¤·¤¤¾ðÊó¤òɽ¼¨¤¹¤ë\n" - -#~ msgid "key %08lX: key has been revoked!\n" -#~ msgstr "¸°%08lX: ¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹!\n" - -#~ msgid "key %08lX: subkey has been revoked!\n" -#~ msgstr "¸°%08lX: Éû¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹!\n" - -#~ msgid "%08lX: key has expired\n" -#~ msgstr "¸°%08lX: ¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹\n" - -#~ msgid "%08lX: We do NOT trust this key\n" -#~ msgstr "%08lX: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ ¤»¤ó\n" - -#~ msgid " (%d) RSA (sign and encrypt)\n" -#~ msgstr " (%d) RSA (½ð̾¤È°Å¹æ²½)\n" - -#, fuzzy -#~ msgid " (%d) RSA (auth only)\n" -#~ msgstr " (%d) RSA (½ð̾¤Î¤ß)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤Ï¡¢¤³¤ÎÈǤÀ¤ÈÆɽФ·¤À¤±¤Ç¤¹\n" -#, fuzzy -#~ msgid " (%d) RSA (sign and auth)\n" -#~ msgstr " (%d) RSA (½ð̾¤È°Å¹æ²½)\n" - -#, fuzzy -#~ msgid " (%d) RSA (encrypt and auth)\n" -#~ msgstr " (%d) RSA (°Å¹æ²½¤Î¤ß)\n" - -#, fuzzy -#~ msgid " (%d) RSA (sign, encrypt and auth)\n" -#~ msgstr " (%d) RSA (½ð̾¤È°Å¹æ²½)\n" - -#~ msgid "%s: can't open: %s\n" -#~ msgstr "%s: ³«¤±¤Þ¤»¤ó: %s\n" - -#~ msgid "%s: WARNING: empty file\n" -#~ msgstr "%s: ·Ù¹ð: ¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n" - -#~ msgid "can't open %s: %s\n" -#~ msgstr "%s¤¬³«¤±¤Þ¤»¤ó: %s\n" - -#, fuzzy -#~ msgid " (%d) I trust marginally\n" -#~ msgstr " %d = ¤¢¤ëÄøÅÙ¿®ÍѤ¹¤ë\n" +#~ msgid "[%8.8s] " +#~ msgstr "[%8.8s] " -#, fuzzy -#~ msgid " (%d) I trust fully\n" -#~ msgstr " %d = ´°Á´¤Ë¿®ÍѤ¹¤ë\n" - -#, fuzzy -#~ msgid "expires" -#~ msgstr "expire" - -#, fuzzy #~ msgid "" -#~ "\"\n" -#~ "locally signed with your key %s at %s\n" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" #~ msgstr "" -#~ "\"\n" -#~ "¤¢¤Ê¤¿¤Î¸°%08lX¤Ç%s¤ËÆâÉôŪ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" - -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " %08lX¤Ç%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" - -#~ msgid "%s: can't access: %s\n" -#~ msgstr "%s: ¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó: %s\n" - -#~ msgid "%s: can't create lock\n" -#~ msgstr "%s: ¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó\n" - -#~ msgid "%s: can't make lock\n" -#~ msgstr "%s: ¥í¥Ã¥¯¤¬¤Ç¤­¤Þ¤»¤ó\n" - -#~ msgid "%s: can't create: %s\n" -#~ msgstr "%s: ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" +#~ "¿·¤·¤¤%s¸°ÂФòÀ¸À®¤·¤Þ¤¹¡£\n" +#~ " ºÇû¤Î¸°Ä¹¤Ï 768 ¥Ó¥Ã¥È\n" +#~ " ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n" +#~ " ºÇĹ¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n" -#~ msgid "%s: can't create directory: %s\n" -#~ msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n" -#~ msgid "If you want to use this revoked key anyway, answer \"yes\"." -#~ msgstr "¤³¤Î¼º¸ú¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£" +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n" -#~ msgid "Unable to open photo \"%s\": %s\n" -#~ msgstr "¼Ì¿¿¤ò¡Ö%s¡×¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s\n" - -#~ msgid "can't open file: %s\n" -#~ msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó: %s\n" - -#~ msgid "error: missing colon\n" -#~ msgstr "¥¨¥é¡¼: ¥³¥í¥ó¤¬È´¤±¤Æ¤¤¤Þ¤¹\n" - -#~ msgid "error: no ownertrust value\n" -#~ msgstr "¥¨¥é¡¼: ½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤ¬¤¢¤ê¤Þ¤»¤ó\n" - -#~ msgid " (main key ID %08lX)" -#~ msgstr " (¼ç¸°ID %08lX)" - -#~ msgid "rev! subkey has been revoked: %s\n" -#~ msgstr "rev! Éû¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹: %s\n" - -#~ msgid "rev- faked revocation found\n" -#~ msgstr "rev- ¤Ç¤Ã¤Á¤¢¤²¤Î¼º¸ú¤òȯ¸«\n" - -#~ msgid "rev? problem checking revocation: %s\n" -#~ msgstr "rev? ¼º¸ú¸¡ºº¾ã³²: %s\n" - -#~ msgid "[revoked] " -#~ msgstr "[¼º¸ú] " - -#~ msgid "[expired] " -#~ msgstr "[Ëþλ] " - -#, fuzzy -#~ msgid " [expired: %s]" -#~ msgstr " [Í­¸ú´ü¸Â: %s]" - -#~ msgid " [expires: %s]" -#~ msgstr " [Í­¸ú´ü¸Â: %s]" - -#, fuzzy -#~ msgid " [revoked: %s]" -#~ msgstr "[¼º¸ú] " - -#~ msgid "can't create %s: %s\n" -#~ msgstr "%s¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n" +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "¸°Ä¹¤¬Â礭¤¹¤®¤Þ¤¹¡£%d¤¬ºÇÂç¤Ç¤¹¡£\n" #~ msgid "" -#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" -#~ msgstr "" -#~ "·Ù¹ð: Í×Ìó¡Ö%s¡×¤Ï¡¢OpenPGP¤Î°ìÉô¤Ç¤¢¤ê¤Þ¤»¤ó¡£¤´¼«¿È¤ÎÀÕǤ¤Ç»È¤¤¤¯¤À¤µ" -#~ "¤¤!\n" - -#~ msgid "|[files]|encrypt files" -#~ msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤ò°Å¹æ²½" - -#~ msgid "store only" -#~ msgstr "Êݸ¤Î¤ß" - -#~ msgid "|[files]|decrypt files" -#~ msgstr "|[¥Õ¥¡¥¤¥ë·²]|¥Õ¥¡¥¤¥ë·²¤òÉü¹æ" - -#~ msgid "sign a key non-revocably" -#~ msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ë½ð̾" - -#~ msgid "sign a key locally and non-revocably" -#~ msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" - -#~ msgid "list only the sequence of packets" -#~ msgstr "¥Ñ¥±¥Ã¥ÈÎó¤Î¤ß¤Î°ìÍ÷" - -#~ msgid "export the ownertrust values" -#~ msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤò½ñ¤­½Ð¤¹" - -#~ msgid "unattended trust database update" -#~ msgstr "¼êÅö¤Æ¤·¤Æ¤Ê¤¤¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·" - -#~ msgid "fix a corrupted trust database" -#~ msgstr "²õ¤ì¤¿¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò½¤Éü" - -#~ msgid "De-Armor a file or stdin" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" #~ msgstr "" -#~ "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎ\n" -#~ "ÊñÁõ½üµî" - -#~ msgid "En-Armor a file or stdin" -#~ msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÊñÁõ²½" - -#~ msgid "|NAME|use NAME as default recipient" -#~ msgstr "" -#~ "|̾Á°|´ûÄê¤Î¼õ¼è¿Í¤È¤·¤Æ\n" -#~ "¡Ö̾Á°¡×¤ò»ÈÍÑ" - -#~ msgid "use the default key as default recipient" -#~ msgstr "´ûÄê¤Î¼õ¼è¿Í¤Ë´ûÄê¤Î¸°¤ò»ÈÍÑ" +#~ "2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n" +#~ "¿ä¾©¤·¤Þ¤»¤ó!\n" -#~ msgid "don't use the terminal at all" -#~ msgstr "üËö¤òÉÔ»ÈÍÑ" - -#~ msgid "force v3 signatures" -#~ msgstr "¶¯À©Åª¤Ëv3½ð̾" - -#~ msgid "do not force v3 signatures" -#~ msgstr "v3½ð̾¤ò¶¯À©¤·¤Ê¤¤" - -#~ msgid "force v4 key signatures" -#~ msgstr "¶¯À©Åª¤Ëv4½ð̾" - -#~ msgid "do not force v4 key signatures" -#~ msgstr "v4½ð̾¤ò¶¯À©¤·¤Ê¤¤" - -#~ msgid "always use a MDC for encryption" -#~ msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤ËMDC¤ò»ÈÍÑ" - -#~ msgid "never use a MDC for encryption" -#~ msgstr "°Å¹æ²½¤Ë¤ÏÀäÂФËMDC¤ò»ÈÍѤ·¤Ê¤¤" - -#~ msgid "use the gpg-agent" -#~ msgstr "gpg¥¨¡¼¥¸¥§¥ó¥È¤ò»ÈÍÑ" - -#~ msgid "batch mode: never ask" -#~ msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É: ³Îǧ¾Êά" - -#~ msgid "assume yes on most questions" -#~ msgstr "" -#~ "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïyes\n" -#~ "¤È¤ß¤Ê¤¹" - -#~ msgid "assume no on most questions" -#~ msgstr "" -#~ "¤¿¤¤¤Æ¤¤¤Î¼ÁÌä¤ÎÅú¤¨¤Ïno\n" -#~ "¤È¤ß¤Ê¤¹" - -#~ msgid "add this keyring to the list of keyrings" -#~ msgstr "¸°ÎؤΰìÍ÷¤Ë¤³¤Î¸°ÎؤòÄɲÃ" - -#~ msgid "add this secret keyring to the list" -#~ msgstr "°ìÍ÷¤Ë¤³¤ÎÈëÌ©¸°ÎؤòÄɲÃ" - -#~ msgid "show which keyring a listed key is on" -#~ msgstr "°ìÍ÷¤Î¸°¤¬¤¢¤ë¸°Îؤòɽ¼¨" - -#~ msgid "|NAME|use NAME as default secret key" -#~ msgstr "" -#~ "|̾Á°|´ûÄê¤ÎÈëÌ©¸°¤È¤·¤Æ\n" -#~ "¡Ö̾Á°¡×¤ò»ÈÍÑ" - -#~ msgid "|HOST|use this keyserver to lookup keys" -#~ msgstr "|¥Û¥¹¥È|¸°¤Î¸¡º÷¤Ë¤³¤Î¸°¥µ¡¼¥Ð¡¼¤ò»ÈÍÑ" - -#~ msgid "|NAME|set terminal charset to NAME" -#~ msgstr "" -#~ "|CHARSET̾|üËö¤Îcharset¤ò¡ÖCHARSET̾¡×\n" -#~ "¤ËÀßÄê" - -#~ msgid "read options from file" -#~ msgstr "" -#~ "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤ò\n" -#~ "Æɤ߹þ¤à" - -#~ msgid "|[file]|write status info to file" -#~ msgstr "" -#~ "|¥Õ¥¡¥¤¥ë|¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤ò¥Õ¥¡¥¤¥ë¤Ë\n" -#~ "½ñ¤­½Ð¤¹" - -#~ msgid "|KEYID|ultimately trust this key" -#~ msgstr "|¸°ID|¤³¤Î¸°¤òÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë" - -#~ msgid "|FILE|load extension module FILE" -#~ msgstr "" -#~ "|¥Õ¥¡¥¤¥ë|³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤ò\n" -#~ "Æɤ߹þ¤à" - -#~ msgid "emulate the mode described in RFC1991" -#~ msgstr "" -#~ "RFC1991¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤ò\n" -#~ "»ÈÍÑ" - -#~ msgid "set all packet, cipher and digest options to OpenPGP behavior" -#~ msgstr "" -#~ "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤ÈÍ×Ìó¤Î¥ª¥×¥·¥ç\n" -#~ "¥ó¤òÁ´¤ÆOpenPGP¤Î¿¶Éñ¤ËÀßÄê" - -#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior" -#~ msgstr "" -#~ "¥Ñ¥±¥Ã¥È¤È°Å¹æ¤ÈÍ×Ìó¤Î¥ª¥×¥·¥ç\n" -#~ "¥ó¤òÁ´¤ÆPGP 2.x¤Î¿¶Éñ¤ËÀßÄê" - -#~ msgid "|N|use passphrase mode N" -#~ msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¡¦¥â¡¼¥ÉN¤ò»ÈÍÑ" - -#~ msgid "|NAME|use message digest algorithm NAME for passphrases" -#~ msgstr "" -#~ "|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î¥á¥Ã\n" -#~ "¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à¤ò»ÈÍÑ" - -#~ msgid "|NAME|use cipher algorithm NAME for passphrases" -#~ msgstr "" -#~ "|̾Á°|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¡Ö̾Á°¡×¤Î°Å¹æ\n" -#~ "¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ" - -#~ msgid "|NAME|use cipher algorithm NAME" -#~ msgstr "" -#~ "|̾Á°|¡Ö̾Á°¡×¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ò\n" -#~ "»ÈÍÑ" - -#~ msgid "|NAME|use message digest algorithm NAME" -#~ msgstr "" -#~ "|̾Á°|¡Ö̾Á°¡×¤Î¥á¥Ã¥»¡¼¥¸Í×Ìó\n" -#~ "¥¢¥ë¥´¥ê¥º¥à¤ò»ÈÍÑ" - -#~ msgid "|N|use compress algorithm N" -#~ msgstr "" -#~ "|̾Á°|¡Ö̾Á°¡×¤Î°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ò\n" -#~ "»ÈÍÑ" - -#~ msgid "throw keyid field of encrypted packets" -#~ msgstr "" -#~ "°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸°ID¥Õ¥£¡¼¥ë¥É\n" -#~ "¤òÁ÷½Ð" - -#~ msgid "Show Photo IDs" -#~ msgstr "¥Õ¥©¥ÈID¤òɽ¼¨" - -#~ msgid "Don't show Photo IDs" -#~ msgstr "¥Õ¥©¥ÈID¤òɽ¼¨¤·¤Ê¤¤" - -#~ msgid "Set command line to view Photo IDs" -#~ msgstr "" -#~ "¥Õ¥©¥ÈID¤ò±ÜÍ÷¤¹¤ë¥³¥Þ¥ó¥É¹Ô\n" -#~ "¤òÀßÄê" - -#~ msgid "compress algorithm `%s' is read-only in this release\n" -#~ msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤Ï¡¢¤³¤ÎÈǤÀ¤ÈÆɽФ·¤À¤±¤Ç¤¹\n" - -#~ msgid "compress algorithm must be in range %d..%d\n" -#~ msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï%d..%d¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤è¤¤¤Ç¤¹¤«? (y/N) " #~ msgid "" -#~ "%08lX: It is not sure that this key really belongs to the owner\n" -#~ "but it is accepted anyway\n" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" #~ msgstr "" -#~ "%08lX: ¤³¤Î¸°¤Ï¼ÂºÝ¤ËËܿͤΤâ¤Î¤«¤ÏÉÔÌÀ¤Ç¤¹¤¬¡¢\n" -#~ "¤¤¤Á¤ª¤¦¼õÍý¤·¤Þ¤¹\n" +#~ "¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥Éíռͤϡ¢\n" +#~ "¹¶·â¤Ë¤¿¤¤¤·¤ÆÀȼå¤Ç¤¢¤ë¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤!\n" -#~ msgid "preference %c%lu is not valid\n" -#~ msgstr "Áª¹¥%c%lu¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" - -#~ msgid "key %08lX: not a rfc2440 key - skipped\n" -#~ msgstr "¸° %08lX: rfc2440¤Î¸°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó - ¥¹¥­¥Ã¥×\n" +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n" #~ msgid "" -#~ "NOTE: Elgamal primary key detected - this may take some time to import\n" -#~ msgstr "Ãí°Õ: ElGamal¤Î¼ç¸°¤ò¸¡½Ð - ±ý¡¹¤Ë¤·¤ÆÆɹþ¤ß¤Ë»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹\n" - -#~ msgid " (default)" -#~ msgstr " (´ûÄê)" - -#~ msgid "%s%c %4u%c/%08lX created: %s expires: %s" -#~ msgstr "%s%c %4u%c/%08lX ºîÀ®: %s ´ü¸Â: %s" - -#~ msgid "Notation: " -#~ msgstr "Ãí¼á: " - -#~ msgid "Policy: " -#~ msgstr "¥Ý¥ê¥·¡¼: " - -#~ msgid "can't get key from keyserver: %s\n" -#~ msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" - -#~ msgid "error sending to `%s': %s\n" -#~ msgstr "`%s'¤Ø¤ÎÁ÷¿®¥¨¥é¡¼: %s\n" - -#~ msgid "success sending to `%s' (status=%u)\n" -#~ msgstr "`%s'¤Ø¤ÎÁ÷¿®¤ËÀ®¸ù (¾õÂÖ=%u)\n" - -#~ msgid "failed sending to `%s': status=%u\n" -#~ msgstr "`%s'¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¾õÂÖ=%u\n" - -#~ msgid "this keyserver does not support --search-keys\n" -#~ msgstr "¤³¤Î¸°¥µ¡¼¥Ð¡¼¤Ï¡¢--search-keys¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó\n" - -#~ msgid "can't search keyserver: %s\n" -#~ msgstr "¸°¥µ¡¼¥Ð¡¼¤ò¸¡º÷¤Ç¤­¤Þ¤»¤ó: %s\n" - -#~ msgid "" -#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " -#~ "signatures!\n" -#~ msgstr "" -#~ "¸°%08lX: ¤³¤ì¤Ï¡¢PGP¤ÎÀ¸À®¤·¤¿ElGamal¤Ç¤¹¡£\n" -#~ "½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢¤³¤Î¸°¤Ï°ÂÁ´¤Ç¤Ï ¤Ê¤¤ ¤Ç¤¹!\n" - -#~ msgid "" -#~ "key %08lX has been created %lu second in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "¸°%08lX¤Ï¡¢%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" - -#~ msgid "" -#~ "key %08lX has been created %lu seconds in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "¸°%08lX¤Ï¡¢%luÉÃ̤Íè¤Ë¤Ç¤­¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n" - -#~ msgid "key %08lX marked as ultimately trusted\n" -#~ msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤È¤·¤Æ¸° %08lX ¤òµ­Ï¿¤·¤Þ¤·¤¿\n" - -#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n" -#~ msgstr "ElGamal½ð̾¸° %08lX ¤«¤é %08lX ¤Þ¤Ç¤Î½ð̾¤ò¥¹¥­¥Ã¥×\n" - -#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n" -#~ msgstr "%08lX ¤«¤éElGamal½ð̾¸° %08lX ¤Þ¤Ç¤Î½ð̾¤ò¥¹¥­¥Ã¥×\n" - -#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" -#~ msgstr "¿¼¤µ%d¤Ç¸¡ºº¡¢½ð̾ºÑ¤ß=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" - -#~ msgid "" -#~ "Select the algorithm to use.\n" -#~ "\n" -#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n" -#~ "for signatures. This is the suggested algorithm because verification of\n" -#~ "DSA signatures are much faster than those of ElGamal.\n" -#~ "\n" -#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n" -#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt " -#~ "only\n" -#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n" -#~ "selected in a special way to create a safe key for signatures: this " -#~ "program\n" -#~ "does this but other OpenPGP implementations are not required to " -#~ "understand\n" -#~ "the signature+encryption flavor.\n" -#~ "\n" -#~ "The first (primary) key must always be a key which is capable of " -#~ "signing;\n" -#~ "this is the reason why the encryption only ElGamal key is not available " -#~ "in\n" -#~ "this menu." -#~ msgstr "" -#~ "»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#~ "\n" -#~ "DSA (ÊÌ̾DSS) ¤Ï¡¢½ð̾¤Ë¤Î¤ßÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ëÅŻҽð̾¥¢¥ë¥´¥ê\n" -#~ "¥º¥à¤Ç¤¹¡£DSA½ð̾¤ÏElGamalË¡¤è¤ê¤â¹â®¤Ë¸¡¾Ú¤Ç¤­¤ë¤Î¤Ç¡¢¤³¤ì¤Ï\n" -#~ "¿ä¾©¤¹¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" -#~ "\n" -#~ "ElGamal¤Ï¡¢½ð̾¤È°Å¹æ²½¤ËÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£\n" -#~ "OpenPGP¤Ç¤Ï¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Î¡Ö°Å¹æ²½¤Î¤ß¡×¤È¡Ö½ð̾+°Å¹æ²½¡×\n" -#~ "¤Î2¤Ä¤ÎÍÑË¡¤ò¶èÊ̤·¤Æ¤¤¤Þ¤¹¤¬¡¢¼ÂºÝ¤Ë¤ÏƱ¤¸¤Ç¤¹¡£¤·¤«¤·¡¢½ð̾ÍÑ\n" -#~ "¤Î°ÂÁ´¤Ê¸°¤òºî¤ë¤Ë¤Ï°ìÉô¤ÎÊÑ¿ô¤òÆÃÊ̤ÊÊýË¡¤ÇÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê\n" -#~ "¤Þ¤»¤ó¡£¤³¤Î¥×¥í¥°¥é¥à¤Ç¤Ï¤½¤ì¤¬²Äǽ¤Ç¤¹¤¬¡¢Â¾¤ÎOpenPGP¤Î¼ÂÁõ¤Ç\n" -#~ "¤Ï¡¢¡Ö½ð̾+°Å¹æ²½¡×¤ÎÍÑË¡¤ò²ò¼á¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#~ "\n" -#~ "ºÇ½é¤Î¸°(¼ç¸°)¤Ï¡¢½ð̾¤Ë»ÈÍѤǤ­¤ë¸°¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤ì¤¬\n" -#~ "¤³¤Î¥á¥Ë¥å¡¼¤Ë¡Ö°Å¹æ²½¤Î¤ß¡×¤ÎElGamal¸°¤Î¤Ê¤¤Íýͳ¤Ç¤¹¡£" - -#~ msgid "" -#~ "Although these keys are defined in RFC2440 they are not suggested\n" -#~ "because they are not supported by all programs and signatures created\n" -#~ "with them are quite large and very slow to verify." +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" #~ msgstr "" -#~ "¤³¤ì¤é¤Î¸°¤ÏRFC2440¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¿ä¾©¤·¤Þ¤»¤ó¡£\n" -#~ "¤Ê¤¼¤Ê¤é¡¢¤³¤ì¤é¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥×¥í¥°¥é¥à¤¬¤¢¤ê¡¢\n" -#~ "ºîÀ®¤µ¤ì¤ë½ð̾¤ÏÈó¾ï¤ËŤ¯¤Æ¡¢¸¡¾Ú¤Ë¤â»þ´Ö¤¬¤«¤«¤ë¤¿¤á¤Ç¤¹¡£" - -#~ msgid "%lu keys so far checked (%lu signatures)\n" -#~ msgstr "¤³¤ì¤Þ¤Ç¤Ë%lu¸Ä¤Î¸°¤Þ¤Ç¸¡ºº (%lu¸Ä¤Î½ð̾)\n" - -#~ msgid "key incomplete\n" -#~ msgstr "ÉÔ´°Á´¤Ê¸°\n" - -#~ msgid "key %08lX incomplete\n" -#~ msgstr "¸°%08lX: ÉÔ´°Á´\n" +#~ "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" +#~ "¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤!\n" Index: gnupg/po/nl.po diff -u gnupg/po/nl.po:1.17 gnupg/po/nl.po:1.18 --- gnupg/po/nl.po:1.17 Thu Oct 28 11:06:49 2004 +++ gnupg/po/nl.po Fri Dec 10 23:20:44 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-11-03 17:37+0100\n" "PO-Revision-Date: 2004-05-10 19:23+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" @@ -38,8 +38,8 @@ #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 #: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -75,7 +75,7 @@ #: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 #: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "kan `%s' niet aanmaken: %s\n" @@ -694,7 +694,7 @@ msgid "--output doesn't work for this command\n" msgstr "--uitvoer werkt niet voor deze opdracht\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2927 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -744,7 +744,7 @@ msgstr "" "gebruik de optie \"--delete-secret-keys\" om deze eerst te verwijderen.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "fout bij maken wachtwoord: %s\n" @@ -793,7 +793,7 @@ "het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van " "de ontvanger in\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -1298,7 +1298,7 @@ msgid "`%s' is not a valid character set\n" msgstr "%s is geen geldige tekenset\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2279 g10/keyedit.c:3443 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "kon sleutelserver URI niet inlezen\n" @@ -2209,7 +2209,7 @@ msgid "no writable keyring found: %s\n" msgstr "geen schrijfbare sleutelbos gevonden: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "bezig met schrijven naar `%s'\n" @@ -2752,7 +2752,7 @@ msgid "Really sign? (y/N) " msgstr "Echt ondertekenen? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3891 g10/keyedit.c:3982 g10/keyedit.c:4055 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -3262,83 +3262,84 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Deze sleutel is mogelijk herroepen door sleutel %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (gevoelig)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2444 g10/keyedit.c:2459 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "kan %s niet aanmaken: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[herroepen] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:829 #, fuzzy, c-format msgid "expired: %s" msgstr " [verloopt: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2446 g10/keyedit.c:2461 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [verloopt: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " vertrouwen: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " vertrouwen: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Deze sleutel is uit gezet" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 +#: g10/keyedit.c:2365 g10/keyedit.c:2367 g10/keyedit.c:2369 #, c-format msgid "[%8.8s] " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 +#: g10/keyedit.c:2365 g10/keyedit.c:2478 g10/keylist.c:782 g10/keyserver.c:376 #: g10/mainproc.c:1575 g10/trustdb.c:1133 #, fuzzy msgid "revoked" msgstr "[herroepen] " -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 +#: g10/keyedit.c:2367 g10/keyedit.c:2480 g10/keylist.c:784 g10/keyserver.c:380 #: g10/mainproc.c:1577 g10/trustdb.c:500 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2406 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Er zijn geen voorkeuren op een PGP 2.x stijl gebruikerscode.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2414 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3347,13 +3348,13 @@ "juist\n" "is tenzij u het programma opnieuw start.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2545 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2605 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3363,45 +3364,45 @@ "kan\n" " zorgen dat sommige versies van PGP deze sleutel verwerpen.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2610 g10/keyedit.c:2888 msgid "Are you sure you still want to add it? (y/N) " msgstr "Weet u zeker dat u deze toch wilt toevoegen? (j/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2616 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "U kunt geen foto ID toevoegen aan een PGP2 stijl sleutel.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2756 msgid "Delete this good signature? (y/N/q)" msgstr "Deze goede ondertekening verwijderen? (j/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2766 msgid "Delete this invalid signature? (y/N/q)" msgstr "Deze ongeldige ondertekening verwijderen? (j/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2770 msgid "Delete this unknown signature? (y/N/q)" msgstr "Deze onbekende ondertekening verwijderen? (j/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2776 msgid "Really delete this self-signature? (y/N)" msgstr "Echt deze zelfondertekening verwijderen? (j/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2790 #, c-format msgid "Deleted %d signature.\n" msgstr "%d ondertekening verwijderd.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2791 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d ondertekeningen verwijderd.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2794 msgid "Nothing deleted.\n" msgstr "Niets verwijderd.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2883 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3411,166 +3412,166 @@ " toevoegen kan zorgen dat sommige versies van PGP deze sleutel " "verwerpen.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2894 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "U kunt geen aangestelde herroeper toevoegen aan een PGP 2.x stijl sleutel.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2914 msgid "Enter the user ID of the designated revoker: " msgstr "Geef de gebruikerscode van de aangestelde herroeper: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2937 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2952 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2974 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2993 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper " "kan niet ongedaan gemaakt worden!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2999 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Wilt u echt deze sleutel aanwijzen als een aangestelde herroeper? (j/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3060 msgid "Please remove selections from the secret keys.\n" msgstr "Verwijder alstublieft selecties van de geheime sleutels.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3066 msgid "Please select at most one secondary key.\n" msgstr "Selecteer alstublieft ten hoogste één secundaire sleutel.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3070 msgid "Changing expiration time for a secondary key.\n" msgstr "De verlooptijd voor een secundaire sleutel wordt gewijzigd.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3073 msgid "Changing expiration time for the primary key.\n" msgstr "De verlooptijd voor de primaire sleutel wordt gewijzigd.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3119 msgid "You can't change the expiration date of a v3 key\n" msgstr "U kunt de verlooptijd van een v3-sleutel niet wijzigen\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3135 msgid "No corresponding signature in secret ring\n" msgstr "Geen geassocieerde ondertekening in geheime sleutelbos\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3215 msgid "Please select exactly one user ID.\n" msgstr "Selecteer alstublieft precies één gebruikerscode.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3254 g10/keyedit.c:3364 g10/keyedit.c:3483 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "v3-zelfondertekening op gebruikerscode \"%s\" wordt overgeslagen\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3425 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3504 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3505 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3567 #, c-format msgid "No user ID with index %d\n" msgstr "Geen gebruikerscode met index %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3613 #, c-format msgid "No secondary key with index %d\n" msgstr "Geen secundaire sleutel met index %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3730 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "gebruikerscode: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3733 g10/keyedit.c:3797 g10/keyedit.c:3840 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " ondertekend door %08lX op %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3735 g10/keyedit.c:3799 g10/keyedit.c:3842 msgid " (non-exportable)" msgstr " (niet-uitvoerbaar)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3739 #, c-format msgid "This signature expired on %s.\n" msgstr "Deze ondertekening is verlopen op %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3743 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Weet u zeker dat u deze nog steeds wilt herroepen? (j/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3747 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3774 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "U heeft deze gebruikerscodes ondertekend:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3800 #, fuzzy msgid " (non-revocable)" msgstr " (niet-uitvoerbaar)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3807 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " herroepen door %08lX op %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3829 msgid "You are about to revoke these signatures:\n" msgstr "U staat op het punt deze ondertekeningen te herroepen:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3849 msgid "Really create the revocation certificates? (y/N) " msgstr "Echt de herroepingscertificaten maken? (j/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3879 msgid "no secret key\n" msgstr "geen geheime sleutel\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3949 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "gebruikerscode \"%s\" is al herroepen\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3966 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "WAARSCHUWING: een gebruikerscode ondertekening is van %d seconden in de " "toekomst\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4135 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -4744,12 +4745,12 @@ msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem met agent: agent geeft 0x%lx terug\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1053 g10/passphrase.c:1212 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "kan niet vragen om wachtwoord in batch-modus\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1058 g10/passphrase.c:1217 msgid "Enter passphrase: " msgstr "Geef wachtwoord: " @@ -4773,7 +4774,7 @@ msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1221 msgid "Repeat passphrase: " msgstr "Herhaal wachtwoord: " @@ -4983,7 +4984,8 @@ msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Dit kan betekenen dat de ondertekening een vervalsing is.\n" #: g10/pkclist.c:527 @@ -5442,54 +5444,49 @@ "u kunt alleen losgekoppeld ondertekenen met PGP 2.x stijl sleutels in in --" "pgp2 modus\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "bezig met schrijven naar `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "afdwingen van digest-algoritme %s (%d) overtreedt voorkeuren ontvanger\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "bezig met ondertekenen:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "u kunt alleen niet-gecodeerde ondertekeningen maken met PGP 2.x stijl " "sleutels in --pgp2 modus\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s codering zal worden gebruikt\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "sleutel is niet gemarkeerd als onveilig - kan deze niet gebruiken met de nep " "RNG!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "`%s' overgeslagen: dubbel\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "`%s' overgeslagen: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "overgeslagen: geheime sleutel reeds aanwezig\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -6121,6 +6118,10 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(mogelijk heeft u het verkeerde programma gebruikt voor deze taak)\n" +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "bezig met schrijven naar `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "sorry, dat kan niet in batch-modus\n" Index: gnupg/po/pl.po diff -u gnupg/po/pl.po:1.47 gnupg/po/pl.po:1.48 --- gnupg/po/pl.po:1.47 Thu Oct 28 11:06:49 2004 +++ gnupg/po/pl.po Fri Dec 10 23:20:43 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -24,11 +24,6 @@ "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-" "enc.c\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "w tej wersji algorytm skrótu ,,%s'' jest tylko do odczytu\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -43,11 +38,12 @@ msgid "no entropy gathering module detected\n" msgstr "modu³ gromadzenia entropii nie zosta³ wykryty\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -81,9 +77,9 @@ msgid "note: random_seed file not updated\n" msgstr "uwaga: plik random_seed nie jest uaktualniony\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "nie mo¿na utworzyæ ,,%s'': %s\n" @@ -143,90 +139,150 @@ "Proszê kontynuowaæ inne dzia³ania aby system móg³ zebraæ odpowiedni±\n" "ilo¶æ entropii do ich wygenerowania (brakuje %d bajtów).\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "nie powiod³a siê odbudowa bufora bazy: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "wysy³ka do serwera kluczy nie powiod³a siê: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "b³±d podczas tworzenia has³a: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "b³±d odczytu bloku kluczy: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: b³±d odczytu pustego wpisu: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr ",,%s'' ju¿ jest skompresowany\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "generacja nowej pary kluczy" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "usuniêcie bloku klucza nie powiod³o siê: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Generacja klucza nie powiod³a siê: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "b³±d podczas tworzenia has³a: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "usuniêcie bloku klucza nie powiod³o siê: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -314,15 +370,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "nie dzia³a w trybie wsadowym\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Twój wybór? " @@ -330,143 +386,152 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "w³kl" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "w³kl" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "nie podano przyczyny" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "nie zosta³ przetworzony" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "brak odpowiadaj±cego klucza publicznego: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "b³±d odczytu ,,%s'': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "aktualizacja ustawieñ klucza" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "niew³a¶ciwy znak w tek¶cie ustawieñ\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "niew³a¶ciwy znak w tek¶cie ustawieñ\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "b³±d: niew³a¶ciwy odcisk klucza\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Odcisk klucza:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "b³±d: niew³a¶ciwy odcisk klucza\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Generacja klucza nie powiod³a siê: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "b³±d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Czy na pewno podpisaæ? (t/N) " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Czy na pewno podpisaæ? (t/N) " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -474,233 +539,257 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Proszê wybraæ rodzaj klucza:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Wa¿no¶æ podpisu wygas³a %s.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (tylko do szyfrowania)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Niew³a¶ciwy wybór.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Proszê wybraæ powód uniewa¿nienia:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "nieznany algorytm ochrony\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Czê¶æ tajna g³ównego klucza jest niedostêpna.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "pominiêty: klucz prywatny jest ju¿ wpisany\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "wyj¶cie" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "wyj¶cie z tego menu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "w" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "sprzeczne polecenia\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "pomoc" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "ten tekst pomocy" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "lista" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Klucz dostêpny w: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "¶ledzenia" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "w³kl" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lpodpis" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "zmiana daty wa¿no¶ci klucza" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "zmiana zaufania w³a¶ciciela" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "odc" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "okazanie odcisku klucza" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "unpod" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "b³±d ogólny" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "generacja nowej pary kluczy" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "has³o" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Polecenie> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "sprzeczne polecenia\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "sprzeczne polecenia\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (spróbuj \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Podaj identyfikator u¿ytkownika (user ID): " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Podaj identyfikator u¿ytkownika (user ID): " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Podaj identyfikator u¿ytkownika (user ID): " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Powtórz has³o: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -710,13 +799,13 @@ msgid "--output doesn't work for this command\n" msgstr "opcja --output nie dzia³a z tym poleceniem\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -759,7 +848,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "aby go usun±æ nalezy najpierw u¿yæ opcji \"--delete-secret-key\".\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "b³±d podczas tworzenia has³a: %s\n" @@ -779,7 +868,7 @@ msgid "`%s' already compressed\n" msgstr ",,%s'' ju¿ jest skompresowany\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "OSTRZE¯ENIE: plik ,,%s'' jest pusty\n" @@ -806,7 +895,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "wymuszone u¿ycie szyfru %s (%d) k³óci siê z ustawieniami adresata\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -908,27 +997,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "OSTRZE¯ENIE: nie mo¿na skasowaæ tymczasowego katalogu ,,%s'': %s.\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "klucz %08lX: nie jest chroniony - pominiêty\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "klucz %08lX: klucz PGP 2.x - pominiêty\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "OSTRZE¯ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n" @@ -1107,15 +1196,15 @@ msgid "prompt before overwriting" msgstr "pytanie przed nadpisaniem plików" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1123,7 +1212,7 @@ "@\n" "(Pe³n± listê poleceñ i opcji mo¿na znale¼æ w podrêczniku systemowym.)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1144,15 +1233,15 @@ " --list-keys [nazwy] pokazuje klucze\n" " --fingerprint [nazwy] pokazuje odciski kluczy\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "B³êdy prosimy zg³aszaæ na adres .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1162,7 +1251,7 @@ "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n" "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1170,73 +1259,73 @@ "\n" "Obs³ugiwane algorytmy:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Asymetryczne: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Symetryczne: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Skrótów: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Kompresji: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "wywo³anie: gpg [opcje]" -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do %s ,,%s''.\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do %s ,,%s''.\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do %s ,,%s''.\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do %s ,,%s''.\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do %s ,,%s''.\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do %s ,,%s''.\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do katalogu\n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" @@ -1244,21 +1333,21 @@ "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do katalogu\n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" "OSTRZE¯ENIE: niebezpieczne prawa w³asno¶ci do katalogu\n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do katalogu \n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" @@ -1266,381 +1355,381 @@ "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do katalogu \n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" "OSTRZE¯ENIE: niebezpieczne prawa dostêpu do katalogu \n" " zawieraj±cego %s ,,%s''\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "nieznana opcja ,,%s''\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "UWAGA: stary domy¶lny plik opcji ,,%s'' zosta³ zignorowany\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy¶lnego pliku opcji ,,%s''\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji ,,%s'': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z ,,%s''\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "modu³ szyfru ,,%s'' nie zosta³ za³adowany z powodu niebezpiecznych praw " "dostêpu\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nie jest poprawn± nazw± zestawu znaków\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "niezrozuma³y URI serwera kluczy\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie wolno u¿ywaæ %s z %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nie ma sensu w po³±czeniu z %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "w trybie --pgp2 mo¿na sk³adaæ tylko podpisy oddzielne lub do³±czone do " "tekstu\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "w trybie --pgp2 nie mo¿na jednocze¶nie szyfrowaæ i podpisywaæ\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "w trybie --pgp2 trzeba u¿ywaæ plików a nie potoków.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "szyfrowanie wiadomo¶ci w trybie --pgp2 wymaga modu³u szyfru IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów po¶wiadczeñ jest niepoprawny\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "niew³a¶ciwy domy¶lny poziom sprawdzania; musi mieæ warto¶æ 0, 1, 2 lub 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "niew³a¶ciwy minimalny poziom sprawdzania; musi mieæ warto¶æ 0, 1, 2 lub 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "niew³a¶ciwe domy¶lne ustawienia\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "niew³a¶ciwe ustawienia szyfrów\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "niew³a¶ciwe ustawienia skrótów\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "niew³a¶ciwe ustawienia algorytmów kompresji\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s jeszcze nie dzia³a z %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "szyfr ,,%s'' nie jest dostêpny w trybie %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "skrót ,,%s'' nie jest dostêpny w trybie %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "kompresja ,,%s'' nie jest dostêpna w trybie %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "OSTRZE¯ENIE: podano adresatów (-r) w dzia³aniu które ich nie dotyczy\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "b³±d odszyfrowywania: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [plik]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key nazwa u¿ytkownika" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key nazwa u¿ytkownika" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key nazwa u¿ytkownika" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrsign-key nazwa u¿ytkownika" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u¿ytkownika [polecenia]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "wysy³ka do serwera kluczy nie powiod³a siê: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "eksport kluczy nie powiód³ siê: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "szukanie w serwerze kluczy nie powiod³o siê: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "od¶wie¿enie kluczy z serwera nie powiod³o siê: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1648,23 +1737,23 @@ "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki i podkre¶lenia, \n" "i musi koñczyæ siê ,,=''\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "adnotacja u¿ytkownika musi zawieraæ znak '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "tre¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "podany URL regulaminu po¶wiadczania jest niepoprawny\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "podany URL regulaminu podpisów jest niepoprawny\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "podany URL regulaminu podpisów jest niepoprawny\n" @@ -1673,28 +1762,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "zbyt wiele wpisów w buforze kluczy publicznych - wy³±czony\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[brak identyfikatora u¿ytkownika]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Opcja --allow-non-selfsigned-uid wymusi³a uznanie za poprawny klucza %08lX.\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pominiêty\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominiêty\n" @@ -2048,382 +2137,382 @@ msgid "No help available for `%s'" msgstr "Brak pomocy o ,,%s''" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "blok typu %d zostaje pominiêty\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu kluczy przetworzonych do tej chwili\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Ogó³em przetworzonych kluczy: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " pominiêtych nowych kluczy: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " bez identyfikatora: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " do³±czono do zbioru: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " bez zmian: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nowych identyfikatorów: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nowych podkluczy: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nowych podpisów: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " nowych uniewa¿nieñ kluczy: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " tajnych kluczy wczytanych: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " tajnych kluczy dodanych: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " tajnych kluczy bez zmian: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " nie w³±czono do zbioru: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Te identyfikatory s± podpisane przez Ciebie:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "podpis %s, skrót %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta³ naprawiony\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "klucz %08lX: przyjêto identyfikator nie podpisany nim samym ,,%s''\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "klucz %08lX: brak poprawnych identyfikatorów u¿ytkownika\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "to mo¿e byæ spowodowane brakiem podpisu klucza nim samym\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "klucz %08lX: brak klucza publicznego: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "klucz %08lX: nowy klucz - pominiêty\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "zapis do '%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "b³±d zapisu zbioru kluczy '%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "klucz %08lX: nie zgadza siê z lokaln± kopi±\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "klucz %08lX: nie mo¿na odczytaæ oryginalnego bloku klucza; %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u¿ytkownika\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "klucz %08lX: ,,%s'' %d nowych identyfikatorów u¿ytkownika\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "klucz %08lX: ,,%s'' %d nowych podpisów\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "klucz %08lX: ,,%s'' bez zmian\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pominiêty\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "brak domy¶lego zbioru kluczy tajnych: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "Klucz %08lX: ten klucz ju¿ znajduje siê w zbiorze\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "klucz %08lX: brak klucza tajnego: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "klucz %08lX: brak klucza publicznego którego dotyczy wczytany certyfikat\n" " uniwa¿nienia\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "klucz %08lX: niepoprawny certyfikat uniewa¿nienia: %s - odrzucony\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "klucz %08lX: ,,%s'' certyfikat uniewa¿nienia zosta³ ju¿ wczytany\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs³ugiwany\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "klucz %08lX: brak podklucza do dowi±zania\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "klucz %08lX: nie obs³ugiwany algorytm asymetryczny\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "klucz %08lX: niepoprawne dowi±zanie podklucza\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "klucz %08lX: usuniêto wielokrotne dowi±zanie podklucza\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "klucz %08lX: brak podklucza, którego dotyczy uniewa¿nienie\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "klucz %08lX: nieoprawne uniewa¿nienie podklucza\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "klucz %08lX: usuniêto wielokrotne uniewa¿nienie podklucza\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "klucz %08lX: pominiêto identyfikator u¿ytkownika '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "klucz %08lX: podklucz pominiêty\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pominiêty\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "" "klucz %08lX: pominiêto certyfikat uniewa¿nienia umieszczony \n" " w niew³a¶ciwym miejscu\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "klucz %08lX: pominiêto - niepoprawny certyfikat uniewa¿nienia: %s\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "klucz %08lX: pominiêto - podpis na podkluczu w niew³a¶ciwym miejscu\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "klucz %08lX: pominiêto - nieoczekiwana klasa podpisu (%02x)\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "key %08lX: do³±czono powtórzony identyfikator u¿ytkownika\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "OSTRZE¯ENIE: klucz %08lX móg³ zostaæ uniewazniony:\n" " zapytanie o uniewa¿niaj±cy klucz %08lX w serwerze kluczy\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "OSTRZE¯ENIE: klucz %08lX móg³ zostaæ uniewa¿niony:\n" " brak uniewa¿niaj±cego klucza %08lX.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa¿nienia\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "klucz %08lX: dodano bezpo¶redni podpis\n" @@ -2661,7 +2750,8 @@ msgstr " (3) Bardzo dok³adnie.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Twój wybór (,,?'' podaje wiêcej informacji): " #: g10/keyedit.c:918 @@ -2733,7 +2823,7 @@ msgid "Really sign? (y/N) " msgstr "Czy na pewno podpisaæ? (t/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2764,7 +2854,7 @@ "Wprowad¼ nowe d³ugie, skomplikowane has³o dla tego klucza tajnego.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba" @@ -3245,83 +3335,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Klucz mo¿e zostaæ uniewa¿niony przez klucz %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (poufne)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "nie mo¿na utworzyæ %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[uniewa¿niony]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [wygasa :%s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [wygasa :%s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " zaufanie: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " zaufanie: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Ten klucz zosta³ wy³±czony z u¿ytku" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[uniewa¿niony]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "data" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Klucze PGP 2.x nie zawieraj± opisu ustawieñ.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3329,7 +3403,19 @@ "Pokazana warto¶æ wiarygodno¶ci klucza mo¿e byæ niepoprawna,\n" "dopóki program nie zostanie uruchomiony ponownie.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[uniewa¿niony]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "data" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3338,7 +3424,7 @@ " jako g³ówny. Wykonanie tego polecenie mo¿e wiêc spowodowaæ\n" " wy¶wietlanie innego identyfikatora jako domy¶lnego g³ównego.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3347,45 +3433,45 @@ "OSTRZE¯ENIE: To jest klucz PGP wersji 2. Dodanie zdjêcia spowoduje, ¿e\n" " niektóre wersje przestan± go rozumieæ.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Czy dalej chcesz je dodaæ? (t/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Do klucza dla PGP 2.x nie mo¿na dodaæ zdjêcia.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Usun±æ ten poprawny podpis? (t/N/w) " -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) " -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Usun±æ ten nieznany podpis? (t/N/w) " -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) " -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d podpis usuniêty.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d podpisów usuniêtych.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nic nie zosta³o usuniête.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3395,162 +3481,162 @@ " uniewa¿niaj±cego, spowoduje, ¿e niektóre wersje PGP przestan±\n" " go rozumieæ.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Do klucza dla PGP 2.x nie mo¿na wyznaczyæ klucza uniewa¿niaj±cego.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Podaj identyfikator klucza uniewa¿niaj±cego: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "klucza PGP 2.x nie mo¿na wyznaczyæ jako uniewa¿niaj±cego\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nie mo¿na wyznaczuæ klucza do uniewa¿niania jego samego\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony kluczem uniewa¿niaj±cym!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "OSTRZE¯ENIE: nie mo¿na cofn±æ wyznaczenia klucza jako uniewa¿niaj±cego!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Czy na pewno chcesz wyznaczyæ ten klucz jako uniewa¿niaj±cy? (t/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Proszê usun±æ znacznik wyboru z kluczy prywatnych.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Proszê wybraæ tylko jeden podklucz.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Zmiana daty wa¿no¶ci podklucza.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nie mo¿na zmieniæ daty wa¿no¶ci klucza w wersji 3.\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy prywatnych\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominiêty\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Czy na pewno chcesz tego u¿yæ? (t/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Czy na pewno chcesz tego u¿yæ? (t/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Brak podklucza o numerze %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Identyfikator u¿ytkownika: " -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "podpisany przez %08lX w %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Te identyfikatory s± podpisane przez Ciebie:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr "uniewa¿niony przez %08lX w %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "brak klucza tajnego\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "identyfikator u¿ytkownika ,,%s'' zosta³ ju¿ uniewa¿niony\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "OSTRZE¯ENIE: identyfikator u¿ytkownika podpisany za %d sekund (w " "przysz³o¶ci)\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Zdjêcie w formacie %s, rozmiar %ld bajtów, klucz 0x%08lX (id %d).\n" @@ -3592,12 +3678,12 @@ msgid "writing key binding signature\n" msgstr "zapis podpisu wi±¿±cego klucz\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "niew³a¶ciwa d³ugo¶æ klucza; wykorzystano %u bitów\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "rozmair klucza zaokr±glony do %u bitów\n" @@ -3665,91 +3751,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (tylko do szyfrowania)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (tylko do podpisywania)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (tylko do szyfrowania)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (tylko do szyfrowania)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Nast±pi generacja nowej pary kluczy dla algorytmu(ów) %s.\n" -" minimalny rozmiar klucza wynosi 768 bitów\n" -" domy¶lny rozmiar klucza wynosi 1024 bity\n" -" najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "Klucz dla DSA musi mieæ d³ugo¶æ pomiêdzy 512 i 1024 bitow.\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Para kluczy dla DSA bêdzie mia³a 1024 bity d³ugo¶ci.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "zbyt du¿y rozmiar klucza, ograniczenie wynosi %d.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ potrzebne\n" -"obliczenia trwaj± wtedy BARDZO d³ugo!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Nale¿y tak¿e pamiêtaæ o tym, ¿e informacje mog± byæ te¿ wykradzione z\n" -"komputera przez pods³uch emisji elektromagnetycznej klawiatury i monitora!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "¯±dana d³ugo¶æ klucza to %u bitów.\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "zaokr±glono do %u bitów\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3765,7 +3820,7 @@ " m = termin wa¿no¶ci klucza up³ywa za n miesiêcy\n" " y = termin wa¿no¶ci klucza up³ywa za n lat\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3781,29 +3836,29 @@ " m = termin wa¿no¶ci podpisu up³ywa za n miesiêcy\n" " y = termin wa¿no¶ci podpisu up³ywa za n lat\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Okres wa¿no¶ci klucza ? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Okres wa¿no¶ci podpisu? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "niepoprawna warto¶æ\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s nie ma daty wa¿no¶ci\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s traci wa¿no¶æ: %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3811,12 +3866,12 @@ "Twój system nie potrafi pokazaæ daty po roku 2038.\n" "Niemniej daty do roku 2106 bêd± poprawnie obs³ugiwane.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Czy wszystko siê zgadza (t/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3833,44 +3888,44 @@ " \"Tadeusz ¯eleñski (Boy) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Imiê i nazwisko: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Imiê i nazwisko musz± mieæ conajmniej 5 znaków d³ugo¶ci.\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Adres poczty elektronicznej: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "To nie jest poprawny adres poczty elektronicznej\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Komentarz: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Niew³a¶ciwy znak w komentarzu\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "U¿ywasz zestawu znaków %s.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3881,43 +3936,43 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Nie nalezy umieszczaæ adresu poczty elektronicznej w polu nazwiska czy\n" "komentarza.\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "IiKkEeDdWw" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, czy (W)yj¶æ? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, przej¶æ (D)alej,\n" "czy (W)yj¶æ z programu ? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Najpierw trzeba poprawiæ ten b³±d\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" "Musisz podaæ d³ugie, skomplikowane has³o aby ochroniæ swój klucz tajny.\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3929,7 +3984,7 @@ "\"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3945,54 +4000,50 @@ "ilo¶ci\n" "entropii.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Para kluczy dla DSA bêdzie mia³a 1024 bity d³ugo¶ci.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Procedura generacji klucza zosta³a anulowana.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisujê klucz publiczny w '%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "b³±d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "b³±d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "klucz publiczny i prywatny (tajny) zosta³y utworzone i podpisane.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -4000,12 +4051,12 @@ "Ten klucz nie mo¿e byæ wykorzystany do szyfrowania. Komend± \"--edit-key\"\n" "mo¿na dodaæ do niego podklucz szyfruj±cy.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiod³a siê: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4013,7 +4064,7 @@ "klucz zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4021,41 +4072,41 @@ "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n" "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Czy na pewno utworzyæ? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "usuniêcie bloku klucza nie powiod³o siê: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "nie mo¿na utworzyæ ,,%s'': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "UWAGA: wa¿no¶æ klucza tajnego %08lX wygas³a %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4101,28 +4152,28 @@ msgid "expired: %s)" msgstr " [wygasa :%s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Odcisk klucza g³ównego:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Odcisk podklucza:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Odcisk klucza g³ównego:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Odcisk podklucza:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Odcisk klucza =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4475,7 +4526,7 @@ msgid "textmode" msgstr "tekstowy" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "nieznany" @@ -4507,29 +4558,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "nie mo¿na wy³±czyæ zrzutów pamiêci: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "naniesienie poprawek bazy zaufania nie powiod³o siê: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "baza zaufania: funkcja read() (n=%d) zawiod³a: %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "nie mo¿na obs³u¿yæ tego algorytmu klucza publicznego: %d\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" -"u¿ywanie tego szyfru jest odradzane; nale¿y u¿ywaæ standardowych szyfrów!\n" +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algorytm szyfruj±cy nie jest zaimplementowany" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "podpis %s, skrót %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "wymuszone u¿ycie skrótu %s (%d) k³óci siê z ustawieniami adresata\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4638,50 +4700,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nie jest dostêpny w tej sesji\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "nie mo¿na ustawiæ numeru procesu klienckiego agenta\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "serwer nie chce czytaæ deskryptora dla agenta\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "serwer nie chce pisaæ deskryptora dla agenta\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "z³y format zmiennej ¶rodowiskowej GPG_AGENT_INFO\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "wersja %d protoko³u agenta nie jest obs³ugiwana\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nie mo¿na siê po³±czyæ z ,,%s'': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problem z porozumiewaniem siê z agentem\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problem z agentem - zostaje wy³±czony\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (podklucz %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4692,41 +4754,41 @@ "\"%.*s\".\n" "Klucz o d³ugo¶ci %u bitów, typ %s, numer %08lX, stworzony %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Powtórzone has³o\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Has³o\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "has³o zbyt d³ugie\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "b³êdna odpowied¼ agenta\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "anulowano przez u¿ytkownika\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem agenta: zwróci³ 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Podaj has³o: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4736,17 +4798,17 @@ "Musisz podaæ has³o aby odbezpieczyæ klucz prywatny u¿ytkownika:\n" "\"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "d³ugo¶æ %u bitów, typ %s, numer %08lX, stworzony %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Powtórz has³o: " @@ -4951,7 +5013,8 @@ msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony przez w³a¶ciciela!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " To mo¿e oznaczaæ ¿e podpis jest fa³szerstwem.\n" #: g10/pkclist.c:527 @@ -5057,28 +5120,28 @@ msgstr "" "dane nie zosta³y zapisane; aby to zrobiæ, nale¿y u¿yæ opcji \"--output\"\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "b³±d tworzenia `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Podpis oddzielony od danych.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Nazwa pliku danych: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "czytam strumieñ standardowego wej¶cia\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "brak podpisanych danych\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "nie mo¿na otworzyæ podpisanego pliku ,,%s''\n" @@ -5411,51 +5474,46 @@ "kluczami PGP 2 w trybie --pgp2 mo¿na podpisywaæ tylko do oddzielonych " "podpisów\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "zapis do '%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "wymuszone u¿ycie skrótu %s (%d) k³óci siê z ustawieniami adresata\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "podpis:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "w trybie --pgp2 mo¿na podpisywaæ tylko za pomoc± kluczy z wersji 2.x\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "zostanie u¿yty szyfr %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap± \n" "generatora liczb losowych!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "pominiêty ,,%s'': duplikat\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "pominiêty ,,%s'': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "pominiêty: klucz prywatny jest ju¿ wpisany\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5644,12 +5702,12 @@ msgstr "" "Baza zaufania jest uszkodzona; proszê uruchomiæ ,,gpg --fix-trustdb''.\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nie mo¿na obs³u¿yæ linii tekstu d³u¿szej ni¿ %d znaków\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "linia d³u¿sza ni¿ %d znaków\n" @@ -5700,85 +5758,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[uniewa¿niony]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[przeterminowany]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "nieznany" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "nigdy " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "nastêpne sprawdzanie bazy odbêdzie siê %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "klucz publiczny %08lX nie odnaleziony: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "nale¿y uruchomiæ gpg z opcj± ,,--check-trustdb''\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "sprawdzanie bazy zaufania\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "przetworzono %d kluczy (rozwi±zano %d przeliczeñ zaufania)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "brak absolutnie zaufanych kluczy\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powiód³ siê: %s\n" @@ -6087,6 +6180,66 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dlatego zadania)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "w tej wersji algorytm skrótu ,,%s'' jest tylko do odczytu\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Nast±pi generacja nowej pary kluczy dla algorytmu(ów) %s.\n" +#~ " minimalny rozmiar klucza wynosi 768 bitów\n" +#~ " domy¶lny rozmiar klucza wynosi 1024 bity\n" +#~ " najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "Klucz dla DSA musi mieæ d³ugo¶æ pomiêdzy 512 i 1024 bitow.\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczalna dla RSA wynosi 1024 " +#~ "bity.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "zbyt du¿y rozmiar klucza, ograniczenie wynosi %d.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ potrzebne\n" +#~ "obliczenia trwaj± wtedy BARDZO d³ugo!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Nale¿y tak¿e pamiêtaæ o tym, ¿e informacje mog± byæ te¿ wykradzione z\n" +#~ "komputera przez pods³uch emisji elektromagnetycznej klawiatury i " +#~ "monitora!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "u¿ywanie tego szyfru jest odradzane; nale¿y u¿ywaæ standardowych " +#~ "szyfrów!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "zapis do '%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "niestety, to nie dzia³a w trybie wsadowym\n" @@ -6219,12 +6372,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "un? problem przy sprawdzaniu uniewa¿nienia: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[uniewa¿niony]" - -#~ msgid "[expired] " -#~ msgstr "[przeterminowany]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [wygasa :%s]" Index: gnupg/po/pt.po diff -u gnupg/po/pt.po:1.12 gnupg/po/pt.po:1.13 --- gnupg/po/pt.po:1.12 Thu Oct 28 11:06:49 2004 +++ gnupg/po/pt.po Fri Dec 10 23:20:43 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -17,11 +17,6 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" - #: cipher/primegen.c:120 #, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -36,11 +31,12 @@ msgid "no entropy gathering module detected\n" msgstr "nenhum módulo de recolha de entropia detectado\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -74,9 +70,9 @@ msgid "note: random_seed file not updated\n" msgstr "nota: ficheiro random_seed não actualizado\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "impossível criar `%s': %s\n" @@ -127,90 +123,150 @@ "Não há bytes aleatórios suficientes. Por favor, faça outro trabalho para\n" "que o sistema possa recolher mais entropia! (São necessários mais %d bytes)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "falha ao criar 'cache' do porta-chaves: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "erro na criação da frase secreta: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "erro na leitura do bloco de chave: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: erro ao ler registo livre: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "%s' já comprimido\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "gerar um novo par de chaves" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "remoção do bloco de chave falhou: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nenhum dado OpenPGP válido encontrado.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "erro na criação da frase secreta: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "remoção do bloco de chave falhou: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -298,15 +354,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "impossível fazer isso em modo não-interativo\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Opção? " @@ -314,141 +370,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Nenhum motivo especificado" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "não processado" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "a escrever chave pública para `%s'\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "preferências actualizadas" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "caracter inválido na cadeia de caractéres da preferência\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "caracter inválido na cadeia de caractéres da preferência\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "%s: versão de ficheiro inválida %d\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "mostra impressão digital" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "%s: versão de ficheiro inválida %d\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "nenhum dado OpenPGP válido encontrado.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -456,232 +521,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Por favor selecione o tipo de chave desejado:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Opção inválida.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "motivo da revocação: " -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo de compressão desconhecido" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Componentes secretas da chave primária não disponíveis.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "sair" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "sair deste menu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandos em conflito\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nenhuma ajuda disponível" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "muda a data de validade" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "muda os valores de confiança" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra impressão digital" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "erro geral" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "gerar um novo par de chaves" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "comandos em conflito\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos em conflito\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Repita a frase secreta: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "a frase secreta não foi repetida corretamente; tente outra vez" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -691,13 +778,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output não funciona para este comando\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "chave `%s' não encontrada: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -740,7 +827,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "utilize a opção \"--delete-secret-keys\" para a apagar primeiro.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "erro na criação da frase secreta: %s\n" @@ -759,7 +846,7 @@ msgid "`%s' already compressed\n" msgstr "%s' já comprimido\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' é um ficheiro vazio\n" @@ -787,7 +874,7 @@ msgstr "" "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -890,27 +977,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "chave %08lX: não está protegida - ignorada\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "chave %08lX: tipo PGP 2.x - ignorada\n" -#: g10/export.c:361 +#: g10/export.c:384 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "AVISO: nada exportado\n" @@ -1093,15 +1180,15 @@ msgid "prompt before overwriting" msgstr "perguntar antes de sobrepôr" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1109,7 +1196,7 @@ "@\n" "(Veja a página man para uma lista completa de comandos e opções)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1129,15 +1216,15 @@ " --list-keys [nomes] mostrar chaves\n" " --fingerprint [nomes] mostrar impressões digitais\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1147,7 +1234,7 @@ "assina, verifica, cifra ou decifra\n" "a operação por omissão depende dos dados de entrada\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1155,465 +1242,465 @@ "\n" "Algoritmos suportados:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Chave pública: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Cifra: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Dispersão: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Compressão: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "uso: gpg [opções] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "comandos em conflito\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "criado um novo ficheiro de configuração `%s'\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opções `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "a ler opções de `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "a extensão de cifra \"%s\" não foi carregada devido às suas permissões " "inseguras\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "não consegui processar a URI do servidor de chaves\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "opções de importação inválidas\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "opções de importação inválidas\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "não foi possível alterar o exec-path para %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um ficheiro core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sobrepõe %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "não pode assinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "deve utilizar ficheiros (e não um 'pipe') quando trabalho no modo --pgp2.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado é inválido\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "preferências por omissão inválidas\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "preferências pessoais de cifra inválidas\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "preferências pessoais de 'digest' inválidas\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "preferências pessoais de compressão inválidas\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [nome_do_ficheiro]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_ficheiro]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifragem falhou: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_ficheiro]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [nome_do_ficheiro]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nome_do_ficheiro]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_ficheiro]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_ficheiro]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id-utilizador" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizador" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-utilizador" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-utilizador" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizador [comandos]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de dispersão inválido `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nome_do_ficheiro]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Digite a sua mensagem ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1621,23 +1708,23 @@ "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e " "terminar com um '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "a URL de política de certificação dada é inválida\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "a URL de política de assinatura dada é inválida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "a URL de política de assinatura dada é inválida\n" @@ -1646,27 +1733,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desactivado\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Utilizador não encontrado]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "há uma chave secreta para a chave pública \"%s\"!\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -2027,381 +2114,381 @@ msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponível para `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloco do tipo %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu chaves processadas até agora\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Número total processado: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " ignorei novas chaves: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sem IDs de utilizadores: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importados: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " não modificados: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de utilizadores: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " novas assinaturas: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revogações de chaves: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " chaves secretas lidas: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " chaves secretas importadas: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " chaves secretas não modificadas: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " não importadas: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Assinou estes identificadores de utilizadores:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "assinatura %s de: \"%s\"\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "chave %08lX: sem ID de utilizador\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "chave %08lX: subchave HKP corrompida foi reparada\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "chave %08lX: sem IDs de utilizadores válidos\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por falta de auto-assinatura\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "chave %08lX: chave pública não encontrada: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "chave %08lX: chave nova - ignorada\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "a escrever para `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erro na escrita do porta-chaves `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "chave %08lX: chave pública \"%s\" importada\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "chave %08lX: não corresponde à nossa cópia\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "chave %08lX: \"%s\" 1 nova assinatura\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "chave %08lX: \"%s\" %d novas assinaturas\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "chave %08lX: \"%s\" 1 nova subchave\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "chave %08lX: \"%s\" %d novas subchaves\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "chave %08lX: \"%s\" não modificada\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "sem porta-chaves público por omissão: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "chave %08lX: já está no porta-chaves secreto\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "chave %08lX: chave secreta não encontrada: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: sem chave pública - impossível aplicar certificado\n" "de revogação\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "chave %08lX: \"%s\" certificado de revogação importado\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "chave %08lX: algoritmo de chave pública não suportado no utilizador \"%s\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida do utilizador \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pública não suportado\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "chave %08lX: apagada ligação múltipla de subchave \n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "chave %08lX: sem subchave para revocação de chave\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "chave %08lX: revocação de subchave inválida\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "chave %08lX: removida revogação múltiplace de subchaves\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "chave %08lX: ignorado ID de utilizador '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "chave %08lX: subchave ignorada\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocação %" "08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não " "presente.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "chave %08lX: assinatura directa de chave adicionada\n" @@ -2639,7 +2726,7 @@ msgstr " (3) Verifiquei com bastante cuidado.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +msgid "Your selection? (enter `?' for more information): " msgstr "" #: g10/keyedit.c:918 @@ -2712,7 +2799,7 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2743,7 +2830,7 @@ "Digite a nova frase para esta chave secreta.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "a frase secreta não foi repetida corretamente; tente outra vez" @@ -3223,83 +3310,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Esta chave pode ser revogada pela chave %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (sensível)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Esta chave foi desactivada" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "revkey" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3307,13 +3378,25 @@ "Não se esqueça que a validade de chave mostrada não é necessáriamente a\n" "correcta a não ser que reinicie o programa.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "revkey" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3322,46 +3405,46 @@ "AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n" " algumas versão do PGP podem rejeitá-la.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Apagar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Apagar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Apagar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3370,161 +3453,161 @@ "AVISO: Esta chave é do tipo PGP 2.x. Se adicionar um revogador designado\n" " algumas versão do PGP podem rejeitá-la.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Insira o ID de utilizador do revogador escolhido: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as selecções das chaves secretas.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Por favor seleccione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "A modificar a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Modificar a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Você não pode modificar a data de validade de uma chave v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Seleccione exactamente um identificador de utilizador.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de utilizador com índice %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de utilizador: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " assinado por %08lX em %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (não-exportável)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Tem a certeza de que quer revogá-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Assinou estes identificadores de utilizadores:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (não-exportável)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente criar os certificados de revogação? (s/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3567,12 +3650,12 @@ msgid "writing key binding signature\n" msgstr "a escrever a assinatura ligada a uma chave\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "tamanho de chave inválido; a utilizar %u bits\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "tamanho da chave arredondado para %u bits\n" @@ -3640,90 +3723,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (apenas cifragem)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (apenas cifragem)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (apenas assinatura)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (apenas cifragem)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Prestes a gerar um novo par de chaves %s.\n" -" tamanho mínimo é 768 bits\n" -" tamanho por omissão é 1024 bits\n" -" tamanho máximo sugerido é 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Qual o tamanho de chave desejado? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA permite apenas tamanhos de 512 a 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "tamanho muito pequeno; 1024 é o valor mínimo permitido para RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "O par de chaves DSA terá 1024 bits.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "tamanho muito grande; %d é o valor máximo permitido.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Tamanhos de chave maiores que 2048 não são recomendados\n" -"porque o tempo de computação é REALMENTE longo!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Você tem certeza de que quer este tamanho de chave? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Qual o tamanho de chave desejado? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Tudo bem, mas não se esqueça que a radiação do seu monitor e teclado também " -"é extremamente vulnerável a ataques!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "arredondado para %u bits\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3739,7 +3792,7 @@ " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3755,29 +3808,29 @@ " m = assinatura expira em n meses\n" " y = assinatura expira em n anos\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "A assinatura é valida por? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "A %s não expira nunca\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s expira em %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3785,12 +3838,12 @@ "O seu sistema não consegue mostrar datas para além de 2038.\n" "No entanto, estas vão ser tratadas correctamente até 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Está correto (s/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3808,44 +3861,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Caracter inválido no nome\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "O nome não pode começar com um dígito\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Endereço de correio eletrónico: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Endereço eletrónico inválido\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Comentário: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Caracter inválido no comentário\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Você está usando o conjunto de caracteres `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3856,29 +3909,29 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Por favor não coloque o endereço de email no nome verdadeiro ou no " "comentário\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Por favor corrija primeiro o erro\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3886,12 +3939,12 @@ "Você precisa de uma frase secreta para proteger a sua chave.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3903,7 +3956,7 @@ "qualquer hora, usando este programa com a opção \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3915,54 +3968,50 @@ "geração dos números primos; isso dá ao gerador de números aleatórios\n" "uma hipótese maior de ganhar entropia suficiente.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "O par de chaves DSA terá 1024 bits.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Geração de chave cancelada.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "a escrever chave pública para `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "nenhum porta-chaves público com permissões de escrita encontrado: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "nenhum porta-chaves secreto com permissões de escrita encontrado: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erro ao escrever no porta-chaves público `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3970,12 +4019,12 @@ "Note que esta chave não pode ser usada para cifragem. Você pode usar\n" "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3983,7 +4032,7 @@ "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -3991,40 +4040,40 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTA: a criação de sub-chave para chaves v3 não respeito o OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Realmente criar? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "remoção do bloco de chave falhou: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "impossível criar `%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: chave secreta %08lX expirou em %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4070,28 +4119,28 @@ msgid "expired: %s)" msgstr "[expira: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Impressão da chave primária:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Impressão da subchave:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr "Impressão da chave primária:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Impressão da subchave:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Impressão da chave =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4446,7 +4495,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 #, fuzzy msgid "unknown" msgstr "versão desconhecida" @@ -4479,30 +4528,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inválido detectado em proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "impossível desactivar core dumps: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Algoritmos experimentais não devem ser usados!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "impossível manipular algoritmo de chave pública %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algoritmo de criptografia não implementado" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "assinatura %s de: \"%s\"\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"este algoritmo de criptografia está desctualizado; por favor use um " -"algoritmo mais standard!x\n" +"forçar o algoritmo de 'digest' %s (%d) viola as preferências do " +"destinatário\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4610,50 +4671,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "o gpg-agent não está disponível nesta sessão\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "não consegui colocar o pid do cliente no agente\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "não consigo obter FD de leitura no servidor para o agente\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "não consigo obter FD de escrita no servidor para o agente\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variável de ambiente GPG_AGENT_INFO inválida\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versão %d do protocolo gpg-agent não é suportada\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível ligar a `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problemas na comunicação com o gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problema com o agente - a desactivar a utilização deste\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4666,41 +4727,41 @@ "\"%.*s\"\n" "chave %u bits %s, ID %08lx, criada %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Repita a frase secreta\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Insira a frase secreta\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "frase secreta demasiado longa\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "resposta do agente inválida\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "cancelado pelo utilizador\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema com o agente: o agente returnou 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "impossível pedir senha em modo não-interactivo\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4710,17 +4771,17 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "utilizador: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -4926,7 +4987,8 @@ msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Isto pode significar que a assinatura é falsificada.\n" #: g10/pkclist.c:527 @@ -5029,28 +5091,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "dados não gravados; use a opção \"--output\" para gravá-los\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "erro ao criar `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Assinatura separada.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do ficheiro de dados: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "lendo do \"stdin\" ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "não há dados assinados\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossível abrir dados assinados `%s'\n" @@ -5372,12 +5434,7 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "só pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "a escrever para `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" @@ -5385,39 +5442,39 @@ "forçar o algoritmo de 'digest' %s (%d) viola as preferências do " "destinatário\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "a assinar:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "só pode assinar à vista com chaves do tipo PGP 2.x no modo --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "será utilizada a cifragem %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "a chave não está marcada insegura - impossível usá-la com o RNG falso!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "ignorado `%s': duplicada\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "ignorado `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5605,12 +5662,12 @@ "A base de dados de confiança está danificada; por favor execute\n" "\"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossível manipular linhas de texto maiores que %d caracteres\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "linha de entrada maior que %d caracteres\n" @@ -5662,87 +5719,122 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "revkey" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "expire" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "versão desconhecida" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 msgid "never" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "proxima verificação da base de dados de confiança a %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública %08lX não encontrada: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "a verificar a base de dados de confiança\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "" "chave pública da chave absolutamente de confiança %08lX não encontrada\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "chave pública da chave absolutamente de confiança %08lX não encontrada\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n" @@ -6052,6 +6144,60 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Prestes a gerar um novo par de chaves %s.\n" +#~ " tamanho mínimo é 768 bits\n" +#~ " tamanho por omissão é 1024 bits\n" +#~ " tamanho máximo sugerido é 2048 bits\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA permite apenas tamanhos de 512 a 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "tamanho muito pequeno; 1024 é o valor mínimo permitido para RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "tamanho muito grande; %d é o valor máximo permitido.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Tamanhos de chave maiores que 2048 não são recomendados\n" +#~ "porque o tempo de computação é REALMENTE longo!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Você tem certeza de que quer este tamanho de chave? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Tudo bem, mas não se esqueça que a radiação do seu monitor e teclado " +#~ "também é extremamente vulnerável a ataques!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Algoritmos experimentais não devem ser usados!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "este algoritmo de criptografia está desctualizado; por favor use um " +#~ "algoritmo mais standard!x\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "a escrever para `%s'\n" + #, fuzzy #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "impossível fazer isso em modo não-interativo\n" @@ -6182,14 +6328,6 @@ #~ msgstr "rev? problema ao verificar revogação: %s\n" #, fuzzy -#~ msgid "[revoked] " -#~ msgstr "revkey" - -#, fuzzy -#~ msgid "[expired] " -#~ msgstr "expire" - -#, fuzzy #~ msgid " [expired: %s]" #~ msgstr "[expira: %s]" Index: gnupg/po/pt_BR.po diff -u gnupg/po/pt_BR.po:1.49 gnupg/po/pt_BR.po:1.50 --- gnupg/po/pt_BR.po:1.49 Thu Oct 28 11:06:49 2004 +++ gnupg/po/pt_BR.po Fri Dec 10 23:20:43 2004 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -21,11 +21,6 @@ "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "" - #: cipher/primegen.c:120 #, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -40,11 +35,12 @@ msgid "no entropy gathering module detected\n" msgstr "" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -78,9 +74,9 @@ msgid "note: random_seed file not updated\n" msgstr "" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, fuzzy, c-format msgid "can't create `%s': %s\n" msgstr "impossível criar %s: %s\n" @@ -132,90 +128,150 @@ "para que o sistema possa coletar mais entropia!\n" "(São necessários mais %d bytes)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "%s: falha ao criar tabela de \"hash\": %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "erro na criação da frase secreta: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "erro na leitura de `%s': %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: erro lendo registro livre: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "%lu chaves processadas\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "gerar um novo par de chaves" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "enumeração de blocos de chaves falhou: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "A geração de chaves falhou: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nenhum dado OpenPGP válido encontrado.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "erro na criação da frase secreta: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "enumeração de blocos de chaves falhou: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -303,15 +359,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "impossível fazer isso em modo não-interativo\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Sua opção? " @@ -319,142 +375,151 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 msgid "unspecified" msgstr "" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "não processado(s)" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "escrevendo certificado público para `%s'\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "lista preferências" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "Caractere inválido no nome\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "Caractere inválido no nome\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "erro: impressão digital inválida\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Impressão digital:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "erro: impressão digital inválida\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "nenhum dado OpenPGP válido encontrado.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Realmente assinar? " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Realmente assinar? " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -462,235 +527,259 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Por favor selecione o tipo de chave desejado:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Esta chave não é protegida.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Opção inválida.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "rev- revogações de chaves incorreta\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritmo de compressão desconhecido" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "chave secreta não disponível" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" # INICIO MENU -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "sair" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "sair deste menu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nenhuma ajuda disponível" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "muda a data de validade" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "muda os valores de confiança" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra impressão digital" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "erro geral" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "gerar um novo par de chaves" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "escrevendo certificado privado para `%s'\n" # help ou ajuda ??? -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "Digite o identificador de usuário: " + +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "Digite o identificador de usuário: " + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 #, fuzzy msgid "Enter PIN: " msgstr "Digite o identificador de usuário: " -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Repita a frase secreta: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -700,13 +789,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "usuário `%s' não encontrado: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, fuzzy, c-format msgid "error reading keyblock: %s\n" @@ -750,7 +839,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "use a opção \"--delete-secret-key\" para deletá-la antes.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "erro na criação da frase secreta: %s\n" @@ -769,7 +858,7 @@ msgid "`%s' already compressed\n" msgstr "%lu chaves processadas\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' é um arquivo vazio\n" @@ -794,7 +883,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -895,27 +984,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" -#: g10/export.c:361 +#: g10/export.c:384 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "AVISO: nada exportado\n" @@ -1104,21 +1193,21 @@ msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1138,15 +1227,15 @@ " --list-keys [nomes] mostrar chaves\n" " --fingerprint [nomes] mostrar impressões digitais\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Por favor comunique bugs para .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1156,7 +1245,7 @@ "assina, verifica, criptografa ou descriptografa\n" "a operação padrão depende dos dados de entrada\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1164,473 +1253,473 @@ "\n" "Algoritmos suportados:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "" -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "" -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "" -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 #, fuzzy msgid "Compression: " msgstr "Comentário: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "uso: gpg [opções] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opções `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 #, fuzzy msgid "invalid import options\n" msgstr "armadura inválida" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 #, fuzzy msgid "invalid export options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "armadura inválida" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 #, fuzzy msgid "invalid default preferences\n" msgstr "lista preferências" -#: g10/g10.c:2736 +#: g10/g10.c:2769 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "lista preferências" -#: g10/g10.c:2740 +#: g10/g10.c:2773 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "lista preferências" -#: g10/g10.c:2744 +#: g10/g10.c:2777 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "lista preferências" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "descriptografia falhou: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3060 +#: g10/g10.c:3093 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuário" -#: g10/g10.c:3110 +#: g10/g10.c:3143 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:3114 +#: g10/g10.c:3147 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuário [comandos]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record falhou: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas não fica claro -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1639,26 +1728,26 @@ "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e " "terminar com '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "a URL de política dada é inválida\n" @@ -1667,27 +1756,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desativado\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[usuário não encontrado]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "há uma chave secreta para esta chave pública!\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -1993,376 +2082,376 @@ msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponível para `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloco do tipo %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu chaves processadas até agora\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Número total processado: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, fuzzy, c-format msgid " skipped new keys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sem IDs de usuários: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importados: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " não modificados: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de usuários: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " novas assinaturas: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revogações de chaves: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " chaves secretas lidas: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " chaves secretas importadas: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " chaves secretas não modificadas: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, fuzzy, c-format msgid " not imported: %lu\n" msgstr " importados: %lu" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Você assinou estes IDs de usuário:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "assinatura %s de: %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "chave %08lX: sem ID de usuário\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "chave %08lX: aceito ID de usuário sem auto-assinatura '" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "chave %08lX: sem IDs de usuários válidos\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por falta de auto-assinatura\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "chave %08lX: chave pública não encontrada: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "chave %08lX: não é uma chave rfc2440 - ignorada\n" -#: g10/import.c:761 +#: g10/import.c:763 #, fuzzy, c-format msgid "no writable keyring found: %s\n" msgstr "impossível escrever chaveiro: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "chave %08lX: chave pública importada\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "chave %08lX: não corresponde à nossa cópia\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "chave %8lX: 1 novo ID de usuário\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "chave %08lX: %d novos IDs de usuários\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "chave %08lX: 1 nova assinatura\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "chave %08lX: %d novas assinaturas\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "chave %08lX: 1 nova subchave\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "chave %08lX: %d novas subchaves\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "chave %08lX: não modificada\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, fuzzy, c-format msgid "no default secret keyring: %s\n" msgstr "impossível bloquear chaveiro secreto: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "chave %08lX: já está no chaveiro secreto\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "chave %08lX: chave secreta não encontrada: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: sem chave pública - impossível aplicar certificado\n" "de revogação\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "chave %08lX: certificado de revogação importado\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "chave %08lX: nenhum ID de usuário para assinatura\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "chave %08lX: algoritmo de chave pública não suportado\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pública não suportado\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "chave %08lX: sem subchave para ligação de chaves\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "chave %08lX.%lu: Revogação de subchave válida\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "chave %08lX: ligação de subchave inválida\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "chave %08lX: ignorado ID de usuário '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "chave %08lX: subchave ignorada\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revogação no local errado - ignorada\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revogação inválido: %s - ignorada\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "chave %08lX: certificado de revogação no local errado - ignorada\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "chave %08lX: detectado ID de usuário duplicado - unido\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "chave %08lX: certificado de revogação adicionado\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "chave %08lX: %d novas assinaturas\n" @@ -2597,7 +2686,7 @@ msgstr "" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +msgid "Your selection? (enter `?' for more information): " msgstr "" #: g10/keyedit.c:918 @@ -2659,7 +2748,7 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2691,7 +2780,7 @@ "Digite a nova frase para esta chave secreta.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 #, fuzzy msgid "passphrase not correctly repeated; try again" msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" @@ -3187,305 +3276,300 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 +#: g10/keyedit.c:2245 #, fuzzy, c-format -msgid "This key may be revoked by %s key " +msgid "This key may be revoked by %s key %s" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr "trust" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr "trust" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Esta chave foi desativada" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " +#: g10/keyedit.c:2397 +msgid "There are no preferences on a PGP 2.x-style user ID.\n" +msgstr "" + +#: g10/keyedit.c:2405 +msgid "" +"Please note that the shown key validity is not necessarily correct\n" +"unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 #, fuzzy msgid "revoked" msgstr "revkey" -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2400 -msgid "There are no preferences on a PGP 2.x-style user ID.\n" -msgstr "" - -#: g10/keyedit.c:2408 -msgid "" -"Please note that the shown key validity is not necessarily correct\n" -"unless you restart the program.\n" -msgstr "" - -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Deletar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Deletar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Deletar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Digite o tamanho da chave" -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as seleções das chaves secretas.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Por favor selecione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Modificando a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Modificando a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Você não pode modificar a data de validade de uma chave v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de usuário com índice %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuário: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " assinado por %08lX em %s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Você assinou estes IDs de usuário:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr "assinar uma chave localmente" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Você está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3532,12 +3616,12 @@ msgid "writing key binding signature\n" msgstr "escrevendo assinatura ligada a uma chave\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, fuzzy, c-format msgid "keysize invalid; using %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, fuzzy, c-format msgid "keysize rounded up to %u bits\n" msgstr "arredondado para %u bits\n" @@ -3605,91 +3689,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) ElGamal (apenas criptografia)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, fuzzy, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) DSA (apenas assinatura)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, fuzzy, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) ElGamal (apenas criptografia)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Prestes a gerar novo par de chaves %s.\n" -" tamanho mínimo é 768 bits\n" -" tamanho padrão é 1024 bits\n" -" tamanho máximo sugerido é 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Que tamanho de chave você quer? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA permite apenas tamanhos de 512 a 1024\n" - -#: g10/keygen.c:1425 -#, fuzzy -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "O par de chaves DSA terá 1024 bits.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "tamanho muito grande; %d é o valor máximo permitido.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Tamanhos de chave maiores que 2048 não são recomendados\n" -"porque o tempo de computação é REALMENTE longo!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Você tem certeza de que quer este tamanho de chave? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Que tamanho de chave você quer? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado também " -"é vulnerável a ataques!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "O tamanho de chave pedido é %u bits\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "arredondado para %u bits\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3705,7 +3758,7 @@ " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 #, fuzzy msgid "" "Please specify how long the signature should be valid.\n" @@ -3722,30 +3775,30 @@ " m = chave expira em n meses\n" " y = chave expira em n anos\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 #, fuzzy msgid "Signature is valid for? (0) " msgstr "A chave é valida por? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "valor inválido\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, fuzzy, c-format msgid "%s does not expire at all\n" msgstr "A chave não expira nunca\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, fuzzy, c-format msgid "%s expires at %s\n" msgstr "A chave expira em %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3753,12 +3806,12 @@ "Seu sistema não consegue mostrar datas além de 2038.\n" "Apesar disso, elas serão corretamente manipuladas até 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Está correto (s/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3775,44 +3828,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nome completo: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Caractere inválido no nome\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "O nome não pode começar com um dígito\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "O nome deve ter pelo menos 5 caracteres\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Endereço de correio eletrônico: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Endereço eletrônico inválido\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Comentário: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Caractere inválido no comentário\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Você está usando o conjunto de caracteres `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3823,28 +3876,28 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoSs" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 #, fuzzy msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3852,12 +3905,12 @@ "Você precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3869,7 +3922,7 @@ "qualquer hora, usando este programa com a opção \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3881,54 +3934,50 @@ "geração dos números primos; isso dá ao gerador de números aleatórios\n" "uma chance melhor de conseguir entropia suficiente.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "O par de chaves DSA terá 1024 bits.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Geração de chave cancelada.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, fuzzy, c-format msgid "writing public key to `%s'\n" msgstr "escrevendo certificado público para `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, fuzzy, c-format msgid "writing secret key to `%s'\n" msgstr "escrevendo certificado privado para `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, fuzzy, c-format msgid "no writable public keyring found: %s\n" msgstr "chave %08lX: chave pública não encontrada: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, fuzzy, c-format msgid "no writable secret keyring found: %s\n" msgstr "impossível bloquear chaveiro secreto: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, fuzzy, c-format msgid "error writing public keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, fuzzy, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3936,12 +3985,12 @@ "Note que esta chave não pode ser usada para criptografia. Você pode usar\n" "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3949,7 +3998,7 @@ "a chave foi criada %lu segundo no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -3957,40 +4006,40 @@ "a chave foi criada %lu segundos no futuro\n" "(viagem no tempo ou problema no relógio)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Realmente criar? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "enumeração de blocos de chaves falhou: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "impossível criar %s: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTA: chave secreta %08lX expirou %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4040,32 +4089,32 @@ msgid "expired: %s)" msgstr "A chave expira em %s\n" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 #, fuzzy msgid "Primary key fingerprint:" msgstr "listar as chaves e as impressões digitais" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 #, fuzzy msgid " Subkey fingerprint:" msgstr " Impressão digital:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 #, fuzzy msgid " Primary key fingerprint:" msgstr " Impressão digital:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 #, fuzzy msgid " Subkey fingerprint:" msgstr " Impressão digital:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Impressão digital:" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4421,7 +4470,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 #, fuzzy msgid "unknown" msgstr "versão desconhecida" @@ -4454,31 +4503,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inválido detectado em proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "impossível desativar core dumps: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "atualização do banco de dados de confiabilidade falhou: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Algoritmos experimentais não devem ser usados!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "impossível manipular algoritmo de chave pública %d\n" -#: g10/misc.c:324 -#, fuzzy -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" -"este algoritmo de criptografia é depreciado; por favor use algum\n" -"algoritmo padrão!\n" +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algoritmo de criptografia não implementado" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "assinatura %s de: %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4586,50 +4644,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "algoritmo de proteção %d não é suportado\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4641,44 +4699,44 @@ "usuário: \"%.*s\"\n" "%u-bit %s chave, ID %08lX, criada %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 #, fuzzy msgid "Repeat passphrase\n" msgstr "Repita a frase secreta: " -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 #, fuzzy msgid "Enter passphrase\n" msgstr "Digite a frase secreta: " -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 #, fuzzy msgid "passphrase too long\n" msgstr "linha muito longa\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "impossível pedir senha em modo não-interativo\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4688,17 +4746,17 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "usuário: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -4904,7 +4962,8 @@ msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Isto pode significar que a assinatura é falsificada.\n" #: g10/pkclist.c:527 @@ -5010,29 +5069,29 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "dados não salvos; use a opção \"--output\" para salvá-los\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, fuzzy, c-format msgid "error creating `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Assinatura separada.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do arquivo de dados: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "lendo de \"stdin\" ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 #, fuzzy msgid "no signed data\n" msgstr "no dados assinados\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossível abrir dados assinados `%s'\n" @@ -5343,52 +5402,47 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "escrevendo para `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "assinando:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, fuzzy, c-format msgid "%s encryption will be used\n" msgstr "descriptografia falhou: %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "a chave não está marcada como insegura - impossível usá-la com o pseudo " "RNG!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "ignorado `%s': duplicado\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "ignorado `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 #, fuzzy msgid "skipped: secret key already present\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5578,12 +5632,12 @@ "O banco de dados de confiabilidade está danificado; por favor rode\n" "\"gpg --fix-trust-db\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossível manipular linhas de texto maiores que %d caracteres\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "linha de entrada maior que %d caracteres\n" @@ -5634,87 +5688,122 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "revkey" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "expire" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "versão desconhecida" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 msgid "never" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 #, fuzzy msgid "no need for a trustdb check\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, fuzzy, c-format msgid "next trustdb check due at %s\n" msgstr "inserção de registro de confiança falhou: %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública não encontrada" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 #, fuzzy msgid "checking the trustdb\n" msgstr "muda os valores de confiança" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registro de confiança %lu, tipo %d: escrita falhou: %s\n" @@ -6028,6 +6117,62 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Prestes a gerar novo par de chaves %s.\n" +#~ " tamanho mínimo é 768 bits\n" +#~ " tamanho padrão é 1024 bits\n" +#~ " tamanho máximo sugerido é 2048 bits\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA permite apenas tamanhos de 512 a 1024\n" + +#, fuzzy +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "tamanho muito grande; %d é o valor máximo permitido.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Tamanhos de chave maiores que 2048 não são recomendados\n" +#~ "porque o tempo de computação é REALMENTE longo!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Você tem certeza de que quer este tamanho de chave? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado " +#~ "também é vulnerável a ataques!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Algoritmos experimentais não devem ser usados!\n" + +#, fuzzy +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "este algoritmo de criptografia é depreciado; por favor use algum\n" +#~ "algoritmo padrão!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "escrevendo para `%s'\n" + #, fuzzy #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "impossível fazer isso em modo não-interativo\n" @@ -6157,14 +6302,6 @@ #~ msgstr "rev- revogações de chaves incorreta\n" #, fuzzy -#~ msgid "[revoked] " -#~ msgstr "revkey" - -#, fuzzy -#~ msgid "[expired] " -#~ msgstr "expire" - -#, fuzzy #~ msgid " [expired: %s]" #~ msgstr "A chave expira em %s\n" Index: gnupg/po/ro.po diff -u gnupg/po/ro.po:1.7 gnupg/po/ro.po:1.8 --- gnupg/po/ro.po:1.7 Thu Oct 28 11:06:49 2004 +++ gnupg/po/ro.po Fri Dec 10 23:20:42 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-06-17 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -18,11 +18,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "algoritm rezumat `%s' este numai-citire în acestã ediþie\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -37,11 +32,12 @@ msgid "no entropy gathering module detected\n" msgstr "nu a fost gãsit nici un modul de adunare a entropiei\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -76,9 +72,9 @@ msgid "note: random_seed file not updated\n" msgstr "notã: fiºierul random_seed nu a fost actualizat\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "nu pot crea `%s': %s\n" @@ -134,90 +130,150 @@ "a da sistemului de operare o ºansã de a colecta mai multã entropie\n" "(Mai sunt necesari %d octeþi)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "am eºuat sã iniþializez TrustDB:%s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "am eºuat sã reconstruiesc cache-ul inelului de chei: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "trimitere server de chei eºuatã: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "eroare la crearea frazei-parolã: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "eroare la citire keyblock: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: eroare citire înregistrare liberã: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' deja compresat\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "genereazã o nouã perechi de chei" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "stergere keyblock a eºuat: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Generarea cheii a eºuat: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nici o datã OpenPGP validã gãsitã.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "eroare la crearea frazei-parolã: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "am eºuat sã iniþializez TrustDB:%s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "stergere keyblock a eºuat: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -305,15 +361,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "nu pot face acest lucru în modul batch\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Selecþia d-voastrã? " @@ -321,141 +377,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "activ" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "activ" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Nici un motiv specificat" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "neprocesat" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "nici o cheie publicã corespunzãtoare: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "eroare la citire `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "preferinþe actualizate" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "caracter invalid în ºir preferinþe\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "caracter invalid în ºir preferinþe\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "eroare: amprentã invalidã\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "afiºeazã amprenta" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "eroare: amprentã invalidã\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Generarea cheii a eºuat: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "nici o datã OpenPGP validã gãsitã.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "eroare la scrierea inelului de chei secret `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -463,232 +528,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Selectaþi ce fel de cheie doriþi:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Semnãturã expiratã %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (numai cifrare)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Selecþie invalidã.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Vã rugãm selectaþi motivul pentru revocare:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "algoritm de protecþie necunoscut\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Pãrþile secrete ale cheii primare nu sunt disponibile.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "sãritã: cheia secretã deja prezentã\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "terminã" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ieºi din acest meniu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "t" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comenzi în conflict\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "ajutor" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "afiºeazã acest mesaj" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "enumerã" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Cheie disponibilã la: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "depanare" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "activ" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "semloc" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "schimbã data de expirare" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "schimbã încrederea pentru proprietar" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "ampr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "afiºeazã amprenta" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsem" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "eroare generalã" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "genereazã o nouã perechi de chei" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "parola" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Comandã> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "comenzi în conflict\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comenzi în conflict\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Comandã invalidã (încercaþi \"ajutor\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Repetaþi fraza-parolã: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "fraza-parolã nu a fost repetatã corect; mai încercaþi o datã" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -698,13 +785,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output nu merge pentru aceastã comandã\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "cheia `%s' nu a fost gãsitã: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -749,7 +836,7 @@ "folosiþi opþiunea \"--delete-secret-keys\" pentru a o ºterge pe aceasta mai " "întâi.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "eroare la crearea frazei-parolã: %s\n" @@ -768,7 +855,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' deja compresat\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVERTISMENT: `%s' este un fiºier gol\n" @@ -795,7 +882,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "forþând cifrul simetric %s (%d) violaþi preferinþele destinatarului\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -899,27 +986,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "AVERTISMENT: nu pot ºterge directorul temporar `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "cheia %08lX: nu e protejatã - sãritã\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "cheia %08lX: cheie stil PGP 2.x - sãritã\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "AVERTISMENT: cheia secretã %08lX nu are un checksum SK simplu\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "AVERTISMENT: nimic exportat\n" @@ -1098,15 +1185,15 @@ msgid "prompt before overwriting" msgstr "întreabã înainte de a suprascrie" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1114,7 +1201,7 @@ "@\n" "(Aratã pagina man pentru o listã completã a comenzilor ºi opþiunilor)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1134,15 +1221,15 @@ " --list-keys [nume] aratã chei\n" " --fingerprint [nume] aratã amprente\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Raportaþi bug-uri la .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Folosire: gpg [opþiuni] [fiºiere] (-h pentru ajutor)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1152,7 +1239,7 @@ "sign, check, encrypt sau decrypt\n" "operaþiunea implicitã depinde de datele de intrare\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1160,73 +1247,73 @@ "\n" "Algoritmuri suportate:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Cifru: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Compresie: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "folosire: gpg [opþiuni] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "comenzi în conflict\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "nu am gãsit nici un semn = în definiþia grupului \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "AVERTISMENT: proprietate nesigurã (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "AVERTISMENT: proprietate nesigurã (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "AVERTISMENT: proprietate nesigurã (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "" "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" @@ -1234,21 +1321,21 @@ "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" @@ -1256,385 +1343,385 @@ "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s" "\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "articol configurare necunoscut \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTÃ: fisier opþiuni implicite vechi `%s' ignorat\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTÃ: nici un fiºier opþiuni implicit `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "fiºier opþiuni `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "citesc opþiuni din `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTÃ: %s nu este pentru o folosire normalã!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "extensie cifru \"%s\" nu a fost încãrcat din cauza permisiunilor nesigure " "(unsafe)\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nu este un set de carectere valid\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "nu am putut interpreta URI pentru serverul de chei\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opþiuni import invalide\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "opþiuni import invalide\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opþiuni import invalide\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "opþiuni import invalide\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nu pot seta cale-execuþie ca %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "AVERTISMENT: programul ar putea crea un fiºier core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTISMENT: %s înlocuieºte %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s nu este permis cu %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nu are sens cu %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "puteþi crea doar semnãturi detaºate sau în clar câtã vreme sunteþi în modul " "--pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "nu puteþi semna ºi cifra în acelaºi timp câtã vreme sunteþi în modul --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "trebuie sã folosiþi fiºiere (ºi nu un pipe) când lucraþi cu modul --pgp2 " "activat.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrarea unui mesaj în modul --pgp2 necesitã un cifru IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "algoritm rezumat selectat este invalid\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritm rezumat certificare selectat este invalid\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed trebuie sã fie mai mare decât 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed trebuie sã fie mai mare decât 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth trebuie sã fie în intervalul 1..255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTÃ: modul S2K simplu (0) este contraindicat cu insistenþã\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mod S2K invalid; trebuie sã fie 0, 1 sau 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "preferinþe implicite invalide\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "preferinþe cifrare personale invalide\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "preferinþe rezumat personale invalide\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "preferinþe compresie personale invalide\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s nu merge încã cu %s!\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "nu puteþi folosi algoritmul de cifrare \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "nu puteþi folosi algorimul de rezumat \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "nu puteþi folosi algoritmul de compresie \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "am eºuat sã iniþializez TrustDB:%s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISMENT: destinatari (-r) furnizaþi fãrã a folosi cifrare cu cheie " "publicã\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [nume_fiºier]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [nume_fiºier]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decriptarea a eºuat: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [nume_fiºier]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [nume_fiºier]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nume_fiºier]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [nume_fiºier]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [nume_fiºier]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id-utilizator" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizator" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-utilizator" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-utilizator" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizator [comenzi]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "trimitere server de chei eºuatã: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepþie server de chei eºuatã: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "export cheie eºuat: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "cãutare server de chei eºuatã: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualizare server de chei eºuatã: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminarea armurii a eºuat: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "punerea armurii a eºuat: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritm hash invalid `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[nume_fiºier]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Daþi-i drumul ºi scrieþi mesajul ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1642,24 +1729,24 @@ "un nume de notaþie trebuie sã conþinã numai caractere imprimabile sau spaþii " "ºi sã se termine cu un '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "un nume de notaþie utilizator trebuie sã conþinã caracterul '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "" "o valoare de notaþie trebuie sã nu foloseascã nici un caracter de control\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "URL-ul politicii de certificare furnizat este invalid\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "URL-ul politicii de semnãturi furnizat este invalid\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL-ul politicii de semnãturi furnizat este invalid\n" @@ -1668,27 +1755,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "prea multe intrãri în cache-ul pk - deactivat\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[ID utilizator nu a fost gãsit]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Cheia invalidã %08lX fãcutã validã de --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "nici o subcheie secretã pentru subcheia publicã %08lX - ignoratã\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "folosim cheia secundarã %08lX în loc de cheia primarã %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "cheia %08lX: cheie secretã fãrã cheie publicã - sãritã\n" @@ -2051,380 +2138,380 @@ msgid "No help available for `%s'" msgstr "Nici un disponibil disponibil pentru `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "bloc de tip %d sãrit\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu chei procesate pânã acum\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Numãr total procesate: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " chei noi sãrite: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " fãrã ID-uri utilizator: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importate: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " neschimbate: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " noi ID-uri utilizator: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " noi subchei: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " noi semnãturi: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " noi revocãri de chei: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " chei secrete citite: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " chei secrete importate: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "chei secrete neschimbate: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " ne importate: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Aþi semnat aceste ID-uri utilizator:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "semnãturã %s, algoritm rezumat %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "cheia %08lX: nici un ID utilizator\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "cheia %08lX: subcheia HPK coruptã a fost reparatã\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "cheia %08lX: am acceptat ID-ul utilizator ce nu e auto-semnat '%s'\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "cheia %08lX: nici un ID utilizator valid\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "aceasta poate fi cauzatã de o auto-semnãturã ce lipseºte\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "cheia %08lX: cheia publicã nu a fost gãsitã: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "cheia %08lX: cheie nouã - sãritã\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "n-am gãsit nici un inel de chei ce poate fi scris: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "scriu în `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "eroare la scrierea inelului de chei `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "cheia %08lX: cheia publicã \"%s\" importatã\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "cheia %08lX: nu se potriveºte cu copia noastrã\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "cheia %08lX: nu pot gãsi keyblock-ul original: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "cheia %08lX: nu pot citi keyblock-ul original: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "cheia %08lX: \"%s\" 1 nou ID utilizator\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "cheia %08lX: \"%s\" %d noi ID-uri utilizator\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "cheia %08lX: \"%s\" 1 nouã semnãturã\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "cheia %08lX: \"%s\" %d noi semnãturi\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "key %08lX: \"%s\" 1 nouã subcheie\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "key %08lX: \"%s\" %d noi subchei\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "key %08lX: \"%s\" nu a fost schimbatã\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "key %08lX: cheie secretã cu cifru invalid %d - sãritã\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "nici un inel de chei secret implicit: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "cheia %08lX: cheie secretã importatã\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "cheia %08lX: deja în inelul de chei secret\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "cheia %08lX: cheia secretã nu a fost gãsitã: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "cheia %08lX: nici o cheie publicã - nu pot aplica certificatul de revocare\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "cheia %08lX: certificat de revocare invalid: %s - respins\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "cheia %08lX: certificatul de revocare \"%s\" importat\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "cheia %08lX: nici un ID utilizator pentru semnãturã\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "cheia %08lX: algoritm cu cheie publicã nesuportat pentru ID-ul utilizator \"%" "s\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "cheia %08lX: auto-semnãturã invalidã pentru ID-ul utilizator \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "cheia %08lX: nici o subcheie legatã de cheie\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "cheia %08lX: algoritm cu cheie publicã nesuportat\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "cheia %08lX: legãturã subcheie invalidã\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "cheia %08lX: am ºters multiple legãturi de subchei\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "cheia %08lX: nici o subcheie pentru revocarea cheii\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "cheia %08lX: revocare de subcheie invalidã\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "cheia %08lX: am ºters multiple revocãri de subcheie\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "cheia %08lX: am sãrit ID-ul utilizator '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "cheia %08lX: am sãrit subcheia\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "cheia %08lX: semnãtura nu poate fi exportatã (clasa %02x) - sãritã\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "cheia %08lX: certificat de revocare într-un loc greºit - sãrit\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "cheia %08lX: certificat de revocare invalid: %s - sãrit\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "cheia %08lX: semnãturã subcheie într-un loc greºit - sãritã\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "cheia %08lX: clasã de semnãturã neaºteptatã (0x%02X) - sãritã\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "cheia %08lX: am detectat un ID utilizator duplicat - combinate\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "AVERTISMENT: cheia %08lX poate fi revocatã: aduc revocarea cheii %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "AVERTISMENT: cheia %08lX poate fi revocatã: cheia de revocare %08lX nu este " "prezentã.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "cheia %08lX: am adãugat certificatul de revocare \"%s\"\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "cheia %08lX: am adãugat semnãtura de cheie directã\n" @@ -2663,7 +2750,8 @@ msgstr " (3) Am fãcut verificãri foarte atente.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Selecþia dvs.? (introduceþi '?' pentru informaþii suplimentare): " #: g10/keyedit.c:918 @@ -2736,7 +2824,7 @@ msgid "Really sign? (y/N) " msgstr "Doriþi cu adevãrat sã semnaþi?" -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2767,7 +2855,7 @@ "Introduceþi noua frazã-parolã pentru acestã cheie secretã.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "fraza-parolã nu a fost repetatã corect; mai încercaþi o datã" @@ -3248,83 +3336,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Aceastã cheie poate fi revocatã de cheia %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (senzitiv)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "nu pot crea %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocatã] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [expirã: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [expirã: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " încredere: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " încredere: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Aceastã cheie a fost deactivatã" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revocatã] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expira" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Nu existã nici o preferinþã pentru un ID utilizator stil PGP 2.x.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3332,7 +3404,19 @@ "Vã rugãm observaþi cã validitatea cheii arãtate nu este în mod necesar\n" "corectã dacã nu reporniþi programul.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[revocatã] " + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expira" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3341,7 +3425,7 @@ " Aceastã comandã poate cauza ca un alt ID utilizator\n" " sã devinã ID-ul utilizator primar presupus.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3350,45 +3434,45 @@ "AVERTISMENT: Aceasta este o cheie stil PGP2. Adãugarea unei poze ID poate\n" " cauza unele versiuni de PGP sã respingã aceastã cheie.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sunteþi încã sigur(ã) cã doriþi sã o adãugaþi? (d/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nu puteþi adãuga o pozã ID la o cheie stil PGP2.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã bunã? (d/N/t)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã invalidã? (d/N/t)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã necunoscutã? (d/N/t)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "ªtergeþi într-adevãr aceastã auto-semnãturã? (d/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Am ºters %d semnãturã.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Am ºters %d semnãturi.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Nu am ºters nimic.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3398,34 +3482,34 @@ "revocator desemnat poate face ca unele versiuni de PGP sã respingã " "cheia.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nu puteþi adãuga un revocator desemnat la o cheie stil PGP 2.x.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Introduceþi ID-ul utilizator al revocatorului desemnat: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nu puteþi desemna o cheie ca propriul sãu revocator desemnat\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVERTISMENT: Aceastã cheie a fost revocatã revocatorul desemnat!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi " "anulatã!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3433,129 +3517,129 @@ "Sunteþi sigur(ã) cã doriþi sã desemnaþi aceastã cheie ca ºi revocator " "desemnat? (d/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Vã rugãm ºtergeþi selecþiile din cheile secrete.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Vã rugãm selectaþi cel mult o cheie secundarã.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Schimbarea timpului de expirare pentru o cheie secundarã.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Schimbarea timpului de expirare pentru o cheie primarã.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nu puteþi schimba data de expirare a unei chei v3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Vã rugãm selectaþi exact un ID utilizator.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "auto-semnãturi v3 sãrite pentru ID-ul utilizator \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã o folosiþi (d/N)? " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã o folosiþi (d/N)? " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Nici un ID utilizator cu indicele %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Nici o cheie secundarã cu indicele %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID utilizator: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " semnatã de %08lX la %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (non-exportabilã)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Aceastã semnãturã a expirat pe %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sunteþi încã sigur(ã) cã doriþi sã o revocaþi? (d/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creaþi un certificat de revocare pentru aceastã semnãturã? (d/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Aþi semnat aceste ID-uri utilizator:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (non-exportabilã)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocat de %08lX la %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Sunteþi pe cale sã revocaþi aceste semnãturi:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Doriþi într-adevãr sã creaþi certificatele de revocare? (d/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "nici o cheie secretã\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID-ul utilizator \"%s\" este deja revocat\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVERTISMENT: o semnãturã ID utilizator este datatã %d secunde în viitor\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Afiºez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n" @@ -3597,12 +3681,12 @@ msgid "writing key binding signature\n" msgstr "scriu semnãturã legatã de cheie\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "lungime cheie invalidã; folosesc %u biþi\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "lungime cheie rotunjitã la %u biþi\n" @@ -3670,91 +3754,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (numai cifrare)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (numai cifrare)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (numai semnãturã)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (numai cifrare)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (numai cifrare)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Pe cale sã generaþi o nouã pereche de chei %s.\n" -" lungimea minimã este 768 bits\n" -" lungimea implicitã este 1024 bits\n" -" cea mai lungã cheie sugeratã este 2048 bits\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Ce lungime de cheie doriþi? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA permite numai chei de la 512 la 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"lungime cheie prea micã; 1024 este cea mai micã valoare permisã pentru RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "lungime cheie prea micã; 768 este cea mai micã valoare permisã.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Perechea de chei DSA va avea 1024 biþi.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "lungime cheie prea mare; %d este cea mai mare valoare permisã.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n" -"deoarece calculele iau FOARTE MULT timp!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Sunteþi sigur(ã) cã doriþi aceastã lungime de cheie?" +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Ce lungime de cheie doriþi? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Bine, dar þineþi minte cã radiaþia monitorului ºi tastaturii d-voastrã este " -"de asemenea vulnerabilã la atacuri!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Lungimea cheii necesarã este %u biþi\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "rotunjitã prin adaos la %u biþi\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3770,7 +3823,7 @@ " m = cheia expirã în n luni\n" " y = cheia expirã în n ani\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3786,29 +3839,29 @@ " m = semnãtura expirã în n luni\n" " y = semnãtura expirã în n ani\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Cheia este validã pentru? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Semnãtura este validã pentru? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "valoare invalidã\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s nu expirã deloc\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s expirã la %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3816,12 +3869,12 @@ "Sistemul d-voastrã nu poate afiºa date dupã 2038.\n" "Totuºi, acestea vor fi corect mânuite pânã în 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Este aceasta corect (d/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3839,44 +3892,44 @@ " \"Popa Ioan (popicã) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Nume real: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Caracter invalid în nume\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Numele nu poate începe cu o cifrã\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Numele trebuie sã fie de cel puþin 5 caractere\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Adresã de email: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Nu este o adresã de email validã\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Comentariu: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Caracter invalid în comentariu\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Folosiþi setul de caractere `%s'\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3887,27 +3940,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Vã rugãm nu puneþi adresa de email în numele real sau comentariu\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoTt" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Schimbã (N)ume, (C)omentariu, (E)mail sau (T)Terminã? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Schimbã (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Terminã? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Vã rugãm corectaþi mai întâi eroarea\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3915,12 +3968,12 @@ "Aveþi nevoie de o frazã-parolã pentru a vã proteja cheia secretã.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3931,7 +3984,7 @@ "O sã o fac oricum. Puteþi schimba fraza-parolã oricând, folosind acest\n" "program cu opþiunea \"--edit-key\".\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3943,54 +3996,50 @@ "în timpul generãrii numerelor prime; aceasta dã o ºansã generatorului de\n" "numere aleatoare o ºansã mai bunã de a aduna destulã entropie.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Perechea de chei DSA va avea 1024 biþi.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Generarea cheii a fost anulatã.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "scriu cheia publicã în `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "nu am gãsit nici un inel de chei public de scris: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "nu am gãsit nici un inel de chei secret de scris: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "eroare la scrierea inelului de chei public `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "eroare la scrierea inelului de chei secret `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "cheile secretã ºi publicã au fost create ºi semnate.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -4000,12 +4049,12 @@ "sã folosiþi comanda \"--edit-key\" pentru a genera o cheie secundarã pentru\n" "acest scop.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Generarea cheii a eºuat: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4013,7 +4062,7 @@ "cheia a fost creatã %lu secundã în viitor (warp în timp sau probleme cu " "ceasul)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4021,40 +4070,40 @@ "cheia a fost creatã %lu secunde în viitor (warp în timp sau probleme cu " "ceasul)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "NOTÃ: crearea de subchei pentru chei v3 nu este conform OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Creaþi într-adevãr? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "stergere keyblock a eºuat: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "nu pot crea `%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "NOTÃ: cheia secretã %08lX a expirat la %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4100,28 +4149,28 @@ msgid "expired: %s)" msgstr " [expirã: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Amprentã cheie primarã:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Amprentã subcheie:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Amprentã cheie primarã:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Amprentã subcheie:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Amprentã cheie =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4474,7 +4523,7 @@ msgid "textmode" msgstr "modtext" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "necunoscut" @@ -4506,29 +4555,41 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "pachet root invalid detectat în proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "nu pot deactiva generarea fiºierelor core: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "nu pot deschide fiºierul: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: citirea a eºuat (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Algoritme experimentale nu ar trebui folosite!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "nu pot mânui algoritmul cu cheie publicã %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "algoritm cifrare neimplementat" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "semnãturã %s, algoritm rezumat %s\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"acest algoritm de cifrare este învechit; vã rugãm folosiþi unul standard!\n" +"forþarea algoritmului rezumat %s (%d) violeazã preferinþele destinatarului\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4640,50 +4701,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpachetul de tip %d are bitul critic setat\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nu este disponibil în aceastã sesiune\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "nu pot seta pid-ul client pentru agent\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "nu pot convinge serverul sã citeascã FD pentru agent\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "nu pot convinge serverul sã scrie FD pentru agent\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabila de mediu GPG_AGENT_INFO anormalã\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent versiune protocol %d nu este suportat\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nu mã pot conecta la `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "probleme de comunicare cu gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problemã cu agentul - deactivez folosirea agentului\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID cheie principalã %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4695,41 +4756,41 @@ "\"%.*s\"\n" "%u-bit cheia %s, ID %08lX, creatã %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Repetaþi fraza-parolã\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Introduceþi fraza-parolã\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "frazã-parolã prea lungã\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "rãspuns invalid de la agent\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "anulatã de utilizator\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemã cu agentul: agentul returneazã 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "nu pot cere parola în modul batch\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Introduceþi fraza-parolã: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4739,17 +4800,17 @@ "Aveþi nevoie de o frazã-parolã pentru a descuia cheia\n" "secretã pentru utilizator: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "cheia %2$s de %1$u-biþi, ID %3$08lX, creatã %4$s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Repetaþi fraza-parolã: " @@ -4960,7 +5021,8 @@ msgstr "AVERTISMENT: Aceastã cheie a fost revocatã de proprietarul ei!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Aceasta ar putea însemna cã semnãtura e falsificatã.\n" #: g10/pkclist.c:527 @@ -5066,28 +5128,28 @@ msgstr "" "datele nu au fost salvate: folosiþi opþiunea \"--output\" pentru a le salva\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "eroare la creearea `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Semnãturã detaºatã.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Vã rugãm introduceþi numele fiºierului de date: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "citesc stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "nici o datã semnatã\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "nu pot deschide date semnate `%s'\n" @@ -5408,50 +5470,45 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "puteþi semna-dataºat cu chei stil PGP 2.x numai în modul --pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "scriu în `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "forþarea algoritmului rezumat %s (%d) violeazã preferinþele destinatarului\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "semnare:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "puteþi semna-în-clar cu chei stil PGP 2.x în modul --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "va fi folositã cifrarea %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "cheia nu este marcatã ca sigurã - nu o pot folosi cu GNA falsificat!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "sãritã `%s': duplicatã\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "sãritã `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "sãritã: cheia secretã deja prezentã\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5639,12 +5696,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb este coruptã; rulaþi \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nu pot mânui linii de text mai lungi de %d caractere\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "linii de intrare mai lungi de %d caractere\n" @@ -5694,85 +5751,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[revocatã] " + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[expiratã] " + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "necunoscut" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "niciodatã " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "urmãtoarea verificare pentru trustdb programatã pe %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "cheia publicã %08lX nu a fost gãsitã: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "vã rugãm faceþi un --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "verific trustdb\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d chei procesate (%d numãrãtori valide anulate)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "nu am gãsit nici o cheie cu încredere supremã\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "cheia publicã a cheii cu încredere supremã %08lX nu a fost gãsitã\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "înregistrare încredere %lu, tip %d: scrierea a eºuat: %s\n" @@ -6082,6 +6174,65 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(aþi folosit probabil un program nepotrivit pentru aceastã sarcinã)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "algoritm rezumat `%s' este numai-citire în acestã ediþie\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Pe cale sã generaþi o nouã pereche de chei %s.\n" +#~ " lungimea minimã este 768 bits\n" +#~ " lungimea implicitã este 1024 bits\n" +#~ " cea mai lungã cheie sugeratã este 2048 bits\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA permite numai chei de la 512 la 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "lungime cheie prea micã; 1024 este cea mai micã valoare permisã pentru " +#~ "RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "lungime cheie prea micã; 768 este cea mai micã valoare permisã.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "lungime cheie prea mare; %d este cea mai mare valoare permisã.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n" +#~ "deoarece calculele iau FOARTE MULT timp!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Sunteþi sigur(ã) cã doriþi aceastã lungime de cheie?" + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Bine, dar þineþi minte cã radiaþia monitorului ºi tastaturii d-voastrã " +#~ "este de asemenea vulnerabilã la atacuri!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Algoritme experimentale nu ar trebui folosite!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "acest algoritm de cifrare este învechit; vã rugãm folosiþi unul " +#~ "standard!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "scriu în `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "îmi pare rãu, nu pot face acest lucru în modul batch\n" @@ -6210,12 +6361,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? probleme la verificare revocãrii: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[revocatã] " - -#~ msgid "[expired] " -#~ msgstr "[expiratã] " - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [expirã: %s]" Index: gnupg/po/ru.po diff -u gnupg/po/ru.po:1.50 gnupg/po/ru.po:1.51 --- gnupg/po/ru.po:1.50 Thu Oct 28 11:06:49 2004 +++ gnupg/po/ru.po Fri Dec 10 23:20:42 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GnuPG 1.2.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2003-12-23 19:24+0100\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -15,11 +15,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ `%s' в данной верÑии только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -34,11 +29,12 @@ msgid "no entropy gathering module detected\n" msgstr "не найден модуль Ð½Ð°ÐºÐ¾Ð¿Ð»ÐµÐ½Ð¸Ñ Ñнтропии\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -71,9 +67,9 @@ msgid "note: random_seed file not updated\n" msgstr "замечание: файл random_seed не обновлен\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "не могу Ñоздать `%s': %s\n" @@ -128,90 +124,150 @@ "ÐедоÑтаточно Ñлучайных чиÑел. ВыполнÑйте какие-либо дейÑÑ‚Ð²Ð¸Ñ Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾,\n" "чтобы ОС могла получить большую Ñнтропию! (Ðеобходимо еще %d байт)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "Ñбой инициализации таблицы доверий: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "Ñбой переÑтройки кÑша таблицы ключей: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "неудача при отправке на Ñервер ключей: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "ошибка при Ñоздании ключевой фразы (паролÑ): %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ° ключей: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñвободной запиÑи: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' уже Ñжат\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "Ñоздать новую пару ключей" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "Ñбой при удалении блока ключа: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Сбой при Ñоздании ключа: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "не найдено данных формата OpenPGP.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "ошибка при Ñоздании ключевой фразы (паролÑ): %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "Ñбой инициализации таблицы доверий: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "Ñбой при удалении блока ключа: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -299,15 +355,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "не могу делать Ñто в пакетном режиме\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Ваш выбор (?-подробнее)? " @@ -315,141 +371,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Без ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ñ‹" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "не выполнено" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "нет ÑоотвеÑтвующего открытого ключа: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "обновить предпочтениÑ" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "недопуÑтимый Ñимвол в Ñтроке предпочтений\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "недопуÑтимый Ñимвол в Ñтроке предпочтений\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "ошибка: неверный отпечаток\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "показать отпечаток" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "ошибка: неверный отпечаток\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Сбой при Ñоздании ключа: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "не найдено данных формата OpenPGP.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "ошибка запиÑи таблицы Ñекретных ключей `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -457,232 +522,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Выберите тип ключа:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "ПодпиÑÑŒ проÑрочена %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (только Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Ðеправильный выбор.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Выберите причину отзыва:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "неизвеÑтный алгоритм защиты\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Ð¡ÐµÐºÑ€ÐµÑ‚Ð½Ð°Ñ Ñ‡Ð°ÑÑ‚ÑŒ главного ключа отÑутÑтвует.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "пропущено: Ñекретный ключ уже имеетÑÑ\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "Выход" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "выйти из Ñтого меню" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "неÑовмеÑтимые команды\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "показать Ñту Ñправку" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Ключ доÑтупен: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "Ñменить Ñрок дейÑтвиÑ" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "изменить уровень Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "показать отпечаток" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "Ð¾Ð±Ñ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "Ñоздать новую пару ключей" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Команда> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "неÑовмеÑтимые команды\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "неÑовмеÑтимые команды\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (ÑпиÑок команд: \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Повторите пароль: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "повторный ввод Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚ÐµÐ½; попробуйте еще раз" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -692,13 +779,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output не работает Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ команды\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "ключ `%s' не найден: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -741,7 +828,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "Ñначала иÑпользуйте опцию \"--delete-secret-keys\".\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "ошибка при Ñоздании ключевой фразы (паролÑ): %s\n" @@ -760,7 +847,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' уже Ñжат\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "Ð’ÐИМÐÐИЕ: `%s' пуÑтой файл\n" @@ -785,7 +872,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "иÑпользование шифра %s (%d) нарушает Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -886,27 +973,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "Ð’ÐИМÐÐИЕ: не могу удалить временный каталог `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "ключ %08lX: не защищен - пропущен\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "ключ %08lX: PGP 2.x ÑÑ‚Ð¸Ð»Ñ - пропущен\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "Ð’ÐИМÐÐИЕ: Ñекретный ключ %08lX не имеет SK контрольной Ñуммы\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "Ð’ÐИМÐÐИЕ: нечего ÑкÑпортировать\n" @@ -1085,15 +1172,15 @@ msgid "prompt before overwriting" msgstr "ÑпроÑить перед перезапиÑью" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1101,7 +1188,7 @@ "@\n" "(См. документацию Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ полного Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ð¼Ð¸ и параметрами)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1121,18 +1208,18 @@ " --list-keys [имена] показать ключи\n" " --fingerprint [имена] показать отпечатки (fingerprints)\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "О найденных ошибка Ñообщайте .\n" "ПодпишитеÑÑŒ на руÑÑкоÑзычную группу раÑÑылки GnuPG-ru отправив пиÑьмо по " "адреÑу gnupg-ru-request@gnupg.org Ñ Ñ‚ÐµÐ¼Ð¾Ð¹ subscribe.\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "ИÑпользование: gpg [параметры] [файлы] (-h Ð´Ð»Ñ Ð¿Ð¾Ð´Ñказки)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1142,7 +1229,7 @@ "подпиÑать и проверить, зашифровать или раÑшифровать\n" "Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð¾ умолчанию завиÑит от входных данных\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1150,463 +1237,463 @@ "\n" "ПоддерживаютÑÑ Ñледующие алгоритмы:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "С открытым ключом: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Симметричные шифры: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Ð¥Ñш-функции: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Ðлгоритмы ÑжатиÑ: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "иÑпользование: gpg [опции] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "неÑовмеÑтимые команды\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "no = sign found in group definition \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑный владелец у файла %s \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑный владелец у файла %s \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑный владелец у файла %s \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные права доÑтупа к %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные права доÑтупа к %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные права доÑтупа к %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные уÑтановки владельца каталога %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные уÑтановки владельца каталога %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные уÑтановки владельца каталога %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные права доÑтупа к каталогу %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные права доÑтупа к каталогу %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "Ð’ÐИМÐÐИЕ: небезопаÑные права доÑтупа к каталогу %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "файл конфигурации Ñодержит неизвеÑтный параметр \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "ЗÐМЕЧÐÐИЕ: файл наÑтроек Ñтарого формата `%s' проигнорирован\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ЗÐМЕЧÐÐИЕ: файл наÑтроек `%s' не обнаружен\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "файл наÑтроек `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "наÑтройки взÑÑ‚Ñ‹ из файла `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ЗÐМЕЧÐÐИЕ: %s не предназначен Ð´Ð»Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ð³Ð¾ иÑпользованиÑ!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "раÑширение шифра \"%s\" не загружено вÑледÑтвие небезопаÑных прав доÑтупа\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° Ñимволов\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "не могу проанализировать URI Ñервера ключей\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: недопуÑтимые параметры импорта\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "недопуÑтимые параметры импорта\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: недопуÑтимые параметры импорта\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "недопуÑтимые параметры импорта\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "не могу определить путь запуÑка Ð´Ð»Ñ %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "Ð’ÐИМÐÐИЕ: возможно Ñоздание файла дампа памÑти!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "Ð’ÐИМÐÐИЕ: %s заменит %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s недопуÑтимо иÑпользовать Ñ %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s не имеет ÑмыÑла ÑовмеÑтно Ñ %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Можно Ñделать только отделенную или прозрачную подпиÑÑŒ в режиме --pgp2\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Ð’Ñ‹ не можете одновременно подпиÑать и зашифровать в режиме --pgp2\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Ð’Ñ‹ должны иÑпользовать файлы (а не каналы (pipe)) в режиме --pgp2.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Ð´Ð»Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²ÐºÐ¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² режиме --pgp2 требуетÑÑ ÑˆÐ¸Ñ„Ñ€ IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "выбран неверный алгоритм шифрованиÑ\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-функциÑ\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "выбран неверный алгоритм шифрованиÑ\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð´Ð»Ñ Ñертификации\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "недопуÑтимый default-cert-level; должен быть 0, 1, 2 или 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "недопуÑтимый min-cert-level; должен быть 1, 2 или 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ЗÐМЕЧÐÐИЕ: проÑтой (0) режим S2K Ñтрого не рекомендуетÑÑ\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопуÑтимый режим S2K; должно быть 0, 1 или 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "недопуÑтимые Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð°\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ…Ñш-функции\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð°Ð»Ð³Ð¾Ñ€Ð¸Ñ‚Ð¼Ð¾Ð² ÑжатиÑ\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s не работает пока Ñ %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать шифрование \"%s\" в режиме %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñ…Ñш-функцию \"%s\" в режиме %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñжатие \"%s\" в режиме %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ñбой инициализации таблицы доверий: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Ð’ÐИМÐÐИЕ: получатели (-r) заданы без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ " "ключом\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Ñбой раÑшифрованиÑ: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать %s в режиме %s\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать %s в режиме %s\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "неудача при отправке на Ñервер ключей: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "неудача при получении Ñ Ñервера ключей: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "не удалоÑÑŒ ÑкÑпортировать ключ: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "неудача при поиÑке на Ñервере ключей: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "неудача при обновлении на Ñервере ключей: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· ASCII формата: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² ASCII формат: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[filename]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Ðабирайте Ваше Ñообщение ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1614,23 +1701,23 @@ "Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать только печатные Ñимволы или пробелы,и " "заканчиватьÑÑ Ð·Ð½Ð°ÐºÐ¾Ð¼ '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать '@' Ñимвол\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "значение Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð½Ðµ должно Ñодержать управлÑющие Ñимволы\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "заданный URL правил Ñертификации неверен\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "заданный URL правил подпиÑи неверен\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "заданный URL правил подпиÑи неверен\n" @@ -1639,28 +1726,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "Ñлишком много входов в pk кÑше - отключено\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[User ID Ðе найден]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "ÐедейÑтвительный ключ %08lX разрешен параметром --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "нет Ñекретного подключа Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ подключа %08lX - игнорирую\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "иÑпользуетÑÑ Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‡Ð½Ñ‹Ð¹ ключ %08lX вмеÑто главного %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "ключ %08lX: Ñекретный ключ без открытого - пропущен\n" @@ -2015,375 +2102,375 @@ msgid "No help available for `%s'" msgstr "Ðет Ñправки Ð´Ð»Ñ `%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "пропущен блок типа %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu ключей обработано\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Ð’Ñего обработано: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " пропущено новых ключей: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " без User ID: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " импортировано: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " неизмененных: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " новых User ID: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " новых подключей: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " новых подпиÑей: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " новых отзывов ключей: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " прочитано Ñекретных ключей: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "импортировано Ñекретных ключей: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " неизменённых Ñекретных ключей: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " не импортировано: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Ð’Ñ‹ подпиÑали данные User ID:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s подпиÑÑŒ, Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "ключ %08lX: не имеет User ID\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "ключ %08lX: HKP повреждение подключа иÑправлено\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "ключ %08lX: принÑÑ‚ ключ без ÑамоподпиÑи '%s'\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "ключ %08lX: нет дейÑтвительных User ID\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "причиной Ñтого может быть отÑутÑтвие ÑамоподпиÑи\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "ключ %08lX: не найден открытый ключ: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "ключ %08lX: новый ключ - пропущен\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "нет доÑтупной Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи таблицы ключей: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "ÑохранÑÑŽ в `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "ошибка запиÑи таблицы ключей `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "ключ %08lX: открытый ключ \"%s\" импортирован\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "ключ %08lX: не Ñовпадает Ñ ÐºÐ¾Ð¿Ð¸ÐµÐ¹ хранимой у наÑ\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "ключ %08lX: не нахожу оригинальный блок ключей: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "ключ %08lX: не могу прочитать оригинальный блок ключей: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "ключ %08lX: \"%s\" 1 новый User ID\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "ключ %08lX: \"%s\" %d новых User ID\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "ключ %08lX: \"%s\" 1 Ð½Ð¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "ключ %08lX: \"%s\" %d новых подпиÑей\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "ключ %08lX: \"%s\" 1 новый подключ\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "ключ %08lX: \"%s\" %d новых подключей\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "ключ %08lX: \"%s\" не изменен\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "ключ %08lX: Ñекретный ключ Ñ Ð½ÐµÐ´Ð¾Ð¿ÑƒÑтимым шифром %d - пропущен\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "нет оÑновной таблицы Ñекретных ключей: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "ключ %08lX: Ñекретный ключ импортирован\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "ключ %08lX: уже еÑÑ‚ÑŒ в таблице Ñекретных ключей\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "ключ %08lX: не найден Ñекретный ключ: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "ключ %08lX: нет открытого ключа - не могу применить Ñертификат отзыва\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "ключ %08lX: неправильный Ñертификат отзыва: %s - отвергнут\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "ключ %08lX: \"%s\" Ñертификат отзыва импортирован\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "ключ %08lX: нет User ID Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "ключ %08lX: неподдерживаемый алгоритм Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ ключом у \"%s\" \n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "ключ %08lX: Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑамоподпиÑÑŒ на \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "ключ %08lX: нет подключа Ð´Ð»Ñ ÑвÑзи ключей\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "ключ %08lX: неподдерживаемый алгоритм Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ ключом\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "ключ %08lX: Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ ÑвÑзь подключей\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "ключ %08lX: удалено многократное ÑвÑзывание подключей\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "ключ %08lX: нет подключа Ð´Ð»Ñ Ð¾Ñ‚Ð·Ñ‹Ð²Ð° ключа\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "ключ %08lX: неправильный отзыв подключа\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "ключ %08lX: удален многократный отзыв подключа\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "ключ %08lX: пропущен User ID '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "ключ %08lX: пропущен подключ\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "ключ %08lX: не ÑкÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ (клаÑÑ %02x) - пропущена\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "ключ %08lX: Ñертификат отзыва в неправильном меÑте - пропущен\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "ключ %08lX: неправильный Ñертификат отзыва: %s - пропущен\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "ключ %08lX: подпиÑÑŒ подключа в неправильном меÑте - пропущена\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "ключ %08lX: неизвеÑтный клаÑÑ Ð¿Ð¾Ð´Ð¿Ð¸Ñи (0x%02X) - пропущена\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "ключ %08lX: обнаружено дублирование User ID - объединены\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "Ð’ÐИМÐÐИЕ: ключ %08lX возможно отозван: запрашиваю ключ отзыва %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "Ð’ÐИМÐÐИЕ: ключ %08lX возможно отозван: ключ отзыва %08lX не получен.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "ключ %08lX: \"%s\" добавлен Ñертификат отзыва\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "ключ %08lX: direct key signature добавлена\n" @@ -2620,7 +2707,8 @@ msgstr " (3) Я проверил очень тщательно.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Ваш выбор? (введите '?' Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐµÐ¹ информации): " #: g10/keyedit.c:918 @@ -2693,7 +2781,7 @@ msgid "Really sign? (y/N) " msgstr "ДейÑтвительно подпиÑать? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2724,7 +2812,7 @@ "Введите новый пароль Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñекретного ключа.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "повторный ввод Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚ÐµÐ½; попробуйте еще раз" @@ -3203,83 +3291,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Данный ключ может быть отозван ключом %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "не могу Ñоздать %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[отозван]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [годен до: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [годен до: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " доверие: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " доверие: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Данный ключ отключен" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[отозван]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Ðе может быть предпочтений в PGP 2.x-Ñтиле User ID.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3287,7 +3359,19 @@ "Заметьте, что показанные Ñтепени доÑтоверноÑти могут быть неверными,\n" "пока Ð’Ñ‹ не перезапуÑтите программу.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[отозван]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3295,7 +3379,7 @@ "Ð’ÐИМÐÐИЕ: нет User ID отмеченного как главный. Ð”Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° может\n" " иÑпользовать другой User ID в качеÑтве главного.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3304,45 +3388,45 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP2. Добавление фото ID может в некоторых верÑиÑÑ…\n" " PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите добавить Ñто? (y/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Ð’Ñ‹ можете не добавлÑÑ‚ÑŒ фото ID в ключ PGP2-типа.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Удалить данную дейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Удалить данную недейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Удалить данную неизвеÑтную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "ДейÑтвительно удалить данную ÑамоподпиÑÑŒ? (y/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Удалена %d подпиÑÑŒ.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Удалено %d подпиÑи.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Ðичего не удалено.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3351,159 +3435,159 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n" " может в некоторых верÑиÑÑ… PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Ð’Ñ‹ не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Укажите User ID ключа, назначенного отзывающим: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÑŒ PGP 2.x ключ, как назначенный отзывающим\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "ключ не может быть назначен отзывающим Ñам ÑебÑ\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "Ð’ÐИМÐÐИЕ: Данный ключ отозван отзывающим ключом!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "Ð’ÐИМÐÐИЕ: назначение ключа отзывающим не возможно будет отменить!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите назначить данный ключ отзывающим? (y/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Снимите выделение Ñ Ñекретного ключа.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Выделите не более одного вторичного ключа.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Смена Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ ключа.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Смена Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ ключа\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Ð’Ñ‹ не можете изменить Ñрок дейÑÑ‚Ð²Ð¸Ñ v3 ключа\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Ðет ÑоответÑтвующей подпиÑи в ÑвÑзке Ñекретных\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Выберите только один User ID.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "пропуÑк v3 ÑамоподпиÑи на User ID \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите иÑпользовать его? (y/N)" -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите иÑпользовать его? (y/N)" -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Ðет User ID Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Ðет вторичного ключа Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "User ID: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " подпиÑан %08lX %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (не ÑкÑпортируемаÑ)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Срок подпиÑи закончилÑÑ %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите отозвать? (y/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Создать Ñертификат отзыва Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ подпиÑи? (y/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ð’Ñ‹ подпиÑали данные User ID:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (не ÑкÑпортируемаÑ)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " отозван %08lX %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Ð’Ñ‹ отзываете Ñледующие подпиÑи:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "ДейÑтвительно Ñоздать Ñертификат отзыва? (y/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "нет Ñекретного ключа\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" уже отозван\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "Ð’ÐИМÐÐИЕ: User ID подпиÑÑŒ датирована %d Ñекундами в будущем\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Показ %s фото ID размера %ld Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° 0x%08lX (uid %d)\n" @@ -3545,12 +3629,12 @@ msgid "writing key binding signature\n" msgstr "ÑохранÑем объединÑющую подпиÑÑŒ\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "неверный размер ключа; иÑпользуетÑÑ %u бит\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "размер ключа приведен к %u битам\n" @@ -3618,90 +3702,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (только Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (только Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (только Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (только Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (только Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Создаем новую пару %s ключей.\n" -" минимальный размер ключа 768 бит\n" -" размер ключа по умолчанию 1024 бит\n" -" макÑимально рекомендуемый размер 2048 бит\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Какой размер ключа Ð’Ñ‹ выбрали? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA поддерживает размер ключа от 512 до 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "Ñлишком малый размер ключа; 1024 - минимальный размер ключа RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "Ñлишком малый размер ключа; 768 - минимально допуÑтимый размер.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Пара ключей DSA будет иметь длину 1024 бита.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "Ñлишком большой размер ключа; %d - макÑимально допуÑтимый размер.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Размер ключа больше 2048 не рекомендуетÑÑ, Ñ‚.к.\n" -"вычиÑÐ»ÐµÐ½Ð¸Ñ Ñ Ð½Ð¸Ð¼ займут ÐœÐОГО времени!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Ð’Ñ‹ дейÑтвительно хотите иметь ключ такого размера? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Какой размер ключа Ð’Ñ‹ выбрали? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Отлично, только помните, что излучение монитора и клавиатуры\n" -"также могут быть перехвачены!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Запрашиваемый размер ключа %u бит\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "приведен к размеру %u бит\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3717,7 +3771,7 @@ " m = Ñрок дейÑÑ‚Ð²Ð¸Ñ n меÑÑцев\n" " y = Ñрок дейÑÑ‚Ð²Ð¸Ñ n лет\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3733,29 +3787,29 @@ " m = Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи n меÑÑцев\n" " y = Ñрок дейÑÑ‚Ð²Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи n лет\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Ключ дейÑтвителен до? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "ПодпиÑÑŒ дейÑтвительна до? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "неправильное значение\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s не имеет Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ Ñрока дейÑтвиÑ\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s дейÑтвителен до: %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3763,12 +3817,12 @@ "Ваша ÑиÑтема не может корректно отображать даты поÑле 2038.\n" "Однако, корректно обрабатываютÑÑ Ð´Ð°Ñ‚Ñ‹ до 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Ð’Ñе верно? (y/n) " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3784,44 +3838,44 @@ " \"Baba Yaga (pensioner) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Ваше наÑтоÑщее имÑ: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "ÐедопуÑтимый Ñимвол в Имени\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Ð˜Ð¼Ñ Ð½Ðµ должно начинатьÑÑ Ñ Ñ†Ð¸Ñ„Ñ€Ñ‹\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Ð˜Ð¼Ñ Ð½Ðµ должно быть короче 5 Ñимволов\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "Email-адреÑ: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Ðеправильный e-mail адреÑ\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Комментарий: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "ÐедопуÑтимый Ñимвол в комментарии\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "ИÑпользуетÑÑ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° Ñимволов: `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3832,28 +3886,28 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Ðе вÑтавлÑйте email-Ð°Ð´Ñ€ÐµÑ Ð² Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ комментарий\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Сменить (N)ИмÑ, (C)Комментарий, (E)email-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ (Q)Выход? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "Сменить (N)ИмÑ, (C)Комментарий, (E)email-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ (O)ПринÑÑ‚ÑŒ/(Q)Выход? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Сначала иÑправьте ошибку\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3861,12 +3915,12 @@ "Ð”Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ Ñекретного ключа необходим пароль.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3878,7 +3932,7 @@ "запуÑтив данную программу Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3890,54 +3944,50 @@ "Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ðº диÑкам) в процеÑÑе генерации; Ñто даÑÑ‚ генератору\n" "Ñлучайных чиÑел возможноÑÑ‚ÑŒ получить лучшую Ñнтропию.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Пара ключей DSA будет иметь длину 1024 бита.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Создание ключа прервано.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "Ñохранение открытого ключа в `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "нет доÑтупной Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи таблицы открытых ключей: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "нет доÑтупной Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи таблицы закрытых ключей: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "ошибка запиÑи таблицы открытых ключей `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "ошибка запиÑи таблицы Ñекретных ключей `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "открытый и закрытый ключи Ñозданы и подпиÑаны.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3946,60 +3996,60 @@ "можете\n" "воÑпользоватьÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ \"--edit-key\" и Ñоздать подключ Ð´Ð»Ñ Ñтих целей.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Сбой при Ñоздании ключа: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "ключ был Ñоздан на %lu Ñекунд в будущем (time warp или проблемы Ñ Ñ‡Ð°Ñами)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" "ключ был Ñоздан на %lu Ñекунд в будущем (time warp или проблемы Ñ Ñ‡Ð°Ñами)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "ПРЕДУПРЕЖДÐЮ: Ñоздание подключа Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡ÐµÐ¹ v3 не ÑовмеÑтимо Ñ OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "ДейÑтвительно Ñоздать? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "Ñбой при удалении блока ключа: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "не могу Ñоздать `%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "ЗÐМЕТЬТЕ: Ñекретный ключ %08lX проÑрочен Ñ %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4045,28 +4095,28 @@ msgid "expired: %s)" msgstr " [годен до: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr " Отпечаток главного ключа:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Отпечаток подключа:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Отпечаток главного ключа:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Отпечаток подключа:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Отпечаток ключа =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4418,7 +4468,7 @@ msgid "textmode" msgstr "текÑтовый" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "неизвеÑтен" @@ -4449,29 +4499,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "обнаружен недопуÑтимый корневой пакет в proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "не могу отключить Ñоздание образа памÑти (core dumps): %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "не могу открыть файл: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "trustdb: read failed (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "ИÑпользовать ÑкÑпериментальные алгоритмы не рекомендуетÑÑ!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "не могу иÑпользовать алгоритм Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ ключом %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "нереализованный алгоритм шифрованиÑ" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" -"не рекомендуем данный алгоритм шифрованиÑ; иÑпользуйте более Ñтандартный!\n" +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s подпиÑÑŒ, Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "иÑпользование Ñ…Ñш-функции %s (%d) нарушает Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4580,50 +4641,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "подпакет типа %d имеет выÑтавленный критичеÑкий бит\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent недоÑтупен в данной ÑеÑÑии\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "не могу уÑтановить pid Ð´Ð»Ñ Ð°Ð³ÐµÐ½Ñ‚Ð°\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "не могу получить деÑкриптор Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð°Ð³ÐµÐ½Ñ‚Ð°\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "не могу получить деÑкриптор запиÑи Ð´Ð»Ñ Ð°Ð³ÐµÐ½Ñ‚Ð°\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ GPG_AGENT_INFO\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "протокол gpg-agent верÑии %d не поддерживаетÑÑ\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "не могу подключитьÑÑ Ðº `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "коммуникационный проблемы Ñ gpg-agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼ - иÑпользование агента отключено\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (главный идентификатор ключа %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4634,41 +4695,41 @@ "\"%.*s\"\n" "%u-бит %s ключ, ID %08lX, Ñоздан %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Повторите пароль\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Введите пароль\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "пароль Ñлишком длинный\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "неверный ответ от агента\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "прервано пользователем\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼: агент вернул 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "не могу получить пароль в пакетном режиме\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Введите пароль: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4678,17 +4739,17 @@ "Ðеобходим пароль Ð´Ð»Ñ Ð´Ð¾Ñтупа к Ñекретному ключу пользователÑ:\n" "\"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-бит %s ключ, ID %08lX, Ñоздан %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Повторите пароль: " @@ -4891,7 +4952,8 @@ msgstr "Ð’ÐИМÐÐИЕ: Данный ключ отозван его владельцем!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Это может означать, что подпиÑÑŒ поддельнаÑ.\n" #: g10/pkclist.c:527 @@ -4993,28 +5055,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "данные не Ñохранены; иÑпользуйте \"--output\" Ð´Ð»Ñ ÑохранениÑ\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "ÐžÑ‚Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Введите Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "читаю stdin ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "нет подпиÑанных данных\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "не могу открыть подпиÑанные данные `%s'\n" @@ -5328,50 +5390,45 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "только Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ доÑтупна Ñ PGP 2.x ключом в режиме --pgp2\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "ÑохранÑÑŽ в `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "иÑпользование Ñ…Ñш-функции %s (%d) нарушает Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "подпиÑывание:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "только Ð¿Ñ€Ð¾Ð·Ñ€Ð°Ñ‡Ð½Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ доÑтупна Ñ PGP 2.x ключом в режиме --pgp2\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "будет иÑпользовано %s шифрование\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "ключ не помечен как ненадежный - не могу иÑпользовать его Ñ Ð½ÐµÐ½Ð°Ð´Ñ‘Ð¶Ð½Ñ‹Ð¼ RNG!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "пропущено `%s': дубликат\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "пропущено `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "пропущено: Ñекретный ключ уже имеетÑÑ\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5559,12 +5616,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "таблица доверий повреждена; запуÑтите \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "не могу обработать Ñтроки текÑта длиннее %d Ñимволов\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "Ñтрока ввода длиннее %d Ñимволов\n" @@ -5614,85 +5671,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[отозван]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[проÑрочен]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "неизвеÑтен" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "никогда " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "Ñрок Ñледующей проверки таблицы доверий %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "открытый ключ %08lX не найден: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "выполните --check-trustdb, пожалуйÑта\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "проверка таблицы доверий\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d ключей обработано (%d дейÑвующих запиÑей очищено)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "не найдено абÑолютно доверÑемых ключей\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "открытый ключ Ð´Ð»Ñ Ð°Ð±Ñолютно доверÑемого ключа %08lX не найден\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "запиÑÑŒ о доверии %lu, тип %d: ошибка запиÑи: %s\n" @@ -6003,6 +6095,63 @@ "(возможно, Ð’Ñ‹ иÑпользуете неподходÑщее программное обеÑпечение\n" "Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ задачи)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ `%s' в данной верÑии только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Создаем новую пару %s ключей.\n" +#~ " минимальный размер ключа 768 бит\n" +#~ " размер ключа по умолчанию 1024 бит\n" +#~ " макÑимально рекомендуемый размер 2048 бит\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA поддерживает размер ключа от 512 до 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "Ñлишком малый размер ключа; 1024 - минимальный размер ключа RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "Ñлишком малый размер ключа; 768 - минимально допуÑтимый размер.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "Ñлишком большой размер ключа; %d - макÑимально допуÑтимый размер.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Размер ключа больше 2048 не рекомендуетÑÑ, Ñ‚.к.\n" +#~ "вычиÑÐ»ÐµÐ½Ð¸Ñ Ñ Ð½Ð¸Ð¼ займут ÐœÐОГО времени!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Ð’Ñ‹ дейÑтвительно хотите иметь ключ такого размера? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Отлично, только помните, что излучение монитора и клавиатуры\n" +#~ "также могут быть перехвачены!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "ИÑпользовать ÑкÑпериментальные алгоритмы не рекомендуетÑÑ!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "не рекомендуем данный алгоритм шифрованиÑ; иÑпользуйте более " +#~ "Ñтандартный!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "ÑохранÑÑŽ в `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "извините, но Ñто невозможно выполнить в пакетном режиме\n" @@ -6131,12 +6280,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? проблема проверки отзыва: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[отозван]" - -#~ msgid "[expired] " -#~ msgstr "[проÑрочен]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [годен до: %s]" Index: gnupg/po/sk.po diff -u gnupg/po/sk.po:1.7 gnupg/po/sk.po:1.8 --- gnupg/po/sk.po:1.7 Thu Oct 28 11:06:49 2004 +++ gnupg/po/sk.po Fri Dec 10 23:20:42 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -13,11 +13,6 @@ "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "hashovací algoritmus `%s' je len na èítanie v tejto verzii\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -32,11 +27,12 @@ msgid "no entropy gathering module detected\n" msgstr "nebol detekovaný ¾iadny modul na získanie entropie\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -69,9 +65,9 @@ msgid "note: random_seed file not updated\n" msgstr "poznámka: súbor random_seed nie je aktualizovaný\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "nemô¾em vytvori» `%s': %s\n" @@ -124,90 +120,150 @@ "Nedostatok náhodných bajtov. Prosím, pracujte s operaèným systémom, aby\n" "ste mu umo¾nili získa» viac entropie (je potrebných %d bajtov).\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "nemô¾em inicializova» databázu dôvery: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "zlyhalo obnovenie vyrovnávacej pamäti kµúèov: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "nepodarilo posla» kµúè na server: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "chyba pri vytváraní hesla: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "chyba pri èítaní bloku kµúèa: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: chyba pri èítaní voµného záznamu: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' je u¾ skomprimovaný\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "vytvori» nový pár kµúèov" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "nenájdené ¾iadne platné dáta vo formáte OpenPGP.\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "chyba pri vytváraní hesla: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "nemô¾em inicializova» databázu dôvery: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -295,15 +351,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "nemo¾no previes» v dávkovom móde\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Vá¹ výber? " @@ -311,141 +367,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Dôvod nebol ¹pecifikovaný" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "nespracované" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "¾iadny zodpovedajúci verejný kµúè: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "chyba pri èítaní `%s': %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "aktualizova» predvoµby" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "neplatný znak v re»azci s predvoµbami\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "neplatný znak v re»azci s predvoµbami\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "chyba: neplatný odtlaèok\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "vypísa» fingerprint" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "chyba: neplatný odtlaèok\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "nenájdené ¾iadne platné dáta vo formáte OpenPGP.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "chyba pri zápise do súboru tajných kµúèov `%s': %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -453,232 +518,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Prosím, vyberte druh kµúèa, ktorý chcete:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Platnos» podpisu vypr¹ala %s\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Neplatný výber.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Prosím výberte dôvod na revokáciu:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "neznámy ochranný algoritmus\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Tajné èasti primárneho kµúèa nie sú dostupné.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "preskoèené: tajný kµúè je u¾ v databáze\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "ukonèi»" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ukonèi» toto menu" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "u" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "ukáza» túto pomoc" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Kµúè k dispozícii na: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "zmeni» dobu platnosti" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "zmeni» dôveryhodnos» vlastníka kµúèa" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "vypísa» fingerprint" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "v¹eobecná chyba" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "vytvori» nový pár kµúèov" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Príkaz> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný príkaz (skúste \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Opakujte heslo: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "heslo nie je zopakované správne; skúste to znovu" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -688,13 +775,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output pre tento príkaz nefunguje\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "kµúè `%s' nebol nájdený: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -737,7 +824,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "aby ste ho zmazali, pou¾ite najprv prepínaè \"--delete-secret-key\".\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "chyba pri vytváraní hesla: %s\n" @@ -756,7 +843,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' je u¾ skomprimovaný\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "VAROVANIE: súbor `%s' je prázdny\n" @@ -782,7 +869,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "vy¾iadaná symetrická ¹ifra %s (%d) nevyhovuje predvoµbám príjemcu\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -887,27 +974,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VAROVANIE: nemô¾em vymaza» doèasný adresár `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "kµúè %08lX: nie je chránený - preskoèené\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "kµúè %08lX: PGP 2.x kµúè - preskoèené\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "VAROVANIE: tajný kµúè %08lX nemá jednoduchý SK kontrolný súèet\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "VAROVANIE: niè nebolo vyexportované\n" @@ -1090,15 +1177,15 @@ msgid "prompt before overwriting" msgstr "vy¾iada» potvrdenie pred prepísaním" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1107,7 +1194,7 @@ "(Pou¾ite manuálové stránky pre kompletný zoznam v¹etkých príkazov a " "mo¾ností)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1127,17 +1214,17 @@ " --list-keys [mená] vypísa» kµúèe\n" " --fingerprint [mená] vypísa» fingerprinty\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "Chyby oznámte, prosím, na adresu .\n" "Pripomienky k prekladu .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Pou¾itie: gpg [mo¾nosti] [súbory] (-h pre pomoc)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1147,7 +1234,7 @@ "podpísa», overi», ¹ifrova» alebo de¹ifrova»\n" "implicitné operácie závisia od vstupných dát\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1155,471 +1242,471 @@ "\n" "Podporované algoritmy:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "Verejné kµúèe: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "©ifry: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Kompresia: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "pou¾itie: gpg [mo¾nosti] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "konfliktné príkazy\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpeène \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "" "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpeène \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "neznáma polo¾ka konfigurácie \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitný súbor s mo¾nos»ami `%s ignorovaný'\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitný súbor s mo¾nos»ami `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "súbor s mo¾nos»ami `%s': %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "èítam mo¾nosti z `%s'\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s nie je pre normálne pou¾itie!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "¹ifra \"%s\" nebola nahraná, preto¾e prístupové práva nie sú nastavené " "bezpeène\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nie je platná znaková sada\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "neplatný parameter pre import\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "neplatný parameter pre import\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nemo¾no nastavi» exec-path na %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "VAROVANIE: program mô¾e vytvori» súbor core!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVANIE: %s prepí¹e %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie je dovolené pou¾íva» %s s %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedáva s %s zmysel!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v móde --pgp2 mô¾ete vytvára» len oddelené podpisy alebo podpisy èitateµné " "ako text\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v móde --pgp2 nemo¾no súèasne ¹ifrova» a podpisova»\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v móde --pgp2 musíte pou¾i» súbor (nie rúru).\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrovanie správ v móde --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí by» väè¹ia ako 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí by» väè¹ia ako 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "polo¾ka max-cert-depth musí by» v rozmedzí od 1 do 255\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "neplatná implicitná úroveò certifikácie; musí by» 0, 1, 2 alebo 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "neplatná minimálna úroveò certifikácie; musí by» 0, 1, 2 alebo 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dôrazne nedoporuèovaný\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí by» 0, 1 alebo 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "neplatné defaultné predvoµby\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre ¹ifrovanie\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre hashovanie\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre kompresiu\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s e¹te nepracuje s %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» ¹ifrovací algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» hashovací algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» kompresný algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemô¾em inicializova» databázu dôvery: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVANIE: daný adresát (-r) bez pou¾itia ¹ifrovania s verejným kµúèom\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [meno súboru]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [meno súboru]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "de¹ifrovanie zlyhalo: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [meno súboru]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" "pou¾itie %s nie je v móde %s dovolené\n" "\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [meno súboru]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" "pou¾itie %s nie je v móde %s dovolené\n" "\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [meno súboru]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [meno súboru]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [meno súboru]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key id u¾ívateµa" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ívateµa" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u¾ívateµa" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u¾ívateµa" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ívateµa [príkazy]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ívateµa] [súbor s kµúèmi (keyring)]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "nepodarilo posla» kµúè na server: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "nepodarilo sa prija» kµúè zo servera: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "nepodaril sa export kµúèa: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "nepodarilo sa nájs» server: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aktualizácia servera zlyhala: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódovanie do ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[meno súboru]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Zaènite písa» svoju správu ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1627,23 +1714,23 @@ "meno mô¾e obsahova» len písmená, èíslice, bodky, podèiarníky alebo medzery a " "konèi» s '='\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "hodnota musí obsahova» znak '@'\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "hodnota nesmie obsahova» ¾iadne kontrolné znaky\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pre certifikaènú politiku je neplatné\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pre podpisovú politiku je neplatné\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "zadané URL pre podpisovú politiku je neplatné\n" @@ -1652,29 +1739,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "príli¹ veµa polo¾iek v bufferi verejných kµúèov - vypnuté\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[User id not found]" # c-format -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Neplatný kµúè %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "existuje tajný kµúè pre tento verejný kµúè %08lX!\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "pou¾ívam sekundárny kµúè %08lX namiesto primárneho kµúèa %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "kµúè %08lX: tajný kµúè bez verejného kµúèa - preskoèené\n" @@ -2032,383 +2119,383 @@ msgid "No help available for `%s'" msgstr "Pomoc nie je dostupná pre '%s'" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "blok typu %d bol preskoèený\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "%lu kµúèe boli doteraz spracované\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Celkovo spracovaných kµúèov: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " preskoèené nové kµúèe: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " bez identifikátorov: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importované: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " bez zmien: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nové id u¾ívateµov: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nové podkµúèe: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nové podpisy: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " nové revokácie kµúèov: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " preèítané tajné kµúèe: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " importované tajné kµúèe: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " tajné kµúèe nezmenené: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " neimportované: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Podpísali ste nasledujúce identifikátory u¾ívateµa:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s podpis, hashovací algoritmus %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "kµúè %08lX: chyba identifikátor u¾ívateµa\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "kµúè %08lX: HKP po¹kodenie podkµúèa opravené\n" # c-format -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "" "kµúè %08lX: prijaté id u¾ívateµa '%s', ktorý nie je podpísaný ním samým\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "kµúè %08lX: chýba platný identifikátor u¾ívateµa\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "mô¾e to by» spôsobené chýbajúcim podpisom kµúèa ním samým\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "kµúè %08lX: verejný kµúè nenájdený: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "kµúè %08lX: nový kµúè - preskoèený\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "nenájdený zapisovateµný súbor kµúèov (keyring): %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "zapisujem do '%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "chyba pri zápise súboru kµúèov (keyring) `%s': %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "kµúè %08lX: verejný kµúè \"%s\" importovaný\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "kµúè %08lX: nezodpovedá na¹ej kópii\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "kµúè %08lX: nemô¾em nájs» originálny blok kµúèa: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "kµúè %08lX: nemô¾em èíta» originálny blok kµúèa: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "kµúè %08lX: \"%s\" 1 nový identifikátor u¾ívateµa\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "kµúè %08lX: \"%s\" %d nových identifikátorov u¾ívateµa\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "kµúè %08lX: \"%s\" 1 nový podpis\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "kµúè %08lX: \"%s\" %d nových podpisov\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "kµúè %08lX: \"%s\" 1 nový podkµúè\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "kµúè %08lX: \"%s\" %d nových podkµúèov\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "kµúè %08lX: \"%s\" bez zmeny\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "kµúè %08lX: tajný kµúè bez verejného kµúèa %d - preskoèené\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "nie je nastavený implicitný súbor tajných kµúèov %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "kµúè %08lX: tajný kµúè importovaný\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "kµúè %08lX: je u¾ v súbore tajných kµúèov\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "kµúè %08lX: nebol nájdený tajný kµúè: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "kµúè %08lX: chýba verejný kµúè - nemô¾em aplikova» revokaèný certifikát\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "kµúè %08lX: neplatný revokaèný certifikát: %s - zamietnuté\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "kµúè %08lX: \"%s\" revokaèný certifikát importovaný\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "kµúè %08lX: neexistuje id u¾ívateµa pre podpis\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "kµúè %08lX: nepodporovaný algoritmus verejného kµúèa u u¾ívateµského id \"%s" "\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "" "kµúè %08lX: neplatný podpis kµúèa ním samým u u¾ívateµského id \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "kµúè %08lX: neexistuje podkµúè pre viazanie kµúèov\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "kµúè %08lX: nepodporovaný algoritmus verejného kµúèa\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "kµúè %08lX: neplatná väzba podkµúèa\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "kµúè %08lX: zmazaná viacnásobná väzba podkµúèa\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "kµúè %08lX: neexistuje podkµúè na revokáciu kµúèa\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "kµúè %08lX: neplatný revokaèný podkµúè\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "kµúè %08lX: zmazaná viacnásobná revokácia podkµúèa\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "kµúè %08lX: identifikátor u¾ívateµa preskoèený '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "kµúè %08lX: podkµúè preskoèený\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "kµúè %08lX: podpis nie je exportovateµný (trieda %02x) - preskoèené\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "kµúè %08lX: revokaèný certifikát na zlom mieste - preskoèené \n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "kµúè %08lX: neplatný revokaèný certifikát: %s - preskoèené\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "kµúè %08lX: podpis subkµúèa na zlom mieste - preskoèené \n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "kµúè %08lX: neoèakávaná podpisová trieda (0x%02X) - preskoèené\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "kµúè %08lX: zistený duplikovaný identifikátor u¾ívateµa - zlúèený\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "VAROVANIE: kµúè %08lX mô¾e by» revokovaný: skú¹am získa» revokaèný kµúè %" "08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "VAROVANIE: kµúè %08lX mô¾e by» revokovaný: revokaèný kµúè %08lX nenájdený.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "kµúè %08lX: pridaný revokaèný certifikát \"%s\"\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "kµúè %08lX: podpis kµúèa ním samým (direct key signature)\n" @@ -2647,7 +2734,8 @@ msgstr " (3) Veµmi dôkladne som to overil(a).%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Vá¹ výber? ('?' - viac informácií): " #: g10/keyedit.c:918 @@ -2721,7 +2809,7 @@ msgid "Really sign? (y/N) " msgstr "Skutoène podpísa»? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2752,7 +2840,7 @@ "Vlo¾te nové heslo (passphrase) pre tento tajný kµúè.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "heslo nie je zopakované správne; skúste to znovu" @@ -3231,83 +3319,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Tento kµúè mô¾e by» revokovaný kµúèom %s " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr "(citlivá informácia)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s: nemô¾em vytvori»: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revokované]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Tento kµúè bol oznaèený za neplatný (disabled)" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[revokované]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "U¾ívateµské ID vo formáte PGP 2.x nemá ¾iadne predvoµby\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3315,7 +3387,19 @@ "Prosím nezabúdajte, ¾e zobrazované údaje o platnosti kµúèov nemusia\n" "by» správne, pokiaµ znovu nespustíte program.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[revokované]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3323,7 +3407,7 @@ "VAROVANIE: ¾iadne ID u¾ívateµa nebolo oznaèené ako primárne. Tento príkaz\n" "spôsobí, ¾e iné ID u¾ívateµa sa bude pova¾ova» primárne.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3332,45 +3416,45 @@ "VAROVANIE: Toto je PGP2 kµúè. Pridanie fotografického ID mô¾e v niektorých\n" " verziách PGP vies» k odmietnutiu tohto kµúèa.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Ste si istý, ¾e ho chcete stále prida»? (a/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nemali by ste pridáva» fotografické ID k PGP2 kµúèu.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Zmaza» tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Zmaza» tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Zmaza» tento neznámy podpis? (a/N/u)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Skutoène zmaza» tento podpis podpísaný sebou samým? (a/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Zmazaný %d podpis.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Zmazaných %d podpisov.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Niè nebolo zmaznané.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3379,159 +3463,159 @@ "VAROVANIE: Toto je PGP2 kµúè. Pridanie fotografického ID mô¾e v niektorých\n" " verziách PGP vies» k odmietnutiu tohoto kµúèa.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nemali by ste pridáva» fotografické ID k PGP2 kµúèu.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ívateµa povereného revokáciou: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "kµúè vo formáte PGP 2.x nemo¾no poveri» revokáciou\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "kµúè nemo¾no poveri» revokáciou ním samým\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VAROVANIE: Tento kµúè bol revokovaný jeho urèeným revokátorom/!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VAROVANIE: oznaèenie kµúèa ako revokovací u¾ nemô¾e by» zru¹ené!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Ste si istý, ¾e chcete oznaèi» tento kµúè ako revokovací? (a/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Prosím, odstráòte výber z tajných kµúèov.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Mením dobu platnosti sekundárneho kµúèa.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Mením dobu platnosti primárneho kµúèa.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nemô¾ete zmeni» dobu platnosti kµúèa verzie 3\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "V súbore tajných kµúèov chýba zodpovedajúci podpis\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte práve jedno id u¾ívateµa.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "preskoèený v3 podpis kµúèa ním samým u u¾ívateµského id \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Ste si istý, ¾e ho chcete pou¾i»? (a/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Ste si istý, ¾e ho chcete pou¾i»? (a/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundárny kµúè s indexom %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "id u¾ívateµa: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " podpísané %08lX v %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnos» podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Ste si istý, ¾e ho chcete stále revokova»? (a/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvori» pre tento podpis revokaèný certifikát? (a/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Podpísali ste nasledujúce identifikátory u¾ívateµa:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokované %08lX v %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte sa revokova» tieto podpisy:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Skutoène vytvori» revokaèné certifikáty? (a/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "neexistuje tajný kµúè\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "VAROVANIE: podpis pou¾ivateµkého ID vznikol %d sekund v budúcnosti\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3574,12 +3658,12 @@ msgid "writing key binding signature\n" msgstr "zapisujem \"key-binding\" podpis\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "neplatná då¾ka kµúèa; pou¾ijem %u bitov\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "då¾ka kµúèa zaokrúhlená na %u bitov\n" @@ -3647,93 +3731,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (len na ¹ifrovanie)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (len na ¹ifrovanie)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (len na podpis)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (len na ¹ifrovanie)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Chystám sa vytvori» nový pár kµúèov %s.\n" -" minimálna veµkos» kµúèa je 768 bitov\n" -" implicitná veµkos» kµúèa je 1024 bitov\n" -" najvy¹¹ia navrhovaná veµkos» kµúèa je 2048 bitov\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Akú veµkos» kµúèa si prajete? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "kµúè DSA musí ma» veµkos» od 512 do 1024 bitov.\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"veµkos» kµúèa je príli¹ malá; minimálna povolená veµkos» pre RSA je 1024 " -"bitov.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "" -"veµkos» kµúèa je príli¹ malá; minimálna povolená veµkos» je 768 bitov.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "Pár kµúèov DSA bude ma» då¾ku 1024 bitov.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "veµkos» kµúèa je príli¹ veµká; maximálna povolená hodnota je %d.\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Veµkosti kµúèov väè¹ie ako 2048 bitov se neodporúèajú, preto¾e\n" -"výpoèty potom trvajú VE¥MI dlho!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Skutoène chcete vytvori» kµúè tejto då¾ky? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Akú veµkos» kµúèa si prajete? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Dobre, ale nezabúdajte, ¾e informácie mô¾u by» vyzradené z poèítaèa aj " -"elektromagnetickým vy¾arovaním monitora alebo klávesnice!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Po¾adovaná då¾ka kµúèa je %u bitov.\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "zaokrúhlené na %u bitov\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3749,7 +3800,7 @@ " m = doba platnosti kµúèa skonèí za n mesiacov\n" " y = doba platnosti kµúèa skonèí za n rokov\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3765,29 +3816,29 @@ " m = doba platnosti podpisu skonèí za n mesiacov\n" " y = doba platnosti podpisu skonèí za n rokov\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Kµúè je platný na? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Podpis je platný na? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "neplatná hodnota\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "platnos» %s neskonèí\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "platnos» %s skonèí %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3795,12 +3846,12 @@ "Vá¹ systém nevie zobrazi» dátumy po roku 2038.\n" "V ka¾dom prípade budú dátumy korektne spracovávané do roku 2106.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Je to správne (a/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3817,44 +3868,44 @@ " \"Jozko Mrkvicka (student) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Meno a priezvisko: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Neplatný znak ve mene\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Meno nemô¾e zaèína» èíslicou\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Meno musí by» dlhé aspoò 5 znakov\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "E-mailová adresa: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "Neplatná e-mailová adresa\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Komentár: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Neplatný znak v komentári\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Pou¾ívate znakovú sadu `%s'.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3865,27 +3916,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "Do poµa meno alebo komentár nepí¹te, prosím, e-mailovú adresu.\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "mMkKeEPpUu" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Zmeni» (M)eno, (K)omentár, (E)-mail alebo (U)konèi»? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Zmeni» (M)eno, (K)omentár, (E)-mail alebo (P)okraèova»/(U)konèi»? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Najskôr, prosím, opravte chybu\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3893,12 +3944,12 @@ "Na ochranu Vá¹ho tajného kµúèa musíte zada» heslo.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3910,7 +3961,7 @@ "tohto programu s parametrom \"--edit-key\".\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3922,54 +3973,50 @@ "pou¾íva» disky); vïaka tomu má generátor lep¹iu ¹ancu získa» dostatok " "entropie.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "Pár kµúèov DSA bude ma» då¾ku 1024 bitov.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Vytváranie kµúèa bolo zru¹ené.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "zapisujem verejný kµúè do `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "nenájdený zapisovateµný súbor verejných kµúèov (pubring): %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "nenájdený zapisovateµný súbor tajných kµúèov (secring): %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "chyba pri zápise do súboru verejných kµúèov `%s': %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "chyba pri zápise do súboru tajných kµúèov `%s': %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "verejný a tajný kµúè boli vytvorené a podpísané.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3977,12 +4024,12 @@ "Tento kµúè nemô¾e by» pou¾itý na ¹ifrovanie. Pre vytvorenie\n" "sekundárneho kµúèa na tento úèel mô¾ete pou¾i» príkaz \"--edit-key\".\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Vytvorenie kµúèa sa nepodarilo: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3990,7 +4037,7 @@ "kµúè bol vytvorený %lu sekund v budúcnosti (do¹lo k zmene èasu alebo\n" "je problém so systémovým èasom)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -3998,40 +4045,40 @@ "kµúè bol vytvorený %lu sekund v budúcnosti (do¹lo k zmene èasu alebo\n" "je problém so systémovým èasom)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "POZNÁMKA: vytvorenie podkµúèa pre kµúèe v3 nie je v súlade s OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Skutoène vytvori»? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "zmazanie bloku kµúèa sa nepodarilo: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "nemô¾em vytvori» `%s': %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "POZNÁMKA: platnos» tajného kµúèa %08lX skonèila %s\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4077,28 +4124,28 @@ msgid "expired: %s)" msgstr " [platnos» skonèí: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Primárny fingerprint kµúèa:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " Fingerprint podkµúèa:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " Primárny fingerprint kµúèa:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " Fingerprint podkµúèa:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Fingerprint kµúèa =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4457,7 +4504,7 @@ msgid "textmode" msgstr "textový mód" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "neznáme" @@ -4488,30 +4535,41 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "nájdený neplatný koreòový paket v proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "nemô¾em vypnú» vytváranie core súborov: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "nemo¾no otvori» súbor: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Experimentálne algoritmy by sa nemali pou¾íva»!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "nemô¾em pracova» s algoritmom verejného kµúèa %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "¹ifrovací algoritmus nie je implementovaný" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s podpis, hashovací algoritmus %s\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"tento ¹ifrovací algoritmus je zastaralý; prosím, pou¾ite nejaký " -"¹tandardnej¹í!\n" +"vy¾iadaný hashovací algoritmus %s (%d) nevyhovuje predvoµbám príjemcu\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4620,50 +4678,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nie je v tomto sedení dostupný\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "nemô¾em nastavi» PID klienta pre gpg-agenta\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "nemo¾no získa» server read file descriptor pre agenta\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "nemo¾no získa» server write file descriptor pre agenta\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "zlý formát premennej prostredia GPG_AGENT_INFO\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verzie %d nie je podporovaný\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemô¾em sa pripoji» k `%s': %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problém v komunikácii s gpg-agentom\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentom - pou¾ívanie agenta vypnuté\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (hlavné ID kµúèa %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4674,41 +4732,41 @@ "\"%.*s\"\n" "kµúè s då¾kou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Opakova» heslo\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Vlo¾i» heslo\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "heslo je príli¹ dlhé\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "neplatná reakcia od agenta\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "zru¹ené u¾ívateµom\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentom: agent vracia 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "v dávkovom re¾ime sa nemô¾em pýta» na heslo\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4718,17 +4776,17 @@ "Musíte pozna» heslo, aby ste odomkli tajný kµúè pre\n" "u¾ívateµa: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "då¾ka %u bitov, typ %s, ID %08lX, vytvorený %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -4934,7 +4992,8 @@ msgstr "VAROVANIE: Tento kµúè bol revokovaný jeho vlastníkom!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " To mô¾e znamena», ¾e podpis je falo¹ný.\n" #: g10/pkclist.c:527 @@ -5039,28 +5098,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "dáta neboli ulo¾ené; na ich ulo¾enie pou¾ite prepínaè \"--output\"\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "chyba pri vytváraní `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Podpis oddelený od dokumentu.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Prosím, vlo¾te názov dátového súboru: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "èítam ¹tandardný vstup (stdin) ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "chýbajú podpísané dáta\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "nemô¾em otvori» podpísané dáta '%s'\n" @@ -5380,54 +5439,49 @@ msgstr "" "v móde --pgp2 mô¾ete vytvori» len oddelený podpis kµúèa vo formáte PGP-2.x\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "zapisujem do '%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" "vy¾iadaný hashovací algoritmus %s (%d) nevyhovuje predvoµbám príjemcu\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "podpisujem:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "v móde --pgp2 mô¾ete vytvára» èitateµné podpisy len s kµúèmi formátu PGP-2." "x\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "bude pou¾ité ¹ifrovanie %s\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "kµúè nie je oznaèený ako nedostatoène bezpeèný - nemô¾em ho pou¾i» s " "falo¹ným RNG!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "preskoèený `%s': duplikovaný\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "preskoèený `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "preskoèené: tajný kµúè je u¾ v databáze\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5617,12 +5671,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "databáza dôvery je po¹kodená; prosím spustite \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nemô¾em pracova» s riadkami dlh¹ími ako %d znakov\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "vstupný riadok je dlh¹í ako %d znakov\n" @@ -5673,85 +5727,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[revokované]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[expirované]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "neznáme" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "nikdy " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹ia kontrola databázy dôvery %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "verejný kµúè %08lX nebol nájdený: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "prosím vykonajte --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "kontrolujem databázu dôvery\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kµúèov spracovaných (%d poètov platnosti vymazaných)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "neboli nájdené ¾iadne absolútne dôveryhodné kµúèe\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "verejný kµúè k absolútne dôveryhodnému kµúèu %08lX nebol nájdený\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n" @@ -6060,6 +6149,66 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(pravdepodobne ste na túto úlohu pou¾ili nesprávny program)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "hashovací algoritmus `%s' je len na èítanie v tejto verzii\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Chystám sa vytvori» nový pár kµúèov %s.\n" +#~ " minimálna veµkos» kµúèa je 768 bitov\n" +#~ " implicitná veµkos» kµúèa je 1024 bitov\n" +#~ " najvy¹¹ia navrhovaná veµkos» kµúèa je 2048 bitov\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "kµúè DSA musí ma» veµkos» od 512 do 1024 bitov.\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "veµkos» kµúèa je príli¹ malá; minimálna povolená veµkos» pre RSA je 1024 " +#~ "bitov.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "" +#~ "veµkos» kµúèa je príli¹ malá; minimálna povolená veµkos» je 768 bitov.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "veµkos» kµúèa je príli¹ veµká; maximálna povolená hodnota je %d.\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Veµkosti kµúèov väè¹ie ako 2048 bitov se neodporúèajú, preto¾e\n" +#~ "výpoèty potom trvajú VE¥MI dlho!\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Skutoène chcete vytvori» kµúè tejto då¾ky? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Dobre, ale nezabúdajte, ¾e informácie mô¾u by» vyzradené z poèítaèa aj " +#~ "elektromagnetickým vy¾arovaním monitora alebo klávesnice!\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Experimentálne algoritmy by sa nemali pou¾íva»!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "tento ¹ifrovací algoritmus je zastaralý; prosím, pou¾ite nejaký " +#~ "¹tandardnej¹í!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "zapisujem do '%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "nemo¾no previes» v dávkovom móde\n" @@ -6188,12 +6337,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? problém overenia revokácie: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[revokované]" - -#~ msgid "[expired] " -#~ msgstr "[expirované]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [platnos» skonèí: %s]" Index: gnupg/po/sv.po diff -u gnupg/po/sv.po:1.17 gnupg/po/sv.po:1.18 --- gnupg/po/sv.po:1.17 Thu Oct 28 11:06:49 2004 +++ gnupg/po/sv.po Fri Dec 10 23:20:41 2004 @@ -10,54 +10,47 @@ # where corrected. The translations were checked for # consistency and some expressions where given new # translations. -# -# 2004, September 20: First Preliminary new translation. -# This translation will be revised and corrected -# during October 2004. +# 2004/12/01 Per Tunedal # =================================================== # # First translator Daniel Resare , 1999-2002, # who sends his thanks to André Dahlqvist # and to his wife Olivia . # -# $Id: sv.po,v 1.17 2004/10/28 09:06:49 wk Exp $ +# $Id: sv.po,v 1.18 2004/12/10 22:20:41 wk Exp $ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.1\n" +"Project-Id-Version: gnupg 1.2.6\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" -"PO-Revision-Date: 2004-09-20 22:12+0100\n" -"Last-Translator: Per Tunedal \n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"PO-Revision-Date: 2004-12-01 17:49+0100\n" +"Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "sammandragsalgoritmen `%s' kan endast läsas i denna programutgÃ¥va\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" -msgstr "kan inte skapa ett primtal med mindre än %d bits\n" +msgstr "kan inte skapa ett primtal med mindre än %d bitar\n" #: cipher/primegen.c:311 #, c-format msgid "can't generate a prime with less than %d bits\n" -msgstr "kan inte skapa ett primtal med mindre än %d bits\n" +msgstr "kan inte skapa ett primtal med mindre än %d bitar\n" #: cipher/random.c:163 msgid "no entropy gathering module detected\n" msgstr "ingen demon för entropisamling hittad\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -75,11 +68,11 @@ #: cipher/random.c:401 msgid "note: random_seed file is empty\n" -msgstr "notera: filen random_seed är tom\n" +msgstr "Obs: filen random_seed är tom\n" #: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" -msgstr "varning: slumpkärnan har en felaktig storlek och används därför inte\n" +msgstr "VARNING: slumpkärnan har en felaktig storlek och används därför inte\n" #: cipher/random.c:415 #, c-format @@ -88,11 +81,11 @@ #: cipher/random.c:453 msgid "note: random_seed file not updated\n" -msgstr "notera: random_seed uppdaterades inte\n" +msgstr "Obs: random_seed uppdaterades inte\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "kan inte skapa \"%s\": %s\n" @@ -148,102 +141,162 @@ "en stund för att ge operativsystemet en chans att samla mer entropi!\n" "(Behöver %d fler byte)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "misslyckades med att Ã¥terskapa nyckelringscache: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "Sändning till nyckelservern misslyckades: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "Fel vid skapande av `%s': %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "fel vid läsning av nyckelblock: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "fel: ogiltigt fingeravtryck\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' är redan komprimerad\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "generera ett nytt nyckelpar" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "Nyckelgenereringen misslyckades: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Nyckelgenereringen misslyckades: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 -#, fuzzy, c-format +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 +#, c-format msgid "can't access %s - invalid OpenPGP card?\n" -msgstr "hittade ingen giltig OpenPGP-data.\n" +msgstr "" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "fel vid skapandet av lösenmening: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "misslyckades med att radera nyckelblock: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" -msgstr "skal: %s\n" +msgstr "ASCII-skal: %s\n" #: g10/armor.c:346 msgid "invalid armor header: " -msgstr "felaktig rubrikrad i skalet: " +msgstr "felaktig rubrikrad i ASCII-skalet: " #: g10/armor.c:353 msgid "armor header: " -msgstr "rad i skalet: " +msgstr "rad i ASCII-skalet: " #: g10/armor.c:364 msgid "invalid clearsig header\n" @@ -256,18 +309,20 @@ #: g10/armor.c:551 #, fuzzy msgid "unexpected armor: " -msgstr "oväntat skal:" +msgstr "oväntat ASCII-skal:" +# rader i klartexten som inleds med bindestreck fÃ¥r ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..." #: g10/armor.c:563 msgid "invalid dash escaped line: " -msgstr "felaktig bindestreck-kodad rad: " +msgstr "felaktig rad som börjar med bindestreck: " # överhoppad eller hoppades över? #: g10/armor.c:715 g10/armor.c:1300 #, fuzzy, c-format msgid "invalid radix64 character %02X skipped\n" -msgstr "hoppade över ogiltigt radix64-tecken %02x \n" +msgstr "hoppade över felaktigt radix64-tecken %02x \n" +# CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten. #: g10/armor.c:758 msgid "premature eof (no CRC)\n" msgstr "för tidigt filslut (ingen CRC-summa)\n" @@ -301,14 +356,14 @@ #: g10/armor.c:1120 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "felaktigt asciiI-skal: raden är längre än %d tecken\n" +msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n" #: g10/armor.c:1124 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" "tecken kodade enligt \"quoted printable\"-standarden funna i skalet - detta\n" -"beror sannolikt pÃ¥ att en felaktig epostserver eller epostklient har " +"beror sannolikt pÃ¥ att en felaktig e-postserver eller e-postklient har " "använts\n" #: g10/card-util.c:58 g10/card-util.c:282 @@ -321,15 +376,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "kan inte göra detta i batch-läge\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Vad väljer du? " @@ -337,141 +392,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "Ingen anledning har angivits" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "inte behandlade" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "ingen tillhörande öppen nyckel: %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "fel vid läsning av \"%s\": %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "uppdaterat inställningar" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" -msgstr "Ogiltigt tecken i inställningssträngen\n" +msgstr "felaktigt tecken i inställningssträngen\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" -msgstr "Ogiltigt tecken i inställningssträngen\n" +msgstr "felaktigt tecken i inställningssträngen\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "fel: ogiltigt fingeravtryck\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "visa fingeravtryck" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "fel: ogiltigt fingeravtryck\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "hittade ingen giltig OpenPGP-data.\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -479,235 +543,255 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Välj vilken typ av nyckel du vill ha:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 msgid " (1) Signature key\n" msgstr "" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (endast kryptering)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Felaktigt val.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Välj anledning till att nyckeln spärras:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "okänd krypteringsalgoritm\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "hoppade över: hemlig nyckel finns redan\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "avsluta" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "avsluta denna meny" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "motstridiga kommandon\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "visa denna hjälp" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" -msgstr "list" +msgstr "visa en lista" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nyckeln tillgänglig hos: " # ??? -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" -msgstr "debug" +msgstr "avlusa" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "ändra utgÃ¥ngsdatum" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" # originalet borde ha ett value -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "ändra ägartillitsvärdet" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" # skall dessa översättas? -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "visa fingeravtryck" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "allmänt fel" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "generera ett nytt nyckelpar" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Kommando> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "motstridiga kommandon\n" -#: g10/card-util.c:1297 -#, fuzzy +#: g10/card-util.c:1387 msgid "Admin commands are allowed\n" -msgstr "motstridiga kommandon\n" +msgstr "" -#: g10/card-util.c:1299 -#, fuzzy +#: g10/card-util.c:1389 msgid "Admin commands are not allowed\n" -msgstr "skriver hemlig nyckel till \"%s\"\n" +msgstr "" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" -msgstr "Ogiltigt kommando (försök med \"help\")\n" +msgstr "Felaktigt kommando (försök med \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Repetera lösenmeningen: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "lösenmeningen upprepades inte korrekt; försök igen." + # se förra kommentaren -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -717,17 +801,17 @@ msgid "--output doesn't work for this command\n" msgstr "--output kan inte användas för detta kommando\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "hittade inte nyckeln `%s': %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" -msgstr "fel vid läsninga av nyckelblock: %s\n" +msgstr "fel vid läsning av nyckelblock: %s\n" #: g10/delkey.c:121 g10/delkey.c:128 msgid "(unless you specify the key by fingerprint)\n" @@ -766,14 +850,14 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "fel vid skapandet av lösenmening: %s\n" #: g10/encode.c:215 msgid "can't use a symmetric ESK packet due to the S2K mode\n" -msgstr "kan inte använda symetriska ESK-paket pga S2K-läge\n" +msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n" #: g10/encode.c:228 #, c-format @@ -785,7 +869,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' är redan komprimerad\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "VARNING: \"%s\" är en tom fil\n" @@ -793,7 +877,7 @@ #: g10/encode.c:472 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" -"du kan endast krypterar till RSA nycklar som är högst 2048 bitar lÃ¥nga i --" +"du kan endast kryptera till RSA nycklar som är högst 2048 bitar lÃ¥nga i --" "pgp2-läge\n" #: g10/encode.c:494 @@ -811,10 +895,10 @@ msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -"att kräva symetrisk kryptering med %s (%d) strider mot mottagarnas " +"att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas " "inställningar\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -827,7 +911,7 @@ #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "" -"att kräva symetrisk kryptering med %s (%d) strider mot mottagarnas " +"att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas " "inställningar\n" #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757 @@ -850,12 +934,13 @@ msgid "encrypted with unknown algorithm %d\n" msgstr "krypterad med en okänd algoritm %d\n" +# I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas. #: g10/encr-data.c:92 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" -"VARNING: meddelandet krypterades med en svag nyckel i den symmetriska\n" -"krypteringen.\n" +"VARNING: meddelandet krypterades med en svag nyckel\n" +"i den symmetriska krypteringen.\n" #: g10/encr-data.c:103 msgid "problem handling encrypted packet\n" @@ -875,7 +960,7 @@ msgid "" "external program calls are disabled due to unsafe options file permissions\n" msgstr "" -"anrop av externa program är inaktiverat pga osäkra behörigheter för\n" +"anrop av externa program är avstängt pga osäkra behörigheter för\n" "inställningsfilen\n" #: g10/exec.c:355 @@ -921,27 +1006,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "skriver hemlig nyckel till \"%s\"\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" -msgstr "nyckeln %08lX är inte skyddad - överhoppade över den\n" +msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" -msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK kontrollsumma\n" +msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "VARNING: exporterade ingenting\n" @@ -963,7 +1048,7 @@ #: g10/g10.c:362 msgid "make a detached signature" -msgstr "skapa en signatur i en separat fil" +msgstr "skapa signatur i en separat fil" #: g10/g10.c:363 msgid "encrypt data" @@ -971,11 +1056,12 @@ #: g10/g10.c:365 msgid "encryption only with symmetric cipher" -msgstr "endast symetrisk kryptering" +msgstr "endast symmetrisk kryptering" +# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas. #: g10/g10.c:367 msgid "decrypt data (default)" -msgstr "dekryptera data (normalläge)" +msgstr "dekryptera data (standard)" #: g10/g10.c:369 msgid "verify a signature" @@ -983,11 +1069,11 @@ #: g10/g10.c:371 msgid "list keys" -msgstr "räkna upp nycklar" +msgstr "visa en lista pÃ¥ nycklar" #: g10/g10.c:373 msgid "list keys and signatures" -msgstr "räkna upp nycklar och signaturer" +msgstr "visa en lista pÃ¥ nycklar och signaturer" #: g10/g10.c:374 #, fuzzy @@ -996,11 +1082,11 @@ #: g10/g10.c:375 msgid "list keys and fingerprints" -msgstr "räkna upp nycklar och fingeravtryck" +msgstr "visa en lista pÃ¥ nycklar och fingeravtryck" #: g10/g10.c:376 msgid "list secret keys" -msgstr "räkna upp hemliga nycklar" +msgstr "visa en lista pÃ¥ hemliga nycklar" #: g10/g10.c:377 msgid "generate a new key pair" @@ -1074,6 +1160,7 @@ msgid "|algo [files]|print message digests" msgstr "|algo [filer]|skriv ut kontrollsummor" +# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil. #: g10/g10.c:421 g10/gpgv.c:65 msgid "" "@\n" @@ -1098,7 +1185,7 @@ #: g10/g10.c:437 msgid "|N|set compress level N (0 disables)" -msgstr "|N|sätt kompressionsnivÃ¥n till N (0 för att slÃ¥ av kompression)" +msgstr "|N|sätt kompressionsnivÃ¥n till N (0 för att stänga av kompression)" #: g10/g10.c:442 msgid "use canonical text mode" @@ -1120,15 +1207,17 @@ msgid "prompt before overwriting" msgstr "FrÃ¥ga före ersättning" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +# inställningar istället för flaggor? +# Nej, här är det bruksanvisningen för kommandoraden. +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1136,7 +1225,7 @@ "@\n" "(Se manualsidan för en komplett lista pÃ¥ alla kommandon och flaggor)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1152,21 +1241,22 @@ "\n" "-se -r Bo [fil] signera och kryptera för användaren Bo\n" "--clearsign [fil] skapa en klartextsignatur\n" -"--detach-sign [fil] skapa en signatur i en separat fil\n" +"--detach-sign [fil] skapa signatur i en separat fil\n" "--list-keys [namn] visa nycklar\n" "--fingerprint [namn] visa fingeravtryck\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "" "Rapportera gärna fel till .\n" "Rapportera gärna fel eller synpunkter pÃ¥ översättningen till .\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)" -#: g10/g10.c:746 +# Om inget kommando anges (decrypt/encrypt etc) väljs Ã¥tgärd efter indata. +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1176,7 +1266,7 @@ "signera, kontrollera, kryptera eller dekryptera\n" "vilken operation som utförs beror pÃ¥ programmets indata\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1184,478 +1274,476 @@ "\n" "Stödda algoritmer:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " -msgstr "öppen nyckel:" +msgstr "öppen nyckel: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " -msgstr "Chiffer" +msgstr "Chiffer: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Kontrollsumma: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " -msgstr "Komprimering:" +msgstr "Komprimering: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "användning: gpg [flaggor] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "motstridiga kommandon\n" # Vad betyder detta? -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "VARNING: %s osäker ägare till %s\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "VARNING: %s osäker ägare till %s\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "VARNING: %s osäker ägare till %s\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "VARNING: osäkert att infoga katalogägarskap till %s \"%s\"\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "okänt configurationspost \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" -msgstr "OBS: inställningsfilen \"%s\" används inte\n" +msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "OBS: inställningsfilen \"%s\" saknas\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "inställningsfil \"%s\": %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" -msgstr "läser flaggor frÃ¥n \"%s\"\n" +msgstr "läser inställningar frÃ¥n \"%s\"\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "OBS: %s är inte för normal användning!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s är ingen giltig teckentabell\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "kunde inte tolka nyckelserver-URI\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" -msgstr "%s: felaktiga exportalternativ %d\n" +msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" -msgstr "felaktiga exportalternativ\n" +msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" -msgstr "%s: felaktiga importalternativ %d\n" +msgstr "%s: felaktiga importinställningar %d\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" -msgstr "felaktiga importalternativ\n" +msgstr "felaktiga importinställningar\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" -msgstr "%s: felaktiga exportalternativ %d\n" +msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" -msgstr "felaktiga exportalternativ\n" +msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" -msgstr "%s: felaktiga importalternativ %d\n" +msgstr "%s: felaktiga importinställningar %d\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" -msgstr "felaktiga importalternativ\n" +msgstr "felaktiga importinställningar\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" -msgstr "%s: felaktiga exportalternativ %d\n" +msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" -msgstr "felaktiga exportalternativ\n" +msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunde inte sätta exec-sökvägen till %s\n" -#: g10/g10.c:2540 +# Programmet skapar en avbildning (image) av minnet för att lättare kunna spÃ¥ra fel. +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VARNING: %s gäller istället för %s\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s är inte tillÃ¥ten tillsammans med %s!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "det är ingen poäng att använda %s tillsammans med %s!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n" "i --pgp2-läge\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" -msgstr "" -"du kan inte bÃ¥de signera och kryptera samtidigt tillsammans med --pgp2\n" +msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" -msgstr "du mÃ¥ste använda filer (och inte rör) tillsammans med --pgp2\n" +msgstr "du mÃ¥ste använda filer (och inte rör) i --pgp2-läge\n" -#: g10/g10.c:2602 +# IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard. +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -"för att kryptera meddelanden med --pgp2 krävs IDEA-insticksprogrammet\n" +"för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" -msgstr "den valda krypteringsalgoritmen är ogiltig\n" +msgstr "den valda krypteringsalgoritmen är felaktig\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" -msgstr "den valda kontrollsummealgoritmen är ogiltig\n" +msgstr "den valda kontrollsummealgoritmen är felaktig\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" -msgstr "den valda krypteringsalgoritmen är ogiltig\n" +msgstr "den valda krypteringsalgoritmen är felaktig\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" -msgstr "den valda kontrollsummealgoritmen är ogiltig\n" +msgstr "den valda kontrollsummealgoritmen är felaktig\n" -# jag bedömer att detta och de följande är interna felmeddelanden -# som det är i princip omöjligt att översätta pÃ¥ pÃ¥ ett bra sätt. -# Sannolikheten för att användaren drabbas av felmeddelandet -# är ändÃ¥ litet. Eventuellt borde meddelandena inte alls -# översättas för att göra eventuell felsökning lättare -# för internationella felsökare -#: g10/g10.c:2705 +# antalet betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "variabeln \"completes-needed\" mÃ¥ste ha ett värde som är större än 0\n" -#: g10/g10.c:2707 +# antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "variabeln \"marginals-needed\" mÃ¥ste vara större än 1\n" -#: g10/g10.c:2709 +# Hur djupt GnuPG ska leta i Web-of-trust. +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "variabeln \"max-cert-depth\" mÃ¥ste ha ett värde mellan 1 och 255\n" -# cert-level? Vad är det? -# inte testnivÃ¥ i alla fall! -# Kanske är det nivÃ¥n för hur lÃ¥ng förtroendekedjan fÃ¥r vara? -#: g10/g10.c:2711 +# Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -"ogiltigt standardvärde för certifikatnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" +"felaktigt standardvärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" -# testnivÃ¥!? Vad är detta??? -# längd pÃ¥ förtroendekedjan? -#: g10/g10.c:2713 +# Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -"ogiltigt minimivärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" +"felaktigt minimivärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" -#: g10/g10.c:2716 +# S2K har med krypteringen av hemliga nyckeln att göra +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" -msgstr "ogiltigt S2K-läge; mÃ¥ste vara 0, 1 eller 3\n" +msgstr "felaktigt S2K-läge; mÃ¥ste vara 0, 1 eller 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" -msgstr "ogiltiga standardinställningar\n" +msgstr "felaktiga standardinställningar\n" -#: g10/g10.c:2736 +# Du kan ange de algoritmer du föredrar i prioritetsordning. DÃ¥ avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel). +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" -msgstr "felaktiga inställningar av krypteringsalgoritm\n" +msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" -msgstr "felaktiga inställningar av checksummealgoritm\n" +msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" -msgstr "felaktiga inställningar av kompressionsalgoritm\n" +msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s fungerar ännu inte med %s\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" -msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n" +msgstr "" +"du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [filnamn]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [filnamn]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "dekrypteringen misslyckades: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [filnamn]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "du kan inte använda %s när du är i %s läge\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [filnamn]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "du kan inte använda %s när du är i %s läge\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnamn]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [filnamn]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [filnamn]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key användaridentitet" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key användaridentitet" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key användaridentitet" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key användaridentitet" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key användaridentitet [kommandon]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "Sändning till nyckelservern misslyckades: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Hämtning frÃ¥n nyckelservern misslyckades: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "Export av nyckeln misslyckades: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "Sökning pÃ¥ nyckelservern misslyckades: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Uppdatering av nyckeln frÃ¥n en nyckelserver misslyckades: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" -msgstr "misslyckades med att ta bort skalet: %s\n" +msgstr "misslyckades med att ta bort ASCII-skalet: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" -msgstr "misslyckades med att skapa skal: %s\n" +msgstr "misslyckades med att skapa ASCII-skal: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "felaktig kontrollsummealgoritm `%s'\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[filnamn]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Skriv ditt meddelande här ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1663,55 +1751,57 @@ "ett notationsnamn kan bara innehÃ¥lla bokstäver, siffror, punkter eller\n" "understrykningstecken och sluta med ett likhetstecken\n" -# user notation namme?? -#: g10/g10.c:3832 +# user notation name?? +# Werner: +# That is an OpenPGP notation name not registered with IANA. +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" -msgstr "ett användarnoteringsnamn mÃ¥ste innehÃ¥lla '@'-tecknetr\n" +msgstr "ett användarnoteringsnamn mÃ¥ste innehÃ¥lla '@'-tecknet\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "ett notationsvärde fÃ¥r inte inehÃ¥lla nÃ¥gra kontrolltecken\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" -msgstr "den angivna URL som beskriver certifikationspolicy är ogiltig\n" +msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" -msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n" +msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" -msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n" +msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n" #: g10/getkey.c:150 msgid "too many entries in pk cache - disabled\n" -msgstr "för mÃ¥nga poster i pk-cachen - inaktiverad\n" +msgstr "för mÃ¥nga poster i pk-cachen - avstängd\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Hittade inte användaridentiteten]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Ogiltig nyckel %08lX tvingat giltig med --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX " "- hoppar över\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n" @@ -1724,10 +1814,12 @@ msgid "take the keys from this keyring" msgstr "ta nycklarna frÃ¥n denna nyckelring " -# vad menas? +# Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande. +# Kommandot är avsett att användas i "near online system". +# Krav frÃ¥n RIPE. #: g10/gpgv.c:71 msgid "make timestamp conflicts only a warning" -msgstr "konflikter vid utförande av tidsstämpling enbart en varning" +msgstr "utfärda enbart en varning när tidsstämpeln är orimlig" #: g10/gpgv.c:72 msgid "|FD|write status info to this FD" @@ -1828,11 +1920,11 @@ #: g10/helptext.c:121 msgid "please enter an optional but highly suggested email address" -msgstr "ange en epostadress. Detta är valfritt men rekommenderas varmt" +msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt" #: g10/helptext.c:125 msgid "Please enter an optional comment" -msgstr "Ange en valfri kommentar" +msgstr "Ange en kommentar (frivilligt)" #: g10/helptext.c:130 msgid "" @@ -1844,7 +1936,7 @@ msgstr "" "N för att ändra namnet.\n" "C för att ändra kommentaren.\n" -"E för att ändra epostadressen.\n" +"E för att ändra e-postadressen.\n" "O för att fortsätta med nyckelgenerering.\n" "Q för att avsluta nyckelgenereringen." @@ -2049,8 +2141,8 @@ " Use this to state that the user ID should not longer be used;\n" " this is normally used to mark an email address invalid.\n" msgstr "" -"Du borde ange en anledning till certifikationen. Beroende pÃ¥ sammanhanget\n" -"har du möjligheten att välja frÃ¥n följande lista:\n" +"Du borde ange en anledning till spärren. Beroende pÃ¥ sammanhanget\n" +"har du möjlighet att välja frÃ¥n följande lista:\n" " \"Nyckeln har tappat sin säkerhet\"\n" " Använd denna om du har anledning att tro att icke auktoriserade " "personer\n" @@ -2061,7 +2153,7 @@ " Använd denna om du har pensionerat denna nyckel.\n" " \"Användaridentiteten är inte längre giltig\"\n" " Använd denna för att visa att denna användaridentitet inte längre\n" -" skall användas. Detta används normalt för att visa att en epostadress\n" +" skall användas. Detta används normalt för att visa att en e-postadress\n" " är ogiltig.\n" #: g10/helptext.c:271 @@ -2084,397 +2176,396 @@ msgid "No help available for `%s'" msgstr "Det finns ingen hjälp tillgänglig för \"%s\"" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "hoppar över block av typen %d\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "har behandlat %lu nycklar hittills\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr " Totalt antal behandlade enheter: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " överhoppade nya nycklar: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " utan användaridentiteter: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " importerade: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " oförändrade: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " nya användaridentiteter: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " nya undernycklar: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " nya signaturer: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " nya spärrar av nycklar: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " antal lästa hemliga nycklar: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr "antal importerade hemliga nycklar: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "antal oförändrade hemliga nycklar: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " inte importerade: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Du har signerat följande användaridentiteter:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s signatur, sammandragsalgoritm %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "nyckel %08lX: ingen användaridentitet\n" -# eller är det en skadad HKP-nyckel som reparerats? -# Jag tror att undernyckeln är skadad pÃ¥ HKP-servern. Vanligt fel vid mÃ¥nga undernycklar. -#: g10/import.c:713 +# Undernyckeln är skadad pÃ¥ HKP-servern. Vanligt fel vid mÃ¥nga undernycklar. +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" -msgstr "nyckeln %08lX: HKP skadad undernyckel har reparerats!\n" +msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n" # vad innebär fnutten i slutet? -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "" "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "nyckel %08lX: inga giltiga användaridentiteter\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "detta kan bero pÃ¥ att det saknas en egensignatur\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "nyckel %08lX: ny nyckel - hoppade över den\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "hittade ingen nyckelring som gick att skriva till: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "skriver till \"%s\"\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n" # fixme: I appended the %s -wk -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" -msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n" +msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "nyckel %08lX: matchar inte vÃ¥r lokala kopia\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "nyckel %08lX: \"%s\" inte ändrad\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "" "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade " "över den\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "skriver hemlig nyckel till \"%s\"\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" -msgstr "inga standardnyckelringar: %s\n" +msgstr "ingen hemlig nyckelring angiven som standard: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med " "spärrcertifikatet\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n" # fixme: I appended the %s -wk -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID \"%s" "\"\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "nyckel %08lX: ogiltig egensignatur pÃ¥ användar-id \"%s\"\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "nyckel %08lX: ogiltig undernyckelbindning\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" -msgstr "nyckel %08lX: tog bort ogiltig spärr av undernyckel\n" +msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "nyckel %08lX: hoppade över användaridentitet '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "nyckel %08lX: hoppade över undernyckel\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "" "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n" -# Vad skippades? nyckeln eller spärrcertifikatet?? -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" -msgstr "nyckel %08lX: spärrcertifikat pÃ¥ fel plats - hoppade över\n" +msgstr "" +"nyckel %08lX: spärrcertifikat pÃ¥ fel plats - hoppade över certifikatet\n" # nyckeln eller certifikatet?? -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" -msgstr "" -"nyckel %08lX: felaktigt sp?rrcertifikat (revocation certificate): %s - " -"hoppade ?ver\n" +msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n" -# signaturen? -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "" -"nyckel %08lX: signatur pÃ¥ undernyckel pÃ¥ fel plats - hoppade över den\n" +"nyckel %08lX: signatur pÃ¥ undernyckel pÃ¥ fel plats - hoppade över " +"signaturen\n" # nyckeln eller klassen? -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" -msgstr "nyckel %08lX: oväntad signaturklass (0x%02X) - överhoppad\n" +msgstr "" +"nyckel %08lX: oväntad signaturklass (0x%02X) - hoppade över signaturen\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" -msgstr "nyckel %08lX: användaridentitet hittades tvÃ¥ gÃ¥nger - slog ihop\n" +msgstr "" +"nyckel %08lX: användaridentitet hittades flera gÃ¥nger - slog ihop till en\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "VARNING: nyckeln %08lX kan ha spärrats: Hämtar spärrnyckel %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "VARNING: nyckeln %08lX kan ha spärrats: Spärrnyckeln %08lX saknas.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" -msgstr "nyckel %08lX: lagt till direkt nyckelignatur\n" +msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n" #: g10/keydb.c:167 #, c-format @@ -2552,7 +2643,7 @@ #: g10/keyedit.c:406 g10/pkclist.c:274 #, fuzzy, c-format msgid " %d = I trust marginally\n" -msgstr " %d = Jag litar maginellt pÃ¥ denna användare\n" +msgstr " %d = Jag litar marginellt pÃ¥ denna användare\n" #: g10/keyedit.c:407 g10/pkclist.c:276 #, fuzzy, c-format @@ -2657,7 +2748,7 @@ #: g10/keyedit.c:793 msgid "This key has expired!" -msgstr "Notera: Giltighetstiden för denna nyckel har gÃ¥tt ut!" +msgstr "Giltighetstiden för denna nyckel har gÃ¥tt ut!" #: g10/keyedit.c:813 #, c-format @@ -2712,7 +2803,8 @@ msgstr " (3) Jag har gjort en noggrann kontroll av identiteten.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Ditt val? (skriv '?' för mer information): " #: g10/keyedit.c:918 @@ -2736,7 +2828,7 @@ msgid "WARNING: the signature will not be marked as non-exportable.\n" msgstr "" "\n" -"VARNING: Signaturen kommer att markeras som icke exporterbar.\n" +"VARNING: signaturen kommer att markeras som exporterbar.\n" "\n" #: g10/keyedit.c:939 @@ -2744,7 +2836,7 @@ msgid "WARNING: the signature will not be marked as non-revocable.\n" msgstr "" "\n" -"VARNING: Signaturen kommer att markeras som icke möjlig att Ã¥terkalla.\n" +"VARNING: Signaturen kommer att markeras som möjlig att spärra.\n" "\n" #: g10/keyedit.c:949 @@ -2789,7 +2881,7 @@ msgid "Really sign? (y/N) " msgstr "Vill du verkligen signera? " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2820,7 +2912,7 @@ "Skriv in den nya lösenmening för denna hemliga nyckel.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "lösenmeningen upprepades inte korrekt; försök igen." @@ -2829,7 +2921,7 @@ "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -"Du vill inte ha nÃ¥gon lösenmening - detta är sannolikt en dÃ¥lig idé!\n" +"Du vill inte ha nÃ¥gon lösenmening - detta är sannolikt en *dÃ¥lig* idé!\n" "\n" #: g10/keyedit.c:1135 @@ -2860,7 +2952,7 @@ #: g10/keyedit.c:1251 msgid "list key and user IDs" -msgstr "räkna upp nycklar och användaridentiteter" +msgstr "visa en lista pÃ¥ nycklar och användaridentiteter" #: g10/keyedit.c:1253 msgid "uid" @@ -2884,7 +2976,7 @@ #: g10/keyedit.c:1255 msgid "list signatures" -msgstr "räkna upp signaturer" +msgstr "visa en lista pÃ¥ signaturer" #: g10/keyedit.c:1256 msgid "c" @@ -2910,7 +3002,7 @@ #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" -msgstr "skapa en signatur i en separat fil" +msgstr "skapa signatur i en separat fil" #: g10/keyedit.c:1260 msgid "lsign" @@ -2946,11 +3038,11 @@ #: g10/keyedit.c:1265 msgid "addphoto" -msgstr "lägg till bild" +msgstr "addphoto" #: g10/keyedit.c:1265 msgid "add a photo ID" -msgstr "lägg till en användaridentitet med foto" +msgstr "lägg till ett foto som användaridentitet" #: g10/keyedit.c:1266 msgid "deluid" @@ -2962,7 +3054,7 @@ #: g10/keyedit.c:1268 msgid "delphoto" -msgstr "ta bort bild" +msgstr "delphoto" #: g10/keyedit.c:1269 msgid "addkey" @@ -2999,7 +3091,7 @@ #: g10/keyedit.c:1275 msgid "addrevoker" -msgstr "Ange spärrnyckel" +msgstr "addrevoker" #: g10/keyedit.c:1275 msgid "add a revocation key" @@ -3023,7 +3115,7 @@ #: g10/keyedit.c:1278 msgid "primary" -msgstr "huvud" +msgstr "primary" #: g10/keyedit.c:1278 msgid "flag user ID as primary" @@ -3035,7 +3127,7 @@ #: g10/keyedit.c:1279 msgid "toggle between secret and public key listing" -msgstr "hoppa mellan utskrift av hemliga och öppna nycklar" +msgstr "hoppa mellan att visa en lista pÃ¥ hemliga eller öppna nycklar" #: g10/keyedit.c:1281 msgid "t" @@ -3047,7 +3139,7 @@ #: g10/keyedit.c:1282 msgid "list preferences (expert)" -msgstr "skriv ut inställningar (expertläge)" +msgstr "visa en lista pÃ¥ inställningar (expertläge)" #: g10/keyedit.c:1283 msgid "showpref" @@ -3055,7 +3147,7 @@ #: g10/keyedit.c:1283 msgid "list preferences (verbose)" -msgstr "skriv ut inställningar (utförligt)" +msgstr "visa en lista pÃ¥ inställningar (utförligt)" #: g10/keyedit.c:1284 msgid "setpref" @@ -3127,7 +3219,7 @@ #: g10/keyedit.c:1292 msgid "disable a key" -msgstr "deaktivera en nyckel" +msgstr "stäng av en nyckel" #: g10/keyedit.c:1293 msgid "enable" @@ -3139,16 +3231,16 @@ #: g10/keyedit.c:1294 msgid "showphoto" -msgstr "visa bild" +msgstr "showphoto" #: g10/keyedit.c:1294 msgid "show photo ID" -msgstr "visa bild-ID" +msgstr "visa foto-ID" #: g10/keyedit.c:1347 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" -msgstr "fel vid läsning av hemlig nyckel\"%s\": %s\n" +msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n" #: g10/keyedit.c:1365 msgid "Secret key is available.\n" @@ -3173,7 +3265,7 @@ #: g10/keyedit.c:1502 msgid "Hint: Select the user IDs to sign\n" -msgstr "Tips: Välj det användarid du vill signera\n" +msgstr "Tips: Välj de användarID:n du vill signera\n" #: g10/keyedit.c:1527 #, c-format @@ -3289,11 +3381,11 @@ #: g10/keyedit.c:1924 msgid "Digest: " -msgstr "Sammandrag:" +msgstr "Sammandrag: " #: g10/keyedit.c:1976 msgid "Features: " -msgstr "Funktioner:" +msgstr "Funktioner: " #: g10/keyedit.c:1987 msgid "Keyserver no-modify" @@ -3303,92 +3395,88 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "Denna nyckel kan spärras av nyckeln %s" -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (känsligt)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "kan inte skapa %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[spärrad]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[gÃ¥r ut: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[gÃ¥r ut: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, c-format msgid "usage: %s" msgstr "" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " tillit: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" -msgstr "Denna nyckel har deaktiverats" +msgstr "Denna nyckel har stängts av" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[spärrad]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" "Du kan inte ange nÃ¥gra inställningar för ett användar-ID av PGP 2.x-typ.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" "Obs! Den visade nyckelgiltigheten kan vara felaktig\n" -"om du inte startar om programmet.\n" +"om du inte startar om programmet.\n" + +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[spärrad]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3397,7 +3485,7 @@ "Detta kommando kan göra att ett annat användar-ID antas\n" "vara huvudidentitet.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3407,46 +3495,46 @@ "vissa versioner\n" " av PGP avvisa denna nyckel.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Vill du verkligen fortfarande lägga till den? (j/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" -msgstr "Du kan inte lägga till ett bild-ID till en nyckel av PGP 2-typ.\n" +msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Vill du radera denna korrekta signatur? (j/N/a)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Vill du radera denna okända signatur? (j/N/a)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Vill du verkligen radera denna egensignatur? (j/N)" # skulle lika gärna kunna heta 1 signatur va? -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "Raderade %d signatur.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "Raderade %d signaturer.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Ingenting raderat.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3455,33 +3543,33 @@ "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna " "nyckel inte användas i vissa versioner av PGP.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Du fÃ¥r inte ange en spärrnyckel för en PGP 2-nyckel.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " -msgstr "Ange användar-ID för spärrnyckeln:" +msgstr "Ange användar-ID för spärrnyckeln: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" -msgstr "Det gÃ¥r inte att använda en PGP 2-nyckel som spärrnyckel\n" +msgstr "det gÃ¥r inte att använda en PGP 2-nyckel som spärrnyckel\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" -msgstr "VARNING: Denna nyckel har spärrats av sin spärrnyckel!\n" +msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VARNING: det gÃ¥r aldrig att ändra om du utser en spärrnyckel!\n" # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad) -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3489,133 +3577,135 @@ "Är du verkligen säker pÃ¥ att du vill utse denna nyckel till spärrnyckel? (j/" "N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Tag bort markeringar frÃ¥n de hemliga nycklarna.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Välj som högst en undernyckel.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändrar giltighetstid för en undernyckel.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Ändrar giltighetstid för huvudnyckeln.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Du mÃ¥ste välja bara en användaridentitet.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "hoppar över v3 egensignatur pÃ¥ användar-id \"%s\"\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +# Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " -msgstr "Vill du verkligen sp?rra denna nyckel? " +msgstr "Vill du verkligen använda det (j/N)?" -#: g10/keyedit.c:3499 +# Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " -msgstr "Vill du verkligen sp?rra denna nyckel? " +msgstr "Vill du verkligen använda det (j/N)?" -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen användaridentitet med index %d\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen undernyckel med index %d\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "användaridentitet: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" "\"\n" "signerad med din nyckel %08lX %s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Denna signatur gick ut den %s.\n" # nyckel? signatur? -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Vill du verkligen spärra denna nyckel? (j/N)" -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)" -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Du har signerat följande användaridentiteter:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " spärrad av %08lX %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Du stÃ¥r i begrepp att Ã¥terkalla dessa signaturer:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "ingen hemlig nyckel\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Användar-ID \"%s\" är redan spärrad\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "VARNING: en signatur pÃ¥ ett användar-ID är daterad %d sekunder in i " "framtiden\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n" @@ -3623,7 +3713,7 @@ #: g10/keygen.c:293 #, fuzzy, c-format msgid "preference `%s' duplicated\n" -msgstr "inställningen %c%lu är dubblerad\n" +msgstr "inställningen %c%lu förekommer flera gÃ¥nger\n" #: g10/keygen.c:300 #, fuzzy @@ -3643,7 +3733,7 @@ #: g10/keygen.c:401 #, fuzzy, c-format msgid "invalid item `%s' in preference string\n" -msgstr "Ogiltigt tecken i inställningssträngen\n" +msgstr "felaktigt tecken i inställningssträngen\n" #: g10/keygen.c:827 msgid "writing direct signature\n" @@ -3657,12 +3747,12 @@ msgid "writing key binding signature\n" msgstr "skriver signatur knuten till nyckeln\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" -msgstr "ogiltig nyckelstorlek; använder %u bitar\n" +msgstr "felaktig nyckelstorlek; använder %u bitar\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "nyckelstorleken avrundad uppÃ¥t till %u bitar\n" @@ -3730,92 +3820,61 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (endast signering)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (endast kryptering)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (endast signering)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (endast kryptering)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (endast kryptering)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Kommer att generera ett nytt %s nyckelpar.\n" -" den minimala nyckelstorleken är 768 bitar\n" -" den förvalda nyckelstorleken är 1024 bitar\n" -" den största föreslagna nyckelstorleken är 2048 bitar\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Vilken nyckelstorlek vill du ha? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA tillÃ¥ter bara nyckelstorlekar frÃ¥n 512 till 1024\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"nyckelstorleken är för liten; 1024 är det minsta tillÃ¥tna värdet för RSA.\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "nyckelstorleken är för liten; 768 är det minsta tillÃ¥tna värdet.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "nyckelstorleken är för stor; %d är det största tillÃ¥tna värdet\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Nyckelstorlekar större än 2048 är inte att rekommendera\n" -"eftersom beräkningar tar MYCKET lÃ¥ng tid!\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Är du säker pÃ¥ att du vill ha denna nyckelstorlek? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Vilken nyckelstorlek vill du ha? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Ok, men kom ihÃ¥g att din bildskärm och ditt tangentbord ocksÃ¥ sänder\n" -"avslöjande strÃ¥lning som kan avlyssnas!\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Den efterfrÃ¥gade nyckelstorleken är %u bitar\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "avrundade uppÃ¥t till %u bitar\n" # borde kolla upp möjligheterna i källkoden att använda v m Ã¥ istället för wmy -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3832,7 +3891,7 @@ " y = nyckeln blir ogiltig efter n Ã¥r\n" # borde kolla upp möjligheterna i källkoden att använda v m Ã¥ istället för wmy -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3848,29 +3907,29 @@ " m = signaturen blir ogiltig efter n mÃ¥nader\n" " y = signaturen blir ogiltig efter n Ã¥r\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "För hur lÃ¥ng tid ska nyckeln vara giltig? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "För hur lÃ¥ng tid ska signaturen vara giltig? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" -msgstr "ogiltigt värde\n" +msgstr "felaktigt värde\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "Giltighetstiden för %s gÃ¥r aldrig ut\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "Giltighetstiden för %s gÃ¥r ut vid följande tidpunkt: %s\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3878,12 +3937,12 @@ "Ditt system kan inte visa datum senare än Ã¥r 2038.\n" "Datum fram till Ã¥r 2106 kommer dock att hanteras korrekt.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Stämmer detta (j/n)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3895,49 +3954,49 @@ msgstr "" "\n" "Du behöver en användaridentitet för att identifiera din nyckel; mjukvaran\n" -"konstruerar en användaridentitet frÃ¥n namn, kommentar och epostadress\n" +"konstruerar en användaridentitet frÃ¥n namn, kommentar och e-postadress\n" "enligt följande form: \n" " \"Gustav Vasa (Brutal kung) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Namn: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" -msgstr "Ogiltigt tecken i namnet\n" +msgstr "Felaktigt tecken i namnet\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Namnet fÃ¥r inte börja med en siffra\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Namnet mÃ¥ste vara Ã¥tminstone 5 tecken lÃ¥ngt\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " -msgstr "Epostadress: " +msgstr "E-postadress: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" -msgstr "Epostadressen är ogiltig\n" +msgstr "E-postadressen är ogiltig\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" -msgstr "Ogiltigt tecken i kommentaren\n" +msgstr "Felaktigt tecken i kommentaren\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du använder teckenuppsättningen \"%s\"\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3948,29 +4007,29 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" -msgstr "Ange inte epostadressen som namn eller kommentar\n" +msgstr "Ange inte e-postadressen som namn eller kommentar\n" # Ej solklart vad förkortningarna stÃ¥r för -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnKkEeOoAa" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Rätta först felet\n" # fel kapitalisering i originalet? -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3978,12 +4037,12 @@ "Du behöver en lösenmening för att skydda din hemliga nyckel\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3994,7 +4053,7 @@ "Jag kommer att göra det ändÃ¥. Du kan ändra din lösenmening när som helst\n" "om du använder detta program med flaggan \"--edit-key\".\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -4006,69 +4065,65 @@ "hÃ¥rddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n" "en större chans att samla ihop en tillräcklig mängd entropi.\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Skapandet av nycklar avbröts.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "skriver den öppna nyckeln till \"%s\"\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "skriver hemlig nyckel till \"%s\"\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemlig nyckel till \"%s\"\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "hittade ingen öppen nyckelring att skriva till: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" -msgstr "hittade ingen nyckelring som gick att skriva till: %s\n" +msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "fel vid skrivning av öppna nyckelringen \"%s\": %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "den öppna och den hemliga nyckeln är skapade och signerade.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -"Notera att denna nyckel inte kan användas för kryptering. Du kommer\n" +"Observera att denna nyckel inte kan användas för kryptering. Du kommer\n" "kanske att vilja använda kommandot \"--edit-key\" för att skapa en\n" "undernyckel för detta syfte.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" # c-format behövs inte i singularis -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -4076,7 +4131,7 @@ "nyckeln är skapad %lu sekund in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -4084,40 +4139,40 @@ "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" -msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n" +msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Vill du verkligen skapa? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "misslyckades med att radera nyckelblock: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "kan inte skapa \"%s\": %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4128,11 +4183,11 @@ #: g10/keylist.c:201 msgid "Critical signature policy: " -msgstr "FELAKTIG signatur fr?n \"" +msgstr "Viktig signaturpolicy: " #: g10/keylist.c:203 msgid "Signature policy: " -msgstr "Signatur-policy: " +msgstr "Signaturpolicy: " #: g10/keylist.c:242 msgid "Critical preferred keyserver: " @@ -4140,15 +4195,15 @@ #: g10/keylist.c:291 g10/keylist.c:335 msgid "WARNING: invalid notation data found\n" -msgstr "VARNING: ogiltig notationsdata hittades\n" +msgstr "VARNING: ogiltig noteringsdata hittades\n" #: g10/keylist.c:309 msgid "Critical signature notation: " -msgstr "FELAKTIG signatur fr?n \"" +msgstr "Viktig signaturnotation: " #: g10/keylist.c:311 msgid "Signature notation: " -msgstr "Signatur-notering:" +msgstr "Signaturnotering: " #: g10/keylist.c:322 msgid "not human readable" @@ -4163,37 +4218,37 @@ msgid "expired: %s)" msgstr "[gÃ¥r ut: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Huvudnyckelns fingeravtryck:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" -msgstr " Undernyckelns fingeravtryck:" +msgstr " Undernyckelns fingeravtryck:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr "Huvudnyckelns fingeravtryck:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" -msgstr " Undernyckelns fingeravtryck:" +msgstr " Undernyckelns fingeravtryck:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr "Nyckelns fingeravtryck =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" #: g10/keyring.c:1245 #, fuzzy, c-format msgid "renaming `%s' to `%s' failed: %s\n" -msgstr "misslyckades med att skapa skal: %s\n" +msgstr "misslyckades med att skapa ASCII-skal: %s\n" -# märkligt felmeddelande, kolla upp +# Enligt Werner uppstÃ¥r detta om nÃ¥got gÃ¥r snett när den hemliga nyckeln uppdateras. #: g10/keyring.c:1251 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "VARNING: det finns 2 filer med konfidentiell information.\n" @@ -4389,16 +4444,10 @@ msgid "public key is %s\n" msgstr "den öppna nyckeln är %08lX\n" -# DEK betyder Data Encryption Key, Meddelandet är förvirrande -# men efter att ha kikat i koden har jag kommit fram till att -# meddelandet bara visas om verbose-flaggan är satt, och dÃ¥ -# markerar meddelandet att get_session_key lyckades hitta -# rätt publik nyckel att kryptera datat med. Jag tycker -# inte att svenska översättningen är mycket obskyrare än engelska -# originalet iallafall. +# Men jag ändrade sÃ¥ det blev närmare originalet. Per #: g10/mainproc.c:428 msgid "public key encrypted data: good DEK\n" -msgstr "data krypterad med öppen nyckel: korrekt krypteringsnyckel\n" +msgstr "Data krypterat till öppen nyckel: Giltig DEK\n" #: g10/mainproc.c:461 #, fuzzy, c-format @@ -4446,10 +4495,12 @@ msgid "decryption okay\n" msgstr "dekrypteringen lyckades\n" +# Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH. #: g10/mainproc.c:571 msgid "WARNING: message was not integrity protected\n" msgstr "VARNING: detta meddelande var inte integritetsskyddat\n" +# Meddelandet innebär alltsÃ¥ att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut. #: g10/mainproc.c:584 msgid "WARNING: encrypted message has been manipulated!\n" msgstr "VARNING: det krypterade meddelandet har ändrats!\n" @@ -4461,7 +4512,7 @@ #: g10/mainproc.c:610 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "OBS: avsändaren efterfrÃ¥gade \"endast-för-dina-ögon\"\n" +msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n" #: g10/mainproc.c:612 #, c-format @@ -4516,6 +4567,8 @@ msgid "Good signature from \"%s\"" msgstr "Korrekt signatur frÃ¥n \"" +# Visas vid ogiltig signatur: +# Eftersom signaturen är ogiltig kan man inte vara säker pÃ¥ att angivet namn och nyckel-id är riktigt. #: g10/mainproc.c:1536 msgid "[uncertain]" msgstr "[osäkert]" @@ -4548,7 +4601,7 @@ msgid "textmode" msgstr "textläge" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "okänd" @@ -4565,7 +4618,7 @@ msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -"VARNING: multipla signaturerer upptäckta. Endast den första kommer att " +"VARNING: multipla signaturer upptäckta. Endast den första kommer att " "kontrolleras.\n" #: g10/mainproc.c:1811 @@ -4581,30 +4634,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "felaktigt rotpaket hittades i proc_tree()\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" -msgstr "kan inte deaktivera minnesutskrifter: %s\n" +msgstr "kan inte stänga av minnesutskrifter: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Experimentella algoritmer bör inte användas!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "kan inte hantera algoritm %d för öppna nycklar\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "" -"denna krypteringsalgoritm är förÃ¥ldrad, använd istället en mer normal " -"algoritm!\n" +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "krypteringsalgorimten är inte införd" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s signatur, sammandragsalgoritm %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "VARNING: inställningen \"%s\" är förÃ¥ldrad\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4647,7 +4710,7 @@ #: g10/misc.c:973 #, fuzzy, c-format msgid "ambiguous option `%s'\n" -msgstr "läser flaggor frÃ¥n \"%s\"\n" +msgstr "läser inställningar frÃ¥n \"%s\"\n" #: g10/misc.c:998 #, fuzzy, c-format @@ -4712,52 +4775,52 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "kunde inte fÃ¥ tillgÃ¥ng till GPG-Agent i denna session\n" # vad är detta? -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "kan inte ange pid för GPG-Agent\n" # FD? -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "kan inte fÃ¥ server-läs FD för GPG-Agent\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "kan inte fÃ¥ server-skriv FD för GPG-Agent\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent protokoll version %d stöds inte\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan inte ansluta till \"%s\": %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "problem vid kommunikation med GPG-Agent\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" -msgstr "problem med GPG-Agent, inaktiverar den\n" +msgstr "problem med GPG-Agent, stänger av den\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (huvudnyckelns identitet %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4768,41 +4831,41 @@ "användaren: \"%.*s\"\n" "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Repetera lösenmeningen\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Ange lösenmening\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "lösenmeningen är för lÃ¥ng\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "felaktigt svar frÃ¥n GPG-Agent\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "avbruten av användaren\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "kan inte frÃ¥ga efter lösenmening i batch-läge\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Ange lösenmening: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4812,17 +4875,17 @@ "Du behöver en lösenmening för att lÃ¥sa upp den hemliga nyckeln för\n" "användaren: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Repetera lösenmeningen: " @@ -4854,10 +4917,11 @@ msgid "This JPEG is really large (%d bytes) !\n" msgstr "" +# Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. #: g10/photoid.c:104 #, fuzzy msgid "Are you sure you want to use it? (y/N) " -msgstr "Vill du verkligen sp?rra denna nyckel? " +msgstr "Vill du verkligen använda det (j/N)?" #: g10/photoid.c:119 #, fuzzy, c-format @@ -4877,7 +4941,7 @@ msgstr "Ingen anledning har angivits" # tveksam översättning. funderar pÃ¥ "ersatt av nÃ¥got bättre" men det -# känns inte heller bra +# känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla. #: g10/pkclist.c:63 g10/revoke.c:582 msgid "Key is superseded" msgstr "Nyckeln är ersatt" @@ -4896,11 +4960,11 @@ #: g10/pkclist.c:73 msgid "reason for revocation: " -msgstr "Anledning till spärren: " +msgstr "anledning till spärren: " #: g10/pkclist.c:90 msgid "revocation comment: " -msgstr "Spärrkommentar: " +msgstr "spärrkommentar: " # ej kristallklart vad förkortningarna stÃ¥r för #: g10/pkclist.c:205 @@ -4924,7 +4988,7 @@ msgid "" "How much do you trust that this key actually belongs to the named user?\n" msgstr "" -"%08lX: Det finns inget som indikerar att signaturen verkligen tillhör " +"%08lX: Det finns inget som tyder pÃ¥ att signaturen verkligen tillhör " "ägaren.\n" #: g10/pkclist.c:270 @@ -4952,11 +5016,10 @@ msgid " s = skip this key\n" msgstr " s = hoppa över denna nyckel\n" -# q skall bytas ut mot a sÃ¥fort det kollas upp sÃ¥ att q ocksÃ¥ funkar. #: g10/pkclist.c:288 #, fuzzy msgid " q = quit\n" -msgstr " q = avsluta\n" +msgstr "a = avsluta\n" #: g10/pkclist.c:292 #, c-format @@ -4982,14 +5045,14 @@ #, fuzzy, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "" -"%08lX: Det finns inget som indikerar att signaturen verkligen tillhör " +"%08lX: Det finns inget som tyder pÃ¥ att signaturen verkligen tillhör " "ägaren.\n" #: g10/pkclist.c:423 #, fuzzy, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "" -"%08lX: Det finns inget som indikerar att signaturen verkligen tillhör " +"%08lX: Det finns inget som tyder pÃ¥ att signaturen verkligen tillhör " "ägaren.\n" #: g10/pkclist.c:429 @@ -5027,14 +5090,15 @@ #: g10/pkclist.c:517 msgid "WARNING: This key has been revoked by its designated revoker!\n" -msgstr "VARNING: Denna nyckel har spärrats av sin spärrnyckel!\n" +msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n" #: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Detta kan betyda att signaturen är en förfalskning.\n" #: g10/pkclist.c:527 @@ -5043,11 +5107,11 @@ #: g10/pkclist.c:532 msgid "Note: This key has been disabled.\n" -msgstr "Notera: Denna nyckel har deaktiverats.\n" +msgstr "Obs: Denna nyckel har stängts av.\n" #: g10/pkclist.c:537 msgid "Note: This key has expired!\n" -msgstr "Notera: Denna nyckel har gÃ¥tt ut!\n" +msgstr "Obs: Giltighetstiden för denna nyckel har gÃ¥tt ut!\n" #: g10/pkclist.c:548 msgid "WARNING: This key is not certified with a trusted signature!\n" @@ -5116,7 +5180,7 @@ #: g10/pkclist.c:867 msgid "Public key is disabled.\n" -msgstr "Den öppna nyckeln är deaktiverad\n" +msgstr "Den öppna nyckeln är avstängd.\n" #: g10/pkclist.c:874 msgid "skipped: public key already set\n" @@ -5130,39 +5194,42 @@ #: g10/pkclist.c:948 #, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "hoppade över %s: den öppna nyckeln är deaktiverad\n" +msgstr "hoppade över %s: den öppna nyckeln är avstängd\n" +# plural av adressee +# dvs. den som meddelandet är adresserat till. +# Ã…tskillnad görs mellan adressee och receiver. #: g10/pkclist.c:1003 msgid "no valid addressees\n" -msgstr "inga giltiga adresser\n" +msgstr "inga giltiga adressater\n" #: g10/plaintext.c:90 msgid "data not saved; use option \"--output\" to save it\n" msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "Fel vid skapande av `%s': %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Signatur i en separat fil.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Ange namnet pÃ¥ datafilen: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "läser frÃ¥n standard in ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "ingen signerad data\n" # se förra kommentaren -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, fuzzy, c-format msgid "can't open signed data `%s'\n" msgstr "kan inte öppna \"%s\"\n" @@ -5224,9 +5291,14 @@ msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?" +# --force översatt med: +# genomdriv (använd alltid?) +# -do-not-force översatt med: +# genomdriv inte +# I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gÃ¥ att skriva ut. #: g10/revoke.c:293 g10/revoke.c:511 msgid "ASCII armored output forced.\n" -msgstr "utdata med ett ascii-skal valt.\n" +msgstr "utdata med ett ascii-skal genomdrivet.\n" # Vad menas??? #: g10/revoke.c:307 g10/revoke.c:525 @@ -5285,8 +5357,8 @@ "Var vänlig flytta det till ett media du kan gömma; om Mallory fÃ¥r\n" "fÃ¥r tillgÃ¥ng till detta certificate kan han göra din nyckel oanvändbar.\n" "Det är klokt att skriva ut detta certifikat och gömma det, ifall ditt\n" -"media blir oläsligt. But have some caution: The print system of\n" -"your machine might store the data and make it available to others!\n" +"media blir oläsligt. Men se upp: Utskriftsfunktionen pÃ¥\n" +"din dator kan spara data sÃ¥ att det blir Ã¥tkomligt för andra!\n" #: g10/revoke.c:592 msgid "Please select the reason for the revocation:\n" @@ -5303,7 +5375,7 @@ #: g10/revoke.c:645 msgid "Enter an optional description; end it with an empty line:\n" -msgstr "Skriv en frivillig beskrivning; avsluta med en tom rad:\n" +msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n" #: g10/revoke.c:673 #, c-format @@ -5344,7 +5416,7 @@ msgid "%s ...\n" msgstr "%s ...\n" -# är det nyckeln som är svag, konstigt +# För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill pÃ¥ detta sätt hindra dig frÃ¥n att skapa en sÃ¥dan nyckel. #: g10/seckey-cert.c:311 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "VARNING: Upptäckte en svag nyckel - byt lösenmening igen.\n" @@ -5385,7 +5457,7 @@ #, fuzzy, c-format msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "" -"WARNING signeringsundernyckel %08lX har en ogiltig korscertiifiering\n" +"VARNING signeringsundernyckel %08lX har en ogiltig korscertiifiering\n" # behövs verkligen c-format här? #: g10/sig-check.c:168 @@ -5430,12 +5502,13 @@ #: g10/sig-check.c:532 #, fuzzy, c-format msgid "key %s: no subkey for subkey revocation signature\n" -msgstr "nyckel %08lX: ingen undernyckel för spärr av undernyckel\n" +msgstr "nyckel %08lX: ingen undernyckel till paket för spärr av undernyckel\n" #: g10/sig-check.c:558 #, fuzzy, c-format msgid "key %s: no subkey for subkey binding signature\n" -msgstr "nyckel %08lX: ingen anv?ndaridentitet f?r signaturen\n" +msgstr "" +"nyckel %08lX: ingen undernyckel till signatur för bindning av undernyckel\n" # notation data? #: g10/sign.c:85 @@ -5498,14 +5571,9 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n" -" i --pgp2-läge\n" - -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "skriver till \"%s\"\n" +"när du är i --pgp2-läge\n" -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" @@ -5513,44 +5581,43 @@ "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?" "llningar\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "signerar:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -"du kan endast krypterar till RSA nycklar som ?r h?gst 2048 bitar l?nga i --" -"pgp2-l?ge\n" +"du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n" +"när du är i --pgp2-läge\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "krypteringen %s kommer att användas\n" # Slumptalsgenerator: Random Number Generator -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" "nyckeln är inte markerad som osäker - det gÃ¥r inte att använda den med " "fejkad slumptalsgenerator!\n" -# bubblerad? -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" -msgstr "hoppade över \"%s\": kopia\n" +msgstr "hoppade över \"%s\": förekommer flera gÃ¥nger\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "hoppade över `%s': %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "hoppade över: hemlig nyckel finns redan\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5603,7 +5670,7 @@ #: g10/tdbdump.c:218 #, fuzzy, c-format msgid "read error in `%s': %s\n" -msgstr "Läsfel: %s\n" +msgstr "läsfel: %s\n" #: g10/tdbdump.c:227 g10/trustdb.c:380 #, c-format @@ -5653,7 +5720,7 @@ #: g10/tdbio.c:554 #, c-format msgid "%s: invalid trustdb created\n" -msgstr "%s: felaktig tillitsdatabas skapad\n" +msgstr "%s: ogiltig tillitsdatabas skapad\n" #: g10/tdbio.c:557 #, c-format @@ -5667,7 +5734,7 @@ #: g10/tdbio.c:614 #, c-format msgid "%s: invalid trustdb\n" -msgstr "%s: felaktig tillitsdatabas\n" +msgstr "%s: ogiltig tillitsdatabas\n" #: g10/tdbio.c:646 #, c-format @@ -5739,12 +5806,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "kan inte hantera text med rader längre än %d tecken\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "indataraden är längre än %d tecken\n" @@ -5769,21 +5836,19 @@ #: g10/trustdb.c:310 #, fuzzy, c-format msgid "key %s: no public key for trusted key - skipped\n" -msgstr "" -"nyckel %08lX: hittade ingen motsvarande offentlig (publik) nyckel - ?" -"verhoppad\n" +msgstr "nyckel %08lX: hittade ingen motsvarande öppen nyckel - överhoppad\n" #: g10/trustdb.c:320 #, fuzzy, c-format msgid "key %s marked as ultimately trusted\n" msgstr "Nyckeln har förbehÃ¥llslöst förtroende.\n" -# req är nog felstavat i originalet dÃ¥ det syftar pÃ¥ record och inte -# request +# req stÃ¥r för request +# kollat med Werner. Per #: g10/trustdb.c:344 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "tillitspost %lu, posttyp %d: kunde inte läsa: %s\n" +msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n" #: g10/trustdb.c:350 #, c-format @@ -5800,89 +5865,124 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[spärrad]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[Giltighetstiden har gÃ¥tt ut]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "okänd" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "aldrig" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "hittade inte den öppna nyckeln %08lX :%s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n" # originalet borde ha ett value -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "kontrollerar tillitsdatabasen\n" # Vad är detta!? -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d nycklar behandlade (%d validity counts rensade)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "hittade inga nycklar med förbehÃ¥llslöst förtroende\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "Hittar inte den öppna nyckeln tillhörande den förbehÃ¥llslöst betrodda " "nyckeln %08lX \n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n" @@ -6004,7 +6104,7 @@ #: util/errors.c:79 msgid "invalid passphrase" -msgstr "felaktig lösenmening" +msgstr "fel lösenmening" #: util/errors.c:80 msgid "unimplemented pubkey algorithm" @@ -6192,26 +6292,13 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha använt fel program för denna uppgift)\n" -#~ msgid "sorry, can't do this in batch mode\n" -#~ msgstr "kan inte göra detta i batch-läge\n" - -#~ msgid "key `%s' not found: %s\n" -#~ msgstr "hittade inte nyckeln `%s': %s\n" - -#, fuzzy -#~ msgid "can't create file `%s': %s\n" -#~ msgstr "kan inte skapa \"%s\": %s\n" - -# Filnamn bÃ¥de med och utan fnuttar finns. lite ologiskt. Vill nÃ¥gon -# fixa en patch? -#, fuzzy -#~ msgid "can't open file `%s': %s\n" -#~ msgstr "Kan inte öppna fil %s\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "sammandragsalgoritmen `%s' kan endast läsas i denna programutgÃ¥va\n" #~ msgid "" #~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" #~ msgstr "" -#~ "VARNING: sammandraget `%s' ingÃ¥r inte i OpenPGP. Användes pÃ¥ din egen " +#~ "VARNING: sammandraget `%s' ingÃ¥r inte i OpenPGP. Användes pÃ¥ din egen " #~ "risk!\n" #~ msgid "|[files]|encrypt files" @@ -6230,7 +6317,7 @@ #~ msgstr "signera en nyckel lokalt utan möjlighet till Ã¥terkallelse" #~ msgid "list only the sequence of packets" -#~ msgstr "skriv endast ut paketsekvensen" +#~ msgstr "visa endast paketsekvensen" #~ msgid "export the ownertrust values" #~ msgstr "exportera de värden som representerar ägartillit" @@ -6248,31 +6335,37 @@ #~ msgstr "Skapa ett skal för en fil eller standard in" #~ msgid "|NAME|use NAME as default recipient" -#~ msgstr "|NAMN|använd NAMN som standardvärdet för mottagare" +#~ msgstr "|NAMN|använd NAMN som förvald mottagare" #~ msgid "use the default key as default recipient" -#~ msgstr "använd standardnyckeln som standardmottagare" +#~ msgstr "använd standardnyckeln som förvald mottagare" #~ msgid "don't use the terminal at all" #~ msgstr "använd inte terminalen alls" +# AlltsÃ¥ även för V4-nycklar. För att vara PGP-kompatibel. #~ msgid "force v3 signatures" -#~ msgstr "använd v3-signaturer" +#~ msgstr "använd alltid v3-signaturer" +# motsatsen översatt med: +# använd alltid v3-signaturer #~ msgid "do not force v3 signatures" -#~ msgstr "använd inte v3-signaturer" +#~ msgstr "genomdriv inte användning av v3-signaturer" #~ msgid "force v4 key signatures" -#~ msgstr "använd v4-nyckelsignaturer" +#~ msgstr "använd alltid v4-nyckelsignaturer" #~ msgid "do not force v4 key signatures" -#~ msgstr "använd inte v4-nyckelsignaturer" +#~ msgstr "genomdriv inte användning av v4-nyckelsignaturer" +# Framtvingar användning av mdc även vid äldre chiffer. Ej kompatibelt med pgp. +# Cast-5 används som standard vid symmetrisk kryptering. Detta kommando integritetskyddar dÃ¥ den krypterade filen. Onödigt om nyare chiffer angivits med --personal-cipher-preferences #~ msgid "always use a MDC for encryption" -#~ msgstr "använd alltid en MDC för kryptering" +#~ msgstr "använd alltid en MDC vid kryptering" +# mdc är standard för de nyare algoritmerna AES, TWOFISH #~ msgid "never use a MDC for encryption" -#~ msgstr "använd aldrig en MDC för kryptering" +#~ msgstr "använd aldrig en MDC vid kryptering" # syftar pÃ¥ ett användargränsnitt i ett separat program, till exempel gpa #~ msgid "use the gpg-agent" @@ -6288,7 +6381,7 @@ #~ msgstr "anta att svaret är nej pÃ¥ de flesta frÃ¥gor" #~ msgid "add this keyring to the list of keyrings" -#~ msgstr "lägg till denna nyckelring till listan av nyckelringar" +#~ msgstr "lägg till denna nyckelring till listan över nyckelringar" #~ msgid "add this secret keyring to the list" #~ msgstr "lägg till denna hemliga nyckelring till listan" @@ -6306,7 +6399,7 @@ #~ msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN" #~ msgid "read options from file" -#~ msgstr "läs flaggor frÃ¥n fil" +#~ msgstr "läs inställningar frÃ¥n fil" #~ msgid "|[file]|write status info to file" #~ msgstr "|[fil]|skriv statusinformation till fil" @@ -6322,13 +6415,13 @@ #~ msgid "set all packet, cipher and digest options to OpenPGP behavior" #~ msgstr "" -#~ "ändra inställningarna för paket, kryptering och kontrollsumma sÃ¥ att gpg " -#~ "följer OpenPGP-standarden" +#~ "ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma sÃ¥ " +#~ "att gpg följer OpenPGP-standarden" #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior" #~ msgstr "" -#~ "ändra inställningarna för paket, kryptering och kontrollsumma sÃ¥ att gpg " -#~ "härmar PGP 2.x-beteende" +#~ "ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma sÃ¥ " +#~ "att gpg härmar PGP 2.x-beteende" #~ msgid "|N|use passphrase mode N" #~ msgstr "|N|använd lösenmeningsläget N" @@ -6352,13 +6445,14 @@ #~ msgstr "släng bort nyckelidentitetsfältet frÃ¥n krypterade paket" #~ msgid "Show Photo IDs" -#~ msgstr "Visa fotoidentifikation" +#~ msgstr "Visa foto-ID:n" #~ msgid "Don't show Photo IDs" -#~ msgstr "Visa inte fotoidentifikation" +#~ msgstr "Visa inte foto-ID:n" +# Här anges alltsÃ¥ med vilket program som ska visa foto-ID:n #~ msgid "Set command line to view Photo IDs" -#~ msgstr "Sätt komandoraden för att visa fotoientifikation" +#~ msgstr "Ange kommandoraden för att visa foto-ID:n" #~ msgid "compress algorithm `%s' is read-only in this release\n" #~ msgstr "" @@ -6382,7 +6476,7 @@ #~ msgstr "nyckeln %08lX: en undernyckel har spärrats!\n" #~ msgid "%08lX: key has expired\n" -#~ msgstr "%08lX: nyckeln har blivit för gammal\n" +#~ msgstr "%08lX:giltighetstiden har gÃ¥tt ut för nyckeln\n" #~ msgid "%08lX: We do NOT trust this key\n" #~ msgstr "%08lX: Vi litar INTE pÃ¥ denna nyckel\n" @@ -6400,6 +6494,48 @@ #~ msgid " (%d) RSA (sign and encrypt)\n" #~ msgstr " (%d) RSA (signering och kryptering)\n" +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Kommer att generera ett nytt %s nyckelpar.\n" +#~ " den minimala nyckelstorleken är 768 bitar\n" +#~ " den förvalda nyckelstorleken är 1024 bitar\n" +#~ " den största föreslagna nyckelstorleken är 2048 bitar\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA tillÃ¥ter bara nyckelstorlekar frÃ¥n 512 till 1024\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "nyckelstorleken är för liten; 1024 är det minsta tillÃ¥tna värdet för " +#~ "RSA.\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "nyckelstorleken är för liten; 768 är det minsta tillÃ¥tna värdet.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "nyckelstorleken är för stor; %d är det största tillÃ¥tna värdet\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Nyckelstorlekar större än 2048 är inte att rekommendera\n" +#~ "eftersom beräkningar tar MYCKET lÃ¥ng tid!\n" + +#~ msgid "Are you sure that you want this keysize? " +#~ msgstr "Är du säker pÃ¥ att du vill ha denna nyckelstorlek? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Ok, men kom ihÃ¥g att din bildskärm och ditt tangentbord ocksÃ¥ sänder\n" +#~ "avslöjande strÃ¥lning som kan avlyssnas!\n" + #~ msgid "%s: can't open: %s\n" #~ msgstr "%s: kan inte öppna: %s\n" @@ -6407,7 +6543,7 @@ #~ msgstr "%s: VARNING: tom fil\n" #~ msgid "key %08lX: not a rfc2440 key - skipped\n" -#~ msgstr "hoppade över nyckeln %08lX - följer inte standarden RFC2440\n" +#~ msgstr "hoppade över nyckeln %08lX - den följer inte standarden RFC2440\n" #~ msgid "" #~ "NOTE: Elgamal primary key detected - this may take some time to import\n" @@ -6420,7 +6556,7 @@ #~ msgstr "%s%c %4u%c/%08lX skapad: %s gÃ¥r ut: %s" #~ msgid "rev! subkey has been revoked: %s\n" -#~ msgstr "revoked! en undernyckel har spärrats: %s\n" +#~ msgstr "rev! undernyckeln har spärrats: %s\n" #~ msgid "rev- faked revocation found\n" #~ msgstr "rev- hittade förfalskad spärr av nyckeln\n" @@ -6429,9 +6565,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? problem vid kontroll av spärren: %s\n" -#~ msgid "[expired] " -#~ msgstr "[Giltighetstiden har upphört]" - #~ msgid "" #~ "\"\n" #~ "locally signed with your key %08lX at %s\n" @@ -6446,12 +6579,21 @@ #~ msgstr " signerad av %08lX at %s%s\n" #~ msgid "Notation: " -#~ msgstr "Notation: " +#~ msgstr "Notering: " # finns det nÃ¥gon bra svensk översättning av policy? #~ msgid "Policy: " #~ msgstr "Policy: " +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Experimentella algoritmer bör inte användas!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "denna krypteringsalgoritm är förÃ¥ldrad, använd istället en mer normal " +#~ "algoritm!\n" + #~ msgid "can't get key from keyserver: %s\n" #~ msgstr "kan inte hämta nyckeln frÃ¥n en nyckelserver: %s\n" @@ -6468,7 +6610,7 @@ #~ msgstr "Servern stöder inte sökning efter nycklar.\n" #~ msgid "can't search keyserver: %s\n" -#~ msgstr "kan inte h?mta nyckeln fr?n en nyckelserver: %s\n" +#~ msgstr "kan inte söka pÃ¥ nyckelservern: %s\n" #~ msgid "" #~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " @@ -6499,7 +6641,7 @@ #~ msgstr "%s: kan inte skapa lÃ¥s\n" #~ msgid "%s: can't make lock\n" -#~ msgstr "%s: kan inte skapa l?s\n" +#~ msgstr "%s: kan inte skapa lÃ¥s\n" #~ msgid "%s: can't create: %s\n" #~ msgstr "%s: kan inte skapa: %s\n" @@ -6528,7 +6670,8 @@ #~ msgid "If you want to use this revoked key anyway, answer \"yes\"." #~ msgstr "Om du vill använda denna spärrade nyckel ändÃ¥, svara \"ja\"." -# Ska inte avsnittet om ElGAmal -signaturer utgÃ¥! +# Ska inte avsnittet om ElGAmal -signaturer utgÃ¥! SÃ¥dana signaturer knäcktes 2004. +# Jo, enligt Werner ska avsnittet bort till nästa version. #~ msgid "" #~ "Select the algorithm to use.\n" #~ "\n" @@ -6594,8 +6737,17 @@ #~ msgid "key %08lX incomplete\n" #~ msgstr "nyckel %08lX är inte komplett\n" +#~ msgid "sorry, can't do this in batch mode\n" +#~ msgstr "kan inte göra detta i batch-läge\n" + +# Filnamn bÃ¥de med och utan fnuttar finns. lite ologiskt. Vill nÃ¥gon +# fixa en patch? +#~ msgid "can't open file: %s\n" +#~ msgstr "Kan inte öppna fil: %s\n" + +# Det ska vara ett kolon pÃ¥ denna plats, men det saknas! #~ msgid "error: missing colon\n" -#~ msgstr "fel: saknar kolon\n" +#~ msgstr "fel: kolonet saknas\n" #~ msgid "error: no ownertrust value\n" #~ msgstr "fel: förtroende för innehavaren (tillit) inte angivet\n" Index: gnupg/po/tr.po diff -u gnupg/po/tr.po:1.13 gnupg/po/tr.po:1.14 --- gnupg/po/tr.po:1.13 Thu Oct 28 11:06:49 2004 +++ gnupg/po/tr.po Fri Dec 10 23:20:41 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2004-07-08 08:10+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -16,11 +16,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n" - #: cipher/primegen.c:120 #, fuzzy, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -35,11 +30,12 @@ msgid "no entropy gathering module detected\n" msgstr "rasgele bayt elde etme modülü bulunamadı\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -72,9 +68,9 @@ msgid "note: random_seed file not updated\n" msgstr "bilgi: \"random_seed\" dosyası güncel deÄŸil\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "\"%s\" oluÅŸturulamıyor: %s\n" @@ -128,90 +124,150 @@ "daha fazla rasgele bayt toplayabilmesi için iÅŸletim sistemine\n" "yardımcı olun! (%d bayt daha gerekiyor)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "\"TrustDB\" güvence veritabanı baÅŸlangıç aÅŸamasında baÅŸarısız: %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "anahtar zinciri belleÄŸi yeniden oluÅŸturulurken hata: %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "keyserver send baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "anahtar parolası oluÅŸturulurken hata: %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "anahtar bloÄŸu okunurken hata: %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: serbest kaydı okuma hatası: %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' zaten sıkıştırılmış\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "yeni bir anahtar çifti üretir" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "" + +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "anahtar bloÄŸu silinemedi: %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "geçerli OpenPGP verisi yok\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "anahtar parolası oluÅŸturulurken hata: %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "\"TrustDB\" güvence veritabanı baÅŸlangıç aÅŸamasında baÅŸarısız: %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "anahtar bloÄŸu silinemedi: %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -299,15 +355,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "bu önceden belirlenmiÅŸ iÅŸlemler kipinde (in batchmode) yapılamaz\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "Seçiminiz? " @@ -315,143 +371,152 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "BelirtilmiÅŸ bir neden yok" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "iÅŸlenemedi" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "karşılığı olan genel anahtar yok: `%s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "\"%s\" okunurken hata: %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "güncelenmiÅŸ tercihler" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "tercih dizgesindeki karakter geçersiz\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "tercih dizgesindeki karakter geçersiz\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "hata: parmakizi geçersiz\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr " Parmak izi:" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "hata: parmakizi geçersiz\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "geçerli OpenPGP verisi yok\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "`%s' gixli anahtar zincirine yazılırken hata oluÅŸtu: %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 #, fuzzy msgid "Replace existing key? (y/N) " msgstr "Gerçekten imzalayacak mısınız? (e/H) " -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 #, fuzzy msgid "Replace existing keys? (y/N) " msgstr "Gerçekten imzalayacak mısınız? (e/H) " -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -459,232 +524,256 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "Lütfen istediÄŸiniz anahtarı seçiniz:\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "Bu imzanın geçerliliÄŸi %s de bitti.\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (sadece ÅŸifrelemek için)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "Seçim geçersiz.\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "bilinmeyen sıkıştırma algoritması\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "atlandı: gizli anahtar zaten var\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quit" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "bu menüden çık" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "k" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "çeliÅŸen komutlar\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "bunu gösterir " -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Anahtar burada: " -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "son kullanım tarihini deÄŸiÅŸtirir" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "sahibiningüvencesini deÄŸiÅŸtirir" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "parmak izini gösterir" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "genel hata" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "yeni bir anahtar çifti üretir" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "Komut> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "çeliÅŸen komutlar\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "çeliÅŸen komutlar\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "Tekrar: " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "" +"ikinci kez yazdığınız anahtar parolası ilkiyle aynı deÄŸil; iÅŸlem " +"tekrarlanacak" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -694,13 +783,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output seçeneÄŸi bu komutla çalışmaz\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "anahtar `%s' yok: %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -743,7 +832,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "anahtar parolası oluÅŸturulurken hata: %s\n" @@ -762,7 +851,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' zaten sıkıştırılmış\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "UYARI: \"%s\" dosyası boÅŸ\n" @@ -790,7 +879,7 @@ msgstr "" "alıcının tercihleriyle çeliÅŸen %s (%d) simetrik ÅŸifre kullanımı zorlanıyor\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -894,27 +983,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "UYARI: %s geçici dizini silinemiyor: %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "%08lX anahtarı: korunmamış - atlandı\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "UYARI: gizli anahtar %08lX basit bir SK saÄŸlamasına sahip deÄŸil\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "UYARI: hiçbir ÅŸey dışarı aktarılmadı\n" @@ -1093,15 +1182,15 @@ msgid "prompt before overwriting" msgstr "üzerine yazmadan önce sorar" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1109,7 +1198,7 @@ "@\n" "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1129,15 +1218,15 @@ " --list-keys [isimler] anahtarları listeler\n" " --fingerprint [isimler] parmak izlerini gösterir\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "Yazılım hatalarını lütfen adresine bildirin.\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1147,7 +1236,7 @@ "imzalama, kontrol, ÅŸifreleme veya çözme\n" "öntanımlı iÅŸlem girilen veriye bağımlıdır\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1155,460 +1244,460 @@ "\n" "Desteklenen algoritmalar:\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "GenAnah: " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "Åžifre: " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "Sıkıştırma: " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "kullanımı: gpg [seçenekler] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "çeliÅŸen komutlar\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "grup tanımı \"%s\" içinde = iÅŸareti yok\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz izinler\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz izinler\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz izinler\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin iyeliÄŸi\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin iyeliÄŸi\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin iyeliÄŸi\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin izinleri\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin izinleri\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "UYARI: %s \"%s\" de güvensiz iliÅŸtirilen dizin izinleri\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "BÄ°LGÄ°: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "BÄ°LGÄ°: \"%s\" öntanımlı seçenek dosyası yok\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "seçenek dosyası \"%s\": %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "\"%s\"den seçenekler okunuyor\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "BÄ°LGÄ°: %s normal kullanım için deÄŸil!\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ÅŸifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s geçerli bir karakter seti deÄŸil\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "anahtar sunucusunun adresi çözümlenemedi\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "UYARI: program bir \"core\" dosyası oluÅŸturabilir!\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "UYARI: %s %s'i aşıyor\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ile %s birlikte kullanılmaz!\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s, %s ile etkisiz olur!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 kipinde aynı anda hem imzalama hem de ÅŸifreleme yapamazsınız\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "seçilen özümleme algoritması geçersiz\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "\"completes-needed\" 0 dan büyük olmalı\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "\"marginals-needed\" 1 den büyük olmalı\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "öntanımlı tercihler geçersiz\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "kiÅŸisel ÅŸifre tercihleri geçersiz\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "kiÅŸisel özümleme tercihleri geçersiz\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "kiÅŸisel sıkıştırma tercihleri geçersiz\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s henüz %s ile çalışmıyor\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s ÅŸifreleme algoritması kullanılamayabilir.\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "\"TrustDB\" güvence veritabanı baÅŸlangıç aÅŸamasında baÅŸarısız: %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "UYARI: alıcılar (-r) genel anahtar ÅŸifrelemesi kullanılmadan belirtilmiÅŸ\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [dosyaismi]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [dosyaismi]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "ÅŸifre çözme baÅŸarısız: %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [dosyaismi]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [dosyaismi]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [DOSYA]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [dosyaismi]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [dosyaismi]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key KULL-KML" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key KULL-KML" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key kullanıcı-kimliÄŸi [komutlar]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kullanıcı-kimliÄŸi] [anahtar-zinciri]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" msgstr "key export baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh baÅŸarısız: %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "zırhın kaldırılması baÅŸarısız: %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "zırhlama baÅŸarısız: %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "`%s' hash algoritması geçersiz\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[dosyaismi]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "Ä°letinizi yazın ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1616,23 +1705,23 @@ "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve " "sonuna bir '=' gelir.\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "bir niteleme deÄŸerinde kontrol karakterleri kullanılamaz\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "belirtilen sertifika güvence adresi geçersiz\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "belirtilen imza güvence adresi geçersiz\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "belirtilen imza güvence adresi geçersiz\n" @@ -1641,30 +1730,30 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk belleÄŸinde çok fazla girdi - iptal edildi\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[Kullanıcı kimliÄŸi bulunamadı]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "" "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli " "oldu\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "" "yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n" @@ -2008,387 +2097,387 @@ msgid "No help available for `%s'" msgstr "\"%s\" için yardım mevcut deÄŸil" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "%d. tür blok atlandı\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "ÅŸu ana kadar herÅŸey yolunda giderek %lu anahtar iÅŸlenmiÅŸ\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Ä°ÅŸlenmiÅŸ toplam miktar: %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " yeni anahtarlar atlandı: %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " kullanıcı kimliksiz: %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " alınan: %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " deÄŸiÅŸmedi: %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " yeni kullanıcı kimliÄŸi: %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " yeni yardımcı anahtarlar: %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " yeni imzalar: %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " yeni anahtar iptalleri: %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " gizli anahtarlar okundu: %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " gizli anahtarlar indirildi: %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " gizli anahtarlar deÄŸiÅŸmedi: %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " alınamadı: %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s imzası, %s özümleme algoritması\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "anahtar %08lX: kullanıcı kimliÄŸi yok\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliÄŸi '%s' kabul edildi\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "anahtar %08lX: kullanıcı kimliÄŸi geçersiz\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "anahtar %08lX: yeni anahtar - atlandı\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "yazılabilir bir anahtar zinciri yok: %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "\"%s\"e yazıyor\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "\"%s\" anahtar zincirine yazarken hata oluÅŸtu: %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "anahtar %08lX: genel anahtar \"%s\" alındı\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "anahtar %08lX: bizim kopyamızla eÅŸleÅŸmiyor\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "anahtar %08lX: \"%s\" 1 yeni kullanıcı kimliÄŸi\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "anahtar %08lX: \"%s\" %d yeni kullanıcı kimliÄŸi\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "anahtar %08lX: \"%s\" 1 yeni imza\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "anahtar %08lX: \"%s\" %d yeni imza\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "anahtar %08lX: %s 1 yeni yardımcı anahtar\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "anahtar %08lX: \"%s\" %d yeni yardımcı anahtar\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "anahtar %08lX: \"%s\" deÄŸiÅŸmedi\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "%08lX anahtarı: geçersiz ÅŸifreli (%d) gizli anahtar - atlandı\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "öntanımlı gizli anahtar zinciri yok: %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "anahtar %08lX: gizli anahtar indirildi\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "" "anahtar %08lX: genel anahtar deÄŸil - yürürlükten kaldırma sertifikası " "uygulanamaz\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "" "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası alındı\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "anahtar %08lX: imza için kullanıcı kimliÄŸi yok\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "" "anahtar %08lX: genel anahtar algoritması, kullanıcı kimliÄŸi \"%s\" için " "desteklenmiyor\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "anahtar %08lX: kullanıcı kimliÄŸi \"%s\" için öz-imza geçersiz\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "anahtar %08lX: çok sayıda yardımcı anahtar baÄŸlantısı silindi\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "" "anahtar %08lX: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırması geçersiz\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "" "anahtar %08lX: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "anahtar %08lX: kullanıcı kimliÄŸi atlandı: '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "anahtar %08lX: yardımcı anahtar atlandı\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "anahtar %08lX: imza gönderilebilir deÄŸil (%02x sınıfı) - atlandı\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "" "anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "" "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "anahtar %08lX: yardımcı anahtar imzası yanlış yerde - atlandı\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "anahtar %08lX: çift kullanıcı kimliÄŸi saptandı - katıştırıldı\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "" "UYARI: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma " "anahtarı %08lX alınıyor\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "" "UYARI: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma " "anahtarı %08lX mevcut deÄŸil.\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası eklendi\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "anahtar %08lX: doÄŸrudan anahtar imzası eklendi\n" @@ -2626,7 +2715,8 @@ msgstr " (3) Çok dikkatli bir denetim yaptım.%s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +#, fuzzy +msgid "Your selection? (enter `?' for more information): " msgstr "Seçiminiz? (bilgi için '?' giriniz): " #: g10/keyedit.c:918 @@ -2698,7 +2788,7 @@ msgid "Really sign? (y/N) " msgstr "Gerçekten imzalayacak mısınız? (e/H) " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2729,7 +2819,7 @@ "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "" "ikinci kez yazdığınız anahtar parolası ilkiyle aynı deÄŸil; iÅŸlem " @@ -3212,84 +3302,68 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "" "Bu anahtar %s tarafından ÅŸu anahtarla yürürlükten kaldırılmış olabilir: " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " (duyarlı)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s oluÅŸturulamıyor: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[yürürlükten kaldırıldı] " -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[son kullanma tarihi: %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[son kullanma tarihi: %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " güvencesi: %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " güvencesi: %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "Bu anahtar iptal edilmiÅŸti" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[yürürlükten kaldırıldı] " - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Bir PGP 2.x tarzı kullanıcı kimliÄŸine uygun tercih yok.\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3297,7 +3371,19 @@ "Gösterilen anahtarın, uygulamayı yeniden baÅŸlatıncaya kadar, gerekli\n" "doÄŸrulukta olmayacağını lütfen gözönüne alınız.\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[yürürlükten kaldırıldı] " + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3306,7 +3392,7 @@ " baÅŸka bir kullanıcı kimliÄŸinin birincil varsayılmasına sebep " "olabilir.\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3315,45 +3401,45 @@ "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliÄŸi eklenmesi bu anahtarın\n" " bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "Onu yine de eklemek istiyor musunuz? (e/H) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "PGP2 tarzı bir anahtara bir foto kimliÄŸi ekleyemeyebilirsiniz.\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "Bu geçersiz imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "Hiçbir ÅŸey silinmedi.\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3363,41 +3449,41 @@ " eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n" " ile sonuçlanabilir.\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı " "ekleyemeyebilirsiniz.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "" "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliÄŸini giriniz: " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı " "olarak atanamaz\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak " "kullanamazsınız\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar baÅŸka amaçla\n" " kullanılamaz!\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3405,130 +3491,130 @@ "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediÄŸinizden emin " "misiniz? (e/H): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "Bir yardımcı anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "Asıl anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "Bir v3 anahtarının son kullanma tarihini deÄŸiÅŸtiremezsiniz\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "kullanıcı kimliÄŸi \"%s\" için v3 öz-imzası atlanıyor\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "%d endeksine sahip kullanıcı kimliÄŸi yok\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "%d endeksine sahip yardımcı anahtar yok\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Kullanıcı kimliÄŸi: \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " %08lX ile %s%s%s de imzalanmış\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "Bu anahtarın geçerliliÄŸi %s de bitti.\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" "Bu imza için bir yürürlükten kaldırma sertifikası oluÅŸturulsun mu? (e/H) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " %08lX tarafından %s de yürürlükten kaldırılmış\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "" "Bu yürürlükten kaldırma sertifikalarını gerçekten oluÅŸturacak mısınız? (e/H) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "gizli anahtar yok\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "UYARI: bir kullanıcı kimliÄŸi imzası %d saniye gelecekte oluÅŸturuldu\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3572,12 +3658,12 @@ msgid "writing key binding signature\n" msgstr "anahtarı garantileyen imzayı yazıyor\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "anahtar uzunluÄŸu geçersiz; %u bit kullanılıyor\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "anahtar uzunluÄŸu %u bite yuvarlandı\n" @@ -3645,91 +3731,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (sadece ÅŸifrelemek için)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (yalnız ÅŸifrelemek için)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (sadece imzalamak için)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (sadece ÅŸifrelemek için)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (sadece ÅŸifrelemek için)\n" -#: g10/keygen.c:1409 -#, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"Yeni bir %s anahtar çifti üretmek üzeresiniz.\n" -" en küçük anahtar uzunluÄŸu: 768 bit\n" -" öntanımlı anahtar uzunluÄŸu: 1024 bit\n" -" önerilebilecek en büyük anahtar uzunluÄŸu: 2048 bit\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (1024) " - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA anahtarının uzunluÄŸu 512 ile 1024 bit arasında olabilir\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "" -"anahtar uzunluÄŸu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "anahtar uzunluÄŸu çok küçük; en küçük anahtar uzunluÄŸu 768 bit'tir.\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA anahtar çifti 1024 bit olacak.\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "anahtar uzunluÄŸu çok büyük; izin verilen en büyük deÄŸer: %d bit\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n" -"2048 bitten fazlası tavsiye edilmez.\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "Bu anahtar uzunluÄŸunu istediÄŸinizden emin misiniz? " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (1024) " -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından " -"kendinizi uzak tutun! (ne demekse...)\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Ä°stenen anahtar uzunluÄŸu: %u bit\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "%u bite yuvarlandı\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3745,7 +3800,7 @@ " m = anahtar n ay geçerli\n" " y = anahtar n yıl geçerli\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3761,29 +3816,29 @@ " m = imza n ay geçerli\n" " y = imza n yıl geçerli\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "Anahtar ne kadar geçerli olacak? (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "Ä°mza ne kadar geçerli olacak? (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "deÄŸer hatalı\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s hep geçerli olacak\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s %s sonra geçersiz olacak\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3791,12 +3846,12 @@ "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n" "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "Bu doÄŸru mu? (e/h)? " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3813,44 +3868,44 @@ "\t\"Fatih Sultan Mehmed (Padisah) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "Adınız ve Soyadınız: " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "Ad ve soyadınızda geçersiz karakter var\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "Ad ve soyadınız bir rakamla baÅŸlamamalı\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "Ad ve soyadınız en az 5 harfli olmalı\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "E-posta adresiniz: " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "geçerli bir E-posta adresi deÄŸil\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "Önbilgi: " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "Önbilgi alanında geçersiz karakter var\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "`%s' karakter kümesini kullanıyorsunuz.\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3861,29 +3916,29 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "AaYyEeTtKk" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını deÄŸiÅŸtir ya da Çı(k)? " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "" "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını deÄŸiÅŸtir ya da (T)amam/Çı(k)? " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "Lütfen önce hatayı düzeltin\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3891,12 +3946,12 @@ "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3908,7 +3963,7 @@ "seçeneÄŸi ile kullanarak her zaman deÄŸiÅŸtirebilirsiniz.\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3921,54 +3976,50 @@ "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n" "üretecine yardımcı olur. \n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA anahtar çifti 1024 bit olacak.\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "Anahtar üretimi durduruldu.\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "genel anahtarı `%s'e yazıyor\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "`%s' genel anahtar zincirine yazılırken hata oluÅŸtu: %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "`%s' gixli anahtar zincirine yazılırken hata oluÅŸtu: %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3976,19 +4027,19 @@ "Bu anahtar ÅŸifreleme için kullanılamaz. Åžifreleme için ikinci bir anahtarı\n" "\"--edit-key\" seçeneÄŸini kullanarak üretebilirsiniz.\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "Anahtar üretimi baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "anahtar %lu saniye sonra üretilmiÅŸ (zaman sapması veya saat problemi)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -3996,41 +4047,41 @@ "anahtar bundan %lu saniye sonra üretilmiÅŸ (zaman sapması veya saat " "problemi)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "BÄ°LGÄ°: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu deÄŸildir\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "Gerçekten oluÅŸturulsun mu? " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "anahtar bloÄŸu silinemedi: %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "\"%s\" oluÅŸturulamıyor: %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "BÄ°LGÄ°: %08lX gizli anahtarının %s tarihinde kullanım süresi doldu\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4076,28 +4127,28 @@ msgid "expired: %s)" msgstr "[son kullanma tarihi: %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "Birincil anahtar parmak izi:" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr "Yardımcı anahtar parmak izi:" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr "Birincil anahtar parmak izi:" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr "Yardımcı anahtar parmak izi:" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " Anahtar parmak izi =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4454,7 +4505,7 @@ msgid "textmode" msgstr "metinkipi" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "bilinmeyen" @@ -4485,29 +4536,42 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "proc_tree() içinde geçersiz kök paket saptandı\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "\"core\" oluÅŸumu iptal edilemedi: %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "dosya açılamadı: %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "güvence veritabanı: okuma baÅŸarısız (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "Deneysel algoritmalar kullanılmamalı!\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "%d genel anahtar algoritması kullanılamadı\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "tamamlanmamış ÅŸifre algoritması" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s imzası, %s özümleme algoritması\n" -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "" -"bu ÅŸifre algoritması standart dışı; lütfen daha standart birini kullanın!\n" +"alıcının tercihleriyle çeliÅŸen %s (%d) özümleme algoritması kullanılmak " +"isteniyor\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4618,50 +4682,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "%d tipi alt paket kritik bit kümesine sahip\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent bu oturumda kullanılamaz\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "istemci pid'i belirlenemiyor\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO çevre deÄŸiÅŸkeni hatalı\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "\"%s\" sunucusuna baÄŸlanılamadı: %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ile haberleÅŸme problemi\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (asıl anahtar kimliÄŸi %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4672,41 +4736,41 @@ "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n" "%u bitlik %s anahtarı, kimlik %08lX, oluÅŸturulan %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "Parolayı tekrar yazınız\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "Anahtar parolasını giriniz\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "Parola çok uzun\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "yanıt geçersiz\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "kullanıcı tarafından durduruldu\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "önceden tanımlanmış iÅŸlemler kipinde (batchmode) parola sorgulanamaz\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "Anahtar parolasını girin: " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4716,19 +4780,19 @@ "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n" "Anahtarın sahibi: \"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "" "%u bitlik %s anahtarı, %08lX kimliÄŸi ile\n" "%s tarihinde üretilmiÅŸ" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "Tekrar: " @@ -4935,7 +4999,8 @@ msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " Bu imza sahte anlamına gelebilir.\n" #: g10/pkclist.c:527 @@ -5039,28 +5104,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneÄŸini kullanın\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "`%s' oluÅŸturulurken hata: %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "Bağımsız imza.\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "Lütfen veri dosyasının ismini girin: " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "standart girdiden okuyor ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "imzalı veri yok\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "imzalı veri '%s' açılamadı\n" @@ -5383,12 +5448,7 @@ msgstr "" "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "\"%s\"e yazıyor\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" @@ -5396,40 +5456,40 @@ "alıcının tercihleriyle çeliÅŸen %s (%d) özümleme algoritması kullanılmak " "isteniyor\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "imzalanıyor:" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama " "yapabilirsiniz\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s ÅŸifrelemesi kullanılmayacak\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "anahtar güvenli olarak imlenmemiÅŸ - onu sahte RSÃœ ile kullanmayın!\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "`%s' atlandı: tekrarlanmış\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "\"%s\" atlandı: %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "atlandı: gizli anahtar zaten var\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "" @@ -5618,12 +5678,12 @@ msgstr "" "güvence veritabanı bozulmuÅŸ; lütfen \"gpg --fix-trustdb\" çalıştırın.\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "%d karakterden daha uzun metin satırları okunamıyor\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "girdi satırı %d karakterden daha uzun\n" @@ -5673,85 +5733,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[yürürlükten kaldırıldı] " + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[süresi doldu] " + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "bilinmeyen" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "asla " -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "sonraki güvence veritabanı denetimi %s de\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "%08lX genel anahtarı yok: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "lütfen bir --check-trustdb yapın\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "güvence veritabanı denetleniyor\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "son derece güvenli bir anahtar yok\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "son derece güvenli %08lX genel anahtarı yok\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma baÅŸarısız: %s\n" @@ -6062,6 +6157,65 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Yeni bir %s anahtar çifti üretmek üzeresiniz.\n" +#~ " en küçük anahtar uzunluÄŸu: 768 bit\n" +#~ " öntanımlı anahtar uzunluÄŸu: 1024 bit\n" +#~ " önerilebilecek en büyük anahtar uzunluÄŸu: 2048 bit\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA anahtarının uzunluÄŸu 512 ile 1024 bit arasında olabilir\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "" +#~ "anahtar uzunluÄŸu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "" +#~ "anahtar uzunluÄŸu çok küçük; en küçük anahtar uzunluÄŸu 768 bit'tir.\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "anahtar uzunluÄŸu çok büyük; izin verilen en büyük deÄŸer: %d bit\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n" +#~ "2048 bitten fazlası tavsiye edilmez.\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "Bu anahtar uzunluÄŸunu istediÄŸinizden emin misiniz? " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "" +#~ "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından " +#~ "kendinizi uzak tutun! (ne demekse...)\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "Deneysel algoritmalar kullanılmamalı!\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "" +#~ "bu ÅŸifre algoritması standart dışı; lütfen daha standart birini " +#~ "kullanın!\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "\"%s\"e yazıyor\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "pardon, bu betik kipinde yapılamaz\n" @@ -6194,12 +6348,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n" -#~ msgid "[revoked] " -#~ msgstr "[yürürlükten kaldırıldı] " - -#~ msgid "[expired] " -#~ msgstr "[süresi doldu] " - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr "[son kullanma tarihi: %s]" Index: gnupg/po/zh_CN.po diff -u gnupg/po/zh_CN.po:1.7 gnupg/po/zh_CN.po:1.8 --- gnupg/po/zh_CN.po:1.7 Thu Oct 28 11:06:49 2004 +++ gnupg/po/zh_CN.po Fri Dec 10 23:20:41 2004 @@ -1,96 +1,92 @@ # Simplified Chinese(zh-CN) messages for GnuPG # Copyright (C) 2002 Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the gnupg package. # Meng Jie , 2004. # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.2\n" +"Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" -"PO-Revision-Date: 2004-07-20 15:50+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"PO-Revision-Date: 2004-11-08 21:30+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=GB2312\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "¡®%s¡¯É¢ÁÐËã·¨ÔÚ±¾·¢Ðа汾ÖÐÖ»¶Á\n" - #: cipher/primegen.c:120 -#, fuzzy, c-format +#, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" -msgstr "ÎÞ·¨Éú³É¶ÌÓÚ %d λµÄÖÊÊý\n" +msgstr "当 pbits=%u 而 qbits=%u æ—¶ä¸èƒ½ç”Ÿæˆè´¨æ•°\n" #: cipher/primegen.c:311 #, c-format msgid "can't generate a prime with less than %d bits\n" -msgstr "ÎÞ·¨Éú³É¶ÌÓÚ %d λµÄÖÊÊý\n" +msgstr "少于 %d ä½æ—¶ä¸èƒ½ç”Ÿæˆè´¨æ•°\n" #: cipher/random.c:163 msgid "no entropy gathering module detected\n" -msgstr "¼ì²â²»µ½ìØÊýËѼ¯Ä£¿é\n" +msgstr "检测ä¸åˆ°ç†µæ•°æœé›†æ¨¡å—\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" -msgstr "ÎÞ·¨´ò¿ª¡®%s¡¯£º %s\n" +msgstr "无法打开‘%s’： %s\n" #: cipher/random.c:391 #, c-format msgid "can't stat `%s': %s\n" -msgstr "ÎÞ·¨»ñµÃÎļþ¡®%s¡¯µÄÐÅÏ¢£º %s\n" +msgstr "无法获得文件‘%s’的信æ¯ï¼š %s\n" #: cipher/random.c:396 #, c-format msgid "`%s' is not a regular file - ignored\n" -msgstr "¡®%s¡¯²»ÊÇÒ»¸öºÏºõ±ê×¼µÄÎļþ¡ª¡ªÒѺöÂÔ\n" +msgstr "‘%s’ä¸æ˜¯ä¸€ä¸ªåˆä¹Žæ ‡å‡†çš„文件――已忽略\n" #: cipher/random.c:401 msgid "note: random_seed file is empty\n" -msgstr "×¢Ò⣺Ëæ»úÊýÖÖ×ÓÎļþΪ¿Õ\n" +msgstr "注æ„：éšæœºæ•°ç§å­æ–‡ä»¶ä¸ºç©º\n" #: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" -msgstr "¾¯¸æ£ºËæ»úÊýÖÖ×ÓÎļþ´óСÎÞЧ¡ª¡ªÎ´Ê¹ÓÃ\n" +msgstr "警告：éšæœºæ•°ç§å­æ–‡ä»¶å¤§å°æ— æ•ˆâ€•â€•æœªä½¿ç”¨\n" #: cipher/random.c:415 #, c-format msgid "can't read `%s': %s\n" -msgstr "ÎÞ·¨¶ÁÈ¡¡®%s¡¯£º%s\n" +msgstr "无法读å–‘%s’：%s\n" #: cipher/random.c:453 msgid "note: random_seed file not updated\n" -msgstr "×¢Ò⣺Ëæ»úÊýÖÖ×ÓÎļþδ±»¸üÐÂ\n" +msgstr "注æ„：éšæœºæ•°ç§å­æ–‡ä»¶æœªè¢«æ›´æ–°\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" -msgstr "ÎÞ·¨½¨Á¢¡®%s¡¯£º%s\n" +msgstr "无法建立‘%s’：%s\n" #: cipher/random.c:480 #, c-format msgid "can't write `%s': %s\n" -msgstr "ÎÞ·¨Ð´Èë¡®%s¡¯£º%s\n" +msgstr "无法写入‘%s’：%s\n" #: cipher/random.c:483 #, c-format msgid "can't close `%s': %s\n" -msgstr "ÎÞ·¨¹Ø±Õ¡®%s¡¯£º%s\n" +msgstr "无法关闭‘%s’：%s\n" #: cipher/random.c:728 msgid "WARNING: using insecure random number generator!!\n" -msgstr "¾¯¸æ£ºÕýÔÚʹÓò»°²È«µÄËæ»úÊý·¢ÉúÆ÷£¡£¡\n" +msgstr "警告：正在使用ä¸å®‰å…¨çš„éšæœºæ•°å‘生器ï¼ï¼\n" #: cipher/random.c:729 msgid "" @@ -100,10 +96,10 @@ "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n" "\n" msgstr "" -"Õâ¸öËæ»úÊý×Ö·¢ÉúÆ÷¸ù±¾¾ÍÊÇ´óÔӻ⩤©¤\n" -"Ëü¸ù±¾¾Í²»ÊÇÇ¿ÓÐÁ¦µÄËæ»úÊý·¢ÉúÆ÷£¡\n" +"这个éšæœºæ•°å­—å‘生器根本就是大æ‚烩──它根本就ä¸æ˜¯å¼ºæœ‰\n" +"力的éšæœºæ•°å‘生器ï¼\n" "\n" -"*¾ø¶Ô²»ÒªÊ¹ÓÃÕâ¸ö³ÌÐò²úÉúµÄÈκÎÊý¾Ý£¡£¡\n" +"ç»å¯¹ä¸è¦ä½¿ç”¨è¿™ä¸ªç¨‹åºäº§ç”Ÿçš„任何数æ®ï¼ï¼\n" "\n" #: cipher/rndegd.c:204 @@ -112,8 +108,8 @@ "keep you from getting bored, because it will improve the quality\n" "of the entropy.\n" msgstr "" -"ÇëÉÔ´ýƬ¿Ì£¬ÏµÍ³´ËʱÕýÔÚËѼ¯ìØÊý¡£Èç¹ûÄú»á¾õµÃÎÞÁĵĻ°£¬\n" -"²»·Á×öЩ±ðµÄÊ£¬Êµ¼ÊÉÏÕâÉõÖÁÄܹ»ÈÃìØÊýµÄÆ·ÖʸüºÃ¡£\n" +"请ç¨å¾…片刻，系统此时正在æœé›†ç†µæ•°ã€‚如果您会觉得无èŠçš„è¯ï¼Œä¸å¦¨åšäº›\n" +"别的事，实际上这甚至能够让熵数的å“质更好。\n" #: cipher/rndlinux.c:134 #, c-format @@ -123,915 +119,965 @@ "the OS a chance to collect more entropy! (Need %d more bytes)\n" msgstr "" "\n" -"Ëæ»ú×Ö½Ú²»¹»¶à¡£ÇëÔÙ×öһЩÆäËûµÄËöÊ£¬\n" -"ÒÔʹµÃ²Ù×÷ϵͳÄÜËѼ¯µ½¸ü¶àµÄìØÊý£¡(»¹ÐèÒª%d×Ö½Ú)\n" +"éšæœºå­—节ä¸å¤Ÿå¤šã€‚请å†åšä¸€äº›å…¶ä»–çš„ç事，以使æ“作系统能æœé›†åˆ°æ›´å¤šçš„熵数ï¼\n" +"(还需è¦%d字节)\n" -#: g10/app-openpgp.c:534 -#, fuzzy, c-format +#: g10/app-openpgp.c:539 +#, c-format msgid "failed to store the fingerprint: %s\n" -msgstr "³õʼ»¯ÐÅÈζÈÊý¾Ý¿âʧ°Ü£º%s\n" +msgstr "无法存储指纹：%s\n" -#: g10/app-openpgp.c:547 -#, fuzzy, c-format +#: g10/app-openpgp.c:552 +#, c-format msgid "failed to store the creation date: %s\n" -msgstr "ÖØн¨Á¢Ô¿³×»·»º´æʧ°Ü£º %s\n" +msgstr "无法存储创建日期：%s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" -msgstr "" +msgstr "PIN 回调返回错误：%s\n" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" -msgstr "" +msgstr "CHV%d çš„ PIN 太短；最å°é•¿åº¦ä¸º %d\n" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 -#, fuzzy, c-format +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 +#, c-format msgid "verify CHV%d failed: %s\n" -msgstr "ÎÞ·¨·¢Ë͵½¹«Ô¿·þÎñÆ÷£º%s\n" +msgstr "éªŒè¯ CHV%d 失败：%s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" -msgstr "" +msgstr "尚未é…置管ç†å‘˜å‘½ä»¤çš„æƒé™\n" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" -msgstr "" +msgstr "从å¡ä¸­èŽ·å– CHV 状æ€æ—¶å‡ºé”™\n" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" -msgstr "" +msgstr "å¡è¢«æ°¸ä¹…é”定ï¼\n" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" -msgstr "" +msgstr "å°è¯•ç®¡ç†å‘˜ PIN %d 次åŽï¼Œå¡å°†è¢«æ°¸ä¹…é”定ï¼\n" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" -msgstr "" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "|A|管ç†å‘˜ PIN" + +#: g10/app-openpgp.c:1021 +#, fuzzy +msgid "|AN|New Admin PIN" +msgstr "|A|新的管ç†å‘˜ PIN" + +#: g10/app-openpgp.c:1021 +#, fuzzy +msgid "|N|New PIN" +msgstr "æ–°çš„ PIN" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1025 #, c-format -msgid "PIN [sigs done: %lu]" -msgstr "" +msgid "error getting new PIN: %s\n" +msgstr "获å–æ–° PIN 时出错：%s\n" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 -#, fuzzy, c-format -msgid "can't access %s - invalid OpenPGP card?\n" -msgstr "ÕÒ²»µ½ÓÐЧµÄ OpenPGP Êý¾Ý¡£\n" +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +msgid "error reading application data\n" +msgstr "读å–应用程åºæ•°æ®æ—¶å‡ºé”™\n" -#: g10/app-openpgp.c:1668 -#, fuzzy, c-format -msgid "error getting serial number: %s\n" -msgstr "Éú³ÉÃÜÂëµÄʱºò·¢Éú´íÎó£º%s\n" +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +msgid "error reading fingerprint DO\n" +msgstr "读å–指纹 D0 出错\n" -#: g10/app-openpgp.c:1763 -#, fuzzy, c-format -msgid "failed to store the key: %s\n" -msgstr "³õʼ»¯ÐÅÈζÈÊý¾Ý¿âʧ°Ü£º%s\n" +#: g10/app-openpgp.c:1107 +msgid "key already exists\n" +msgstr "密钥已存在\n" -#: g10/app-openpgp.c:1805 -#, fuzzy -msgid "reading the key failed\n" -msgstr "ɾ³ýÃÜÔ¿Çø¿éʱʧ°Ü£º%s\n" +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "现有的密钥将被替æ¢\n" + +#: g10/app-openpgp.c:1113 +msgid "generating new key\n" +msgstr "生æˆæ–°å¯†é’¥\n" -#: g10/app-openpgp.c:1812 +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" +msgstr "请ç¨å€™ï¼Œæ­£åœ¨ç”Ÿæˆå¯†é’¥â€¦â€¦\n" + +#: g10/app-openpgp.c:1138 +msgid "generating key failed\n" +msgstr "生æˆå¯†é’¥å¤±è´¥\n" + +#: g10/app-openpgp.c:1141 +#, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "密钥已生æˆ(耗时 %d 秒)\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 msgid "response does not contain the public key data\n" -msgstr "" +msgstr "å“应未包å«å…¬é’¥æ•°æ®\n" -#: g10/app-openpgp.c:1820 +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 msgid "response does not contain the RSA modulus\n" -msgstr "" +msgstr "å“åº”æœªåŒ…å« RSA 余数\n" -#: g10/app-openpgp.c:1831 +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 msgid "response does not contain the RSA public exponent\n" -msgstr "" +msgstr "å“åº”æœªåŒ…å« RSA 公共指数\n" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "无效的 OpenPGP å¡ç»“æž„(D0 0x93)\n" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "ç›®å‰å·²åˆ›å»ºçš„签字：%lu\n" + +#: g10/app-openpgp.c:1367 +#, c-format +msgid "PIN [sigs done: %lu]" +msgstr "PIN [完æˆç­¾å­—：%lu]" + +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 +#, c-format +msgid "can't access %s - invalid OpenPGP card?\n" +msgstr "ä¸èƒ½å­˜å– %s――无效的 OpenPGP å¡ï¼Ÿ\n" + +#: g10/app-openpgp.c:1734 +#, c-format +msgid "error getting serial number: %s\n" +msgstr "å–å¾—åºåˆ—å·æ—¶å‡ºé”™ï¼š%s\n" + +#: g10/app-openpgp.c:1829 +#, c-format +msgid "failed to store the key: %s\n" +msgstr "无法存储密钥：%s\n" + +#: g10/app-openpgp.c:1871 +msgid "reading the key failed\n" +msgstr "无法读出密钥\n" #: g10/armor.c:317 #, c-format msgid "armor: %s\n" -msgstr "ASCII ·â×°£º%s\n" +msgstr "ASCII å°è£…：%s\n" #: g10/armor.c:346 msgid "invalid armor header: " -msgstr "ÎÞЧµÄ ASCII ·â×°Í·£º" +msgstr "无效的 ASCII å°è£…头：" #: g10/armor.c:353 msgid "armor header: " -msgstr "ASCII ·â×°Í·£º" +msgstr "ASCII å°è£…头：" #: g10/armor.c:364 msgid "invalid clearsig header\n" -msgstr "ÎÞЧµÄÃ÷ÎÄÇ©×ÖÍ·\n" +msgstr "无效的明文签字头\n" #: g10/armor.c:416 msgid "nested clear text signatures\n" -msgstr "¶à²ãÃ÷ÎÄÇ©×Ö\n" +msgstr "多层明文签字\n" #: g10/armor.c:551 -#, fuzzy msgid "unexpected armor: " -msgstr "ÓëÔ¤ÆÚ²»·ûµÄ ASCII ·â×°£º" +msgstr "与预期ä¸ç¬¦çš„ ASCII å°è£…：" #: g10/armor.c:563 msgid "invalid dash escaped line: " -msgstr "ÎÞЧµÄÁ¬×ÖºÅÌø³öÐУº" +msgstr "以连字符开头的行格å¼é”™è¯¯ï¼š" #: g10/armor.c:715 g10/armor.c:1300 -#, fuzzy, c-format +#, c-format msgid "invalid radix64 character %02X skipped\n" -msgstr "Ìø¹ýÎÞЧµÄ 64 ½øÖÆ×Ö·û %02x\n" +msgstr "跳过无效的 64 进制字符 %02x\n" #: g10/armor.c:758 msgid "premature eof (no CRC)\n" -msgstr "ÎļþÏÈÓÚÔ¤ÆÚ½áÊø(ûÓÐ CRC ²¿·Ö)\n" +msgstr "文件先于预期结æŸ(没有 CRC 部分)\n" #: g10/armor.c:792 msgid "premature eof (in CRC)\n" -msgstr "ÎļþÏÈÓÚÔ¤ÆÚ½áÊø(CRC ²¿·Öδ½áÊø)\n" +msgstr "文件先于预期结æŸ(CRC 部分未结æŸ)\n" #: g10/armor.c:800 msgid "malformed CRC\n" -msgstr "Òì³£µÄ CRC\n" +msgstr "异常的 CRC\n" #: g10/armor.c:804 g10/armor.c:1337 -#, fuzzy, c-format +#, c-format msgid "CRC error; %06lX - %06lX\n" -msgstr "CRC ´íÎó£º%06lx - %06lx\n" +msgstr "CRC 错误：%06lx - %06lx\n" #: g10/armor.c:824 -#, fuzzy msgid "premature eof (in trailer)\n" -msgstr "ÎļþÏÈÓÚÔ¤ÆÚ½áÊø(ÓÚ½áβ´¦)\n" +msgstr "文件先于预期结æŸ(于结尾处)\n" #: g10/armor.c:828 msgid "error in trailer line\n" -msgstr "½áβÐÐÓÐÎÊÌâ\n" +msgstr "结尾行有问题\n" #: g10/armor.c:1115 msgid "no valid OpenPGP data found.\n" -msgstr "ÕÒ²»µ½ÓÐЧµÄ OpenPGP Êý¾Ý¡£\n" +msgstr "找ä¸åˆ°æœ‰æ•ˆçš„ OpenPGP æ•°æ®ã€‚\n" #: g10/armor.c:1120 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "ÎÞЧµÄ ASCII ·â×°£ºÒ»Ðг¬¹ý %d ×Ö·û\n" +msgstr "无效的 ASCII å°è£…：一行超过 %d 字符\n" #: g10/armor.c:1124 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" -msgstr "·â×°Àï³öÏÖÀ¨ÉϵĿɴòÓ¡×Ö·û¡ª¡ª¿ÉÄÜÊÇÓÐȱÏݵÄÐżþ´«Êä³ÌÐòÔì³ÉµÄ\n" +msgstr "å°è£…里出现括上的å¯æ‰“å°å­—符――å¯èƒ½æ˜¯æœ‰ç¼ºé™·çš„信件传输程åºé€ æˆçš„\n" #: g10/card-util.c:58 g10/card-util.c:282 -#, fuzzy, c-format +#, c-format msgid "OpenPGP card not available: %s\n" -msgstr "˽Կ²»¿ÉÓÃ" +msgstr "OpenPGP å¡ä¸å¯ç”¨ï¼š%s\n" #: g10/card-util.c:63 #, c-format msgid "OpenPGP card no. %s detected\n" -msgstr "" +msgstr "检测到 OpenPGP å¡å· %s\n" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 -#, fuzzy +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" -msgstr "¸Ã²Ù×÷ÎÞ·¨ÔÚÅú´¦ÀíģʽÖнøÐÐ\n" +msgstr "在批处ç†æ¨¡å¼ä¸­æ— æ³•å®Œæˆæ­¤æ“作\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " -msgstr "ÄúµÄÑ¡Ôñ£¿ " +msgstr "您的选择？ " #: g10/card-util.c:194 g10/card-util.c:244 msgid "[not set]" -msgstr "" +msgstr "[未设定]" -#: g10/card-util.c:376 -#, fuzzy +#: g10/card-util.c:378 msgid "male" -msgstr "enable" +msgstr "男性" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "female" -msgstr "enable" +msgstr "女性" -#: g10/card-util.c:377 -#, fuzzy +#: g10/card-util.c:379 msgid "unspecified" -msgstr "δָ¶¨Ô­Òò" +msgstr "未定义" -#: g10/card-util.c:396 -#, fuzzy +#: g10/card-util.c:406 msgid "not forced" -msgstr "δ±»´¦Àí" +msgstr "å¯é€‰" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" -msgstr "" +msgstr "å¿…é¡»" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" -msgstr "" +msgstr "错误：目å‰åªå…许使用 ASCII 字符。\n" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" -msgstr "" +msgstr "错误：ä¸èƒ½ä½¿ç”¨å­—符“<â€ã€‚\n" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" -msgstr "" +msgstr "错误：ä¸å…许出现两个空格。\n" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " -msgstr "" +msgstr "å¡æŒæœ‰äººçš„姓：" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " -msgstr "" +msgstr "å¡æŒæœ‰äººçš„å：" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" -msgstr "" +msgstr "错误：åˆæˆçš„姓å太长(至多 %d 个字符)。\n" -#: g10/card-util.c:502 -#, fuzzy +#: g10/card-util.c:521 msgid "URL to retrieve public key: " -msgstr "ûÓÐÏà¶ÔÓ¦µÄ¹«Ô¿£º%s\n" +msgstr "获å–公钥的 URL：" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" -msgstr "" +msgstr "错误：URL 太长(至多 %d 个字符)\n" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" -msgstr "¶ÁÈ¡¡®%s¡¯Ê±³ö´í£º%s\n" +msgstr "读å–‘%s’时出错：%s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " -msgstr "" +msgstr "登录数æ®(å¸å·å)：" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" +msgstr "错误：登录数æ®å¤ªé•¿(至多 %d 个字符)。\n" + +#: g10/card-util.c:699 +msgid "Private DO data: " msgstr "" -#: g10/card-util.c:641 -#, fuzzy +#: g10/card-util.c:709 +#, fuzzy, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "错误：URL 太长(至多 %d 个字符)\n" + +#: g10/card-util.c:729 msgid "Language preferences: " -msgstr "¸üйýµÄÊ×Ñ¡Ïî" +msgstr "首选语言：" -#: g10/card-util.c:649 -#, fuzzy +#: g10/card-util.c:737 msgid "Error: invalid length of preference string.\n" -msgstr "Ê×Ñ¡Ïî×Ö·û´®ÀïÓÐÎÞЧµÄ×Ö·û\n" +msgstr "错误：首选项字符串长度无效。\n" -#: g10/card-util.c:658 -#, fuzzy +#: g10/card-util.c:746 msgid "Error: invalid characters in preference string.\n" -msgstr "Ê×Ñ¡Ïî×Ö·û´®ÀïÓÐÎÞЧµÄ×Ö·û\n" +msgstr "错误：首选项字符串里有无效字符。\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " -msgstr "" +msgstr "性别(男性输入 M，女性输入 F，ä¸æŒ‡å®šè¾“入空格)：" -#: g10/card-util.c:693 -#, fuzzy +#: g10/card-util.c:781 msgid "Error: invalid response.\n" -msgstr "´íÎó£ºÎÞЧµÄÖ¸ÎÆ\n" +msgstr "错误：无效的å“应。\n" -#: g10/card-util.c:714 -#, fuzzy +#: g10/card-util.c:802 msgid "CA fingerprint: " -msgstr "ÏÔʾָÎÆ" +msgstr "CA 指纹：" -#: g10/card-util.c:737 -#, fuzzy +#: g10/card-util.c:825 msgid "Error: invalid formatted fingerprint.\n" -msgstr "´íÎó£ºÎÞЧµÄÖ¸ÎÆ\n" +msgstr "错误：指纹格å¼æ— æ•ˆã€‚\n" -#: g10/card-util.c:785 -#, fuzzy, c-format +#: g10/card-util.c:873 +#, c-format msgid "key operation not possible: %s\n" -msgstr "Éú³ÉÃÜԿʧ°Ü£º%s\n" +msgstr "针对密钥的æ“作无法实现：%s\n" -#: g10/card-util.c:786 -#, fuzzy +#: g10/card-util.c:874 msgid "not an OpenPGP card" -msgstr "ÕÒ²»µ½ÓÐЧµÄ OpenPGP Êý¾Ý¡£\n" +msgstr "ä¸æ˜¯ä¸€ä¸ª OpenPGP å¡" -#: g10/card-util.c:795 -#, fuzzy, c-format +#: g10/card-util.c:883 +#, c-format msgid "error getting current key info: %s\n" -msgstr "дÈë˽ԿԿ³×»·¡®%s¡¯Ê±·¢Éú´íÎó£º %s\n" +msgstr "å–得当å‰å¯†é’¥ä¿¡æ¯æ—¶å‡ºé”™ï¼š%s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " -msgstr "" +msgstr "替æ¢å·²æœ‰çš„密钥？(y/N)" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " -msgstr "" +msgstr "是å¦ä¸ºåŠ å¯†å¯†é’¥åˆ›å»ºå¡å¤–的备份？(Y/n)" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " -msgstr "" +msgstr "替æ¢å·²æœ‰çš„密钥？(y/N)" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" " PIN = `%s' Admin PIN = `%s'\n" "You should change them using the command --change-pin\n" msgstr "" +"请注æ„，PIN 在出厂时被设置为：\n" +" PIN = ‘%s’ 管ç†å‘˜ PIN = ‘%s’\n" +"您应当使用 --change-pin 命令æ¥æ›´æ”¹å®ƒä»¬\n" -#: g10/card-util.c:968 -#, fuzzy +#: g10/card-util.c:1056 msgid "Please select the type of key to generate:\n" -msgstr "ÇëÑ¡ÔñÄúҪʹÓõÄÃÜÔ¿ÖÖÀࣺ\n" +msgstr "请选择您è¦ä½¿ç”¨çš„密钥ç§ç±»ï¼š\n" -#: g10/card-util.c:970 g10/card-util.c:1050 -#, fuzzy +#: g10/card-util.c:1058 g10/card-util.c:1138 msgid " (1) Signature key\n" -msgstr "Õâ·ÝÇ©×ÖÒÑÓÚ %s ¹ýÆÚ¡£\n" +msgstr " (1) 签字密钥\n" -#: g10/card-util.c:971 g10/card-util.c:1052 -#, fuzzy +#: g10/card-util.c:1059 g10/card-util.c:1140 msgid " (2) Encryption key\n" -msgstr " (%d) RSA (½öÓÃÓÚ¼ÓÃÜ)\n" +msgstr " (1) 加密密钥\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" -msgstr "" +msgstr " (1) 认è¯å¯†é’¥\n" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" -msgstr "ÎÞЧµÄÑ¡Ôñ¡£\n" +msgstr "无效的选择。\n" -#: g10/card-util.c:1047 -#, fuzzy +#: g10/card-util.c:1135 msgid "Please select where to store the key:\n" -msgstr "ÇëÑ¡ÔñµõÏúµÄÔ­Òò£º\n" +msgstr "请选择在哪里存储密钥：\n" -#: g10/card-util.c:1082 -#, fuzzy +#: g10/card-util.c:1170 msgid "unknown key protection algorithm\n" -msgstr "δ֪µÄ±£»¤Ëã·¨\n" +msgstr "ä¸æ”¯æŒçš„密钥ä¿æŠ¤ç®—法\n" -#: g10/card-util.c:1087 -#, fuzzy +#: g10/card-util.c:1175 msgid "secret parts of key are not available\n" -msgstr "Ö÷Ô¿µÄ˽Կ²¿·ÖÎÞ·¨È¡Óá£\n" +msgstr "ç§é’¥éƒ¨åˆ†ä¸å¯ç”¨\n" -#: g10/card-util.c:1092 -#, fuzzy +#: g10/card-util.c:1180 msgid "secret key already stored on a card\n" -msgstr "ÒÑÌø¹ý£ºË½Ô¿ÒÑ´æÔÚ\n" +msgstr "ç§é’¥å·²å­˜å‚¨åœ¨å¡ä¸Š\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quit" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" -msgstr "À뿪Õâ¸ö²Ëµ¥" +msgstr "离开这个èœå•" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" -msgstr "" +msgstr "admin" -#: g10/card-util.c:1164 -#, fuzzy +#: g10/card-util.c:1252 msgid "show admin commands" -msgstr "³åÍ»µÄÖ¸Áî\n" +msgstr "显示管ç†å‘˜å‘½ä»¤" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" -msgstr "ÏÔʾÕâ·ÝÔÚÏß˵Ã÷" +msgstr "显示这份在线说明" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 -#, fuzzy +#: g10/card-util.c:1255 msgid "list all available data" -msgstr "¹«Ô¿¿ÉÈ¡×Ô£º" +msgstr "列出所有å¯ç”¨æ•°æ®" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 -#, fuzzy +#: g10/card-util.c:1258 msgid "name" -msgstr "enable" +msgstr "name" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" -msgstr "" +msgstr "更改å¡æŒæœ‰äººçš„姓å" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" -msgstr "" +msgstr "url" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" -msgstr "" +msgstr "更改获å–密钥的 URL" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" -msgstr "" +msgstr "fetch" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" -msgstr "" +msgstr "æ ¹æ®å¡ä¸­æŒ‡å®šçš„ URL 获å–密钥" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "login" -msgstr "lsign" +msgstr "login" -#: g10/card-util.c:1174 -#, fuzzy +#: g10/card-util.c:1262 msgid "change the login name" -msgstr "¸ü¸ÄʹÓÃÆÚÏÞ" +msgstr "更改登录å" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" -msgstr "" +msgstr "lang" -#: g10/card-util.c:1175 -#, fuzzy +#: g10/card-util.c:1263 msgid "change the language preferences" -msgstr "¸ü¸ÄÐÅÈζÈ" +msgstr "更改首选语言首选" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" -msgstr "" +msgstr "性别" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" -msgstr "" +msgstr "更改å¡æŒæœ‰äººçš„性别" -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "cafpr" -msgstr "fpr" +msgstr "cafpr" -#: g10/card-util.c:1177 -#, fuzzy +#: g10/card-util.c:1265 msgid "change a CA fingerprint" -msgstr "ÏÔʾָÎÆ" +msgstr "更改一个 CA 指纹" -#: g10/card-util.c:1178 -#, fuzzy +#: g10/card-util.c:1266 msgid "forcesig" -msgstr "revsig" +msgstr "forcesig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" -msgstr "" +msgstr "设定 PIN 签字是å¦å¿…é¡»" -#: g10/card-util.c:1180 -#, fuzzy +#: g10/card-util.c:1268 msgid "generate" -msgstr "³£¹æ´íÎó" +msgstr "generate" -#: g10/card-util.c:1181 -#, fuzzy +#: g10/card-util.c:1269 msgid "generate new keys" -msgstr "Éú³ÉÒ»¸±ÐµÄÃÜÔ¿¶Ô" +msgstr "生æˆæ–°çš„密钥" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" +msgstr "æ›´æ”¹æˆ–è§£é” PIN çš„èœå•" + +#: g10/card-util.c:1272 +msgid "privatedo" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " -msgstr "ÃüÁî> " +msgstr "命令> " -#: g10/card-util.c:1281 -#, fuzzy +#: g10/card-util.c:1371 msgid "Admin-only command\n" -msgstr "³åÍ»µÄÖ¸Áî\n" +msgstr "仅供管ç†å‘˜ä½¿ç”¨çš„命令\n" -#: g10/card-util.c:1297 -#, fuzzy +#: g10/card-util.c:1387 msgid "Admin commands are allowed\n" -msgstr "³åÍ»µÄÖ¸Áî\n" +msgstr "å…许使用管ç†å‘˜å‘½ä»¤\n" -#: g10/card-util.c:1299 -#, fuzzy +#: g10/card-util.c:1389 msgid "Admin commands are not allowed\n" -msgstr "ÕýÔÚ½«Ë½Ô¿Ð´ÖÁ`%s'\n" +msgstr "ä¸å…许使用管ç†å‘˜å‘½ä»¤\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" -msgstr "ÎÞЧµÄÖ¸Áî(³¢ÊÔ¡°help¡±)\n" +msgstr "无效的指令(å°è¯•â€œhelpâ€)\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " -msgstr "" +msgstr "请æ’å…¥å¡å¹¶å›žè½¦ï¼Œæˆ–输入‘c’æ¥å–消：" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" +"请å–出当å‰çš„å¡ï¼Œå¹¶æ’入有下列åºåˆ—å·çš„å¡ï¼š\n" +" %.*s\n" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " -msgstr "" +msgstr "就绪åŽè¯·å›žè½¦ï¼Œæˆ–输入‘c’å–消" + +#: g10/cardglue.c:687 +#, fuzzy +msgid "Enter New Admin PIN: " +msgstr "输入管ç†å‘˜ PIN：" -#: g10/cardglue.c:638 +#: g10/cardglue.c:688 +#, fuzzy +msgid "Enter New PIN: " +msgstr "输入 PIN：" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " -msgstr "" +msgstr "输入管ç†å‘˜ PIN：" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " -msgstr "" +msgstr "输入 PIN：" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +msgid "Repeat this PIN: " +msgstr "å†æ¬¡è¾“入此 PIN：" + +#: g10/cardglue.c:718 +msgid "PIN not correctly repeated; try again" +msgstr "PIN å†æ¬¡è¾“入时与首次输入ä¸ç¬¦ï¼›è¯·å†è¯•ä¸€æ¬¡" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" -msgstr "ÎÞ·¨´ò¿ª¡®%s¡¯\n" +msgstr "无法打开‘%s’\n" #: g10/decrypt.c:104 g10/encode.c:859 msgid "--output doesn't work for this command\n" -msgstr "--output ÔÚÕâ¸öÃüÁîÖв»Æð×÷ÓÃ\n" +msgstr "--output 在这个命令中ä¸èµ·ä½œç”¨\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found: %s\n" -msgstr "ÕÒ²»µ½¡®%s¡¯ÃÜÔ¿£º%s\n" +msgstr "密钥‘%s’找ä¸åˆ°ï¼š%s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" -msgstr "¶ÁÈ¡ÃÜÔ¿Çø¿éʱ·¢Éú´íÎó£º%s\n" +msgstr "读å–密钥区å—æ—¶å‘生错误：%s\n" #: g10/delkey.c:121 g10/delkey.c:128 msgid "(unless you specify the key by fingerprint)\n" -msgstr "(³ý·ÇÄúÓÃÖ¸ÎÆÖ¸¶¨ÃÜÔ¿)\n" +msgstr "(除éžæ‚¨ç”¨æŒ‡çº¹æŒ‡å®šå¯†é’¥)\n" #: g10/delkey.c:127 -#, fuzzy msgid "can't do this in batch mode without \"--yes\"\n" -msgstr "ÔÚÅú´¦ÀíģʽÖУ¬Ã»ÓС°--yes¡±¾ÍÎÞ·¨Õâô×ö\n" +msgstr "在批处ç†æ¨¡å¼ä¸­ï¼Œæ²¡æœ‰â€œ--yesâ€å°±æ— æ³•è¿™ä¹ˆåš\n" #: g10/delkey.c:139 -#, fuzzy msgid "Delete this key from the keyring? (y/N) " -msgstr "Òª´ÓÔ¿³×»·Àïɾ³ýÕâ°ÑÃÜÔ¿Âð£¿" +msgstr "è¦ä»Žé’¥åŒ™çŽ¯é‡Œåˆ é™¤è¿™æŠŠå¯†é’¥å—？(y/N)" #: g10/delkey.c:147 -#, fuzzy msgid "This is a secret key! - really delete? (y/N) " -msgstr "ÕâÊÇÒ»°Ñ˽Կ£¡¡ª¡ªÕæµÄҪɾ³ýÂð£¿" +msgstr "这是一把ç§é’¥ï¼â€•â€•çœŸçš„è¦åˆ é™¤å—？(y/N)" #: g10/delkey.c:157 #, c-format msgid "deleting keyblock failed: %s\n" -msgstr "ɾ³ýÃÜÔ¿Çø¿éʱʧ°Ü£º%s\n" +msgstr "删除密钥区å—时失败：%s\n" #: g10/delkey.c:167 msgid "ownertrust information cleared\n" -msgstr "ÐÅÈζÈÐÅÏ¢Òѱ»Çå³ý\n" +msgstr "信任度信æ¯å·²è¢«æ¸…除\n" #: g10/delkey.c:195 #, c-format msgid "there is a secret key for public key \"%s\"!\n" -msgstr "¹«Ô¿¡°%s¡±ÓжÔÓ¦µÄ˽Կ£¡\n" +msgstr "公钥“%sâ€æœ‰å¯¹åº”çš„ç§é’¥ï¼\n" #: g10/delkey.c:197 msgid "use option \"--delete-secret-keys\" to delete it first.\n" -msgstr "ÇëÏÈʹÓá°--delete-secret-keys¡±Ñ¡ÏîÀ´É¾³ýËü¡£\n" +msgstr "请先使用“--delete-secret-keysâ€é€‰é¡¹æ¥åˆ é™¤å®ƒã€‚\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" -msgstr "Éú³ÉÃÜÂëµÄʱºò·¢Éú´íÎó£º%s\n" +msgstr "生æˆå¯†ç çš„时候å‘生错误：%s\n" #: g10/encode.c:215 msgid "can't use a symmetric ESK packet due to the S2K mode\n" -msgstr "ÔÚ´Ë S2K ģʽÏÂÎÞ·¨Ê¹ÓÃ¶Ô³ÆµÄ ESK °ü\n" +msgstr "在此 S2K 模å¼ä¸‹æ— æ³•ä½¿ç”¨å¯¹ç§°çš„ ESK 包\n" #: g10/encode.c:228 #, c-format msgid "using cipher %s\n" -msgstr "ʹÓöԳƼÓÃÜËã·¨ %s\n" +msgstr "使用对称加密算法 %s\n" #: g10/encode.c:238 g10/encode.c:558 #, c-format msgid "`%s' already compressed\n" -msgstr "¡®%s¡¯Òѱ»Ñ¹Ëõ\n" +msgstr "‘%s’已被压缩\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "¾¯¸æ£º¡®%s¡¯ÊÇÒ»¸ö¿ÕÎļþ\n" +msgstr "警告：‘%s’是一个空文件\n" #: g10/encode.c:472 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" -msgstr "ÔÚ --pgp2 ģʽÖУ¬ÄúÖ»ÄÜʹÓà 2048 ×Ö½Ú¼°ÒÔÏ嵀 RSA ÃÜÔ¿¼ÓÃÜ\n" +msgstr "在 --pgp2 模å¼ä¸­ï¼Œæ‚¨åªèƒ½ä½¿ç”¨ 2048 ä½åŠä»¥ä¸‹çš„ RSA 密钥加密\n" #: g10/encode.c:494 #, c-format msgid "reading from `%s'\n" -msgstr "ÕýÔÚ´Ó¡®%s¡¯¶ÁÈ¡\n" +msgstr "正在从‘%s’读å–\n" #: g10/encode.c:530 msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" -msgstr "ÄúÕýÒªÓÃÀ´¼ÓÃܵÄËùÓÐÃÜÔ¿¶¼²»ÄÜʹÓà IDEA Ëã·¨¡£\n" +msgstr "您正è¦ç”¨æ¥åŠ å¯†çš„所有密钥都ä¸èƒ½ä½¿ç”¨ IDEA 算法。\n" #: g10/encode.c:540 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "Ç¿ÐÐʹÓÃµÄ %s (%d)¶Ô³Æ¼ÓÃÜËã·¨²»ÔÚÊÕ¼þÕßµÄÊ×Ñ¡ÏîÖÐ\n" +msgstr "警告：强行使用的 %s (%d)对称加密算法ä¸åœ¨æ”¶ä»¶è€…的首选项中\n" -#: g10/encode.c:648 g10/sign.c:876 -#, fuzzy, c-format +#: g10/encode.c:648 g10/sign.c:877 +#, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " "preferences\n" -msgstr "Ç¿ÐÐʹÓÃµÄ %s (%d)ѹËõËã·¨²»ÔÚÊÕ¼þÕßµÄÊ×Ñ¡ÏîÖÐ\n" +msgstr "警告：强行使用的 %s (%d)压缩算法ä¸åœ¨æ”¶ä»¶è€…的首选项中\n" #: g10/encode.c:735 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "Ç¿ÐÐʹÓÃµÄ %s (%d)¶Ô³Æ¼ÓÃÜËã·¨²»ÔÚÊÕ¼þÕßµÄÊ×Ñ¡ÏîÖÐ\n" +msgstr "强行使用的 %s (%d)对称加密算法ä¸åœ¨æ”¶ä»¶è€…的首选项中\n" #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757 #, c-format msgid "you may not use %s while in %s mode\n" -msgstr "Äú²»¸Ã½« %s ÓÃÓÚ %s ģʽÖÐ\n" +msgstr "您ä¸è¯¥å°† %s 用于 %s 模å¼ä¸­\n" #: g10/encode.c:832 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" -msgstr "%s/%s ÒѾ­¼ÓÃܸø£º¡°%s¡±\n" +msgstr "%s/%s å·²ç»åŠ å¯†ç»™ï¼šâ€œ%sâ€\n" #: g10/encr-data.c:66 g10/mainproc.c:301 #, c-format msgid "%s encrypted data\n" -msgstr "%s ¼ÓÃܹýµÄÊý¾Ý\n" +msgstr "%s 加密过的数æ®\n" #: g10/encr-data.c:68 g10/mainproc.c:305 #, c-format msgid "encrypted with unknown algorithm %d\n" -msgstr "ÒÔδ֪µÄËã·¨ %d ¼ÓÃÜ\n" +msgstr "以未知的算法 %d 加密\n" #: g10/encr-data.c:92 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" -msgstr "¾¯¸æ£º±¨Îı»Ê¹ÓöԳƼÓÃÜËã·¨µÄÈõÃÜÔ¿¼ÓÃÜ¡£\n" +msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n" #: g10/encr-data.c:103 msgid "problem handling encrypted packet\n" -msgstr "´¦Àí¼ÓÃÜ°üÓÐÎÊÌâ\n" +msgstr "处ç†åŠ å¯†åŒ…有问题\n" #: g10/exec.c:48 msgid "no remote program execution supported\n" -msgstr "²»Ö§³ÖÔ¶³Ìµ÷ÓÃ\n" +msgstr "ä¸æ”¯æŒè¿œç¨‹è°ƒç”¨\n" #: g10/exec.c:184 g10/openfile.c:406 #, c-format msgid "can't create directory `%s': %s\n" -msgstr "ÎÞ·¨½¨Á¢Ä¿Â¼¡®%s¡¯£º%s\n" +msgstr "无法建立目录‘%s’：%s\n" #: g10/exec.c:325 msgid "" "external program calls are disabled due to unsafe options file permissions\n" -msgstr "ÓÉÓÚÅäÖÃÎļþȨÏÞ²»°²È«£¬Íⲿ³ÌÐòµ÷Óñ»½ûÓÃ\n" +msgstr "由于é…置文件æƒé™ä¸å®‰å…¨ï¼Œå¤–部程åºè°ƒç”¨è¢«ç¦ç”¨\n" #: g10/exec.c:355 -#, fuzzy msgid "this platform requires temporary files when calling external programs\n" -msgstr "ÔÚÕâ¸ö²Ù×÷ƽ̨Éϵ÷ÓÃÍⲿ³ÌÐòʱÐèÒªÁÙʱÎļþ\n" +msgstr "在这个æ“作平å°ä¸Šè°ƒç”¨å¤–部程åºæ—¶éœ€è¦ä¸´æ—¶æ–‡ä»¶\n" #: g10/exec.c:433 -#, fuzzy, c-format +#, c-format msgid "unable to execute program `%s': %s\n" -msgstr "ÎÞ·¨Ö´ÐÐ%s¡°%s¡±£º%s\n" +msgstr "无法执行程åºâ€˜%s’：%s\n" #: g10/exec.c:436 -#, fuzzy, c-format +#, c-format msgid "unable to execute shell `%s': %s\n" -msgstr "ÎÞ·¨Ö´ÐÐ%s¡°%s¡±£º%s\n" +msgstr "无法在命令解释环境中执行‘%s’：%s\n" #: g10/exec.c:521 #, c-format msgid "system error while calling external program: %s\n" -msgstr "µ÷ÓÃÍⲿ³ÌÐòʱ·¢Éúϵͳ´íÎó£º%s\n" +msgstr "调用外部程åºæ—¶å‘生系统错误：%s\n" #: g10/exec.c:532 g10/exec.c:598 msgid "unnatural exit of external program\n" -msgstr "Íⲿ³ÌÐòÒì³£Í˳ö\n" +msgstr "外部程åºå¼‚常退出\n" #: g10/exec.c:547 msgid "unable to execute external program\n" -msgstr "ÎÞ·¨Ö´ÐÐÍⲿ³ÌÐò\n" +msgstr "无法执行外部程åº\n" #: g10/exec.c:563 #, c-format msgid "unable to read external program response: %s\n" -msgstr "ÎÞ·¨¶ÁÈ¡Íⲿ³ÌÐòÏìÓ¦£º%s\n" +msgstr "无法读å–外部程åºå“应：%s\n" #: g10/exec.c:609 g10/exec.c:616 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" -msgstr "¾¯¸æ£ºÎÞ·¨É¾³ýÁÙʱÎļþ(%s)¡®%s¡¯£º%s\n" +msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n" #: g10/exec.c:621 #, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" -msgstr "¾¯¸æ£ºÎÞ·¨É¾³ýÁÙʱĿ¼¡®%s¡¯£º%s\n" +msgstr "警告：无法删除临时目录‘%s’：%s\n" -#: g10/export.c:176 -#, fuzzy +#: g10/export.c:182 msgid "exporting secret keys not allowed\n" -msgstr "ÕýÔÚ½«Ë½Ô¿Ð´ÖÁ`%s'\n" +msgstr "ä¸å…许导出ç§é’¥\n" -#: g10/export.c:206 -#, fuzzy, c-format +#: g10/export.c:211 +#, c-format msgid "key %s: not protected - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºÎ´±»±£»¤¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：未被ä¿æŠ¤â€•â€•å·²è·³è¿‡\n" -#: g10/export.c:214 -#, fuzzy, c-format +#: g10/export.c:219 +#, c-format msgid "key %s: PGP 2.x style key - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºPGP 2.x ÑùʽµÄÃÜÔ¿¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：PGP 2.x æ ·å¼çš„密钥――已跳过\n" # I hope this warning doesn't confuse people. -#: g10/export.c:361 -#, fuzzy, c-format +#: g10/export.c:384 +#, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" -msgstr "¾¯¸æ£ºË½Ô¿ %08lX ²»´æÔÚ¼òµ¥SK¼ìÑéºÍ\n" +msgstr "警告：ç§é’¥ %s ä¸å­˜åœ¨ç®€å• SK 检验和\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" -msgstr "¾¯¸æ£ºÃ»Óе¼³öÈκζ«Î÷\n" +msgstr "警告：没有导出任何东西\n" #: g10/g10.c:358 msgid "" "@Commands:\n" " " msgstr "" -"@Ö¸Á\n" +"@指令：\n" " " #: g10/g10.c:360 msgid "|[file]|make a signature" -msgstr "|[ÎļþÃû]|Éú³ÉÒ»·ÝÇ©×Ö" +msgstr "|[文件å]|生æˆä¸€ä»½ç­¾å­—" #: g10/g10.c:361 msgid "|[file]|make a clear text signature" -msgstr "|[ÎļþÃû]|Éú³ÉÒ»·ÝÃ÷ÎÄÇ©×Ö" +msgstr "|[文件å]|生æˆä¸€ä»½æ˜Žæ–‡ç­¾å­—" #: g10/g10.c:362 msgid "make a detached signature" -msgstr "Éú³ÉÒ»·Ý·ÖÀëµÄÇ©×Ö" +msgstr "生æˆä¸€ä»½åˆ†ç¦»çš„签字" #: g10/g10.c:363 msgid "encrypt data" -msgstr "¼ÓÃÜÊý¾Ý" +msgstr "加密数æ®" #: g10/g10.c:365 msgid "encryption only with symmetric cipher" -msgstr "½öʹÓöԳƼÓÃÜ" +msgstr "仅使用对称加密" #: g10/g10.c:367 msgid "decrypt data (default)" -msgstr "½âÃÜÊý¾Ý(ĬÈÏ)" +msgstr "解密数æ®(默认)" #: g10/g10.c:369 msgid "verify a signature" -msgstr "Ñé֤ǩ×Ö" +msgstr "验è¯ç­¾å­—" #: g10/g10.c:371 msgid "list keys" -msgstr "ÁгöÃÜÔ¿" +msgstr "列出密钥" #: g10/g10.c:373 msgid "list keys and signatures" -msgstr "ÁгöÃÜÔ¿ºÍÇ©×Ö" +msgstr "列出密钥和签字" #: g10/g10.c:374 -#, fuzzy msgid "list and check key signatures" -msgstr "¼ì²éÃÜÔ¿Ç©×Ö" +msgstr "列出并检查密钥签字" #: g10/g10.c:375 msgid "list keys and fingerprints" -msgstr "ÁгöÃÜÔ¿ºÍÖ¸ÎÆ" +msgstr "列出密钥和指纹" #: g10/g10.c:376 msgid "list secret keys" -msgstr "Áгö˽Կ" +msgstr "列出ç§é’¥" #: g10/g10.c:377 msgid "generate a new key pair" -msgstr "Éú³ÉÒ»¸±ÐµÄÃÜÔ¿¶Ô" +msgstr "生æˆä¸€å‰¯æ–°çš„密钥对" #: g10/g10.c:378 msgid "remove keys from the public keyring" -msgstr "´Ó¹«Ô¿Ô¿³×»·Àïɾ³ýÃÜÔ¿" +msgstr "从公钥钥匙环里删除密钥" #: g10/g10.c:380 msgid "remove keys from the secret keyring" -msgstr "´Ó˽ԿԿ³×»·Àïɾ³ýÃÜÔ¿" +msgstr "从ç§é’¥é’¥åŒ™çŽ¯é‡Œåˆ é™¤å¯†é’¥" #: g10/g10.c:381 msgid "sign a key" -msgstr "Ϊij°ÑÃÜÔ¿Ìí¼ÓÇ©×Ö" +msgstr "为æŸæŠŠå¯†é’¥æ·»åŠ ç­¾å­—" #: g10/g10.c:382 msgid "sign a key locally" -msgstr "Ϊij°ÑÃÜÔ¿Ìí¼Ó±¾µØÇ©×Ö" +msgstr "为æŸæŠŠå¯†é’¥æ·»åŠ æœ¬åœ°ç­¾å­—" #: g10/g10.c:385 msgid "sign or edit a key" -msgstr "±à¼­Ä³°ÑÃÜÔ¿»òΪÆäÌí¼ÓÇ©×Ö" +msgstr "编辑æŸæŠŠå¯†é’¥æˆ–为其添加签字" #: g10/g10.c:386 msgid "generate a revocation certificate" -msgstr "Éú³ÉÒ»·ÝµõÏúÖ¤Êé" +msgstr "生æˆä¸€ä»½åŠé”€è¯ä¹¦" #: g10/g10.c:388 msgid "export keys" -msgstr "µ¼³öÃÜÔ¿" +msgstr "导出密钥" #: g10/g10.c:389 msgid "export keys to a key server" -msgstr "°ÑÃÜÔ¿µ¼³öµ½Ä³¸ö¹«Ô¿·þÎñÆ÷ÉÏ" +msgstr "把密钥导出到æŸä¸ªå…¬é’¥æœåŠ¡å™¨ä¸Š" #: g10/g10.c:390 msgid "import keys from a key server" -msgstr "´Ó¹«Ô¿·þÎñÆ÷Éϵ¼ÈëÃÜÔ¿" +msgstr "从公钥æœåŠ¡å™¨ä¸Šå¯¼å…¥å¯†é’¥" #: g10/g10.c:392 msgid "search for keys on a key server" -msgstr "ÔÚ¹«Ô¿·þÎñÆ÷ÉÏËÑÑ°ÃÜÔ¿" +msgstr "在公钥æœåŠ¡å™¨ä¸Šæœå¯»å¯†é’¥" #: g10/g10.c:394 msgid "update all keys from a keyserver" -msgstr "´Ó¹«Ô¿·þÎñÆ÷¸üÐÂËùÓеı¾µØÃÜÔ¿" +msgstr "从公钥æœåŠ¡å™¨æ›´æ–°æ‰€æœ‰çš„本地密钥" #: g10/g10.c:397 msgid "import/merge keys" -msgstr "µ¼Èë/ºÏ²¢ÃÜÔ¿" +msgstr "导入/åˆå¹¶å¯†é’¥" #: g10/g10.c:400 msgid "print the card status" -msgstr "" +msgstr "打å°å¡çŠ¶æ€" #: g10/g10.c:401 msgid "change data on a card" -msgstr "" +msgstr "更改å¡ä¸Šçš„æ•°æ®" #: g10/g10.c:402 msgid "change a card's PIN" -msgstr "" +msgstr "更改å¡çš„ PIN" #: g10/g10.c:410 msgid "update the trust database" -msgstr "¸üÐÂÐÅÈζÈÊý¾Ý¿â" +msgstr "更新信任度数æ®åº“" #: g10/g10.c:417 msgid "|algo [files]|print message digests" -msgstr "|Ëã·¨Ãû [ÎļþÃû]|´òÓ¡±¨ÎÄÉ¢ÁÐÖµ£¬Ê¹ÓÃÖ¸¶¨µÄÉ¢ÁÐËã·¨" +msgstr "|算法 [文件]|使用指定的散列算法打å°æŠ¥æ–‡æ•£åˆ—值" #: g10/g10.c:421 g10/gpgv.c:65 msgid "" @@ -1040,62 +1086,62 @@ " " msgstr "" "@\n" -"Ñ¡Ï\n" +"选项：\n" " " #: g10/g10.c:423 msgid "create ascii armored output" -msgstr "Êä³ö¾­ ASCII ·â×°" +msgstr "è¾“å‡ºç» ASCII å°è£…" #: g10/g10.c:425 msgid "|NAME|encrypt for NAME" -msgstr "|ij¼×|ΪÊÕ¼þÕß¡°Ä³¼×¡±¼ÓÃÜ" +msgstr "|æŸç”²|为收件者“æŸç”²â€åŠ å¯†" #: g10/g10.c:436 msgid "use this user-id to sign or decrypt" -msgstr "ʹÓÃÕâ¸öÓû§±êʶÀ´Ç©×Ö»ò½âÃÜ" +msgstr "使用这个用户标识æ¥ç­¾å­—或解密" #: g10/g10.c:437 msgid "|N|set compress level N (0 disables)" -msgstr "|N|É趨ѹËõµÈ¼¶Îª N(0 ±íʾ²»Ñ¹Ëõ)" +msgstr "|N|设定压缩等级为 N (0 表示ä¸åŽ‹ç¼©)" #: g10/g10.c:442 msgid "use canonical text mode" -msgstr "ʹÓñê×¼µÄÎı¾Ä£Ê½" +msgstr "使用标准的文本模å¼" #: g10/g10.c:452 msgid "use as output file" -msgstr "Ö¸¶¨Êä³öÎļþ" +msgstr "指定输出文件" #: g10/g10.c:454 g10/gpgv.c:67 msgid "verbose" -msgstr "Ïêϸģʽ" +msgstr "详细模å¼" #: g10/g10.c:465 msgid "do not make any changes" -msgstr "²»Òª×öÈκθıä" +msgstr "ä¸åšä»»ä½•æ”¹å˜" #: g10/g10.c:466 msgid "prompt before overwriting" -msgstr "¸²¸ÇÇ°ÏÈѯÎÊ" +msgstr "覆盖å‰å…ˆè¯¢é—®" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" -msgstr "" +msgstr "行为严格éµå¾ª OpenPGP 定义" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" -msgstr "" +msgstr "生æˆä¸Ž PGP 2.x 兼容的报文" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" "@\n" -"(Çë²Î¿¼ÔÚÏß˵Ã÷ÒÔ»ñµÃËùÓÐÃüÁîºÍÑ¡ÏîµÄÍêÕûÇåµ¥)\n" +"(请å‚考在线说明以获得所有命令和选项的完整清å•)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1107,575 +1153,567 @@ " --fingerprint [names] show fingerprints\n" msgstr "" "@\n" -"·¶Àý£º\n" +"范例：\n" "\n" -" -se -r Bob [ÎļþÃû] Ϊ Bob Õâ¸öÊÕ¼þÈËÇ©×Ö¼°¼ÓÃÜ\n" -" --clearsign [ÎļþÃû] ×ö³öÃ÷ÎÄÇ©×Ö\n" -" --detach-sign [ÎļþÃû] ×ö³ö·ÖÀëʽǩ×Ö\n" -" --list-keys [ij¼×] ÏÔʾÃÜÔ¿\n" -" --fingerprint [ij¼×] ÏÔʾָÎÆ\n" +" -se -r Bob [文件å] 为 Bob 这个收件人签字åŠåŠ å¯†\n" +" --clearsign [文件å] åšå‡ºæ˜Žæ–‡ç­¾å­—\n" +" --detach-sign [文件å] åšå‡ºåˆ†ç¦»å¼ç­¾å­—\n" +" --list-keys [æŸç”²] 显示密钥\n" +" --fingerprint [æŸç”²] 显示指纹\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" -msgstr "ÇëÏò ±¨¸æ³ÌÐòȱÏÝ¡£\n" +msgstr "" +"è¯·å‘ æŠ¥å‘Šç¨‹åºç¼ºé™·ã€‚\n" +"è¯·å‘ å映简体中文翻译的问题。\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" -msgstr "Ó÷¨£º gpg [Ñ¡Ïî] [Îļþ] (Óà -h ÇóÖú)" +msgstr "用法： gpg [选项] [文件] (用 -h 求助)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" msgstr "" -"Óï·¨£ºgpg [Ñ¡Ïî] [ÎļþÃû]\n" -"Ç©×Ö¡¢¼ì²é¡¢¼ÓÃÜ»ò½âÃÜ\n" -"ĬÈϵIJÙ×÷ÒÀÊäÈëÊý¾Ý¶ø¶¨\n" +"语法：gpg [选项] [文件å]\n" +"签字ã€æ£€æŸ¥ã€åŠ å¯†æˆ–解密\n" +"默认的æ“作ä¾è¾“入数æ®è€Œå®š\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" msgstr "" "\n" -"Ö§³ÖµÄËã·¨£º\n" +"支æŒçš„算法：\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " -msgstr "¹«Ô¿£º" +msgstr "公钥：" -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " -msgstr "¶Ô³Æ¼ÓÃÜ£º" +msgstr "对称加密：" -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " -msgstr "É¢ÁУº" +msgstr "散列：" -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " -msgstr "ѹËõ£º" +msgstr "压缩：" -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " -msgstr "Ó÷¨£ºgpg [Ñ¡Ïî] " +msgstr "用法：gpg [选项] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" -msgstr "³åÍ»µÄÖ¸Áî\n" +msgstr "冲çªçš„指令\n" -#: g10/g10.c:982 -#, fuzzy, c-format +#: g10/g10.c:1017 +#, c-format msgid "no = sign found in group definition `%s'\n" -msgstr "ÔÚ¡°%s¡±×鶨ÒåÀïÕÒ²»µ½µÈºÅ(=)\n" +msgstr "在‘%s’组定义里找ä¸åˆ°ç­‰å·(=)\n" -#: g10/g10.c:1179 -#, fuzzy, c-format +#: g10/g10.c:1214 +#, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" -msgstr "¾¯¸æ£º%s µÄËùÓÐȨ²»°²È«¡°%s¡±\n" +msgstr "警告：用户目录‘%s’所有æƒä¸å®‰å…¨\n" -#: g10/g10.c:1182 -#, fuzzy, c-format +#: g10/g10.c:1217 +#, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" -msgstr "¾¯¸æ£º%s µÄËùÓÐȨ²»°²È«¡°%s¡±\n" +msgstr "警告：é…置文件‘%s’所有æƒä¸å®‰å…¨\n" -#: g10/g10.c:1185 -#, fuzzy, c-format +#: g10/g10.c:1220 +#, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" -msgstr "¾¯¸æ£º%s µÄËùÓÐȨ²»°²È«¡°%s¡±\n" +msgstr "警告：扩展模å—‘%s’所有æƒä¸å®‰å…¨\n" -#: g10/g10.c:1191 -#, fuzzy, c-format +#: g10/g10.c:1226 +#, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" -msgstr "¾¯¸æ£º%s µÄȨÏÞ²»°²È«¡°%s¡±\n" +msgstr "警告：用户目录‘%s’æƒé™ä¸å®‰å…¨\n" -#: g10/g10.c:1194 -#, fuzzy, c-format +#: g10/g10.c:1229 +#, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" -msgstr "¾¯¸æ£º%s µÄȨÏÞ²»°²È«¡°%s¡±\n" +msgstr "警告：é…置文件‘%s’æƒé™ä¸å®‰å…¨\n" -#: g10/g10.c:1197 -#, fuzzy, c-format +#: g10/g10.c:1232 +#, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" -msgstr "¾¯¸æ£º%s µÄȨÏÞ²»°²È«¡°%s¡±\n" +msgstr "警告：扩展模å—‘%s’æƒé™ä¸å®‰å…¨\n" -#: g10/g10.c:1203 -#, fuzzy, c-format +#: g10/g10.c:1238 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" -msgstr "¾¯¸æ£º%s µÄ¹Ø±ÕĿ¼ËùÓÐȨ²»°²È«¡°%s¡±\n" +msgstr "警告：用户目录‘%s’的关闭目录所有æƒä¸å®‰å…¨\n" -#: g10/g10.c:1206 -#, fuzzy, c-format +#: g10/g10.c:1241 +#, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" -msgstr "¾¯¸æ£º%s µÄ¹Ø±ÕĿ¼ËùÓÐȨ²»°²È«¡°%s¡±\n" +msgstr "警告：é…置文件‘%s’的关闭目录所有æƒä¸å®‰å…¨\n" -#: g10/g10.c:1209 -#, fuzzy, c-format +#: g10/g10.c:1244 +#, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" -msgstr "¾¯¸æ£º%s µÄ¹Ø±ÕĿ¼ËùÓÐȨ²»°²È«¡°%s¡±\n" +msgstr "警告：扩展模å—‘%s’的关闭目录所有æƒä¸å®‰å…¨\n" -#: g10/g10.c:1215 -#, fuzzy, c-format +#: g10/g10.c:1250 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" -msgstr "¾¯¸æ£º%s µÄ¹Ø±ÕĿ¼ȨÏÞ²»°²È«¡°%s¡±\n" +msgstr "警告：用户目录‘%s’的关闭目录æƒé™ä¸å®‰å…¨\n" -#: g10/g10.c:1218 -#, fuzzy, c-format +#: g10/g10.c:1253 +#, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" -msgstr "¾¯¸æ£º%s µÄ¹Ø±ÕĿ¼ȨÏÞ²»°²È«¡°%s¡±\n" +msgstr "警告：é…置文件‘%s’的关闭目录æƒé™ä¸å®‰å…¨\n" -#: g10/g10.c:1221 -#, fuzzy, c-format +#: g10/g10.c:1256 +#, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" -msgstr "¾¯¸æ£º%s µÄ¹Ø±ÕĿ¼ȨÏÞ²»°²È«¡°%s¡±\n" +msgstr "警告：扩展模å—‘%s’的关闭目录æƒé™ä¸å®‰å…¨\n" -#: g10/g10.c:1362 -#, fuzzy, c-format +#: g10/g10.c:1397 +#, c-format msgid "unknown configuration item `%s'\n" -msgstr "δ֪µÄÅäÖÃÏî¡°%s¡±\n" +msgstr "未知的é…置项‘%s’\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" -msgstr "×¢Ò⣺¾ÉʽµÄĬÈÏÅäÖÃÎļþ¡®%s¡¯Òѱ»ºöÂÔ\n" +msgstr "注æ„：旧å¼çš„默认é…置文件‘%s’已被忽略\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" -msgstr "×¢Ò⣺ûÓÐĬÈÏÅäÖÃÎļþ¡®%s¡¯\n" +msgstr "注æ„：没有默认é…置文件‘%s’\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" -msgstr "ÅäÖÃÎļþ¡®%s¡¯£º%s\n" +msgstr "é…置文件‘%s’：%s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" -msgstr "´Ó¡®%s¡¯¶ÁÈ¡Ñ¡Ïî\n" +msgstr "从‘%s’读å–选项\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" -msgstr "×¢Ò⣺һ°ãÇé¿öϲ»»áÓõ½ %s£¡\n" +msgstr "注æ„：一般情况下ä¸ä¼šç”¨åˆ° %sï¼\n" -#: g10/g10.c:2048 -#, fuzzy, c-format +#: g10/g10.c:2079 +#, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" -msgstr "¶Ô³Æ¼ÓËãÃÜ·¨À©Õ¹Ä£¿é¡°%s¡±ÒòΪȨÏÞ²»°²È«¶øδ±»ÔØÈë\n" +msgstr "对称加算密法扩展模å—‘%s’因为æƒé™ä¸å®‰å…¨è€Œæœªè¢«è½½å…¥\n" -#: g10/g10.c:2260 -#, fuzzy, c-format +#: g10/g10.c:2293 +#, c-format msgid "`%s' is not a valid character set\n" -msgstr "%s ²»ÊÇÒ»¸öÓÐЧµÄ×Ö·û¼¯\n" +msgstr "‘%s’ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„字符集\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 -#, fuzzy +#: g10/g10.c:2312 g10/keyedit.c:3434 msgid "could not parse keyserver URL\n" -msgstr "ÎÞ·¨½âÎö¹«Ô¿·þÎñÆ÷ URI\n" +msgstr "无法解æžå…¬é’¥æœåŠ¡å™¨ URL\n" -#: g10/g10.c:2285 -#, fuzzy, c-format +#: g10/g10.c:2318 +#, c-format msgid "%s:%d: invalid keyserver options\n" -msgstr "%s£º%d£ºÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "%s：%d：无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/g10.c:2288 -#, fuzzy +#: g10/g10.c:2321 msgid "invalid keyserver options\n" -msgstr "ÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" -msgstr "%s£º%d£ºÎÞЧµÄµ¼ÈëÑ¡Ïî\n" +msgstr "%s：%d：无效的导入选项\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" -msgstr "ÎÞЧµÄµ¼ÈëÑ¡Ïî\n" +msgstr "无效的导入选项\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" -msgstr "%s£º%d£ºÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "%s：%d：无效的导出选项\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" -msgstr "ÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "无效的导出选项\n" -#: g10/g10.c:2315 -#, fuzzy, c-format +#: g10/g10.c:2348 +#, c-format msgid "%s:%d: invalid list options\n" -msgstr "%s£º%d£ºÎÞЧµÄµ¼ÈëÑ¡Ïî\n" +msgstr "%s：%d：无效的列表选项\n" -#: g10/g10.c:2318 -#, fuzzy +#: g10/g10.c:2351 msgid "invalid list options\n" -msgstr "ÎÞЧµÄµ¼ÈëÑ¡Ïî\n" +msgstr "无效的列表选项\n" -#: g10/g10.c:2340 -#, fuzzy, c-format +#: g10/g10.c:2373 +#, c-format msgid "%s:%d: invalid verify options\n" -msgstr "%s£º%d£ºÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "%s：%d：无效的校验选项\n" -#: g10/g10.c:2343 -#, fuzzy +#: g10/g10.c:2376 msgid "invalid verify options\n" -msgstr "ÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "无效的校验选项\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" -msgstr "ÎÞ·¨°ÑÔËÐз¾¶Éè³É %s\n" +msgstr "无法把è¿è¡Œè·¯å¾„è®¾æˆ %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" -msgstr "¾¯¸æ£º³ÌÐò¿ÉÄܻᴴ½¨ºËÐÄÄÚ´æת´¢£¡\n" +msgstr "警告：程åºå¯èƒ½ä¼šåˆ›å»ºæ ¸å¿ƒå†…存转储ï¼\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" -msgstr "¾¯¸æ£º%s »áʹµÃ %s ʧЧ\n" +msgstr "警告：%s 会使得 %s 失效\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" -msgstr "%s ²»¿ÉÓë %s ²¢ÓÃ\n" +msgstr "%s ä¸å¯ä¸Ž %s 并用\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" -msgstr "%s Óë %s ²¢ÓÃÎÞÒâÒ壡\n" +msgstr "%s 与 %s 并用无æ„义ï¼\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" -msgstr "ÄúÖ»ÓÐÔÚ --pgp2 ģʽϲÅÄÜ×ö·ÖÀëʽ»òÃ÷ÎÄÇ©×Ö\n" +msgstr "您åªæœ‰åœ¨ --pgp2 模å¼ä¸‹æ‰èƒ½åšåˆ†ç¦»å¼æˆ–明文签字\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" -msgstr "ÄúÔÚ --pgp2 ģʽÏÂʱ£¬²»ÄÜͬʱǩ×ֺͼÓÃÜ\n" +msgstr "您在 --pgp2 模å¼ä¸‹æ—¶ï¼Œä¸èƒ½åŒæ—¶ç­¾å­—和加密\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" -msgstr "ÆôÓà --pgp2 ʱÄúÓ¦¸ÃֻʹÓÃÎļþ£¬¶ø·Ç¹ÜµÀ\n" +msgstr "å¯ç”¨ --pgp2 时您应该åªä½¿ç”¨æ–‡ä»¶ï¼Œè€Œéžç®¡é“\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" -msgstr "ÔÚ --pgp2 ģʽϼÓÃܱ¨ÎÄÐèÒª IDEA Ëã·¨\n" +msgstr "在 --pgp2 模å¼ä¸‹åŠ å¯†æŠ¥æ–‡éœ€è¦ IDEA 算法\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" -msgstr "ËùÑ¡µÄ¶Ô³Æ¼ÓÃÜËã·¨ÎÞЧ\n" +msgstr "所选的对称加密算法无效\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" -msgstr "ËùÑ¡µÄÉ¢ÁÐËã·¨ÎÞЧ\n" +msgstr "所选的散列算法无效\n" -#: g10/g10.c:2684 -#, fuzzy +#: g10/g10.c:2717 msgid "selected compression algorithm is invalid\n" -msgstr "ËùÑ¡µÄ¶Ô³Æ¼ÓÃÜËã·¨ÎÞЧ\n" +msgstr "所选的压缩算法无效\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" -msgstr "ËùÑ¡µÄÖ¤ÊéÉ¢ÁÐËã·¨ÎÞЧ\n" +msgstr "所选的è¯ä¹¦æ•£åˆ—算法无效\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" -msgstr "ÐèÒªµÄÍêÈ«¿ÉÐÅÇ©×ÖÊýÒ»¶¨Òª´óÓÚ 0\n" +msgstr "需è¦çš„完全å¯ä¿¡ç­¾å­—数一定è¦å¤§äºŽ 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" -msgstr "ÐèÒªµÄÃãÇ¿¿ÉÐÅÇ©×ÖÊýÒ»¶¨Òª´óÓÚ 1\n" +msgstr "需è¦çš„勉强å¯ä¿¡ç­¾å­—数一定è¦å¤§äºŽ 1\n" -#: g10/g10.c:2709 -#, fuzzy +#: g10/g10.c:2742 msgid "max-cert-depth must be in the range from 1 to 255\n" -msgstr "×î´óÈÏÖ¤Éî¶ÈÒ»¶¨Òª½éÓÚ 1 ºÍ 255 Ö®¼ä\n" +msgstr "最大认è¯æ·±åº¦ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 255 之间\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" -msgstr "ÎÞЧµÄĬÈÏÑéÖ¤²ã´Î£»Ò»¶¨ÒªÊÇ 0£¬1£¬2 »ò 3\n" +msgstr "无效的默认验è¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 0，1，2 或 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 msgid "invalid min-cert-level; must be 1, 2, or 3\n" -msgstr "ÎÞЧµÄ×îСÑéÖ¤²ã´Î£»Ò»¶¨ÒªÊÇ 0£¬1£¬2 »ò 3\n" +msgstr "无效的最å°éªŒè¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 1，2 或 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" -msgstr "×¢Ò⣺ǿÁÒ²»½¨ÒéʹÓüòµ¥µÄ S2K ģʽ(0)\n" +msgstr "注æ„：强烈ä¸å»ºè®®ä½¿ç”¨ç®€å•çš„ S2K 模å¼(0)\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" -msgstr "ÎÞЧµÄ S2K ģʽ£»±ØÐëÊÇ 0£¬1 »ò 3\n" +msgstr "无效的 S2K 模å¼ï¼›å¿…须是 0，1 或 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" -msgstr "ÎÞЧµÄĬÈÏÊ×Ñ¡Ïî\n" +msgstr "无效的默认首选项\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" -msgstr "ÎÞЧµÄ¸öÈ˶ԳƼÓÃÜËã·¨Ê×Ñ¡Ïî\n" +msgstr "无效的个人对称加密算法首选项\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" -msgstr "ÎÞЧµÄ¸öÈËÉ¢ÁÐËã·¨Ê×Ñ¡Ïî\n" +msgstr "无效的个人散列算法首选项\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" -msgstr "ÎÞЧµÄ¸öÈËѹËõËã·¨Ê×Ñ¡Ïî\n" +msgstr "无效的个人压缩算法首选项\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, c-format msgid "%s does not yet work with %s\n" -msgstr "%s Ä¿Ç°ÎÞ·¨Óë %s ²¢ÓÃ\n" +msgstr "%s å°šä¸èƒ½å’Œ %s 并用\n" -#: g10/g10.c:2824 -#, fuzzy, c-format +#: g10/g10.c:2857 +#, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" -msgstr "Äú²»¸Ã½«¶Ô³Æ¼ÓÃÜËã·¨¡°%s¡±ÓÃÓÚ %s ģʽÖÐ\n" +msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’对称加密算法\n" -#: g10/g10.c:2829 -#, fuzzy, c-format +#: g10/g10.c:2862 +#, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" -msgstr "Äú²»¸Ã½«É¢ÁÐËã·¨¡°%s¡±ÓÃÓÚ %s ģʽÖÐ\n" +msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’散列算法\n" -#: g10/g10.c:2834 -#, fuzzy, c-format +#: g10/g10.c:2867 +#, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" -msgstr "Äú²»¸Ã½«Ñ¹ËõËã·¨¡°%s¡±ÓÃÓÚ %s ģʽÖÐ\n" +msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’压缩算法\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" -msgstr "³õʼ»¯ÐÅÈζÈÊý¾Ý¿âʧ°Ü£º%s\n" +msgstr "åˆå§‹åŒ–信任度数æ®åº“失败：%s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" -msgstr "¾¯¸æ£º¸ø¶¨ÁËÊÕ¼þÈË(-r)µ«²¢Î´Ê¹Óù«Ô¿¼ÓÃÜ\n" +msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" -msgstr "--store [ÎļþÃû]" +msgstr "--store [文件å]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" -msgstr "--symmetric [ÎļþÃû]" +msgstr "--symmetric [文件å]" -#: g10/g10.c:2961 -#, fuzzy, c-format +#: g10/g10.c:2994 +#, c-format msgid "symmetric encryption of `%s' failed: %s\n" -msgstr "½âÃÜʧ°Ü£º%s\n" +msgstr "对称加密‘%s’失败：%s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" -msgstr "--encrypt [ÎļþÃû]" +msgstr "--encrypt [文件å]" -#: g10/g10.c:2984 -#, fuzzy +#: g10/g10.c:3017 msgid "--symmetric --encrypt [filename]" -msgstr "--sign --encrypt [ÎļþÃû]" +msgstr "--symmetric --encrypt [文件å]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" -msgstr "" +msgstr "使用 --symmetric --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/g10.c:2989 -#, fuzzy, c-format +#: g10/g10.c:3022 +#, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" -msgstr "Äú²»¸Ã½« %s ÓÃÓÚ %s ģʽÖÐ\n" +msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric -encrypt\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" -msgstr "--sign [ÎļþÃû]" +msgstr "--sign [文件å]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" -msgstr "--sign --encrypt [ÎļþÃû]" +msgstr "--sign --encrypt [文件å]" -#: g10/g10.c:3035 -#, fuzzy +#: g10/g10.c:3068 msgid "--symmetric --sign --encrypt [filename]" -msgstr "--sign --encrypt [ÎļþÃû]" +msgstr "--symmetric --sign --encrypt [文件å]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" -msgstr "" +msgstr "使用 --symmetric --sign --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/g10.c:3040 -#, fuzzy, c-format +#: g10/g10.c:3073 +#, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" -msgstr "Äú²»¸Ã½« %s ÓÃÓÚ %s ģʽÖÐ\n" +msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric --sign -encrypt\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" -msgstr "--sign --symmetric [ÎļþÃû]" +msgstr "--sign --symmetric [文件å]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" -msgstr "--clearsign [ÎļþÃû]" +msgstr "--clearsign [文件å]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" -msgstr "--decrypt [ÎļþÃû]" +msgstr "--decrypt [文件å]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" -msgstr "--sign-key Óû§±êʶ" +msgstr "--sign-key 用户标识" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" -msgstr "--lsign-key Óû§±êʶ" +msgstr "--lsign-key 用户标识" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" -msgstr "--nrsign-key Óû§±êʶ" +msgstr "--nrsign-key 用户标识" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key Óû§±êʶ" +msgstr "--nrlsign-key 用户标识" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" -msgstr "--edit-key Óû§±êʶ [Ö¸Áî]" +msgstr "--edit-key 用户标识 [指令]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" -msgstr "-k[v][v][v][c] [Óû§±êʶ] [Ô¿³×»·]" +msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, c-format msgid "keyserver send failed: %s\n" -msgstr "ÎÞ·¨·¢Ë͵½¹«Ô¿·þÎñÆ÷£º%s\n" +msgstr "上传至公钥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, c-format msgid "keyserver receive failed: %s\n" -msgstr "ÎÞ·¨´Ó¹«Ô¿·þÎñÆ÷½ÓÊÕ£º%s\n" +msgstr "从公钥æœåŠ¡å™¨æŽ¥æ”¶å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, c-format msgid "key export failed: %s\n" -msgstr "ÎÞ·¨µ¼³öÃÜÔ¿£º%s\n" +msgstr "导出密钥失败：%s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, c-format msgid "keyserver search failed: %s\n" -msgstr "ÎÞ·¨ÔÚ¹«Ô¿·þÎñÆ÷ÉÏËÑË÷£º%s\n" +msgstr "æœå¯»å…¬é’¥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, c-format msgid "keyserver refresh failed: %s\n" -msgstr "ÎÞ·¨´Ó¹«Ô¿·þÎñÆ÷ÉϸüУº%s\n" +msgstr "从公钥æœåŠ¡å™¨æ›´æ–°å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" -msgstr "½â¿ª ASCII ·âװʧ°Ü£º%s\n" +msgstr "解开 ASCII å°è£…失败：%s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" -msgstr "½øÐÐ ASCII ·âװʧ°Ü£º%s\n" +msgstr "进行 ASCII å°è£…失败：%s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" -msgstr "ÎÞЧµÄ¡®%s¡¯É¢ÁÐËã·¨\n" +msgstr "无效的‘%s’散列算法\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" -msgstr "[ÎļþÃû]" +msgstr "[文件å]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" -msgstr "Ç뿪ʼ¼üÈëÄúµÄ±¨ÎÄ¡­¡­\n" +msgstr "请开始键入您的报文……\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" -msgstr "±ê¼ÇÃû³Æ±ØÐëÖ»º¬ÓпɴòÓ¡µÄ×Ö·û»ò¿Õ¸ñ£¬²¢ÒÔÒ»¸ö¡°=¡±À´½áβ\n" +msgstr "标记å称必须åªå«æœ‰å¯æ‰“å°çš„字符或空格，并以一个“=â€æ¥ç»“å°¾\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" -msgstr "Óû§±ê¼ÇÃû³ÆÒ»¶¨Òªº¬ÓС°@¡±×Ö·û\n" +msgstr "用户标记å称一定è¦å«æœ‰â€œ@â€å­—符\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" -msgstr "±ê¼ÇÖµÒ»¶¨²»ÄÜʹÓÃÈκεĿØÖÆ×Ö·û\n" +msgstr "标记值一定ä¸èƒ½ä½¿ç”¨ä»»ä½•çš„控制字符\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" -msgstr "¸ø¶¨µÄµÄÈÏÖ¤²ßÂÔ URL ÎÞЧ\n" +msgstr "给定的的验è¯ç­–ç•¥ URL 无效\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" -msgstr "¸ø¶¨µÄÇ©×Ö²ßÂÔ URL ÎÞЧ\n" +msgstr "给定的签字策略 URL 无效\n" -#: g10/g10.c:3911 -#, fuzzy +#: g10/g10.c:3944 msgid "the given preferred keyserver URL is invalid\n" -msgstr "¸ø¶¨µÄÇ©×Ö²ßÂÔ URL ÎÞЧ\n" +msgstr "给定的首选公钥æœåŠ¡å™¨ URL 无效\n" #: g10/getkey.c:150 msgid "too many entries in pk cache - disabled\n" -msgstr "pk »º´æÀïÏîÄ¿Ì«¶à¡ª¡ªÒѽûÓÃ\n" +msgstr "pk 缓存里项目太多――已ç¦ç”¨\n" -#: g10/getkey.c:186 g10/getkey.c:2691 -#, fuzzy +#: g10/getkey.c:186 g10/getkey.c:2711 msgid "[User ID not found]" -msgstr "[ÕÒ²»µ½Óû§±êʶ]" +msgstr "[找ä¸åˆ°ç”¨æˆ·æ ‡è¯†]" -#: g10/getkey.c:1614 -#, fuzzy, c-format +#: g10/getkey.c:1639 +#, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" -msgstr "--allow-non-selfsigned-uid ÄÜÈÃÎÞЧµÄÃÜÔ¿ %08lX ÉúЧ\n" +msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n" -#: g10/getkey.c:2169 -#, fuzzy, c-format +#: g10/getkey.c:2189 +#, c-format msgid "no secret subkey for public subkey %s - ignoring\n" -msgstr "¹«Ô¿ %08lX ûÓÐÏà¶ÔÓ¦µÄ˽Կ¡ª¡ªÕýÔÚºöÂÔ\n" +msgstr "公钥 %s 没有相对应的ç§é’¥â€•â€•å¿½ç•¥\n" -#: g10/getkey.c:2400 -#, fuzzy, c-format +#: g10/getkey.c:2420 +#, c-format msgid "using secondary key %s instead of primary key %s\n" -msgstr "ʹÓÃ×ÓÔ¿ %08lX ¶ø·ÇÖ÷Ô¿ %08lX\n" +msgstr "使用å­é’¥ %s 而éžä¸»é’¥ %s\n" -#: g10/getkey.c:2447 -#, fuzzy, c-format +#: g10/getkey.c:2467 +#, c-format msgid "key %s: secret key without public key - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºÖ»ÓÐ˽Կ¶øûÓй«Ô¿¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：无相应公钥的ç§é’¥â€•â€•å·²è·³è¿‡\n" #: g10/gpgv.c:68 msgid "be somewhat more quiet" -msgstr "¾¡Á¿¼õÉÙÌáʾÐÅÏ¢" +msgstr "å°½é‡å‡å°‘æ示信æ¯" #: g10/gpgv.c:69 msgid "take the keys from this keyring" -msgstr "´ÓÕâ¸öÔ¿³×»·ÀïÈ¡ÓÃÃÜÔ¿" +msgstr "从这个钥匙环里å–用密钥" #: g10/gpgv.c:71 msgid "make timestamp conflicts only a warning" -msgstr "°Ñʱ¼ä´Áì¶Ü½öÊÓΪ¾¯¸æ" +msgstr "把时间戳矛盾仅视为警告" #: g10/gpgv.c:72 msgid "|FD|write status info to this FD" -msgstr "|FD|°Ñ״̬ÐÅϢдÈëÎļþÃèÊö·û FD" +msgstr "|FD|把状æ€ä¿¡æ¯å†™å…¥æ–‡ä»¶æ述符 FD" #: g10/gpgv.c:96 msgid "Usage: gpgv [options] [files] (-h for help)" -msgstr "Ó÷¨£ºgpgv [Ñ¡Ïî] [Îļþ] (Óà -h ÇóÖú)" +msgstr "用法：gpgv [选项] [文件] (用 -h 求助)" #: g10/gpgv.c:99 msgid "" "Syntax: gpg [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" -"Óï·¨£ºgpg [Ñ¡Ïî] [Îļþ]\n" -"ÓÃÒÑÖªµÄÊÜÐÅÈÎÃÜÔ¿À´¼ì²éÇ©×Ö\n" +"语法：gpg [选项] [文件]\n" +"用已知的å—信任密钥æ¥æ£€æŸ¥ç­¾å­—\n" #: g10/helptext.c:48 msgid "" @@ -1683,8 +1721,8 @@ "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" "to do with the (implicitly created) web-of-certificates." msgstr "" -"ÔÚÕâÀïÖ¸¶¨µÄÊýÖµÍêÈ«ÓÉÄú×Ô¼º¾ö¶¨£»ÕâЩÊýÖµÓÀÔ¶²»»á±»Êä³ö¸øÈκεÚÈý·½¡£\n" -"ÎÒÃÇÐèÒªËüÀ´ÊµÏÖÐÅÈζÈÍøÂ磻Õâ¸úÒþº¬½¨Á¢ÆðÀ´µÄÈÏÖ¤ÍøÂçÎ޹ء£" +"在这里指定的数值完全由您自己决定；这些数值永远ä¸ä¼šè¢«è¾“出给任何第三方。\n" +"我们需è¦å®ƒæ¥å®žçŽ°â€œä¿¡ä»»ç½‘络â€ï¼›è¿™è·Ÿéšå«å»ºç«‹èµ·æ¥çš„“验è¯ç½‘络â€æ— å…³ã€‚" #: g10/helptext.c:54 msgid "" @@ -1693,18 +1731,17 @@ "access to the secret key. Answer \"yes\" to set this key to\n" "ultimately trusted\n" msgstr "" -"Òª½¨Á¢ÆðÐÅÈÎÍøÂ磬GnuPG ÐèÒªÖªµÀÄÄЩÃÜÔ¿Êǿɾø¶ÔÐÅÈεÄ\n" -"¡ª¡ªÍ¨³£¾ÍÊÇÄúÓµÓÐ˽ԿµÄÄÇЩÃÜÔ¿¡£»Ø´ð¡°yes¡±À´½«ÕâЩ\n" -"ÃÜÔ¿Éè³É¿É¾ø¶ÔÐÅÈεÄ\n" +"è¦å»ºç«‹èµ·ä¿¡ä»»ç½‘络，GnuPG 需è¦çŸ¥é“哪些密钥是å¯ç»å¯¹ä¿¡ä»»çš„――通常\n" +"就是您拥有ç§é’¥çš„那些密钥。回答“yesâ€å°†æ­¤å¯†é’¥è®¾æˆå¯ç»å¯¹ä¿¡ä»»çš„\n" #: g10/helptext.c:61 msgid "If you want to use this untrusted key anyway, answer \"yes\"." -msgstr "Èç¹ûÄúÎÞÂÛÈçºÎҪʹÓÃÕâ°Ñδ±»ÐÅÈεÄÃÜÔ¿£¬Çë»Ø´ð¡°yes¡±¡£" +msgstr "如果您无论如何è¦ä½¿ç”¨è¿™æŠŠæœªè¢«ä¿¡ä»»çš„密钥，请回答“yesâ€ã€‚" #: g10/helptext.c:65 msgid "" "Enter the user ID of the addressee to whom you want to send the message." -msgstr "ÊäÈëÄúÒªµÝË͵ı¨ÎĵĽÓÊÕÕßµÄÓû§±êʶ¡£" +msgstr "输入您è¦é€’é€çš„报文的接收者的用户标识。" #: g10/helptext.c:69 msgid "" @@ -1719,6 +1756,15 @@ "\n" "The first (primary) key must always be a key which is capable of signing." msgstr "" +"选择使用的算法。\n" +"\n" +"DSA (ä¹Ÿå« DSS)å³â€œæ•°å­—签字算法â€ï¼ˆç¾Žå›½å›½å®¶æ ‡å‡†ï¼‰ï¼Œåªèƒ½å¤Ÿç”¨ä½œç­¾å­—。\n" +"\n" +"Elgamal 是一ç§åªèƒ½ç”¨ä½œåŠ å¯†çš„算法。\n" +"\n" +"RSA å¯ä»¥ç”¨ä½œç­¾å­—或加密。\n" +"\n" +"第一把密钥(主钥)必须具有签字的能力。" #: g10/helptext.c:83 msgid "" @@ -1726,18 +1772,17 @@ "encryption. This algorithm should only be used in certain domains.\n" "Please consult your security expert first." msgstr "" -"ͨ³£À´ËµÓÃͬһ°ÑÃÜÔ¿Ç©×Ö¼°¼ÓÃܲ¢²»ÊǸöºÃÖ÷Òâ¡£\n" -"Õâ¸öËã·¨Ö»ÔÚÌض¨µÄÇé¿öÏÂʹÓá£\n" -"ÇëÏÈ×Éѯ°²È«·½ÃæµÄר¼Ò¡£" +"通常æ¥è¯´ç”¨åŒä¸€æŠŠå¯†é’¥ç­¾å­—åŠåŠ å¯†å¹¶ä¸æ˜¯ä¸ªå¥½ä¸»æ„。这个算法åªåœ¨ç‰¹å®šçš„情况\n" +"下使用。请先咨询安全方é¢çš„专家。" #: g10/helptext.c:90 msgid "Enter the size of the key" -msgstr "ÇëÊäÈëÃÜÔ¿µÄ³ß´ç" +msgstr "请输入密钥的尺寸" #: g10/helptext.c:94 g10/helptext.c:99 g10/helptext.c:111 g10/helptext.c:143 #: g10/helptext.c:171 g10/helptext.c:176 g10/helptext.c:181 msgid "Answer \"yes\" or \"no\"" -msgstr "Çë»Ø´ð¡°yes¡±»ò¡°no¡±" +msgstr "请回答“yesâ€æˆ–“noâ€" #: g10/helptext.c:104 msgid "" @@ -1746,21 +1791,21 @@ "get a good error response - instead the system tries to interpret\n" "the given value as an interval." msgstr "" -"ÇëÊäÈëÌáʾËùÒªÇóµÄÊýÖµ¡£\n" -"Äú¿ÉÒÔÊäÈë ISO ÈÕÆÚ¸ñʽ(YYYY-MM-DD)£¬µ«Êdzö´íʱÄú²»»áµÃµ½ÓѺõÄÏìÓ¦¡ª¡ª\n" -"ϵͳ»á³¢ÊÔ½«¸ø¶¨Öµ½âÊÍΪʱ¼ä¼ä¸ô¡£" +"请输入æ示所è¦æ±‚的数值。\n" +"您å¯ä»¥è¾“å…¥ ISO 日期格å¼(YYYY-MM-DD)，但是出错时您ä¸ä¼šå¾—到å‹å¥½çš„å“应――\n" +"系统会å°è¯•å°†ç»™å®šå€¼è§£é‡Šä¸ºæ—¶é—´é—´éš”。" #: g10/helptext.c:116 msgid "Enter the name of the key holder" -msgstr "ÇëÊäÈëÃÜÔ¿³ÖÓÐÈ˵ÄÃû×Ö" +msgstr "请输入密钥æŒæœ‰äººçš„åå­—" #: g10/helptext.c:121 msgid "please enter an optional but highly suggested email address" -msgstr "ÇëÊäÈëµç×ÓÓʼþµØÖ·(¿ÉÑ¡Ïµ«Ç¿ÁÒÍƼöʹÓÃ)" +msgstr "请输入电å­é‚®ä»¶åœ°å€(å¯é€‰é¡¹ï¼Œä½†å¼ºçƒˆæŽ¨è使用)" #: g10/helptext.c:125 msgid "Please enter an optional comment" -msgstr "ÇëÊäÈë×¢ÊÍ(¿ÉÑ¡Ïî)" +msgstr "请输入注释(å¯é€‰é¡¹)" #: g10/helptext.c:130 msgid "" @@ -1770,15 +1815,15 @@ "O to continue with key generation.\n" "Q to to quit the key generation." msgstr "" -"N ÐÞ¸ÄÐÕÃû¡£\n" -"C ÐÞ¸Ä×¢ÊÍ¡£\n" -"E Ð޸ĵç×ÓÓʼþµØÖ·¡£\n" -"O ¼ÌÐø²úÉúÃÜÔ¿¡£\n" -"Q ÖÐÖ¹²úÉúÃÜÔ¿¡£" +"N 修改姓å。\n" +"C 修改注释。\n" +"E 修改电å­é‚®ä»¶åœ°å€ã€‚\n" +"O 继续产生密钥。\n" +"Q 中止产生密钥。" #: g10/helptext.c:139 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." -msgstr "Èç¹ûÄúÔÊÐíÉú³É×ÓÔ¿£¬Çë»Ø´ð¡°yes¡±(»òÕß¡°y¡±)¡£" +msgstr "如果您å…许生æˆå­é’¥ï¼Œè¯·å›žç­”“yesâ€(或者“yâ€)。" #: g10/helptext.c:147 msgid "" @@ -1820,51 +1865,43 @@ "\n" "If you don't know what the right answer is, answer \"0\"." msgstr "" -"µ±ÄúΪij°ÑÃÜÔ¿ÉÏij¸öÓû§±êʶÌí¼ÓÇ©×Öʱ£¬Äú±ØÐëÊ×ÏÈÑéÖ¤Õâ°Ñ\n" -"ÃÜԿȷʵÊôÓÚÊðÃûÓÚËüµÄÓû§±êʶÉϵÄÄǸöÈË¡£Á˽⵽ÄúÔø¶àô½÷\n" -"É÷µØ¶Ô´Ë½øÐйýÑéÖ¤£¬¶ÔÆäËûÈËÊǷdz£ÓÐÓõÄ\n" -"\n" -"¡°0¡± ±íʾÄú²»ÄÜÌá³öÈκÎÌض¨µÄÉùÃ÷À´±íÃ÷\n" -" Äú¶à×ÐϸÑéÖ¤ÄÇ°ÑÃÜÔ¿\n" -"\n" -"¡°1¡± ±íʾÄúÏàÐÅÕâ°ÑÃÜÔ¿ÊôÓÚÄǸöÉùÃ÷ÊÇÖ÷È˵ÄÈË£¬\n" -" µ«ÊÇÄú²»ÄÜ»ò¸ù±¾Ã»ÓÐÑéÖ¤¹ý¡£\n" -" Õâ¶ÔÄÇЩֻÏëÒª¡°¸öÈË¡±ÑéÖ¤µÄÈËÀ´ËµºÜÓÐÓã¬\n" -" ÒòΪÄúΪһ°ÑÀàËÆÄäÃûʹÓÃÕßµÄÃÜÔ¿Ç©ÁË×Ö¡£\n" -"\n" -"¡°2¡± ±íʾÄúËæÒâµØÑéÖ¤ÁËÄÇ°ÑÃÜÔ¿¡£\n" -" ÀýÈ磬ÄúÑéÖ¤ÁËÕâ°ÑÃÜÔ¿µÄÖ¸ÎÆ£¬\n" -" »ò±È¶ÔÕÕƬÑéÖ¤ÁËÓû§±êʶ¡£\n" -"\n" -"¡°3¡± ±íʾÄú×öÁË´óÁ¿Ï꾡µÄÑéÖ¤ÃÜÔ¿¹¤×÷¡£\n" -" ÀýÈç˵£¬ÄúͬÃÜÔ¿³ÖÓÐÈËÑéÖ¤ÁËÃÜÔ¿Ö¸ÎÆ£¬\n" -" ¶øÇÒͨ¹ý²éÑ鸽´øÕÕƬ¶øÄÑÒÔαÔìµÄÖ¤¼þ(È绤ÕÕ)\n" -" È·ÈÏÁËÃÜÔ¿³ÖÓÐÈ˵ÄÐÕÃûÓëÃÜÔ¿ÉϵÄÓû§±êʶһÖ£¬\n" -" ×îºóÄú»¹(ͨ¹ýµç×ÓÓʼþÍùÀ´)ÑéÖ¤ÁËÃÜÔ¿ÉϵÄ\n" -" µç×ÓÓʼþµØַȷʵÊôÓÚÃÜÔ¿³ÖÓÐÈË¡£\n" -"\n" -"Çë×¢ÒâÉÏÊö¹ØÓڵȼ¶ 2 ºÍ 3 µÄ˵Ã÷½öÊÇÀý×Ó¶øÒÑ¡£\n" -"×îÖÕ»¹ÊǵÃÓÉÄú×Ô¼º¾ö¶¨µ±ÄúΪÆäËûÃÜÔ¿Ç©×Öʱ£¬\n" -"ʲôÊÇ¡°ËæÒ⡱£¬¶øʲôÊÇ¡°´óÁ¿¶øÏ꾡¡±¡£\n" +"当您为æŸæŠŠå¯†é’¥ä¸ŠæŸä¸ªç”¨æˆ·æ ‡è¯†æ·»åŠ ç­¾å­—时，您必须首先验è¯è¿™æŠŠå¯†é’¥ç¡®å®žå±žäºŽ\n" +"ç½²å于它的用户标识上的那个人。了解到您曾多么谨慎地对此进行过验è¯ï¼Œå¯¹å…¶\n" +"他人是éžå¸¸æœ‰ç”¨çš„\n" +"\n" +"“0†表示您对您有多么仔细地验è¯è¿™æŠŠå¯†é’¥çš„问题ä¸è¡¨æ€ã€‚\n" +"\n" +"“1†表示您相信这把密钥属于那个声明是主人的人，但是您ä¸èƒ½æˆ–根本没有验\n" +" è¯è¿‡ã€‚如果您为一把属于类似虚拟人物的密钥签字，这个选择很有用。\n" "\n" -"Èç¹ûÄú²»ÖªµÀÓ¦¸Ãѡʲô´ð°¸µÄ»°£¬¾ÍÑ¡¡°0¡±¡£" +"“2†表示您éšæ„地验è¯äº†é‚£æŠŠå¯†é’¥ã€‚例如，您验è¯äº†è¿™æŠŠå¯†é’¥çš„指纹，或比对\n" +" 照片验è¯äº†ç”¨æˆ·æ ‡è¯†ã€‚\n" +"\n" +"“3†表示您åšäº†å¤§é‡è€Œè¯¦å°½çš„验è¯å¯†é’¥å·¥ä½œã€‚例如，您åŒå¯†é’¥æŒæœ‰äººéªŒè¯äº†å¯†\n" +" 钥指纹，而且通过查验附带照片而难以伪造的è¯ä»¶(如护照)确认了密钥æŒ\n" +" 有人的姓å与密钥上的用户标识一致，最åŽæ‚¨è¿˜(通过电å­é‚®ä»¶å¾€æ¥)验è¯\n" +" 了密钥上的电å­é‚®ä»¶åœ°å€ç¡®å®žå±žäºŽå¯†é’¥æŒæœ‰äººã€‚\n" +"\n" +"请注æ„上述关于验è¯çº§åˆ« 2 å’Œ 3 的说明仅是例å­è€Œå·²ã€‚最终还是由您自己决定\n" +"当您为其他密钥签字时，什么是“éšæ„â€ï¼Œè€Œä»€ä¹ˆæ˜¯â€œå¤§é‡è€Œè¯¦å°½â€ã€‚\n" +"\n" +"如果您ä¸çŸ¥é“应该选什么答案的è¯ï¼Œå°±é€‰â€œ0â€ã€‚" #: g10/helptext.c:185 -#, fuzzy msgid "Answer \"yes\" if you want to sign ALL the user IDs" -msgstr "Èç¹ûÄúÏëҪΪËùÓÐÓû§±êʶǩ×ֵĻ°¾ÍÑ¡¡°yes¡±" +msgstr "如果您想è¦ä¸ºæ‰€æœ‰ç”¨æˆ·æ ‡è¯†ç­¾å­—çš„è¯å°±é€‰â€œyesâ€" #: g10/helptext.c:189 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" msgstr "" -"Èç¹ûÄúÕæµÄÏëҪɾ³ýÕâ¸öÓû§±êʶµÄ»°¾Í»Ø´ð¡°yes¡±¡£\n" -"ËùÓÐÏà¹ØÈÏÖ¤ÔÚ´ËÖ®ºóÒ²»á¶ªÊ§£¡" +"如果您真的想è¦åˆ é™¤è¿™ä¸ªç”¨æˆ·æ ‡è¯†çš„è¯å°±å›žç­”“yesâ€ã€‚\n" +"所有相关认è¯åœ¨æ­¤ä¹‹åŽä¹Ÿä¼šä¸¢å¤±ï¼" #: g10/helptext.c:194 msgid "Answer \"yes\" if it is okay to delete the subkey" -msgstr "Èç¹û¿ÉÒÔɾ³ýÕâ°Ñ×ÓÔ¿£¬Çë»Ø´ð¡°yes¡±" +msgstr "如果å¯ä»¥åˆ é™¤è¿™æŠŠå­é’¥ï¼Œè¯·å›žç­”“yesâ€" #: g10/helptext.c:199 msgid "" @@ -1872,9 +1909,9 @@ "to delete this signature because it may be important to establish a\n" "trust connection to the key or another key certified by this key." msgstr "" -"ÕâÊÇÒ»·ÝÔÚÕâ°ÑÃÜÔ¿ÉÏÓÐЧµÄÇ©×Ö£»Í¨³£Äú²»»áÏëҪɾ³ýÕâ·ÝÇ©×Ö£¬\n" -"ÒòΪҪÓëÕâ°ÑÃÜÔ¿»òÓµÓÐÕâ°ÑÃÜÔ¿µÄÇ©×ÖµÄÃÜÔ¿½¨Á¢ÈÏÖ¤¹Øϵ¿ÉÄÜ\n" -"Ï൱ÖØÒª¡£" +"这是一份在这把密钥上有效的签字；通常您ä¸ä¼šæƒ³è¦åˆ é™¤è¿™ä»½ç­¾å­—，\n" +"因为è¦ä¸Žè¿™æŠŠå¯†é’¥æˆ–拥有这把密钥的签字的密钥建立认è¯å…³ç³»å¯èƒ½\n" +"相当é‡è¦ã€‚" #: g10/helptext.c:204 msgid "" @@ -1883,15 +1920,15 @@ "know which key was used because this signing key might establish\n" "a trust connection through another already certified key." msgstr "" -"Õâ·ÝÇ©×ÖÎÞ·¨±»¼ìÑ飬ÒòΪÄúûÓÐÏàÓ¦µÄÃÜÔ¿¡£ÄúÓ¦¸ÃÔÝ»ºÉ¾³ýËü£¬\n" -"Ö±µ½ÄúÖªµÀ´ËÇ©×ÖʹÓÃÁËÄÄÒ»°ÑÃÜÔ¿£»ÒòΪÓÃÀ´Ç©×ÖµÄÃÜÔ¿¿ÉÄÜÓë\n" -"ÆäËûÒѾ­ÑéÖ¤µÄÃÜÔ¿´æÔÚÈÏÖ¤¹Øϵ¡£" +"这份签字无法被检验，因为您没有相应的密钥。您应该暂缓删除它，\n" +"直到您知é“此签字使用了哪一把密钥；因为用æ¥ç­¾å­—的密钥å¯èƒ½ä¸Ž\n" +"其他已ç»éªŒè¯çš„密钥存在信任关系。" #: g10/helptext.c:210 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." -msgstr "Õâ·ÝÇ©×ÖÎÞЧ¡£Ó¦µ±°ÑËü´ÓÄúµÄÔ¿³×»·Àïɾ³ý¡£" +msgstr "这份签字无效。应当把它从您的钥匙环里删除。" #: g10/helptext.c:214 msgid "" @@ -1901,11 +1938,10 @@ "only if this self-signature is for some reason not valid and\n" "a second one is available." msgstr "" -"ÕâÊÇÒ»·Ý½«ÃÜÔ¿ÓëÓû§±êʶÏàÁªÏµµÄÇ©×Ö¡£Í¨³£²»Ó¦\n" -"ɾ³ýÕâÑùµÄÇ©×Ö¡£ÊÂʵÉÏ£¬Ò»µ©É¾³ý£¬GnuPG\n" -"¿ÉÄܴӴ˾Ͳ»ÄÜÔÙʹÓÃÕâ°ÑÃÜÔ¿ÁË¡£Òò´Ë£¬Ö»ÓÐÔÚÕâ\n" -"°ÑÃÜÔ¿µÄµÚÒ»¸ö×ÔÉíÇ©×ÖÒòijЩԭÒòʧЧ£¬¶øÓеڶþ\n" -"¸ö×ÔÉíÇ©×Ö¿ÉÓõÄÇé¿öϲÅÕâô×ö¡£" +"这是一份将密钥与用户标识相è”系的签字。通常ä¸åº”删除这样的签字。\n" +"事实上，一旦删除，GnuPGå¯èƒ½ä»Žæ­¤å°±ä¸èƒ½å†ä½¿ç”¨è¿™æŠŠå¯†é’¥äº†ã€‚因此，\n" +"åªæœ‰åœ¨è¿™æŠŠå¯†é’¥çš„第一个自身签字因æŸäº›åŽŸå› å¤±æ•ˆï¼Œè€Œæœ‰ç¬¬äºŒä¸ªè‡ªèº«ç­¾\n" +"å­—å¯ç”¨çš„情况下æ‰è¿™ä¹ˆåšã€‚" #: g10/helptext.c:222 msgid "" @@ -1913,32 +1949,32 @@ "to the current list of preferences. The timestamp of all affected\n" "self-signatures will be advanced by one second.\n" msgstr "" -"ÓÃÏÖÓеÄÊ×Ñ¡Ïî¸üÐÂËùÓÐ(»ò±»Ñ¡È¡µÄ)Óû§±êʶµÄÊ×Ñ¡Ïî¡£\n" -"ËùÓÐÊÜÓ°ÏìµÄ×ÔÉíÇ©×ÖµÄʱ¼ä´Á¶¼»áÔö¼ÓÒ»ÃëÖÓ¡£\n" +"用现有的首选项更新所有(或被选å–çš„)用户标识的首选项。所有å—å½±å“的自身签\n" +"字的时间戳都会增加一秒钟。\n" #: g10/helptext.c:229 msgid "Please enter the passhrase; this is a secret sentence \n" -msgstr "ÇëÊäÈëÃÜÂ룺ÕâÊÇÒ»¸öÃØÃܵľä×Ó \n" +msgstr "请输入密ç ï¼šè¿™æ˜¯ä¸€ä¸ªç§˜å¯†çš„å¥å­ \n" #: g10/helptext.c:235 msgid "Please repeat the last passphrase, so you are sure what you typed in." -msgstr "ÇëÔÙ´ÎÊäÈë×îºóµÄÃÜÂ룬ÒÔÈ·¶¨Äúµ½µ×¼üÈëÁËЩʲô¡£" +msgstr "请å†æ¬¡è¾“入上次的密ç ï¼Œä»¥ç¡®å®šæ‚¨åˆ°åº•é”®å…¥äº†äº›ä»€ä¹ˆã€‚" #: g10/helptext.c:239 msgid "Give the name of the file to which the signature applies" -msgstr "Çë¸ø¶¨ÒªÌí¼ÓÇ©×ÖµÄÎļþÃû" +msgstr "请给定è¦æ·»åŠ ç­¾å­—的文件å" #: g10/helptext.c:244 msgid "Answer \"yes\" if it is okay to overwrite the file" -msgstr "Èç¹û¿ÉÒÔ¸²¸ÇÕâ¸öÎļþ£¬Çë»Ø´ð¡°yes¡±" +msgstr "如果å¯ä»¥è¦†ç›–这个文件，请回答“yesâ€" #: g10/helptext.c:249 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." msgstr "" -"ÇëÊäÈëÒ»¸öеÄÎļþÃû¡£Èç¹ûÄúÖ±½Ó°´ÏÂÁ˻سµ£¬ÄÇô\n" -"¾Í»áʹÓÃÏÔʾÔÚÀ¨ºÅÖеÄĬÈϵÄÎļþÃû¡£" +"请输入一个新的文件å。如果您直接按下了回车，那么就会使用显示在括\n" +"å·ä¸­çš„默认的文件å。" #: g10/helptext.c:255 msgid "" @@ -1955,18 +1991,17 @@ " Use this to state that the user ID should not longer be used;\n" " this is normally used to mark an email address invalid.\n" msgstr "" -"ÄúÓ¦¸ÃΪÕâ·ÝµõÏúÖ¤ÊéÖ¸¶¨Ò»¸öÔ­Òò¡£\n" -"¸ù¾ÝÇé¾³µÄ²»Í¬£¬ÄúÓ¦¸Ã¿ÉÒÔ´ÓÕâ¸öÇåµ¥ÖÐÑ¡³öÒ»Ï\n" -" ¡°ÃÜÔ¿ÒÑй©¡±\n" -" Èç¹ûÄúÏàÐÅÓÐij¸öδ¾­Ðí¿ÉµÄÈËÒÑÈ¡µÃÁËÄúµÄ˽Կ£¬\n" -" ÇëÑ¡´ËÏî¡£\n" -" ¡°ÃÜÔ¿ÒÑÌæ»»¡±\n" -" Èç¹ûÄúÒÑÓÃÒ»°ÑÐÂÃÜÔ¿´úÌæ¾ÉµÄ£¬ÇëÑ¡´ËÏî¡£\n" -" ¡°ÃÜÔ¿²»ÔÙ±»Ê¹Óá±\n" -" Èç¹ûÄúÒѾö¶¨ÈÃÕâ°ÑÃÜÔ¿ÍËÐÝ£¬ÇëÑ¡´ËÏî\n" -" ¡°Óû§±êʶ²»ÔÙÓÐЧ¡±\n" -" Èç¹ûÕâ¸öÓû§±êʶ²»ÔÙ±»Ê¹ÓÃÁË£¬ÇëÑ¡´ËÏ\n" -" Õâͨ³£ÓñíÃ÷ij¸öµç×ÓÓʼþµØÖ·ÒѲ»ÔÙÓÐЧ¡£\n" +"您应该为这份åŠé”€è¯ä¹¦æŒ‡å®šä¸€ä¸ªåŽŸå› ã€‚æ ¹æ®æƒ…境的ä¸åŒï¼Œæ‚¨å¯ä»¥ä»Žä¸‹åˆ—清å•ä¸­\n" +"选出一项：\n" +" “密钥已泄æ¼â€\n" +" 如果您相信有æŸä¸ªæœªç»è®¸å¯çš„人已å–得了您的ç§é’¥ï¼Œè¯·é€‰æ­¤é¡¹ã€‚\n" +" “密钥已替æ¢â€\n" +" 如果您已用一把新密钥代替旧的，请选此项。\n" +" “密钥ä¸å†è¢«ä½¿ç”¨â€\n" +" 如果您已决定让这把密钥退休，请选此项\n" +" “用户标识ä¸å†æœ‰æ•ˆâ€\n" +" 如果这个用户标识ä¸å†è¢«ä½¿ç”¨äº†ï¼Œè¯·é€‰æ­¤é¡¹ï¼›è¿™é€šå¸¸ç”¨è¡¨æ˜ŽæŸä¸ªç”µå­é‚®\n" +" 件地å€å·²ä¸å†æœ‰æ•ˆã€‚\n" #: g10/helptext.c:271 msgid "" @@ -1974,475 +2009,472 @@ "revocation certificate. Please keep this text concise.\n" "An empty line ends the text.\n" msgstr "" -"ÄúÒ²¿ÉÒÔÊäÈëÒ»´®ÎÄ×Ö£¬ÃèÊö·¢²¼Õâ·ÝµõÏúÖ¤ÊéµÄÀíÓÉ¡£\n" -"Ç뾡Á¿Ê¹Õâ¶ÎÎÄ×Ö¼òÃ÷¶óÒª¡£\n" -"¼üÈëÒ»¿ÕÐÐÒÔ½áÊøÊäÈë¡£\n" +"您也å¯ä»¥è¾“入一串文字，æè¿°å‘布这份åŠé”€è¯ä¹¦çš„ç†ç”±ã€‚请尽é‡ä½¿è¿™æ®µæ–‡\n" +"字简明扼è¦ã€‚\n" +"键入一空行以结æŸè¾“入。\n" #: g10/helptext.c:286 msgid "No help available" -msgstr "ûÓпÉÓõİïÖú" +msgstr "没有å¯ç”¨çš„帮助" #: g10/helptext.c:294 #, c-format msgid "No help available for `%s'" -msgstr "¡®%s¡¯Ã»ÓпÉÓõİïÖú" +msgstr "‘%s’没有å¯ç”¨çš„帮助" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" -msgstr "ÕýÔÚÌø¹ý %d ÑùʽµÄÇø¿é\n" +msgstr "跳过 %d æ ·å¼çš„区å—\n" -#: g10/import.c:256 -#, fuzzy, c-format +#: g10/import.c:258 +#, c-format msgid "%lu keys processed so far\n" -msgstr "ÒÑ´¦Àí %lu °ÑÃÜÔ¿\n" +msgstr "ç›®å‰å·²å¤„ç† %lu 把密钥\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" -msgstr "ºÏ¼Æ±»´¦ÀíµÄÊýÁ¿£º%lu\n" +msgstr "åˆè®¡è¢«å¤„ç†çš„æ•°é‡ï¼š%lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" -msgstr " ÒÑÌø¹ýµÄÐÂÃÜÔ¿£º%lu\n" +msgstr " 已跳过的新密钥：%lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" -msgstr " ÒÅʧµÄÓû§±êʶ£º%lu\n" +msgstr " é—失用户标识：%lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" -msgstr " Òѵ¼È룺%lu" +msgstr " 已导入：%lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" -msgstr " δ¸Ä±ä£º%lu\n" +msgstr " 未改å˜ï¼š%lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" -msgstr " ÐÂÓû§±êʶ£º%lu\n" +msgstr " 新用户标识：%lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" -msgstr " еÄ×ÓÔ¿£º%lu\n" +msgstr " æ–°çš„å­é’¥ï¼š%lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" -msgstr " еÄÇ©×Ö£º%lu\n" +msgstr " 新的签字：%lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" -msgstr " еÄÃÜÔ¿µõÏú£º%lu\n" +msgstr " 新的密钥åŠé”€ï¼š%lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" -msgstr " ¶ÁÈ¡µÄ˽Կ£º%lu\n" +msgstr " 读å–çš„ç§é’¥ï¼š%lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" -msgstr " µ¼ÈëµÄ˽Կ£º%lu\n" +msgstr " 导入的ç§é’¥ï¼š%lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" -msgstr " δ¸Ä±äµÄ˽Կ£º%lu\n" +msgstr " 未改å˜çš„ç§é’¥ï¼š%lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" -msgstr " δ±»µ¼È룺%lu\n" +msgstr " 未被导入：%lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" -msgstr "" +msgstr "警告：密钥 %s 下列用户标识的首选项中包å«ä¸å¯ç”¨çš„\n" -#: g10/import.c:545 -#, fuzzy +#: g10/import.c:547 msgid "algorithms on these user IDs:\n" -msgstr "ÄúÒѾ­ÎªÕâЩÓû§±êʶÌí¼ÓÇ©×Ö£º\n" +msgstr "算法：\n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" -msgstr "" +msgstr " “%sâ€ï¼šå¯¹ç§°åŠ å¯†ç®—法 %s 对应首选项\n" -#: g10/import.c:594 -#, fuzzy, c-format +#: g10/import.c:596 +#, c-format msgid " \"%s\": preference for digest algorithm %s\n" -msgstr "%sÇ©×Ö£¬É¢ÁÐËã·¨ %s\n" +msgstr " “%sâ€ï¼šæ•£åˆ—算法 %s 对应首选项\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" -msgstr "" +msgstr " “%sâ€ï¼šåŽ‹ç¼©ç®—法 %s 对应首选项\n" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" -msgstr "" +msgstr "强烈建议您更新您的首选项并é‡æ–°åˆ†å‘这把密钥，\n" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" -msgstr "" +msgstr "以é¿å…å¯èƒ½çš„算法ä¸åŒ¹é…问题\n" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" -msgstr "" +msgstr "您å¯ä»¥è¿™æ ·æ›´æ–°æ‚¨çš„首选项：gpg --edit-key %s updpref save\n" -#: g10/import.c:693 g10/import.c:1047 -#, fuzzy, c-format +#: g10/import.c:695 g10/import.c:1049 +#, c-format msgid "key %s: no user ID\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»ÓÐÓû§±êʶ\n" +msgstr "密钥 %s：没有用户标识\n" -#: g10/import.c:713 -#, fuzzy, c-format +#: g10/import.c:715 +#, c-format msgid "key %s: PKS subkey corruption repaired\n" -msgstr "ÃÜÔ¿ %08lX£ºÆÆËðµÄ HKP ×ÓÔ¿Òѱ»ÐÞ¸´\n" +msgstr "密钥 %s：PKS å­é’¥ç ´æŸå·²ä¿®å¤\n" -#: g10/import.c:728 -#, fuzzy, c-format +#: g10/import.c:730 +#, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" -msgstr "ÃÜÔ¿ %08lX£º²»º¬×ÔÉíÇ©×ÖµÄÓû§±êʶ¡®%s¡¯Òѱ»½ÓÊÜ\n" +msgstr "密钥 %s：已接å—ä¸å«è‡ªèº«ç­¾å­—的用户标识“%sâ€\n" -#: g10/import.c:734 -#, fuzzy, c-format +#: g10/import.c:736 +#, c-format msgid "key %s: no valid user IDs\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»ÓÐÓÐЧµÄÓû§±êʶ\n" +msgstr "密钥 %s：没有有效的用户标识\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" -msgstr "Õâ¿ÉÄÜÓÉÒÅʧ×ÔÉíÇ©×ÖËùÖÂ\n" +msgstr "è¿™å¯èƒ½ç”±äºŽé—失自身签字所致\n" -#: g10/import.c:746 g10/import.c:1168 -#, fuzzy, c-format +#: g10/import.c:748 g10/import.c:1170 +#, c-format msgid "key %s: public key not found: %s\n" -msgstr "ÃÜÔ¿ %08lX£ºÕÒ²»µ½¹«Ô¿£º%s\n" +msgstr "密钥 %s：找ä¸åˆ°å…¬é’¥ï¼š%s\n" -#: g10/import.c:752 -#, fuzzy, c-format +#: g10/import.c:754 +#, c-format msgid "key %s: new key - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºÐÂÃÜÔ¿¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：新密钥――已跳过\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" -msgstr "ÕÒ²»µ½¿ÉдµÄÔ¿³×»·£º%s\n" +msgstr "找ä¸åˆ°å¯å†™çš„钥匙环：%s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" -msgstr "ÕýÔÚдÈë¡®%s¡¯\n" +msgstr "正在写入‘%s’\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" -msgstr "дÈëÔ¿³×»·¡®%s¡¯Ê±³ö´í£º %s\n" +msgstr "写入钥匙环‘%s’时出错： %s\n" -#: g10/import.c:791 -#, fuzzy, c-format +#: g10/import.c:793 +#, c-format msgid "key %s: public key \"%s\" imported\n" -msgstr "ÃÜÔ¿ %08lX£º¹«Ô¿¡°%s¡±Òѵ¼Èë\n" +msgstr "密钥 %s：公钥“%sâ€å·²å¯¼å…¥\n" -#: g10/import.c:815 -#, fuzzy, c-format +#: g10/import.c:817 +#, c-format msgid "key %s: doesn't match our copy\n" -msgstr "ÃÜÔ¿ %08lX£ºÓëÎÒÃǵĸ±±¾²»ÎǺÏ\n" +msgstr "密钥 %s：与我们的副本ä¸å»åˆ\n" -#: g10/import.c:832 g10/import.c:1186 -#, fuzzy, c-format +#: g10/import.c:834 g10/import.c:1188 +#, c-format msgid "key %s: can't locate original keyblock: %s\n" -msgstr "ÃÜÔ¿ %08lX£ºÎÞ·¨¶¨Î»Ô­Ê¼µÄÃÜÔ¿Çø¿é£º%s\n" +msgstr "密钥 %s：无法定ä½åŽŸå§‹çš„密钥区å—：%s\n" -#: g10/import.c:840 g10/import.c:1193 -#, fuzzy, c-format +#: g10/import.c:842 g10/import.c:1195 +#, c-format msgid "key %s: can't read original keyblock: %s\n" -msgstr "ÃÜÔ¿ %08lX£ºÎÞ·¨¶ÁȡԭʼµÄÃÜÔ¿Çø¿é£º %s\n" +msgstr "密钥 %s：无法读å–原始的密钥区å—： %s\n" -#: g10/import.c:872 -#, fuzzy, c-format +#: g10/import.c:874 +#, c-format msgid "key %s: \"%s\" 1 new user ID\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±Ò»¸öеÄÓû§±êʶ\n" +msgstr "密钥 %s：“%sâ€ä¸€ä¸ªæ–°çš„用户标识\n" -#: g10/import.c:875 -#, fuzzy, c-format +#: g10/import.c:877 +#, c-format msgid "key %s: \"%s\" %d new user IDs\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±%d ¸öеÄÓû§±êʶ\n" +msgstr "密钥 %s：“%sâ€%d 个新的用户标识\n" -#: g10/import.c:878 -#, fuzzy, c-format +#: g10/import.c:880 +#, c-format msgid "key %s: \"%s\" 1 new signature\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±1 ¸öеÄÇ©×Ö\n" +msgstr "密钥 %s：“%sâ€1 个新的签字\n" -#: g10/import.c:881 -#, fuzzy, c-format +#: g10/import.c:883 +#, c-format msgid "key %s: \"%s\" %d new signatures\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±%d ¸öеÄÇ©×Ö\n" +msgstr "密钥 %s：“%sâ€%d 个新的签字\n" -#: g10/import.c:884 -#, fuzzy, c-format +#: g10/import.c:886 +#, c-format msgid "key %s: \"%s\" 1 new subkey\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±1 ¸öеÄ×ÓÔ¿\n" +msgstr "密钥 %s：“%sâ€1 个新的å­é’¥\n" -#: g10/import.c:887 -#, fuzzy, c-format +#: g10/import.c:889 +#, c-format msgid "key %s: \"%s\" %d new subkeys\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±%d ¸öеÄ×ÓÔ¿\n" +msgstr "密钥 %s：“%sâ€%d 个新的å­é’¥\n" -#: g10/import.c:908 -#, fuzzy, c-format +#: g10/import.c:910 +#, c-format msgid "key %s: \"%s\" not changed\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±Ã»Óб»¸Ä±ä\n" +msgstr "密钥 %s：“%sâ€æœªæ”¹å˜\n" -#: g10/import.c:1053 -#, fuzzy, c-format +#: g10/import.c:1055 +#, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºË½Ô¿Ê¹ÓÃÁËÎÞЧµÄ¼ÓÃÜËã·¨ %d¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：ç§é’¥ä½¿ç”¨äº†æ— æ•ˆçš„加密算法 %d――已跳过\n" -#: g10/import.c:1064 -#, fuzzy +#: g10/import.c:1066 msgid "importing secret keys not allowed\n" -msgstr "ÕýÔÚ½«Ë½Ô¿Ð´ÖÁ`%s'\n" +msgstr "ä¸å…许导入ç§é’¥\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" -msgstr "ûÓÐĬÈϵÄ˽ԿԿ³×»·£º %s\n" +msgstr "没有默认的ç§é’¥é’¥åŒ™çŽ¯ï¼š %s\n" -#: g10/import.c:1092 -#, fuzzy, c-format +#: g10/import.c:1094 +#, c-format msgid "key %s: secret key imported\n" -msgstr "ÃÜÔ¿ %08lX£ºË½Ô¿Òѵ¼Èë\n" +msgstr "密钥 %s：ç§é’¥å·²å¯¼å…¥\n" -#: g10/import.c:1121 -#, fuzzy, c-format +#: g10/import.c:1123 +#, c-format msgid "key %s: already in secret keyring\n" -msgstr "ÃÜÔ¿ %08lX£ºÒÑÔÚ˽ԿԿ³×»·ÖÐÁË\n" +msgstr "密钥 %s：已在ç§é’¥é’¥åŒ™çŽ¯ä¸­\n" -#: g10/import.c:1131 -#, fuzzy, c-format +#: g10/import.c:1133 +#, c-format msgid "key %s: secret key not found: %s\n" -msgstr "ÃÜÔ¿ %08lX£ºÕÒ²»µ½Ë½Ô¿£º%s\n" +msgstr "密钥 %s：找ä¸åˆ°ç§é’¥ï¼š%s\n" -#: g10/import.c:1161 -#, fuzzy, c-format +#: g10/import.c:1163 +#, c-format msgid "key %s: no public key - can't apply revocation certificate\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»Óй«Ô¿¡ª¡ªÎÞ·¨Ó¦ÓõõÏúÖ¤Êé\n" +msgstr "密钥 %s：没有公钥――无法应用åŠé”€è¯ä¹¦\n" -#: g10/import.c:1204 -#, fuzzy, c-format +#: g10/import.c:1206 +#, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" -msgstr "ÃÜÔ¿ %08lX£ºÎÞЧµÄµõÏúÖ¤Ê飺%s¡ª¡ª¾Ü¾ø\n" +msgstr "密钥 %s：无效的åŠé”€è¯ä¹¦ï¼š%s――已拒ç»\n" -#: g10/import.c:1236 -#, fuzzy, c-format +#: g10/import.c:1238 +#, c-format msgid "key %s: \"%s\" revocation certificate imported\n" -msgstr "ÃÜÔ¿ %08lX£º¡°%s¡±µõÏúÖ¤ÊéÒѱ»µ¼Èë\n" +msgstr "密钥 %s：“%sâ€åŠé”€è¯ä¹¦å·²è¢«å¯¼å…¥\n" -#: g10/import.c:1301 -#, fuzzy, c-format +#: g10/import.c:1303 +#, c-format msgid "key %s: no user ID for signature\n" -msgstr "ÃÜÔ¿ %08lX£ºÇ©×ÖûÓÐÓû§±êʶ\n" +msgstr "密钥 %s：签字没有用户标识\n" -#: g10/import.c:1316 -#, fuzzy, c-format +#: g10/import.c:1318 +#, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" -msgstr "ÃÜÔ¿ %08lX£ºÓû§±êʶ¡°%s¡±Ê¹ÓÃÁ˲»Ö§³ÖµÄ¹«Ô¿Ëã·¨\n" +msgstr "密钥 %s：用户标识“%sâ€ä½¿ç”¨äº†ä¸æ”¯æŒçš„公钥算法\n" -#: g10/import.c:1318 -#, fuzzy, c-format +#: g10/import.c:1320 +#, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" -msgstr "ÃÜÔ¿ %08lX£ºÓû§±êʶ¡°%s¡±×ÔÉíÇ©×ÖÎÞЧ\n" +msgstr "密钥 %s：用户标识“%sâ€è‡ªèº«ç­¾å­—无效\n" -#: g10/import.c:1336 -#, fuzzy, c-format +#: g10/import.c:1338 +#, c-format msgid "key %s: no subkey for key binding\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»Óпɹ©°ó¶¨µÄ×ÓÔ¿\n" +msgstr "密钥 %s：没有å¯ä¾›ç»‘定的å­é’¥\n" -#: g10/import.c:1347 g10/import.c:1397 -#, fuzzy, c-format +#: g10/import.c:1349 g10/import.c:1399 +#, c-format msgid "key %s: unsupported public key algorithm\n" -msgstr "ÃÜÔ¿ %08lX£º²»Ö§³ÖµÄ¹«Ô¿Ëã·¨\n" +msgstr "密钥 %s：ä¸æ”¯æŒçš„公钥算法\n" -#: g10/import.c:1349 -#, fuzzy, c-format +#: g10/import.c:1351 +#, c-format msgid "key %s: invalid subkey binding\n" -msgstr "ÃÜÔ¿ %08lX£ºÎÞЧµÄ×ÓÔ¿°ó¶¨\n" +msgstr "密钥 %s：无效的å­é’¥ç»‘定\n" -#: g10/import.c:1364 -#, fuzzy, c-format +#: g10/import.c:1366 +#, c-format msgid "key %s: removed multiple subkey binding\n" -msgstr "ÃÜÔ¿ %08lX£º¶àÖØ×ÓÔ¿°ó¶¨Òѱ»É¾³ý\n" +msgstr "密钥 %s：已删除多é‡å­é’¥ç»‘定\n" -#: g10/import.c:1386 -#, fuzzy, c-format +#: g10/import.c:1388 +#, c-format msgid "key %s: no subkey for key revocation\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»ÓÐÓÃÓÚÃÜÔ¿µõÏúµÄ×ÓÔ¿\n" +msgstr "密钥 %s：没有用于密钥åŠé”€çš„å­é’¥\n" -#: g10/import.c:1399 -#, fuzzy, c-format +#: g10/import.c:1401 +#, c-format msgid "key %s: invalid subkey revocation\n" -msgstr "ÃÜÔ¿ %08lX£ºÎÞЧµÄ×ÓÔ¿µõÏú\n" +msgstr "密钥 %s：无效的å­é’¥åŠé”€\n" -#: g10/import.c:1414 -#, fuzzy, c-format +#: g10/import.c:1416 +#, c-format msgid "key %s: removed multiple subkey revocation\n" -msgstr "ÃÜÔ¿ %08lX£º¶àÖØ×ÓÔ¿µõÏúÒÑɾ³ý\n" +msgstr "密钥 %s：已删除多é‡å­é’¥åŠé”€\n" -#: g10/import.c:1456 -#, fuzzy, c-format +#: g10/import.c:1458 +#, c-format msgid "key %s: skipped user ID \"%s\"\n" -msgstr "ÃÜÔ¿ %08lX£ºÒÑÌø¹ýÓû§±êʶ¡®" +msgstr "密钥 %s：已跳过用户标识“%sâ€\n" -#: g10/import.c:1477 -#, fuzzy, c-format +#: g10/import.c:1479 +#, c-format msgid "key %s: skipped subkey\n" -msgstr "ÃÜÔ¿ %08lX£º×ÓÔ¿ÒÑÌø¹ý\n" +msgstr "密钥 %s：已跳过å­é’¥\n" # here we violate the rfc a bit by still allowing # * to import non-exportable signature when we have the # * the secret key used to create this signature - it # * seems that this makes sense -#: g10/import.c:1504 -#, fuzzy, c-format +#: g10/import.c:1506 +#, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" -msgstr "ÃÜÔ¿ %08lX£º²»¿Éµ¼³öµÄÇ©×Ö(µÈ¼¶ %02x)¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：ä¸å¯å¯¼å‡ºçš„签字(验è¯çº§åˆ« 0x%02X)――已跳过\n" -#: g10/import.c:1514 -#, fuzzy, c-format +#: g10/import.c:1516 +#, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºµõÏúÖ¤ÊéλÖôíÎ󡪡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：åŠé”€è¯ä¹¦ä½ç½®é”™è¯¯â€•â€•å·²è·³è¿‡\n" -#: g10/import.c:1531 -#, fuzzy, c-format +#: g10/import.c:1533 +#, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºÎÞЧµÄµõÏúÖ¤Ê飺%s¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：无效的åŠé”€è¯ä¹¦ï¼š%s――已跳过\n" -#: g10/import.c:1545 -#, fuzzy, c-format +#: g10/import.c:1547 +#, c-format msgid "key %s: subkey signature in wrong place - skipped\n" -msgstr "ÃÜÔ¿ %08lX£º×ÓÔ¿Ç©×ÖλÖôíÎ󡪡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：å­é’¥ç­¾å­—ä½ç½®é”™è¯¯â€•â€•å·²è·³è¿‡\n" -#: g10/import.c:1553 -#, fuzzy, c-format +#: g10/import.c:1555 +#, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºÓëÔ¤ÆÚ²»·ûµÄÇ©×ֵȼ¶(0x%02X)¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：与预期ä¸ç¬¦çš„签字验è¯çº§åˆ«(0x%02X)――已跳过\n" -#: g10/import.c:1653 -#, fuzzy, c-format +#: g10/import.c:1655 +#, c-format msgid "key %s: duplicated user ID detected - merged\n" -msgstr "ÃÜÔ¿ %08lX£º¼ì²âµ½Öظ´µÄÓû§±êʶ¡ª¡ªÒѺϲ¢\n" +msgstr "密钥 %s：检测到é‡å¤çš„用户标识――已åˆå¹¶\n" -#: g10/import.c:1715 -#, fuzzy, c-format +#: g10/import.c:1717 +#, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" -msgstr "¾¯¸æ£ºÃÜÔ¿ %08lX ¿ÉÄܱ»µõÏúÁË£ºÕýÔÚÈ¡»ØµõÏúÃÜÔ¿ %08lX\n" +msgstr "警告：密钥 %s å¯èƒ½å·²è¢«åŠé”€ï¼šæ­£åœ¨å–回åŠé”€å¯†é’¥ %s\n" -#: g10/import.c:1729 -#, fuzzy, c-format +#: g10/import.c:1731 +#, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" -msgstr "¾¯¸æ£ºÃÜÔ¿ %08lX ¿ÉÄܱ»µõÏúÁË£ºµõÏúÃÜÔ¿ %08lX ²»´æÔÚ¡£\n" +msgstr "警告：密钥 %s å¯èƒ½å·²è¢«åŠé”€ï¼šåŠé”€å¯†é’¥ %s ä¸å­˜åœ¨ã€‚\n" -#: g10/import.c:1788 -#, fuzzy, c-format +#: g10/import.c:1790 +#, c-format msgid "key %s: \"%s\" revocation certificate added\n" -msgstr "ÃÜÔ¿ %08lX£ºÒÑÐÂÔöµõÏúÖ¤Êé¡°%s¡±\n" +msgstr "密钥 %s：已新增åŠé”€è¯ä¹¦â€œ%sâ€\n" -#: g10/import.c:1822 -#, fuzzy, c-format +#: g10/import.c:1824 +#, c-format msgid "key %s: direct key signature added\n" -msgstr "ÃÜÔ¿ %08lX£ºÒÑÐÂÔöÖ±½ÓÃÜÔ¿Ç©×Ö\n" +msgstr "密钥 %s：已新增直接密钥签字\n" #: g10/keydb.c:167 #, c-format msgid "error creating keyring `%s': %s\n" -msgstr "½¨Á¢Ô¿³×»·¡®%s¡¯Ê±·¢Éú´íÎó£º%s\n" +msgstr "建立钥匙环‘%s’时å‘生错误：%s\n" #: g10/keydb.c:174 #, c-format msgid "keyring `%s' created\n" -msgstr "Ô¿³×»·¡®%s¡¯Òѽ¨Á¢\n" +msgstr "钥匙环‘%s’已建立\n" #: g10/keydb.c:685 #, c-format msgid "failed to rebuild keyring cache: %s\n" -msgstr "ÖØн¨Á¢Ô¿³×»·»º´æʧ°Ü£º %s\n" +msgstr "é‡æ–°å»ºç«‹é’¥åŒ™çŽ¯ç¼“存失败： %s\n" #: g10/keyedit.c:253 msgid "[revocation]" -msgstr "[µõÏú]" +msgstr "[åŠé”€]" #: g10/keyedit.c:254 msgid "[self-signature]" -msgstr "[×ÔÉíÇ©×Ö]" +msgstr "[自身签字]" #: g10/keyedit.c:332 g10/keylist.c:342 msgid "1 bad signature\n" -msgstr "1 ¸öË𻵵ÄÇ©×Ö\n" +msgstr "1 个æŸå的签字\n" #: g10/keyedit.c:334 g10/keylist.c:344 #, c-format msgid "%d bad signatures\n" -msgstr "%d ¸öË𻵵ÄÇ©×Ö\n" +msgstr "%d 个æŸå的签字\n" #: g10/keyedit.c:336 g10/keylist.c:346 msgid "1 signature not checked due to a missing key\n" -msgstr "ÓÐ 1 ·ÝÇ©×ÖÒòΪÒÅʧÃÜÔ¿¶øδ±»¼ì²é\n" +msgstr "有 1 份签字因为é—失密钥而未被检查\n" #: g10/keyedit.c:338 g10/keylist.c:348 #, c-format msgid "%d signatures not checked due to missing keys\n" -msgstr "ÓÐ %d ·ÝÇ©×ÖÒòΪÒÅʧÃÜÔ¿¶øδ±»¼ì²é\n" +msgstr "有 %d 份签字因为é—失密钥而未被检查\n" #: g10/keyedit.c:340 g10/keylist.c:350 msgid "1 signature not checked due to an error\n" -msgstr "ÓÐ 1 ·ÝÇ©×ÖÒòΪij¸ö´íÎó¶øδ±»¼ì²é\n" +msgstr "有 1 份签字因为æŸä¸ªé”™è¯¯è€Œæœªè¢«æ£€æŸ¥\n" #: g10/keyedit.c:342 g10/keylist.c:352 #, c-format msgid "%d signatures not checked due to errors\n" -msgstr "ÓÐ %d ·ÝÇ©×ÖÒòΪijЩ´íÎó¶øδ±»¼ì²é\n" +msgstr "有 %d 份签字因为æŸäº›é”™è¯¯è€Œæœªè¢«æ£€æŸ¥\n" #: g10/keyedit.c:344 msgid "1 user ID without valid self-signature detected\n" -msgstr "¼ì²âµ½ 1 ¸öûÓÐÓÐЧ×ÔÉíÇ©×ÖµÄÓû§±êʶ\n" +msgstr "检测到 1 个没有有效自身签字的用户标识\n" #: g10/keyedit.c:346 #, c-format msgid "%d user IDs without valid self-signatures detected\n" -msgstr "¼ì²âµ½ %d ¸öûÓÐÓÐЧ×ÔÉíÇ©×ÖµÄÓû§±êʶ\n" +msgstr "检测到 %d 个没有有效自身签字的用户标识\n" #: g10/keyedit.c:402 g10/pkclist.c:262 -#, fuzzy msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" "(by looking at passports, checking fingerprints from different sources, " "etc.)\n" msgstr "" -"Äú¶ÔÕâλÓû§ÑéÖ¤ÆäËûÓû§µÄÃÜÔ¿(²é¶ÔÉí·ÝÖ¤¡¢\n" -"ͨ¹ý²»Í¬µÄÇþµÀ¼ì²éÖ¸ÎƵÈ)µÄÄÜÁ¦ÓжàÐÅÈÎÄØ£¿\n" -"\n" +"您是å¦ç›¸ä¿¡è¿™ä½ç”¨æˆ·æœ‰èƒ½åŠ›éªŒè¯å…¶ä»–用户密钥的有效性(查对身份è¯ã€é€šè¿‡ä¸åŒçš„渠é“检" +"查\n" +"指纹等)？\n" #: g10/keyedit.c:406 g10/pkclist.c:274 -#, fuzzy, c-format +#, c-format msgid " %d = I trust marginally\n" -msgstr " %d = ÎÒÃãÇ¿ÐÅÈÎ\n" +msgstr " %d = 我勉强相信\n" #: g10/keyedit.c:407 g10/pkclist.c:276 -#, fuzzy, c-format +#, c-format msgid " %d = I trust fully\n" -msgstr " %d = ÎÒÍêÈ«ÐÅÈÎ\n" +msgstr " %d = 我完全相信\n" #: g10/keyedit.c:426 msgid "" @@ -2450,35 +2482,37 @@ "A depth greater than 1 allows the key you are signing to make\n" "trust signatures on your behalf.\n" msgstr "" +"请输入这份信任签字的深度。\n" +"深度若大于 1 则您将签字的这把密钥将å¯ä»¥ä»¥æ‚¨çš„å义åšå‡ºä¿¡ä»»ç­¾å­—。\n" #: g10/keyedit.c:442 msgid "Please enter a domain to restrict this signature, or enter for none.\n" -msgstr "" +msgstr "请输入这份签字的é™åˆ¶åŸŸï¼Œå¦‚果没有请按回车。\n" #: g10/keyedit.c:584 #, c-format msgid "User ID \"%s\" is revoked." -msgstr "Óû§±êʶ¡°%s¡±Òѱ»µõÏú¡£" +msgstr "用户标识“%sâ€å·²è¢«åŠé”€ã€‚" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 #: g10/keyedit.c:857 g10/keyedit.c:1486 msgid "Are you sure you still want to sign it? (y/N) " -msgstr "ÄúÈÔÈ»ÏëҪΪËüÇ©×ÖÂð£¿(y/N)" +msgstr "您ä»ç„¶æƒ³è¦ä¸ºå®ƒç­¾å­—å—？(y/N)" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 #: g10/keyedit.c:1492 msgid " Unable to sign.\n" -msgstr " ÎÞ·¨Ìí¼ÓÇ©×Ö¡£\n" +msgstr " 无法添加签字。\n" #: g10/keyedit.c:610 #, c-format msgid "User ID \"%s\" is expired." -msgstr "Óû§±êʶ¡°%s¡±ÒѹýÆÚ¡£" +msgstr "用户标识“%sâ€å·²è¿‡æœŸã€‚" #: g10/keyedit.c:636 #, c-format msgid "User ID \"%s\" is not self-signed." -msgstr "¾¯¸æ£ºÓû§±êʶ¡°%s¡±²»º¬×ÔÉíÇ©×Ö¡£" +msgstr "警告：用户标识“%sâ€ä¸å«è‡ªèº«ç­¾å­—。" #: g10/keyedit.c:675 #, c-format @@ -2486,12 +2520,12 @@ "The self-signature on \"%s\"\n" "is a PGP 2.x-style signature.\n" msgstr "" -"¡°%s¡±ÀïµÄ×ÔÉíÇ©×Ö\n" -"ÊÇ PGP 2.x ÑùʽµÄÇ©×Ö¡£\n" +"“%sâ€é‡Œçš„自身签字\n" +"是 PGP 2.x æ ·å¼çš„签字。\n" #: g10/keyedit.c:684 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " -msgstr "ÄúÊÇ·ñÏëÒª½«ËüÉý¼¶³É OpenPGP µÄ×ÔÉíÇ©×Ö£¿(y/N)" +msgstr "您是å¦æƒ³è¦å°†å®ƒå‡çº§æˆ OpenPGP 的自身签字？(y/N)" #: g10/keyedit.c:698 #, c-format @@ -2499,12 +2533,12 @@ "Your current signature on \"%s\"\n" "has expired.\n" msgstr "" -"ÄúĿǰΪ¡°%s¡±µÄÇ©×Ö\n" -"ÒѾ­¹ýÆÚÁË¡£\n" +"您目å‰ä¸ºâ€œ%sâ€çš„签字\n" +"å·²ç»è¿‡æœŸäº†ã€‚\n" #: g10/keyedit.c:702 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " -msgstr "ÄúÏëÒª·¢²¼Ò»·ÝеÄÇ©×ÖÀ´È¡´úÒѹýÆÚµÄÄÇÒ»¸öÂð£¿(y/N)" +msgstr "您想è¦å‘布一份新的签字æ¥å–代已过期的那一个å—？(y/N)" #: g10/keyedit.c:723 #, c-format @@ -2512,54 +2546,54 @@ "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "" -"ÄúÄ¿Ç°ÔÚ¡°%s¡±µÄÇ©×Ö\n" -"ÊÇÒ»·Ý±¾µØÇ©×Ö¡£\n" +"您目å‰åœ¨â€œ%sâ€çš„签字\n" +"是一份本地签字。\n" #: g10/keyedit.c:727 msgid "Do you want to promote it to a full exportable signature? (y/N) " -msgstr "ÄúÊÇ·ñÏëÒª°ÑËûÉý¼¶³É¿ÉÒÔÍêÈ«µ¼³öµÄÇ©×Ö£¿(y/N)" +msgstr "您是å¦æƒ³è¦æŠŠä»–å‡çº§æˆå¯ä»¥å®Œå…¨å¯¼å‡ºçš„签字？(y/N)" #: g10/keyedit.c:748 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already locally signed by key %s\n" -msgstr "¡°%s¡±ÒѾ­ÃÜÔ¿ %08lX ÔÚ±¾µØÇ©×Ö\n" +msgstr "“%sâ€å·²ç”±å¯†é’¥ %s 在本地签字\n" #: g10/keyedit.c:751 -#, fuzzy, c-format +#, c-format msgid "\"%s\" was already signed by key %s\n" -msgstr "¡°%s¡±ÒѾ­ÃÜÔ¿ %08lX Ç©×Ö\n" +msgstr "“%sâ€å·²ç”±å¯†é’¥ %s 签字\n" #: g10/keyedit.c:756 msgid "Do you want to sign it again anyway? (y/N) " -msgstr "ÄúÈÔÈ»ÏëҪΪËüÔÙ´ÎÇ©×ÖÂð£¿(y/N)" +msgstr "您ä»ç„¶æƒ³è¦ä¸ºå®ƒå†æ¬¡ç­¾å­—å—？(y/N)" #: g10/keyedit.c:778 -#, fuzzy, c-format +#, c-format msgid "Nothing to sign with key %s\n" -msgstr "ûÓж«Î÷¿ÉÒÔÈÃÃÜÔ¿ %08lX Ç©×Ö\n" +msgstr "没有东西å¯ä»¥è®©å¯†é’¥ %s签字\n" #: g10/keyedit.c:793 msgid "This key has expired!" -msgstr "Õâ°ÑÃÜÔ¿ÒѾ­¹ýÆÚ£¡" +msgstr "这把密钥已ç»è¿‡æœŸï¼" #: g10/keyedit.c:813 #, c-format msgid "This key is due to expire on %s.\n" -msgstr "Õâ°ÑÃÜÔ¿½«ÔÚ %s ¹ýÆÚ¡£\n" +msgstr "这把密钥将在 %s 过期。\n" #: g10/keyedit.c:817 msgid "Do you want your signature to expire at the same time? (Y/n) " -msgstr "ÄúÏëÒªÈÃÄúµÄÇ©×ÖҲͬʱ¹ýÆÚÂ𣿠(Y/n) " +msgstr "您想è¦è®©æ‚¨çš„签字也åŒæ—¶è¿‡æœŸå—？ (Y/n) " #: g10/keyedit.c:850 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" -msgstr "Äú²»ÄÜÔÚ --pgp2 ģʽÏ£¬Óà PGP 2.x ÃÜÔ¿Éú³É OpenPGP Ç©×Ö¡£\n" +msgstr "您ä¸èƒ½åœ¨ --pgp2 模å¼ä¸‹ï¼Œç”¨ PGP 2.x å¯†é’¥ç”Ÿæˆ OpenPGP 签字。\n" #: g10/keyedit.c:852 msgid "This would make the key unusable in PGP 2.x.\n" -msgstr "Õâ»áÈÃÕâ°ÑÃÜÔ¿ÔÚ PGP 2.x ģʽϲ»¿ÉʹÓá£\n" +msgstr "这会让这把密钥在 PGP 2.x 模å¼ä¸‹ä¸å¯ä½¿ç”¨ã€‚\n" #: g10/keyedit.c:877 msgid "" @@ -2567,154 +2601,129 @@ "belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" -"ÄúÓжàô½÷É÷µØ¼ì²é¹ýÕýҪǩ×ÖµÄÃÜÔ¿ÊÇ·ñȷʵÊôÓÚÒÔÉÏËüÉù³ÆµÄËùÓÐÕßÄØ£¿\n" -"Èç¹ûÄú²»ÖªµÀÕâ¸öÎÊÌâµÄ´ð°¸£¬ÇëÊäÈë¡°0¡±¡£\n" +"您是å¦è°¨æ…Žåœ°æ£€æŸ¥è¿‡ï¼Œç¡®è®¤æ­£è¦ç­¾å­—的密钥的确属于以上它所声称的所有者呢？\n" +"如果您ä¸çŸ¥é“这个问题的答案，请输入“0â€ã€‚\n" #: g10/keyedit.c:882 #, c-format msgid " (0) I will not answer.%s\n" -msgstr " (0) ÎÒ²»×÷´ð¡£ %s\n" +msgstr " (0) 我ä¸ä½œç­”。 %s\n" #: g10/keyedit.c:884 #, c-format msgid " (1) I have not checked at all.%s\n" -msgstr " (1) ÎÒ¸ù±¾Ã»Óмì²é¹ý¡£ %s\n" +msgstr " (1) 我根本没有检查过。 %s\n" #: g10/keyedit.c:886 #, c-format msgid " (2) I have done casual checking.%s\n" -msgstr " (2) ÎÒËæÒâ¼ì²é¹ý¡£ %s\n" +msgstr " (2) 我éšæ„检查过。 %s\n" #: g10/keyedit.c:888 #, c-format msgid " (3) I have done very careful checking.%s\n" -msgstr " (3) Îҷdz£Ð¡Ðĵؼì²é¹ý¡£ %s\n" +msgstr " (3) 我éžå¸¸å°å¿ƒåœ°æ£€æŸ¥è¿‡ã€‚ %s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " -msgstr "ÄúµÄÑ¡Ôñ£¿(ÊäÈë ¡®?¡¯ ÒÔ»ñµÃ¸ü¶àµÄÐÅÏ¢)£º" +#, fuzzy +msgid "Your selection? (enter `?' for more information): " +msgstr "您的选择？(输入‘?’以获得更多的信æ¯)：" #: g10/keyedit.c:918 -#, fuzzy, c-format +#, c-format msgid "" "Are you sure that you want to sign this key with your\n" "key \"%s\" (%s)\n" msgstr "" -"ÄúÕæµÄÈ·¶¨ÒªÇ©×ÖÕâ°ÑÃÜÔ¿\n" -"ʹÓÃÄúµÄÃÜÔ¿£º\"" +"您真的确定è¦ç­¾å­—这把密钥，使用您的密钥\n" +"“%sâ€(%s)\n" #: g10/keyedit.c:925 -#, fuzzy msgid "This will be a self-signature.\n" -msgstr "" -"\n" -"Õ⽫»áÊÇ×ÔÉíÇ©×Ö¡£\n" +msgstr "这将是一个自身签字。\n" #: g10/keyedit.c:931 -#, fuzzy msgid "WARNING: the signature will not be marked as non-exportable.\n" -msgstr "" -"\n" -"¾¯¸æ£ºÕâ·ÝÇ©×Ö²»»á±»±ê¼ÇΪ²»¿Éµ¼³ö¡£\n" +msgstr "警告：这份签字ä¸ä¼šè¢«æ ‡è®°ä¸ºä¸å¯å¯¼å‡ºã€‚\n" #: g10/keyedit.c:939 -#, fuzzy msgid "WARNING: the signature will not be marked as non-revocable.\n" -msgstr "" -"\n" -"¾¯¸æ£ºÕâ·ÝÇ©×Ö²»»á±»±ê¼Ç³É²»¿ÉµõÏú¡£\n" +msgstr "警告：这份签字ä¸ä¼šè¢«æ ‡è®°æˆä¸å¯åŠé”€ã€‚\n" #: g10/keyedit.c:949 -#, fuzzy msgid "The signature will be marked as non-exportable.\n" -msgstr "" -"\n" -"Õâ·ÝÇ©×ֻᱻ±ê¼Ç³É²»¿Éµ¼³ö¡£\n" +msgstr "这份签字会被标记æˆä¸å¯å¯¼å‡ºã€‚\n" #: g10/keyedit.c:956 -#, fuzzy msgid "The signature will be marked as non-revocable.\n" -msgstr "" -"\n" -"Õâ·ÝÇ©×ֻᱻ±ê¼Ç³É²»¿ÉµõÏú¡£\n" +msgstr "这份签字会被标记æˆä¸å¯åŠé”€ã€‚\n" #: g10/keyedit.c:963 -#, fuzzy msgid "I have not checked this key at all.\n" -msgstr "" -"\n" -"ÎÒ¸ù±¾Ã»Óмì²é¹ýÕâ°ÑÃÜÔ¿¡£\n" +msgstr "我根本没有检查过这把密钥。\n" #: g10/keyedit.c:968 -#, fuzzy msgid "I have checked this key casually.\n" -msgstr "" -"\n" -"ÎÒËæÒâ¼ì²é¹ýÕâ°ÑÃÜÔ¿¡£\n" +msgstr "我éšæ„检查过这把密钥。\n" #: g10/keyedit.c:973 -#, fuzzy msgid "I have checked this key very carefully.\n" -msgstr "" -"\n" -"Îҷdz£Ð¡Ðĵؼì²é¹ýÕâ°ÑÃÜÔ¿¡£\n" +msgstr "我éžå¸¸å°å¿ƒåœ°æ£€æŸ¥è¿‡è¿™æŠŠå¯†é’¥ã€‚\n" #: g10/keyedit.c:983 -#, fuzzy msgid "Really sign? (y/N) " -msgstr "ÕæµÄҪǩ×ÖÂ𣿠" +msgstr "真的è¦ç­¾å­—å—？(y/N)" -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" -msgstr "Ç©×Öʱʧ°Ü£º %s\n" +msgstr "签字时失败： %s\n" #: g10/keyedit.c:1084 msgid "This key is not protected.\n" -msgstr "Õâ°ÑÃÜԿûÓб»±£»¤¡£\n" +msgstr "这把密钥没有被ä¿æŠ¤ã€‚\n" #: g10/keyedit.c:1088 msgid "Secret parts of primary key are not available.\n" -msgstr "Ö÷Ô¿µÄ˽Կ²¿·ÖÎÞ·¨È¡Óá£\n" +msgstr "主钥的ç§é’¥éƒ¨åˆ†æ— æ³•å–用。\n" #: g10/keyedit.c:1092 msgid "Key is protected.\n" -msgstr "ÃÜÔ¿±»±£»¤ÁË¡£\n" +msgstr "密钥å—ä¿æŠ¤ã€‚\n" #: g10/keyedit.c:1112 #, c-format msgid "Can't edit this key: %s\n" -msgstr "ÎÞ·¨±à¼­Õâ°ÑÃÜÔ¿£º %s\n" +msgstr "无法编辑这把密钥： %s\n" #: g10/keyedit.c:1118 msgid "" "Enter the new passphrase for this secret key.\n" "\n" msgstr "" -"ÊäÈëÒª¸øÕâ°Ñ˽ԿÓõÄÐÂÃÜÂë¡£\n" +"输入è¦ç»™è¿™æŠŠç§é’¥ç”¨çš„新密ç ã€‚\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" -msgstr "ÃÜÂëÔÙ´ÎÊäÈëʱÓëÊ×´ÎÊäÈë²»·û£»ÇëÔÙÊÔÒ»´Î" +msgstr "密ç å†æ¬¡è¾“入时与首次输入ä¸ç¬¦ï¼›è¯·å†è¯•ä¸€æ¬¡" #: g10/keyedit.c:1132 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -"Äú²»ÏëÒªÓÃÃÜÂ롪¡ªÕâ´ó¸ÅÊǸö»µÖ÷Ò⣡\n" +"您ä¸æƒ³è¦ç”¨å¯†ç â€•â€•è¿™å¤§æ¦‚是个å主æ„ï¼\n" "\n" #: g10/keyedit.c:1135 -#, fuzzy msgid "Do you really want to do this? (y/N) " -msgstr "ÄúÕæµÄÏëÒªÕâô×öÂ𣿠" +msgstr "您真的想è¦è¿™ä¹ˆåšå—？(y/N)" #: g10/keyedit.c:1201 msgid "moving a key signature to the correct place\n" -msgstr "ÕýÔÚ°ÑÃÜÔ¿µÄÇ©×ÖÒƶ¯µ½ÕýÈ·µÄλÖÃÈ¥\n" +msgstr "正在把密钥的签字移动到正确的ä½ç½®åŽ»\n" #: g10/keyedit.c:1247 msgid "save" @@ -2722,7 +2731,7 @@ #: g10/keyedit.c:1247 msgid "save and quit" -msgstr "±£´æ²¢À뿪" +msgstr "ä¿å­˜å¹¶ç¦»å¼€" #: g10/keyedit.c:1250 msgid "fpr" @@ -2730,11 +2739,11 @@ #: g10/keyedit.c:1250 msgid "show fingerprint" -msgstr "ÏÔʾָÎÆ" +msgstr "显示指纹" #: g10/keyedit.c:1251 msgid "list key and user IDs" -msgstr "ÁгöÃÜÔ¿ºÍÓû§±êʶ" +msgstr "列出密钥和用户标识" #: g10/keyedit.c:1253 msgid "uid" @@ -2742,7 +2751,7 @@ #: g10/keyedit.c:1253 msgid "select user ID N" -msgstr "Ñ¡ÔñÓû§±êʶN" +msgstr "选择用户标识 N" #: g10/keyedit.c:1254 msgid "key" @@ -2750,7 +2759,7 @@ #: g10/keyedit.c:1254 msgid "select secondary key N" -msgstr "Ñ¡Ôñ×ÓÔ¿ N" +msgstr "选择å­é’¥ N" #: g10/keyedit.c:1255 msgid "check" @@ -2758,7 +2767,7 @@ #: g10/keyedit.c:1255 msgid "list signatures" -msgstr "ÁгöÇ©×Ö" +msgstr "列出签字" #: g10/keyedit.c:1256 msgid "c" @@ -2770,21 +2779,19 @@ #: g10/keyedit.c:1257 msgid "sign the key" -msgstr "ΪÃÜÔ¿Ìí¼ÓÇ©×Ö" +msgstr "为密钥添加签字" #: g10/keyedit.c:1258 msgid "s" msgstr "s" #: g10/keyedit.c:1259 -#, fuzzy msgid "tsign" -msgstr "sign" +msgstr "tsign" #: g10/keyedit.c:1259 -#, fuzzy msgid "make a trust signature" -msgstr "Éú³ÉÒ»·Ý·ÖÀëµÄÇ©×Ö" +msgstr "生æˆä¸€ä»½ä¿¡ä»»çš„签字" #: g10/keyedit.c:1260 msgid "lsign" @@ -2792,7 +2799,7 @@ #: g10/keyedit.c:1260 msgid "sign the key locally" -msgstr "ΪÃÜÔ¿Ìí¼Ó±¾µØÇ©×Ö" +msgstr "为密钥添加本地签字" #: g10/keyedit.c:1261 msgid "nrsign" @@ -2800,7 +2807,7 @@ #: g10/keyedit.c:1261 msgid "sign the key non-revocably" -msgstr "ΪÃÜÔ¿Ìí¼Ó²»¿ÉµõÏúÇ©×Ö" +msgstr "为密钥添加ä¸å¯åŠé”€ç­¾å­—" #: g10/keyedit.c:1262 msgid "nrlsign" @@ -2808,7 +2815,7 @@ #: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" -msgstr "ΪÃÜÔ¿Ìí¼Ó²»¿ÉµõÏúµÄ±¾µØÇ©×Ö" +msgstr "为密钥添加ä¸å¯åŠé”€çš„本地签字" #: g10/keyedit.c:1264 msgid "adduid" @@ -2816,7 +2823,7 @@ #: g10/keyedit.c:1264 msgid "add a user ID" -msgstr "Ôö¼ÓÒ»¸öÓû§±êʶ" +msgstr "增加一个用户标识" #: g10/keyedit.c:1265 msgid "addphoto" @@ -2824,7 +2831,7 @@ #: g10/keyedit.c:1265 msgid "add a photo ID" -msgstr "Ôö¼ÓÒ»¸öÕÕƬ±êʶ" +msgstr "增加一个照片标识" #: g10/keyedit.c:1266 msgid "deluid" @@ -2832,7 +2839,7 @@ #: g10/keyedit.c:1266 msgid "delete user ID" -msgstr "ɾ³ýÒ»¸öÓû§/ÕÕƬ±êʶ" +msgstr "删除一个用户/照片标识" #: g10/keyedit.c:1268 msgid "delphoto" @@ -2844,24 +2851,23 @@ #: g10/keyedit.c:1269 msgid "add a secondary key" -msgstr "Ôö¼ÓÒ»°Ñ×ÓÔ¿" +msgstr "增加一把å­é’¥" #: g10/keyedit.c:1271 -#, fuzzy msgid "addcardkey" -msgstr "addkey" +msgstr "addcardkey" #: g10/keyedit.c:1271 msgid "add a key to a smartcard" -msgstr "" +msgstr "在智能å¡ä¸Šæ·»åŠ ä¸€æŠŠå¯†é’¥" #: g10/keyedit.c:1272 msgid "keytocard" -msgstr "" +msgstr "å¡å¯†é’¥" #: g10/keyedit.c:1272 msgid "move a key to a smartcard" -msgstr "" +msgstr "将一把密钥移动到智能å¡ä¸Š" #: g10/keyedit.c:1274 msgid "delkey" @@ -2869,7 +2875,7 @@ #: g10/keyedit.c:1274 msgid "delete a secondary key" -msgstr "ɾ³ýÒ»°Ñ×ÓÔ¿" +msgstr "删除一把å­é’¥" #: g10/keyedit.c:1275 msgid "addrevoker" @@ -2877,7 +2883,7 @@ #: g10/keyedit.c:1275 msgid "add a revocation key" -msgstr "Ôö¼ÓÒ»°ÑµõÏúÃÜÔ¿" +msgstr "增加一把åŠé”€å¯†é’¥" #: g10/keyedit.c:1276 msgid "delsig" @@ -2885,7 +2891,7 @@ #: g10/keyedit.c:1276 msgid "delete signatures" -msgstr "ɾ³ýÇ©×Ö" +msgstr "删除签字" #: g10/keyedit.c:1277 msgid "expire" @@ -2893,7 +2899,7 @@ #: g10/keyedit.c:1277 msgid "change the expire date" -msgstr "¸ü¸ÄʹÓÃÆÚÏÞ" +msgstr "更改使用期é™" #: g10/keyedit.c:1278 msgid "primary" @@ -2901,7 +2907,7 @@ #: g10/keyedit.c:1278 msgid "flag user ID as primary" -msgstr "É趨Ê×Ñ¡Óû§±êʶ" +msgstr "设定首选用户标识" #: g10/keyedit.c:1279 msgid "toggle" @@ -2909,7 +2915,7 @@ #: g10/keyedit.c:1279 msgid "toggle between secret and public key listing" -msgstr "ÔÚ˽ԿºÍ¹«Ô¿Çåµ¥¼äÇл»" +msgstr "在ç§é’¥å’Œå…¬é’¥æ¸…å•é—´åˆ‡æ¢" #: g10/keyedit.c:1281 msgid "t" @@ -2921,7 +2927,7 @@ #: g10/keyedit.c:1282 msgid "list preferences (expert)" -msgstr "ÁгöÊ×Ñ¡Ïî(ר¼Òģʽ)" +msgstr "列出首选项(专家模å¼)" #: g10/keyedit.c:1283 msgid "showpref" @@ -2929,7 +2935,7 @@ #: g10/keyedit.c:1283 msgid "list preferences (verbose)" -msgstr "ÁгöÊ×Ñ¡Ïî(Ïêϸģʽ)" +msgstr "列出首选项(详细模å¼)" #: g10/keyedit.c:1284 msgid "setpref" @@ -2937,7 +2943,7 @@ #: g10/keyedit.c:1284 msgid "set preference list" -msgstr "É趨Ê×Ñ¡Ïî" +msgstr "设定首选项" #: g10/keyedit.c:1285 msgid "updpref" @@ -2945,21 +2951,19 @@ #: g10/keyedit.c:1285 msgid "updated preferences" -msgstr "¸üйýµÄÊ×Ñ¡Ïî" +msgstr "更新过的首选项" #: g10/keyedit.c:1286 -#, fuzzy msgid "keyserver" -msgstr "¹«Ô¿·þÎñÆ÷´íÎó" +msgstr "keyserver" #: g10/keyedit.c:1286 -#, fuzzy msgid "set preferred keyserver URL" -msgstr "ÎÞ·¨½âÎö¹«Ô¿·þÎñÆ÷ URI\n" +msgstr "设定首选公钥æœåŠ¡å™¨çš„ URL" #: g10/keyedit.c:1287 msgid "change the passphrase" -msgstr "¸ü¸ÄÃÜÂë" +msgstr "更改密ç " #: g10/keyedit.c:1288 msgid "trust" @@ -2967,7 +2971,7 @@ #: g10/keyedit.c:1288 msgid "change the ownertrust" -msgstr "¸ü¸ÄÐÅÈζÈ" +msgstr "更改信任度" #: g10/keyedit.c:1289 msgid "revsig" @@ -2975,7 +2979,7 @@ #: g10/keyedit.c:1289 msgid "revoke signatures" -msgstr "µõÏúÇ©×Ö" +msgstr "åŠé”€ç­¾å­—" #: g10/keyedit.c:1290 msgid "revuid" @@ -2983,7 +2987,7 @@ #: g10/keyedit.c:1290 msgid "revoke a user ID" -msgstr "µõÏúÒ»¸öÓû§±êʶ" +msgstr "åŠé”€ä¸€ä¸ªç”¨æˆ·æ ‡è¯†" #: g10/keyedit.c:1291 msgid "revkey" @@ -2991,7 +2995,7 @@ #: g10/keyedit.c:1291 msgid "revoke a secondary key" -msgstr "µõÏúÒ»°Ñ×ÓÔ¿" +msgstr "åŠé”€ä¸€æŠŠå­é’¥" #: g10/keyedit.c:1292 msgid "disable" @@ -2999,7 +3003,7 @@ #: g10/keyedit.c:1292 msgid "disable a key" -msgstr "½ûÓÃÒ»°ÑÃÜÔ¿" +msgstr "ç¦ç”¨ä¸€æŠŠå¯†é’¥" #: g10/keyedit.c:1293 msgid "enable" @@ -3007,7 +3011,7 @@ #: g10/keyedit.c:1293 msgid "enable a key" -msgstr "ÆôÓÃÒ»°ÑÃÜÔ¿" +msgstr "å¯ç”¨ä¸€æŠŠå¯†é’¥" #: g10/keyedit.c:1294 msgid "showphoto" @@ -3015,667 +3019,604 @@ #: g10/keyedit.c:1294 msgid "show photo ID" -msgstr "ÏÔʾÕÕƬ±êʶ" +msgstr "显示照片标识" #: g10/keyedit.c:1347 -#, fuzzy, c-format +#, c-format msgid "error reading secret keyblock \"%s\": %s\n" -msgstr "¶ÁÈ¡ÃÜÔ¿Çø¿é¡®%s¡¯Ê±³ö´í£º%s\n" +msgstr "读å–ç§é’¥åŒºå—“%sâ€æ—¶å‡ºé”™ï¼š%s\n" #: g10/keyedit.c:1365 msgid "Secret key is available.\n" -msgstr "˽Կ¿ÉÓá£\n" +msgstr "ç§é’¥å¯ç”¨ã€‚\n" #: g10/keyedit.c:1427 msgid "Need the secret key to do this.\n" -msgstr "ÒªÓÐ˽Կ²ÅÄÜÕâô×ö¡£\n" +msgstr "è¦æœ‰ç§é’¥æ‰èƒ½è¿™ä¹ˆåšã€‚\n" #: g10/keyedit.c:1432 msgid "Please use the command \"toggle\" first.\n" -msgstr "ÇëÏÈʹÓá°toggle¡±Ö¸Áî¡£\n" +msgstr "请先使用“toggleâ€æŒ‡ä»¤ã€‚\n" #: g10/keyedit.c:1480 msgid "Key is revoked." -msgstr "ÃÜÔ¿Òѱ»µõÏú¡£" +msgstr "密钥已被åŠé”€ã€‚" #: g10/keyedit.c:1500 -#, fuzzy msgid "Really sign all user IDs? (y/N) " -msgstr "ÕæµÄΪËùÓеÄÓû§±êʶǩ×ÖÂ𣿠" +msgstr "真的为所有的用户标识签字å—？(y/N)" #: g10/keyedit.c:1502 msgid "Hint: Select the user IDs to sign\n" -msgstr "Ìáʾ£ºÑ¡ÔñÒªÌí¼ÓÇ©×ÖµÄÓû§±êʶ\n" +msgstr "æ示：选择è¦æ·»åŠ ç­¾å­—的用户标识\n" #: g10/keyedit.c:1527 #, c-format msgid "This command is not allowed while in %s mode.\n" -msgstr "ÔÚ %s ģʽÖв»ÔÊÐíʹÓÃÕâ¸öÖ¸Áî¡£\n" +msgstr "在 %s 模å¼ä¸­ä¸å…许使用这个指令。\n" #: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 msgid "You must select at least one user ID.\n" -msgstr "ÄúÖÁÉÙµÃÑ¡ÔñÒ»¸öÓû§±êʶ¡£\n" +msgstr "您至少得选择一个用户标识。\n" #: g10/keyedit.c:1551 msgid "You can't delete the last user ID!\n" -msgstr "Äú²»ÄÜɾ³ý×îºóÒ»¸öÓû§±êʶ£¡\n" +msgstr "您ä¸èƒ½åˆ é™¤æœ€åŽä¸€ä¸ªç”¨æˆ·æ ‡è¯†ï¼\n" #: g10/keyedit.c:1553 -#, fuzzy msgid "Really remove all selected user IDs? (y/N) " -msgstr "ÕæµÄҪɾ³ýËùÓб»Ñ¡ÔñµÄÓû§±êʶÂ𣿠" +msgstr "真的è¦åˆ é™¤æ‰€æœ‰è¢«é€‰æ‹©çš„用户标识å—？(y/N)" #: g10/keyedit.c:1554 -#, fuzzy msgid "Really remove this user ID? (y/N) " -msgstr "ÕæµÄҪɾ³ýÕâ¸öÓû§±êʶÂ𣿠" +msgstr "真的è¦åˆ é™¤è¿™ä¸ªç”¨æˆ·æ ‡è¯†å—？(y/N)" #: g10/keyedit.c:1604 -#, fuzzy msgid "Really move the primary key? (y/N) " -msgstr "ÕæµÄҪɾ³ýÕâ¸öÓû§±êʶÂ𣿠" +msgstr "真的è¦åˆ é™¤ä¸»é’¥å—？(y/N)" #: g10/keyedit.c:1616 -#, fuzzy msgid "You must select exactly one key.\n" -msgstr "Äú±ØÐëÑ¡ÔñÖÁÉÙÒ»°ÑÃÜÔ¿¡£\n" +msgstr "您必须指定一把密钥。\n" #: g10/keyedit.c:1636 g10/keyedit.c:1691 msgid "You must select at least one key.\n" -msgstr "Äú±ØÐëÑ¡ÔñÖÁÉÙÒ»°ÑÃÜÔ¿¡£\n" +msgstr "您必须选择至少一把密钥。\n" #: g10/keyedit.c:1639 -#, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " -msgstr "ÄúÕæµÄÏëҪɾ³ý±»Ñ¡ÔñµÄÃÜÔ¿Â𣿠" +msgstr "您真的想è¦åˆ é™¤è¢«é€‰æ‹©çš„密钥å—？(y/N)" #: g10/keyedit.c:1640 -#, fuzzy msgid "Do you really want to delete this key? (y/N) " -msgstr "ÄúÕæµÄҪɾ³ýÕâ°ÑÃÜÔ¿Â𣿠" +msgstr "您真的è¦åˆ é™¤è¿™æŠŠå¯†é’¥å—？(y/N)" #: g10/keyedit.c:1675 -#, fuzzy msgid "Really revoke all selected user IDs? (y/N) " -msgstr "ÕæµÄÒªµõÏúËùÓб»Ñ¡ÔñµÄÓû§±êʶÂ𣿠" +msgstr "真的è¦åŠé”€æ‰€æœ‰è¢«é€‰æ‹©çš„用户标识å—？(y/N)" #: g10/keyedit.c:1676 -#, fuzzy msgid "Really revoke this user ID? (y/N) " -msgstr "ÕæµÄÒªµõÏúÕâ¸öÓû§±êʶÂ𣿠" +msgstr "真的è¦åŠé”€è¿™ä¸ªç”¨æˆ·æ ‡è¯†å—？(y/N)" #: g10/keyedit.c:1695 -#, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " -msgstr "ÄúÕæµÄÏëÒªµõÏúÕâЩ±»Ñ¡ÔñµÄÃÜÔ¿Â𣿠" +msgstr "您真的想è¦åŠé”€è¢«é€‰æ‹©çš„密钥å—？(y/N)" #: g10/keyedit.c:1696 -#, fuzzy msgid "Do you really want to revoke this key? (y/N) " -msgstr "ÄúÕæµÄÏëÒªµõÏúÕâ°ÑÃÜÔ¿Â𣿠" +msgstr "您真的想è¦åŠé”€è¿™æŠŠå¯†é’¥å—？(y/N)" #: g10/keyedit.c:1735 msgid "" "Owner trust may not be set while using an user provided trust database\n" -msgstr "" +msgstr "使用用户æ供的信任度数æ®åº“时信任度å¯èƒ½å¹¶æœªè¢«è®¾å®š\n" #: g10/keyedit.c:1767 -#, fuzzy msgid "Set preference list to:\n" -msgstr "É趨Ê×Ñ¡Ïî" +msgstr "设为首选项列表为：\n" #: g10/keyedit.c:1773 -#, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " -msgstr "ÕæµÄÒª¸üб»Ñ¡ÔñÓû§±êʶµÄÊ×Ñ¡ÏîÂ𣿠" +msgstr "真的è¦æ›´æ–°è¢«é€‰æ‹©ç”¨æˆ·æ ‡è¯†çš„首选项å—？(y/N)" #: g10/keyedit.c:1775 -#, fuzzy msgid "Really update the preferences? (y/N) " -msgstr "ÕæµÄÒª¸üÐÂÊ×Ñ¡ÏîÂ𣿠" +msgstr "真的è¦æ›´æ–°é¦–选项å—？(y/N)" #: g10/keyedit.c:1825 -#, fuzzy msgid "Save changes? (y/N) " -msgstr "Òª±£´æ±ä¶¯Â𣿠" +msgstr "è¦ä¿å­˜å˜åŠ¨å—？(y/N)" #: g10/keyedit.c:1828 -#, fuzzy msgid "Quit without saving? (y/N) " -msgstr "Òª²»±£´æ¶øÀ뿪Â𣿠" +msgstr "è¦ä¸ä¿å­˜è€Œç¦»å¼€å—？(y/N)" #: g10/keyedit.c:1838 #, c-format msgid "update failed: %s\n" -msgstr "¸üÐÂʧ°Ü£º%s\n" +msgstr "更新失败：%s\n" #: g10/keyedit.c:1845 #, c-format msgid "update secret failed: %s\n" -msgstr "¸üÐÂ˽Կʧ°Ü£º%s\n" +msgstr "æ›´æ–°ç§é’¥å¤±è´¥ï¼š%s\n" #: g10/keyedit.c:1852 msgid "Key not changed so no update needed.\n" -msgstr "ÃÜԿûÓб䶯ËùÒÔ²»ÐèÒª¸üС£\n" +msgstr "密钥没有å˜åŠ¨æ‰€ä»¥ä¸éœ€è¦æ›´æ–°ã€‚\n" #: g10/keyedit.c:1924 msgid "Digest: " -msgstr "É¢ÁУº" +msgstr "散列：" #: g10/keyedit.c:1976 msgid "Features: " -msgstr "Ìص㣺" +msgstr "特点：" #: g10/keyedit.c:1987 msgid "Keyserver no-modify" -msgstr "" +msgstr "公钥æœåŠ¡å™¨ä¸å¯å˜é€ " #: g10/keyedit.c:2002 g10/keylist.c:244 msgid "Preferred keyserver: " -msgstr "" +msgstr "首选公钥æœåŠ¡å™¨ï¼š" -#: g10/keyedit.c:2243 +#: g10/keyedit.c:2245 #, c-format -msgid "This key may be revoked by %s key " -msgstr "Õâ°ÑÃÜÔ¿¿É±»´Ë %s ÃÜÔ¿µõÏú£º" +msgid "This key may be revoked by %s key %s" +msgstr "这把密钥å¯è¢« %s 密钥 %s åŠé”€" -#: g10/keyedit.c:2247 -msgid " (sensitive)" -msgstr " (Ãô¸ÐµÄ)" +#: g10/keyedit.c:2251 +msgid "(sensitive)" +msgstr " (æ•æ„Ÿçš„)" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 -#, fuzzy, c-format +#, c-format msgid "created: %s" -msgstr "ÎÞ·¨½¨Á¢ %s£º%s\n" +msgstr "创建于：%s" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 -#, fuzzy, c-format +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#, c-format msgid "revoked: %s" -msgstr "[ÒѵõÏú]" +msgstr "å·²åŠé”€ï¼š%s" -# of subkey -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 -#, fuzzy, c-format +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#, c-format msgid "expired: %s" -msgstr " [ÓÐЧÆÚÖÁ£º%s]" +msgstr "已过期：%s" -# of subkey -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 -#, fuzzy, c-format +#, c-format msgid "expires: %s" -msgstr " [ÓÐЧÆÚÖÁ£º%s]" +msgstr "有效至：%s" -#: g10/keyedit.c:2270 -#, fuzzy, c-format +#: g10/keyedit.c:2276 +#, c-format msgid "usage: %s" -msgstr " ÐÅÈζȣº %c/%c" +msgstr "å¯ç”¨äºŽï¼š%s" -#: g10/keyedit.c:2285 -#, fuzzy, c-format +#: g10/keyedit.c:2291 +#, c-format msgid "trust: %s" -msgstr " ÐÅÈζȣº %c/%c" +msgstr "信任度：%s" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" -msgstr "" +msgstr "有效性：%s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" -msgstr "Õâ°ÑÃÜÔ¿ÒѾ­±»½ûÓÃ" +msgstr "这把密钥已ç»è¢«ç¦ç”¨" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " -msgstr "" +msgstr "å¡å·ï¼š" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" +#: g10/keyedit.c:2397 +msgid "There are no preferences on a PGP 2.x-style user ID.\n" +msgstr "PGP 2.x æ ·å¼çš„用户标识没有首选项。\n" -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[ÒѵõÏú]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 -msgid "There are no preferences on a PGP 2.x-style user ID.\n" -msgstr "PGP 2.x ÑùʽµÄÓû§±êʶûÓÐÊ×Ñ¡Ïî¡£\n" - -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" -msgstr "" -"Çë×¢Ò⣬ÔÚÄúÖØÆô³ÌÐò֮ǰ£¬\n" -"ÏÔʾµÄÃÜÔ¿ÓÐЧÐÔδ±ØÕýÈ·£¬\n" +msgstr "请注æ„，在您é‡å¯ç¨‹åºä¹‹å‰ï¼Œæ˜¾ç¤ºçš„密钥有效性未必正确，\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +msgid "revoked" +msgstr "å·²åŠé”€" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +msgid "expired" +msgstr "已过期" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -"¾¯¸æ£ºÃ»ÓÐÒ»¸öÓû§±êʶ±»±ê¼ÇΪÊ×Ñ¡Óû§±êʶ¡£´ËÃüÁî¿ÉÄܼٶ¨Ò»¸ö²»Í¬\n" -" µÄÓû§±êʶÊÇÊ×Ñ¡Óû§±êʶ¡£\n" +"警告：没有首选用户标识。此指令å¯èƒ½å‡å®šä¸€ä¸ªä¸åŒçš„用户标识为首选用户标识。\n" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -"¾¯¸æ£ºÕâÊÇÒ»°Ñ PGP2 ÑùʽµÄÃÜÔ¿¡£\n" -" Ôö¼ÓÕÕƬ±êʶ¿ÉÄܻᵼÖÂijЩ°æ±¾µÄ PGP ²»ÄÜʶ±ðÕâ°ÑÃÜÔ¿¡£\n" +"警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" +" 增加照片标识å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP ä¸èƒ½è¯†åˆ«è¿™æŠŠå¯†é’¥ã€‚\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " -msgstr "ÄúÈ·¶¨ÈÔÈ»ÏëÒªÔö¼ÓÂð£¿(y/N)" +msgstr "您确定ä»ç„¶æƒ³è¦å¢žåŠ å—？(y/N)" -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" -msgstr "Äú²»¿ÉÒÔ°ÑÕÕƬ±êʶÔö¼Óµ½ PGP2 ÑùʽµÄÃÜÔ¿Àï¡£\n" +msgstr "您ä¸å¯ä»¥æŠŠç…§ç‰‡æ ‡è¯†å¢žåŠ åˆ° PGP2 æ ·å¼çš„密钥里。\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" -msgstr "ɾ³ýÕâ¸öÍêºÃµÄÇ©×ÖÂð£¿(y/N/q)" +msgstr "删除这个完好的签字å—？(y/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" -msgstr "ɾ³ýÕâ¸öÎÞЧµÄÇ©×ÖÂð£¿(y/N/q)" +msgstr "删除这个无效的签字å—？(y/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" -msgstr "ɾ³ýÕâ¸öδ֪µÄÇ©×ÖÂð£¿(y/N/q)" +msgstr "删除这个未知的签字å—？(y/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" -msgstr "ÕæµÄҪɾ³ýÕâ¸ö×ÔÉíÇ©×ÖÂð£¿(y/N)" +msgstr "真的è¦åˆ é™¤è¿™ä¸ªè‡ªèº«ç­¾å­—å—？(y/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" -msgstr "ÒѾ­É¾³ýÁË %d ¸öÇ©×Ö¡£\n" +msgstr "å·²ç»åˆ é™¤äº† %d 个签字。\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" -msgstr "ÒѾ­É¾³ýÁË %d ¸öÇ©×Ö¡£\n" +msgstr "å·²ç»åˆ é™¤äº† %d 个签字。\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" -msgstr "ûÓж«Î÷±»É¾³ý¡£\n" +msgstr "没有东西被删除。\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -"¾¯¸æ£ºÕâÊÇÒ»°Ñ PGP2 ÑùʽµÄÃÜÔ¿¡£\n" -" Ôö¼ÓÖ¸¶¨µõÏúÕß¿ÉÄܻᵼÖÂijЩ°æ±¾µÄ PGP ÎÞ·¨Ê¶±ðÕâ°ÑÃÜÔ¿¡£\n" +"警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" +" 增加指定åŠé”€è€…å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" -msgstr "Äú²»¿ÉÒÔΪ PGP 2.x ÑùʽµÄÃÜÔ¿Ìí¼ÓÖ¸¶¨µõÏúÕß¡£\n" +msgstr "您ä¸å¯ä»¥ä¸º PGP 2.x æ ·å¼çš„密钥添加指定åŠé”€è€…。\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " -msgstr "ÊäÈëÖ¸¶¨µõÏúÕßµÄÓû§±êʶ£º" +msgstr "输入指定åŠé”€è€…的用户标识：" -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" -msgstr "ÎÞ·¨½« PGP 2.x ÑùʽµÄÃÜÔ¿ÉèΪָ¶¨µõÏúÕß\n" +msgstr "无法将 PGP 2.x æ ·å¼çš„密钥设为指定åŠé”€è€…\n" # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" -msgstr "Äú²»Äܽ«Ä³°ÑÃÜÔ¿ÉèΪËü×Ô¼ºµÄÖ¸¶¨µõÏúÕß\n" +msgstr "您ä¸èƒ½å°†æŸæŠŠå¯†é’¥è®¾ä¸ºå®ƒè‡ªå·±çš„指定åŠé”€è€…\n" -#: g10/keyedit.c:2968 -#, fuzzy +# This actually causes no harm (after all, a key that +# designates itself as a revoker is the same as a +# regular key), but it's easy enough to check. +#: g10/keyedit.c:2965 msgid "this key has already been designated as a revoker\n" -msgstr "¾¯¸æ£ºÕâ°ÑÃÜÔ¿ÒѾ­±»ËüµÄÖ¸¶¨µõÏúÕßµõÏúÁË£¡\n" +msgstr "这把密钥已被指定为一个åŠé”€è€…\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" -msgstr "¾¯¸æ£º½«Ä³°ÑÃÜÔ¿Ö¸ÅÉΪָ¶¨µõÏúÕߵIJÙ×÷ÎÞ·¨³·Ïú£¡\n" +msgstr "警告：将æŸæŠŠå¯†é’¥æŒ‡æ´¾ä¸ºæŒ‡å®šåŠé”€è€…çš„æ“作无法撤销ï¼\n" -#: g10/keyedit.c:2993 -#, fuzzy +#: g10/keyedit.c:2990 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " -msgstr "ÄúÈ·¶¨Òª½«Õâ°ÑÃÜÔ¿ÉèΪָ¶¨µõÏúÕßÂð£¿(y/N)£º" +msgstr "您确定è¦å°†è¿™æŠŠå¯†é’¥è®¾ä¸ºæŒ‡å®šåŠé”€è€…å—？(y/N)：" -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" -msgstr "Çë´Ó˽ԿÖÐɾ³ýÑ¡Ôñ¡£\n" +msgstr "请从ç§é’¥ä¸­åˆ é™¤é€‰æ‹©ã€‚\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" -msgstr "ÇëÖÁ¶àÑ¡ÔñÒ»°Ñ×ÓÔ¿¡£\n" +msgstr "请至多选择一把å­é’¥ã€‚\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" -msgstr "ÕýÔÚ±ä¸ü×ÓÔ¿µÄʹÓÃÆÚÏÞ¡£\n" +msgstr "正在å˜æ›´å­é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" -msgstr "ÕýÔÚ±ä¸üÖ÷Ô¿µÄʹÓÃÆÚÏÞ¡£\n" +msgstr "正在å˜æ›´ä¸»é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" -msgstr "Äú²»Äܱä¸üv3ÃÜÔ¿µÄʹÓÃÆÚÏÞ\n" +msgstr "您ä¸èƒ½å˜æ›´v3密钥的使用期é™\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" -msgstr "ÔÚ˽Կ»·ÀïûÓÐÒ»ÖµÄÇ©×Ö\n" +msgstr "在ç§é’¥çŽ¯é‡Œæ²¡æœ‰ä¸€è‡´çš„签字\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" -msgstr "Ç뾫ȷµØÑ¡ÔñÒ»¸öÓû§±êʶ¡£\n" +msgstr "请精确地选择一个用户标识。\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 -#, fuzzy, c-format +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" -msgstr "ÕýÔÚÌø¹ýÓû§±êʶ¡°%s¡±µÄ v3 ×ÔÉíÇ©×Ö\n" +msgstr "跳过用户标识“%sâ€çš„ v3 自身签字\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " -msgstr "" +msgstr "输入您首选的公钥æœåŠ¡å™¨çš„ URL：" -#: g10/keyedit.c:3498 -#, fuzzy +#: g10/keyedit.c:3495 msgid "Are you sure you want to replace it? (y/N) " -msgstr "ÄúÈ·¶¨ÒªÓÃËüÂð£¿(y/N)" +msgstr "您确定è¦æ›¿æ¢å®ƒå—？(y/N)" -#: g10/keyedit.c:3499 -#, fuzzy +#: g10/keyedit.c:3496 msgid "Are you sure you want to delete it? (y/N) " -msgstr "ÄúÈ·¶¨ÒªÓÃËüÂð£¿(y/N)" +msgstr "您确定è¦åˆ é™¤å®ƒå—？(y/N)" -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" -msgstr "ûÓÐË÷ÒýΪ %d µÄÓû§±êʶ\n" +msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" -msgstr "ûÓÐË÷ÒýΪ %d µÄ×ÓÔ¿\n" +msgstr "没有索引为 %d çš„å­é’¥\n" -#: g10/keyedit.c:3724 -#, fuzzy, c-format +#: g10/keyedit.c:3721 +#, c-format msgid "user ID: \"%s\"\n" -msgstr "Óû§±êʶ£º¡°" +msgstr "用户标识：“%sâ€\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 -#, fuzzy, c-format +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#, c-format msgid "signed by your key %s on %s%s%s\n" -msgstr " ÓÉ %08lX ÓÚ %s%s%s Ìí¼ÓÇ©×Ö\n" +msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" -msgstr " (²»¿Éµ¼³ö)" +msgstr " (ä¸å¯å¯¼å‡º)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" -msgstr "Õâ·ÝÇ©×ÖÒÑÔÚ %s ¹ýÆÚ¡£\n" +msgstr "这份签字已在 %s 过期。\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " -msgstr "ÄúÈ·¶¨ÄúÈÔÈ»ÏëÒªµõÏúËüÂð£¿(y/N)" +msgstr "您确定您ä»ç„¶æƒ³è¦åŠé”€å®ƒå—？(y/N)" -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " -msgstr "ҪΪÕâ·ÝÇ©×ÖÉú³ÉÒ»·ÝµõÏúÖ¤ÊéÂð£¿(y/N)" +msgstr "è¦ä¸ºè¿™ä»½ç­¾å­—生æˆä¸€ä»½åŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:3768 -#, fuzzy, c-format +#: g10/keyedit.c:3765 +#, c-format msgid "You have signed these user IDs on key %s:\n" -msgstr "ÄúÒѾ­ÎªÕâЩÓû§±êʶÌí¼ÓÇ©×Ö£º\n" +msgstr "您已ç»ä¸ºè¿™äº›å¯†é’¥ %s 上的这些用户标识添加签字：\n" -#: g10/keyedit.c:3794 -#, fuzzy +#: g10/keyedit.c:3791 msgid " (non-revocable)" -msgstr " (²»¿Éµ¼³ö)" +msgstr " (ä¸å¯åŠé”€)" -#: g10/keyedit.c:3801 -#, fuzzy, c-format +#: g10/keyedit.c:3798 +#, c-format msgid "revoked by your key %s on %s\n" -msgstr " ÓÉ %08lX µõÏúÓÚ %s\n" +msgstr "由您的密钥 %s 于 %s åŠé”€\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" -msgstr "ÄúÕýÔÚµõÏúÕâЩǩ×Ö£º\n" +msgstr "您正在åŠé”€è¿™äº›ç­¾å­—：\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " -msgstr "ÕæµÄÒªÉú³ÉµõÏúÖ¤ÊéÂð£¿(y/N)" +msgstr "真的è¦ç”ŸæˆåŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" -msgstr "ûÓÐ˽Կ\n" +msgstr "没有ç§é’¥\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" -msgstr "Óû§±êʶ¡°%s¡±ÒѾ­±»µõÏú¡£\n" +msgstr "用户标识“%sâ€å·²ç»è¢«åŠé”€ã€‚\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" -msgstr "¾¯¸æ£ºÓÐÒ»·ÝÓû§±êʶǩ×ÖµÄÈÕÆÚ±ê¼ÇΪ %d ÃëºóµÄδÀ´\n" +msgstr "警告：有一份用户标识签字的日期标记为 %d 秒åŽçš„未æ¥\n" -#: g10/keyedit.c:4129 -#, fuzzy, c-format +#: g10/keyedit.c:4126 +#, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" -msgstr "ÕýÔÚÏÔʾ %s ÕÕƬ±êʶ(´óСΪ %ld£¬ÊôÓÚÃÜÔ¿ 0x%08lX£¬Óû§±êʶ %d)\n" +msgstr "正在显示 %s 照片标识(大å°ä¸º %ld，属于密钥 %s，用户标识 %d)\n" #: g10/keygen.c:293 -#, fuzzy, c-format +#, c-format msgid "preference `%s' duplicated\n" -msgstr "Ê×Ñ¡Ïî %c%lu Öظ´\n" +msgstr "首选项‘%s’é‡å¤\n" #: g10/keygen.c:300 -#, fuzzy msgid "too many cipher preferences\n" -msgstr "Ì«¶àÊ×Ñ¡Ïî¡®%c¡¯\n" +msgstr "太多对称加密算法首选项\n" #: g10/keygen.c:302 -#, fuzzy msgid "too many digest preferences\n" -msgstr "Ì«¶àÊ×Ñ¡Ïî¡®%c¡¯\n" +msgstr "太多散列算法首选项\n" #: g10/keygen.c:304 -#, fuzzy msgid "too many compression preferences\n" -msgstr "Ì«¶àÊ×Ñ¡Ïî¡®%c¡¯\n" +msgstr "太多首选压缩算法\n" #: g10/keygen.c:401 -#, fuzzy, c-format +#, c-format msgid "invalid item `%s' in preference string\n" -msgstr "Ê×Ñ¡Ïî×Ö·û´®ÀïÓÐÎÞЧµÄ×Ö·û\n" +msgstr "首选项字符串里有无效项‘%s’\n" #: g10/keygen.c:827 msgid "writing direct signature\n" -msgstr "ÕýÔÚдÈëÖ±½ÓÇ©×Ö\n" +msgstr "正在写入直接签字\n" #: g10/keygen.c:866 msgid "writing self signature\n" -msgstr "ÕýÔÚдÈë×ÔÉíÇ©×Ö\n" +msgstr "正在写入自身签字\n" #: g10/keygen.c:912 msgid "writing key binding signature\n" -msgstr "ÕýÔÚдÈëÃÜÔ¿°ó¶¨Ç©×Ö\n" +msgstr "正在写入密钥绑定签字\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" -msgstr "ÃÜÔ¿³ß´çÎÞЧ£º¸ÄÓà %u ×Ö½Ú\n" +msgstr "密钥尺寸无效：改用 %u ä½\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" -msgstr "ÃÜÔ¿³ß´çÉáÈëµ½ %u ×Ö½Ú\n" +msgstr "密钥尺寸èˆå…¥åˆ° %u ä½\n" #: g10/keygen.c:1247 -#, fuzzy msgid "Sign" -msgstr "sign" +msgstr "签字" #: g10/keygen.c:1250 -#, fuzzy msgid "Encrypt" -msgstr "¼ÓÃÜÊý¾Ý" +msgstr "加密" #: g10/keygen.c:1253 msgid "Authenticate" -msgstr "" +msgstr "认è¯" #: g10/keygen.c:1261 msgid "SsEeAaQq" -msgstr "" +msgstr "SsEeAaQq" #: g10/keygen.c:1276 #, c-format msgid "Possible actions for a %s key: " -msgstr "" +msgstr "%s 密钥å¯èƒ½çš„æ“作：" #: g10/keygen.c:1280 msgid "Current allowed actions: " -msgstr "" +msgstr "ç›®å‰å…许的æ“作：" #: g10/keygen.c:1285 #, c-format msgid " (%c) Toggle the sign capability\n" -msgstr "" +msgstr " (%c) 选择是å¦ç”¨äºŽç­¾å­—\n" #: g10/keygen.c:1288 -#, fuzzy, c-format +#, c-format msgid " (%c) Toggle the encrypt capability\n" -msgstr " (%d) ElGamal (½öÓÃÓÚ¼ÓÃÜ)\n" +msgstr " (%c) 选择是å¦ç”¨äºŽåŠ å¯†\n" #: g10/keygen.c:1291 #, c-format msgid " (%c) Toggle the authenticate capability\n" -msgstr "" +msgstr " (%c) 选择是å¦ç”¨äºŽè®¤è¯\n" #: g10/keygen.c:1294 #, c-format msgid " (%c) Finished\n" -msgstr "" +msgstr " (%c) 已完æˆ\n" #: g10/keygen.c:1348 msgid "Please select what kind of key you want:\n" -msgstr "ÇëÑ¡ÔñÄúҪʹÓõÄÃÜÔ¿ÖÖÀࣺ\n" +msgstr "请选择您è¦ä½¿ç”¨çš„密钥ç§ç±»ï¼š\n" #: g10/keygen.c:1350 -#, fuzzy, c-format +#, c-format msgid " (%d) DSA and Elgamal (default)\n" -msgstr " (%d) DSA ºÍ ElGamal (ĬÈÏ)\n" +msgstr " (%d) DSA å’Œ ElGamal (默认)\n" #: g10/keygen.c:1351 #, c-format msgid " (%d) DSA (sign only)\n" -msgstr " (%d) DSA (½öÓÃÓÚÇ©×Ö)\n" +msgstr " (%d) DSA (仅用于签字)\n" #: g10/keygen.c:1353 #, fuzzy, c-format -msgid " (%d) Elgamal (encrypt only)\n" -msgstr " (%d) ElGamal (½öÓÃÓÚ¼ÓÃÜ)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (自定义用途)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1355 #, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (½öÓÃÓÚÇ©×Ö)\n" +msgid " (%d) Elgamal (encrypt only)\n" +msgstr " (%d) ElGamal (仅用于加密)\n" #: g10/keygen.c:1356 #, c-format -msgid " (%d) RSA (encrypt only)\n" -msgstr " (%d) RSA (½öÓÃÓÚ¼ÓÃÜ)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (仅用于签字)\n" #: g10/keygen.c:1358 -#, fuzzy, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (½öÓÃÓÚ¼ÓÃÜ)\n" - -#: g10/keygen.c:1409 #, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" -msgstr "" -"½«ÒªÉú³ÉÒ»¸±ÐµÄ%sÃÜÔ¿¶Ô¡£\n" -" ×îСµÄÃÜÔ¿³ß´çÊÇ 768×Ö½Ú\n" -" ĬÈϵÄÃÜÔ¿³ß´çÊÇ 1024×Ö½Ú\n" -" ÍƼöµÄ×î´óÃÜÔ¿³ß´çÊÇ 2048×Ö½Ú\n" - -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " -msgstr "ÄúÏëÒªÓöà´óµÄÃÜÔ¿³ß´ç£¿(1024)" - -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSAµÄÃÜÔ¿³ß´çÖ»ÄܽéÓÚ 512 ºÍ 1024 Ö®¼ä\n" +msgid " (%d) RSA (encrypt only)\n" +msgstr " (%d) RSA (仅用于加密)\n" -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "ÃÜÔ¿³ß´ç̫С£ºRSA ÃÜÔ¿³ß´çÖÁÉÙÒªÓÐ 1024¡£\n" +#: g10/keygen.c:1360 +#, c-format +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (自定义用途)\n" -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "ÃÜÔ¿³ß´ç̫С£»ÖÁÉÙÒªÓÐ 768¡£\n" +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA 密钥对会有 1024 ä½ã€‚\n" #: g10/keygen.c:1439 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "ÃÜÔ¿³ß´çÌ«´ó£»×î´óÖ»Äܹ»Óõ½ %d¡£\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"²»½¨ÒéʹÓóߴç´óÓÚ 2048 µÄÃÜÔ¿£¬\n" -"ÒòΪ¼ÆËãÕæµÄ»á»¨È¥ºÜ¶àʱ¼ä£¡\n" -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "ÄúÈ·¶¨ÒªÓÃÕâ¸öÃÜÔ¿³ß´çÂ𣿠" +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " +msgstr "您想è¦ç”¨å¤šå¤§çš„密钥尺寸？(1024)" -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" -msgstr "ºÃ°É£¬µ«ÊÇÇë¼ÇסÄúµÄÆÁÄ»ºÍ¼üÅÌÒ²ÊÇÏ൱Ò×±»¿úÊӵģ¡\n" +#: g10/keygen.c:1460 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" -msgstr "ÄúËùÒªÇóµÄÃÜÔ¿³ß´çÊÇ %u ×Ö½Ú\n" +msgstr "您所è¦æ±‚的密钥尺寸是 %u ä½\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" -msgstr "ÉáÈëµ½ %u ×Ö½Ú\n" +msgstr "èˆå…¥åˆ° %u ä½\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3684,14 +3625,14 @@ " m = key expires in n months\n" " y = key expires in n years\n" msgstr "" -"ÇëÉ趨Õâ°ÑÃÜÔ¿µÄÓÐЧÆÚÏÞ¡£\n" -" 0 = ÃÜÔ¿ÓÀ²»¹ýÆÚ\n" -" = ÃÜÔ¿ÔÚ n Ììºó¹ýÆÚ\n" -" w = ÃÜÔ¿ÔÚ n Öܺó¹ýÆÚ\n" -" m = ÃÜÔ¿ÔÚ n Ôºó¹ýÆÚ\n" -" y = ÃÜÔ¿ÔÚ n Äêºó¹ýÆÚ\n" +"请设定这把密钥的有效期é™ã€‚\n" +" 0 = 密钥永ä¸è¿‡æœŸ\n" +" = 密钥在 n 天åŽè¿‡æœŸ\n" +" w = 密钥在 n 周åŽè¿‡æœŸ\n" +" m = 密钥在 n 月åŽè¿‡æœŸ\n" +" y = 密钥在 n å¹´åŽè¿‡æœŸ\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3700,50 +3641,48 @@ " m = signature expires in n months\n" " y = signature expires in n years\n" msgstr "" -"ÇëÉ趨Õâ·ÝÇ©×ÖµÄÓÐЧÆÚÏÞ¡£\n" -" 0 = Ç©×ÖÓÀ²»¹ýÆÚ\n" -" = Ç©×ÖÔÚ n Ììºó¹ýÆÚ\n" -" w = Ç©×ÖÔÚ n Öܺó¹ýÆÚ\n" -" m = Ç©×ÖÔÚ n Ôºó¹ýÆÚ\n" -" y = Ç©×ÖÔÚ n Äêºó¹ýÆÚ\n" +"请设定这份签字的有效期é™ã€‚\n" +" 0 = 签字永ä¸è¿‡æœŸ\n" +" = 签字在 n 天åŽè¿‡æœŸ\n" +" w = 签字在 n 周åŽè¿‡æœŸ\n" +" m = 签字在 n 月åŽè¿‡æœŸ\n" +" y = 签字在 n å¹´åŽè¿‡æœŸ\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " -msgstr "ÃÜÔ¿µÄÓÐЧÆÚÏÞÊÇ£¿(0) " +msgstr "密钥的有效期é™æ˜¯ï¼Ÿ(0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " -msgstr "Ç©×ÖµÄÓÐЧÆÚÏÞÊǶà¾Ã£¿(0) " +msgstr "签字的有效期é™æ˜¯å¤šä¹…？(0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" -msgstr "ÎÞЧµÄÊýÖµ\n" +msgstr "无效的数值\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" -msgstr "%s ÓÀÔ¶²»»á¹ýÆÚ\n" +msgstr "%s 永远ä¸ä¼šè¿‡æœŸ\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" -msgstr "%s ½«ÔÚ %s ¹ýÆÚ\n" +msgstr "%s 将在 %s 过期\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" msgstr "" -"ÄúµÄϵͳÎÞ·¨ÏÔʾ 2038 ÄêÒÔºóµÄÈÕÆÚ¡£\n" -"²»¹ý£¬Ëü¿ÉÒÔÕýÈ·´¦Àí 2106 Äê֮ǰµÄÄê·Ý¡£\n" +"您的系统无法显示 2038 年以åŽçš„日期。\n" +"ä¸è¿‡ï¼Œå®ƒå¯ä»¥æ­£ç¡®å¤„ç† 2106 年之å‰çš„年份。\n" -#: g10/keygen.c:1577 -#, fuzzy +#: g10/keygen.c:1589 msgid "Is this correct? (y/N) " -msgstr "ÒÔÉÏÕýÈ·Âð£¿(y/n)" +msgstr "以上正确å—？(y/n)" -#: g10/keygen.c:1620 -#, fuzzy +#: g10/keygen.c:1632 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3753,911 +3692,903 @@ "\n" msgstr "" "\n" -"ÄúÐèÒªÒ»¸öÓû§±êʶÀ´±æʶÄúµÄÃÜÔ¿£»±¾Èí¼þ»áÓÃÕæʵÐÕÃû¡¢\n" -"×¢Êͺ͵ç×ÓÓʼþµØÖ·×éºÏ³ÉÓû§±êʶ£¬ÈçÏÂËùʾ£º\n" -" ¡°Heinrich Heine (Der Dichter) ¡±\n" +"您需è¦ä¸€ä¸ªç”¨æˆ·æ ‡è¯†æ¥è¾¨è¯†æ‚¨çš„密钥；本软件会用真实姓åã€æ³¨é‡Šå’Œç”µå­é‚®ä»¶åœ°å€ç»„" +"åˆ\n" +"æˆç”¨æˆ·æ ‡è¯†ï¼Œå¦‚下所示：\n" +" “Heinrich Heine (Der Dichter) â€\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " -msgstr "ÕæʵÐÕÃû£º" +msgstr "真实姓å：" -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" -msgstr "ÐÕÃûº¬ÓÐÎÞЧµÄ×Ö·û\n" +msgstr "姓åå«æœ‰æ— æ•ˆçš„字符\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" -msgstr "ÐÕÃû²»¿ÉÒÔÓÃÊý×Ö¿ªÍ·\n" +msgstr "姓åä¸å¯ä»¥ç”¨æ•°å­—开头\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" -msgstr "ÐÕÃûÖÁÉÙÒªÓÐÎå¸ö×Ö·û³¤\n" +msgstr "姓å至少è¦æœ‰äº”个字符长\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " -msgstr "µç×ÓÓʼþµØÖ·£º" +msgstr "电å­é‚®ä»¶åœ°å€ï¼š" -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" -msgstr "µç×ÓÓʼþµØÖ·ÎÞЧ\n" +msgstr "电å­é‚®ä»¶åœ°å€æ— æ•ˆ\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " -msgstr "×¢ÊÍ£º" +msgstr "注释：" -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" -msgstr "×¢Êͺ¬ÓÐÎÞЧµÄ×Ö·û\n" +msgstr "注释å«æœ‰æ— æ•ˆçš„字符\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" -msgstr "ÄúÕýÔÚʹÓá®%s¡¯×Ö·û¼¯¡£\n" +msgstr "您正在使用‘%s’字符集。\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" " \"%s\"\n" "\n" msgstr "" -"ÄúÑ¡ÔñÁËÕâ¸öÓû§±êʶ£º\n" -" ¡°%s¡±\n" +"您选择了这个用户标识：\n" +" “%sâ€\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" -msgstr "Çë²»Òª°Ñµç×ÓÓʼþµØÖ··Å½øÄúµÄÕæʵÐÕÃû»ò×¢ÊÍÀï\n" +msgstr "请ä¸è¦æŠŠç”µå­é‚®ä»¶åœ°å€æ”¾è¿›æ‚¨çš„真实姓å或注释里\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " -msgstr "¸ü¸ÄÐÕÃû(N)¡¢×¢ÊÍ(C)¡¢µç×ÓÓʼþµØÖ·(E)»òÍ˳ö(Q)£¿" +msgstr "更改姓å(N)ã€æ³¨é‡Š(C)ã€ç”µå­é‚®ä»¶åœ°å€(E)或退出(Q)？" -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " -msgstr "¸ü¸ÄÐÕÃû(N)¡¢×¢ÊÍ(C)¡¢µç×ÓÓʼþµØÖ·(E)»òÈ·¶¨(O)/Í˳ö(Q)£¿" +msgstr "更改姓å(N)ã€æ³¨é‡Š(C)ã€ç”µå­é‚®ä»¶åœ°å€(E)或确定(O)/退出(Q)？" -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" -msgstr "ÇëÏȸÄÕý´íÎó\n" +msgstr "请先改正错误\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" msgstr "" -"ÄúÐèÒªÒ»¸öÃÜÂëÀ´±£»¤ÄúµÄ˽Կ¡£\n" +"您需è¦ä¸€ä¸ªå¯†ç æ¥ä¿æŠ¤æ‚¨çš„ç§é’¥ã€‚\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" "using this program with the option \"--edit-key\".\n" "\n" msgstr "" -"Äú²»ÏëÒªÓÐÃÜÂ롪¡ªÕâ¸öÏ뷨ʵÔÚÊÇÔâ͸ÁË£¡\n" -"²»¹ý£¬ÎÒÈÔÈ»»áÕÕÄúÏëµÄÈ¥×ö¡£ÄúÈκÎʱºò¶¼¿ÉÒÔ±ä¸üÄúµÄÃÜÂ룬\n" -"½öÐèÒªÔÙ´ÎÖ´ÐÐÕâ¸ö³ÌÐò£¬²¢ÇÒʹÓá°--edit-key¡±Ñ¡Ïî¼´¿É¡£\n" +"您ä¸æƒ³è¦æœ‰å¯†ç â€•â€•è¿™ä¸ªæƒ³æ³•å®žåœ¨æ˜¯é­é€äº†ï¼\n" +"ä¸è¿‡ï¼Œæˆ‘ä»ç„¶ä¼šç…§æ‚¨æƒ³çš„去åšã€‚您任何时候都å¯ä»¥å˜æ›´æ‚¨çš„密ç ï¼Œä»…需è¦\n" +"å†æ¬¡æ‰§è¡Œè¿™ä¸ªç¨‹åºï¼Œå¹¶ä¸”使用“--edit-keyâ€é€‰é¡¹å³å¯ã€‚\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" msgstr "" -"ÎÒÃÇÐèÒªÉú³É´óÁ¿µÄËæ»ú×Ö½Ú¡£Õâ¸öʱºòÄú¿ÉÒÔ¶à×öЩËöÊÂ\n" -"(ÏñÊÇÇôò¼üÅÌ¡¢Òƶ¯Êó±ê¡¢¶ÁдӲÅÌÖ®ÀàµÄ)\n" -"Õâ»áÈÃËæ»úÊý×Ö·¢ÉúÆ÷ÓиüºÃµÄ»ú»á»ñµÃ×ã¹»µÄìØÊý¡£\n" - -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA ÃÜÔ¿¶Ô»áÓÐ 1024 ×Ö½Ú¡£\n" +"我们需è¦ç”Ÿæˆå¤§é‡çš„éšæœºå­—节。这个时候您å¯ä»¥å¤šåšäº›ç事(åƒæ˜¯æ•²æ‰“键盘ã€ç§»åŠ¨\n" +"é¼ æ ‡ã€è¯»å†™ç¡¬ç›˜ä¹‹ç±»çš„)，这会让éšæœºæ•°å­—å‘生器有更好的机会获得足够的熵数。\n" -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" -msgstr "ÃÜÔ¿Éú³ÉÒÑÈ¡Ïû¡£\n" +msgstr "密钥生æˆå·²å–消。\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" -msgstr "ÕýÔÚ½«¹«Ô¿Ð´ÖÁ`%s'\n" +msgstr "正在将公钥写至`%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 -#, fuzzy, c-format +#: g10/keygen.c:2761 g10/keygen.c:2899 +#, c-format msgid "writing secret key stub to `%s'\n" -msgstr "ÕýÔÚ½«Ë½Ô¿Ð´ÖÁ`%s'\n" +msgstr "å‘‘%s’写入ç§é’¥å ä½ç¬¦\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" -msgstr "ÕýÔÚ½«Ë½Ô¿Ð´ÖÁ`%s'\n" +msgstr "正在将ç§é’¥å†™è‡³`%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" -msgstr "ÕÒ²»µ½¿ÉдµÄ¹«Ô¿Ô¿³×»·£º%s\n" +msgstr "找ä¸åˆ°å¯å†™çš„公钥钥匙环：%s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" -msgstr "ÕÒ²»µ½¿ÉдµÄ˽ԿԿ³×»·£º%s\n" +msgstr "找ä¸åˆ°å¯å†™çš„ç§é’¥é’¥åŒ™çŽ¯ï¼š%s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" -msgstr "дÈ빫ԿԿ³×»·¡®%s¡¯Ê±·¢Éú´íÎó£º %s\n" +msgstr "写入公钥钥匙环‘%s’时å‘生错误： %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" -msgstr "дÈë˽ԿԿ³×»·¡®%s¡¯Ê±·¢Éú´íÎó£º %s\n" +msgstr "写入ç§é’¥é’¥åŒ™çŽ¯â€˜%s’时å‘生错误： %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" -msgstr "¹«Ô¿ºÍ˽ԿÒѾ­Éú³É²¢¾­Ç©×Ö¡£\n" +msgstr "公钥和ç§é’¥å·²ç»ç”Ÿæˆå¹¶ç»ç­¾å­—。\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -"Çë×¢ÒâÕâ°ÑÃÜÔ¿»¹²»ÄÜÓÃÀ´¼ÓÃÜ£¬Äú±ØÐëÏÈÓá°--edit-key¡±Ö¸Áî\n" -"Éú³ÉÓÃÓÚ¼ÓÃܵÄ×ÓÔ¿¡£\n" +"请注æ„这把密钥还ä¸èƒ½ç”¨æ¥åŠ å¯†ï¼Œæ‚¨å¿…须先用“--edit-keyâ€æŒ‡ä»¤\n" +"生æˆç”¨äºŽåŠ å¯†çš„å­é’¥ã€‚\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" -msgstr "Éú³ÉÃÜԿʧ°Ü£º%s\n" +msgstr "生æˆå¯†é’¥å¤±è´¥ï¼š%s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" -msgstr "ÃÜÔ¿ÊÇÔÚ %lu ÃëºóµÄδÀ´Éú³ÉµÄ(¿ÉÄÜÊÇÒòΪʱ¿ÕŤÇú»òʱÖÓµÄÎÊÌâ)\n" +msgstr "密钥是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" -msgstr "ÃÜÔ¿ÊÇÔÚ %lu ÃëºóµÄδÀ´Éú³ÉµÄ(¿ÉÄÜÊÇÒòΪʱ¿ÕŤÇú»òʱÖÓµÄÎÊÌâ)\n" +msgstr "密钥是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" -msgstr "×¢Ò⣺Ϊ v3 ÃÜÔ¿Éú³É×ÓÔ¿»áʧȥ OpenPGP ¼æÈÝÐÔ\n" +msgstr "注æ„：为 v3 密钥生æˆå­é’¥ä¼šå¤±åŽ» OpenPGP 兼容性\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 -#, fuzzy +#: g10/keygen.c:3052 g10/keygen.c:3174 msgid "Really create? (y/N) " -msgstr "ÕæµÄÒª½¨Á¢Â𣿠" +msgstr "真的è¦å»ºç«‹å—？(y/N)" -#: g10/keygen.c:3315 -#, fuzzy, c-format +#: g10/keygen.c:3327 +#, c-format msgid "storing key onto card failed: %s\n" -msgstr "ɾ³ýÃÜÔ¿Çø¿éʱʧ°Ü£º%s\n" +msgstr "å‘å¡ä¸Šå­˜å‚¨å¯†é’¥æ—¶å¤±è´¥ï¼š%s\n" -#: g10/keygen.c:3362 -#, fuzzy, c-format +#: g10/keygen.c:3374 +#, c-format msgid "can't create backup file `%s': %s\n" -msgstr "ÎÞ·¨½¨Á¢¡®%s¡¯£º%s\n" +msgstr "ä¸èƒ½åˆ›å»ºå¤‡ä»½æ–‡ä»¶â€˜%s’：%s\n" -#: g10/keygen.c:3385 -#, fuzzy, c-format +#: g10/keygen.c:3397 +#, c-format msgid "NOTE: backup of card key saved to `%s'\n" -msgstr "×¢Ò⣺˽Կ %08lX ÒÑÓÚ %s ¹ýÆÚ\n" +msgstr "注æ„：å¡å¯†é’¥çš„备份已ä¿å­˜åˆ°â€˜%s’\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" -msgstr "" +msgstr "RSA 余数的长度ä¸ä¸º %d\n" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" -msgstr "" +msgstr "公钥指数太大(超过 32 ä½)\n" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" -msgstr "" +msgstr "RSA 质数的长度ä¸ä¸º %d\n" #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533 msgid "never " -msgstr "ÓÀ²»¹ýÆÚ" +msgstr "æ°¸ä¸è¿‡æœŸ" #: g10/keylist.c:201 msgid "Critical signature policy: " -msgstr "¹Ø¼üÇ©×Ö²ßÂÔ£º" +msgstr "关键签字策略：" #: g10/keylist.c:203 msgid "Signature policy: " -msgstr "Ç©×Ö²ßÂÔ£º" +msgstr "签字策略：" #: g10/keylist.c:242 msgid "Critical preferred keyserver: " -msgstr "" +msgstr "关键首选公钥æœåŠ¡å™¨ï¼š" #: g10/keylist.c:291 g10/keylist.c:335 msgid "WARNING: invalid notation data found\n" -msgstr "¾¯¸æ£ºÕÒµ½ÎÞЧµÄ±ê¼ÇÊý¾Ý\n" +msgstr "警告：找到无效的标记数æ®\n" #: g10/keylist.c:309 msgid "Critical signature notation: " -msgstr "¹Ø¼üÇ©×Ö±ê¼Ç£º" +msgstr "关键签字标记：" #: g10/keylist.c:311 msgid "Signature notation: " -msgstr "Ç©×Ö±ê¼Ç£º" +msgstr "签字标记：" #: g10/keylist.c:322 msgid "not human readable" -msgstr "²»ÊÇÈËÀàÄܶÁ¶®µÄ" +msgstr "ä¸æ˜¯äººç±»èƒ½è¯»æ‡‚çš„" #: g10/keylist.c:423 msgid "Keyring" -msgstr "Ô¿³×»·" +msgstr "钥匙环" -# of subkey #: g10/keylist.c:729 -#, fuzzy, c-format +#, c-format msgid "expired: %s)" -msgstr " [ÓÐЧÆÚÖÁ£º%s]" +msgstr "已过期：%s)" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" -msgstr "Ö÷Ô¿Ö¸ÎÆ£º" +msgstr "主钥指纹：" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" -msgstr "×ÓÔ¿Ö¸ÎÆ£º" +msgstr "å­é’¥æŒ‡çº¹ï¼š" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" -msgstr " Ö÷Ô¿Ö¸ÎÆ£º" +msgstr " 主钥指纹：" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" -msgstr " ×ÓÔ¿Ö¸ÎÆ£º" +msgstr " å­é’¥æŒ‡çº¹ï¼š" # use tty -#: g10/keylist.c:1446 g10/keylist.c:1450 -#, fuzzy +#: g10/keylist.c:1440 g10/keylist.c:1444 msgid " Key fingerprint =" -msgstr " ÃÜÔ¿Ö¸ÎÆ =" +msgstr " 密钥指纹 =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" -msgstr "" +msgstr " å¡åºåˆ—å· =" #: g10/keyring.c:1245 -#, fuzzy, c-format +#, c-format msgid "renaming `%s' to `%s' failed: %s\n" -msgstr "½øÐÐ ASCII ·âװʧ°Ü£º%s\n" +msgstr "将‘%s’é‡å‘½å为‘%s’时失败：%s\n" #: g10/keyring.c:1251 msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "¾¯¸æ£ºÁ½¸öÎļþ´æÔÚÓл¥Ïàì¶ÜµÄÐÅÏ¢¡£\n" +msgstr "警告：两个文件存在有互相矛盾的信æ¯ã€‚\n" #: g10/keyring.c:1253 #, c-format msgid "%s is the unchanged one\n" -msgstr "%s ÊÇûÓиıäµÄÄÇÒ»¸ö\n" +msgstr "%s 是没有改å˜çš„那一个\n" #: g10/keyring.c:1254 #, c-format msgid "%s is the new one\n" -msgstr "%s ÊÇеÄÄÇÒ»¸ö\n" +msgstr "%s 是新的那一个\n" #: g10/keyring.c:1255 msgid "Please fix this possible security flaw\n" -msgstr "ÇëÐÞ²¹Õâ¸ö¿ÉÄܵݲȫÐÔ©¶´\n" +msgstr "请修补这个å¯èƒ½çš„安全性æ¼æ´ž\n" #: g10/keyring.c:1375 -#, fuzzy, c-format +#, c-format msgid "caching keyring `%s'\n" -msgstr "ÕýÔÚ¼ì²éÔ¿³×»·¡®%s¡¯\n" +msgstr "缓存钥匙环‘%s’\n" #: g10/keyring.c:1421 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached so far (%lu signatures)\n" -msgstr "ÒѼì²é %lu °ÑÃÜÔ¿(%lu ·ÝÇ©×Ö)\n" +msgstr "ç›®å‰å·²ç¼“å­˜ %lu 把密钥(%lu 份签字)\n" #: g10/keyring.c:1433 -#, fuzzy, c-format +#, c-format msgid "%lu keys cached (%lu signatures)\n" -msgstr "ÒѼì²é %lu °ÑÃÜÔ¿(%lu ·ÝÇ©×Ö)\n" +msgstr "缓存了 %lu 把密钥(%lu 份签字)\n" #: g10/keyring.c:1504 #, c-format msgid "%s: keyring created\n" -msgstr "%s£ºÔ¿³×»·Òѽ¨Á¢\n" +msgstr "%s：钥匙环已建立\n" #: g10/keyserver.c:98 -#, fuzzy, c-format +#, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" -msgstr "¾¯¸æ£ºÔÚ¡®%s¡¯ÀïµÄÑ¡ÏîÓÚ´Ë´ÎÔËÐÐÆÚ¼äδ±»Ê¹ÓÃ\n" +msgstr "警告：公钥æœåŠ¡å™¨é€‰é¡¹â€˜%s’在此平å°ä¸Šæ²¡æœ‰è¢«ä½¿ç”¨\n" #: g10/keyserver.c:378 -#, fuzzy msgid "disabled" -msgstr "disable" +msgstr "å·²ç¦ç”¨" #: g10/keyserver.c:579 msgid "Enter number(s), N)ext, or Q)uit > " -msgstr "" +msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" #: g10/keyserver.c:662 g10/keyserver.c:1142 -#, fuzzy, c-format +#, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" -msgstr "ÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "无效的公钥æœåŠ¡å™¨åè®®(us %d!=handler %d)\n" #: g10/keyserver.c:752 -#, fuzzy, c-format +#, c-format msgid "key \"%s\" not found on keyserver\n" -msgstr "ÕÒ²»µ½¡®%s¡¯ÃÜÔ¿£º%s\n" +msgstr "在公钥æœåŠ¡å™¨ä¸Šæ‰¾ä¸åˆ°å¯†é’¥â€œ%sâ€\n" #: g10/keyserver.c:754 -#, fuzzy msgid "key not found on keyserver\n" -msgstr "ÕÒ²»µ½¡®%s¡¯ÃÜÔ¿£º%s\n" +msgstr "在公钥æœåŠ¡å™¨ä¸Šæ‰¾ä¸åˆ°å¯†é’¥\n" #: g10/keyserver.c:896 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s server %s\n" -msgstr "ÕýÔÚ²éѯÃÜÔ¿ %08lX£¬À´×Ô %s\n" +msgstr "下载密钥‘%s’，从 %s æœåŠ¡å™¨ %s\n" #: g10/keyserver.c:900 -#, fuzzy, c-format +#, c-format msgid "requesting key %s from %s\n" -msgstr "ÕýÔÚ²éѯÃÜÔ¿ %08lX£¬À´×Ô %s\n" +msgstr "下载密钥 %s，从 %s\n" #: g10/keyserver.c:1045 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s server %s\n" -msgstr "ÕýÔÚËÑÑ°¡°%s¡±£¬ÔÚ HKP ·þÎñÆ÷ %s ÉÏ\n" +msgstr "将密钥‘%s’上传到 %s æœåŠ¡å™¨ %s\n" #: g10/keyserver.c:1049 -#, fuzzy, c-format +#, c-format msgid "sending key %s to %s\n" -msgstr "" -"¡±\n" -"ÒѾ­Ê¹ÓÃÄúµÄÃÜÔ¿ %08lX ÓÚ %s Ìí¼ÓÇ©×Ö\n" +msgstr "将密钥‘%s’上传到 %s\n" #: g10/keyserver.c:1092 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s server %s\n" -msgstr "ÕýÔÚËÑÑ°¡°%s¡±£¬ÔÚ HKP ·þÎñÆ÷ %s ÉÏ\n" +msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s æœåŠ¡å™¨ %s 上\n" #: g10/keyserver.c:1095 -#, fuzzy, c-format +#, c-format msgid "searching for \"%s\" from %s\n" -msgstr "ÕýÔÚËÑÑ°¡°%s¡±£¬ÔÚ HKP ·þÎñÆ÷ %s ÉÏ\n" +msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s 上\n" #: g10/keyserver.c:1102 g10/keyserver.c:1197 -#, fuzzy msgid "no keyserver action!\n" -msgstr "ÎÞЧµÄµ¼³öÑ¡Ïî\n" +msgstr "公钥æœåŠ¡å™¨æ— åŠ¨ä½œï¼\n" #: g10/keyserver.c:1150 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" -msgstr "" +msgstr "警告：处ç†å…¬é’¥æœåŠ¡å™¨çš„程åºæ¥è‡ªä¸åŒç‰ˆæœ¬çš„ GnuPG (%s)\n" #: g10/keyserver.c:1159 msgid "keyserver did not send VERSION\n" -msgstr "" +msgstr "公钥æœåŠ¡å™¨æœªå‘é€ VERSION\n" #: g10/keyserver.c:1218 msgid "no keyserver known (use option --keyserver)\n" -msgstr "" +msgstr "未给出公钥æœåŠ¡å™¨(使用 --keyserver 选项)\n" #: g10/keyserver.c:1224 msgid "external keyserver calls are not supported in this build\n" -msgstr "" +msgstr "这一编译版本ä¸æ”¯æŒå¤–部调用公钥æœåŠ¡å™¨\n" #: g10/keyserver.c:1236 #, c-format msgid "no handler for keyserver scheme `%s'\n" -msgstr "" +msgstr "没有处ç†â€˜%s’公钥æœåŠ¡å™¨çš„程åº\n" #: g10/keyserver.c:1241 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" -msgstr "" +msgstr "‘%s’æ“作ä¸ä¸ºâ€˜%s’公钥æœåŠ¡å™¨æ‰€æ”¯æŒ\n" #: g10/keyserver.c:1249 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" -msgstr "" +msgstr "gpgkeys_%s ä¸æ”¯æŒå¯¹ç‰ˆæœ¬ %d 的处ç†\n" #: g10/keyserver.c:1254 -#, fuzzy msgid "keyserver timed out\n" -msgstr "¹«Ô¿·þÎñÆ÷´íÎó" +msgstr "公钥æœåŠ¡å™¨è¶…æ—¶\n" #: g10/keyserver.c:1259 -#, fuzzy msgid "keyserver internal error\n" -msgstr "¹«Ô¿·þÎñÆ÷´íÎó" +msgstr "公钥æœåŠ¡å™¨å†…部错误\n" #: g10/keyserver.c:1268 -#, fuzzy, c-format +#, c-format msgid "keyserver communications error: %s\n" -msgstr "ÎÞ·¨´Ó¹«Ô¿·þÎñÆ÷½ÓÊÕ£º%s\n" +msgstr "公钥æœåŠ¡å™¨é€šè®¯é”™è¯¯ï¼š%s\n" #: g10/keyserver.c:1293 g10/keyserver.c:1327 #, c-format msgid "\"%s\" not a key ID: skipping\n" -msgstr "" +msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªç”¨æˆ·æ ‡è¯†ï¼šè·³è¿‡\n" #: g10/keyserver.c:1578 -#, fuzzy, c-format +#, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" -msgstr "¾¯¸æ£ºÎÞ·¨É¾³ýÁÙʱÎļþ(%s)¡®%s¡¯£º%s\n" +msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" #: g10/keyserver.c:1600 -#, fuzzy, c-format +#, c-format msgid "refreshing 1 key from %s\n" -msgstr "ÕýÔÚ²éѯÃÜÔ¿ %08lX£¬À´×Ô %s\n" +msgstr "1 个密钥正从 %s 得到更新\n" #: g10/keyserver.c:1602 -#, fuzzy, c-format +#, c-format msgid "refreshing %d keys from %s\n" -msgstr "ÕýÔÚ²éѯÃÜÔ¿ %08lX£¬À´×Ô %s\n" +msgstr "%d 个密钥正从 %s 得到更新\n" #: g10/mainproc.c:248 #, c-format msgid "weird size for an encrypted session key (%d)\n" -msgstr "¼ÓÃܹýµÄ»á»°ÃÜÔ¿³ß´ç(%d)¹îÒì\n" +msgstr "加密过的会è¯å¯†é’¥å°ºå¯¸(%d)诡异\n" #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" -msgstr "´íÎóµÄÃÜÂë»òδ֪µÄ¶Ô³Æ¼ÓÃÜËã·¨ (%d)\n" +msgstr "密ç ä¸æ­£ç¡®æˆ–未知的对称加密算法(%d)\n" #: g10/mainproc.c:299 #, c-format msgid "%s encrypted session key\n" -msgstr "%s ¼ÓÃܹýµÄ»á»°ÃÜÔ¿\n" +msgstr "%s 加密过的会è¯å¯†é’¥\n" #: g10/mainproc.c:309 -#, fuzzy, c-format +#, c-format msgid "passphrase generated with unknown digest algorithm %d\n" -msgstr "ÒÔδ֪µÄËã·¨ %d ¼ÓÃÜ\n" +msgstr "密ç ç”±æœªçŸ¥çš„散列算法 %d 生æˆ\n" #: g10/mainproc.c:373 -#, fuzzy, c-format +#, c-format msgid "public key is %s\n" -msgstr "¹«Ô¿ÊÇ %08lX\n" +msgstr "公钥是 %s\n" #: g10/mainproc.c:428 msgid "public key encrypted data: good DEK\n" -msgstr "¹«Ô¿¼ÓÃܹýµÄÊý¾Ý£ºÍêºÃµÄ DEK\n" +msgstr "公钥加密过的数æ®ï¼šå®Œå¥½çš„æ•°æ®åŠ å¯†å¯†é’¥\n" #: g10/mainproc.c:461 -#, fuzzy, c-format +#, c-format msgid "encrypted with %u-bit %s key, ID %s, created %s\n" -msgstr "Óó¤¶ÈΪ %u ×Ö½Ú¡¢ÀàÐÍΪ %s¡¢Ô¿³×ºÅΪ %08lX¡¢Éú³ÉÓÚ %s µÄÃÜÔ¿¼ÓÃܹý\n" +msgstr "ç”± %u ä½çš„ %s 密钥加密，钥匙å·ä¸º %sã€ç”ŸæˆäºŽ %s\n" #: g10/mainproc.c:465 g10/pkclist.c:218 -#, fuzzy, c-format +#, c-format msgid " \"%s\"\n" -msgstr " Ò༴ \"" +msgstr " “%sâ€\n" #: g10/mainproc.c:469 -#, fuzzy, c-format +#, c-format msgid "encrypted with %s key, ID %s\n" -msgstr "ÓÃÀàÐÍΪ %s¡¢Ô¿³×ºÅΪ %08lX µÄÃÜÔ¿¼ÓÃܹý\n" +msgstr "ç”± %s 密钥加密ã€é’¥åŒ™å·ä¸º %s\n" #: g10/mainproc.c:483 #, c-format msgid "public key decryption failed: %s\n" -msgstr "¹«Ô¿½âÃÜʧ°Ü£º%s\n" +msgstr "公钥解密失败：%s\n" #: g10/mainproc.c:497 #, c-format msgid "encrypted with %lu passphrases\n" -msgstr "Óà %lu ¸öÃÜÂë¼ÓÃÜ\n" +msgstr "以 %lu 个密ç åŠ å¯†\n" #: g10/mainproc.c:499 msgid "encrypted with 1 passphrase\n" -msgstr "Óà 1 ¸öÃÜÂë¼ÓÃÜ\n" +msgstr "以 1 个密ç åŠ å¯†\n" #: g10/mainproc.c:527 g10/mainproc.c:549 #, c-format msgid "assuming %s encrypted data\n" -msgstr "¼Ù¶¨ %s Ϊ¼ÓÃܹýµÄÊý¾Ý\n" +msgstr "å‡å®š %s 为加密过的数æ®\n" #: g10/mainproc.c:535 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" -msgstr "IDEA Ëã·¨²»¿ÉÓã¬ÊÔÒÔ %s ´úÌæ\n" +msgstr "IDEA 算法ä¸å¯ç”¨ï¼Œè¯•ä»¥ %s 代替\n" #: g10/mainproc.c:567 msgid "decryption okay\n" -msgstr "½âÃܳɹ¦\n" +msgstr "解密æˆåŠŸ\n" #: g10/mainproc.c:571 msgid "WARNING: message was not integrity protected\n" -msgstr "¾¯¸æ£º±¨ÎÄδÊܵ½ÍêÕûµÄ±£»¤\n" +msgstr "警告：报文未å—到完整的ä¿æŠ¤\n" #: g10/mainproc.c:584 msgid "WARNING: encrypted message has been manipulated!\n" -msgstr "¾¯¸æ£º¼ÓÃܹýµÄ±¨ÎÄÒѾ­±äÔ죡\n" +msgstr "警告：加密过的报文已ç»å˜é€ ï¼\n" #: g10/mainproc.c:590 #, c-format msgid "decryption failed: %s\n" -msgstr "½âÃÜʧ°Ü£º%s\n" +msgstr "解密失败：%s\n" #: g10/mainproc.c:610 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "×¢Ò⣺·¢¼þÕßÒªÇóÄú¡°Ö»ÔĶÁ²»´æÅÌ¡±\n" +msgstr "注æ„：å‘件者è¦æ±‚您“åªé˜…读ä¸å­˜ç›˜â€\n" #: g10/mainproc.c:612 #, c-format msgid "original file name='%.*s'\n" -msgstr "ԭʼÎļþÃû =¡®%.*s¡¯\n" +msgstr "原始文件å =‘%.*s’\n" #: g10/mainproc.c:784 msgid "standalone revocation - use \"gpg --import\" to apply\n" -msgstr "¶ÀÁ¢µÄµõÏúÖ¤Ê顪¡ªÇëÓá°gpg --import¡±À´Ó¦ÓÃ\n" +msgstr "独立的åŠé”€è¯ä¹¦â€•â€•è¯·ç”¨â€œgpg --importâ€æ¥åº”用\n" #: g10/mainproc.c:1288 msgid "signature verification suppressed\n" -msgstr "Ç©×ÖÑéÖ¤Òѱ»ÒÖÖÆ\n" +msgstr "签字验è¯å·²è¢«æŠ‘制\n" #: g10/mainproc.c:1330 g10/mainproc.c:1340 msgid "can't handle these multiple signatures\n" -msgstr "ÎÞ·¨´¦ÀíÕâЩ¶àÖØÇ©×Ö\n" +msgstr "无法处ç†è¿™äº›å¤šé‡ç­¾å­—\n" #: g10/mainproc.c:1350 -#, fuzzy, c-format +#, c-format msgid "Signature made %s\n" -msgstr "Õâ·ÝÇ©×ÖÒÑÓÚ %s ¹ýÆÚ¡£\n" +msgstr "签字建立于 %s\n" #: g10/mainproc.c:1351 -#, fuzzy, c-format +#, c-format msgid " using %s key %s\n" -msgstr " Ò༴ \"" +msgstr " 使用 %s 密钥 %s\n" #: g10/mainproc.c:1355 -#, fuzzy, c-format +#, c-format msgid "Signature made %s using %s key ID %s\n" -msgstr "ÓÚ %.*s ½¨Á¢µÄÇ©×Ö£¬Ê¹Óà %s£¬Ô¿³×ºÅ %08lX\n" +msgstr "于 %s 创建的签字，使用 %sï¼Œé’¥åŒ™å· %s\n" #: g10/mainproc.c:1375 msgid "Key available at: " -msgstr "¹«Ô¿¿ÉÈ¡×Ô£º" +msgstr "å¯ç”¨çš„密钥在：" #: g10/mainproc.c:1480 g10/mainproc.c:1528 -#, fuzzy, c-format +#, c-format msgid "BAD signature from \"%s\"" -msgstr "ÒÑË𻵵ÄÇ©×Ö£¬À´×ÔÓÚ\"" +msgstr "å·²æŸå的签字，æ¥è‡ªäºŽâ€œ%sâ€" #: g10/mainproc.c:1482 g10/mainproc.c:1530 -#, fuzzy, c-format +#, c-format msgid "Expired signature from \"%s\"" -msgstr "¹ýÆÚµÄÇ©×Ö£¬À´×ÔÓÚ\"" +msgstr "过期的签字，æ¥è‡ªäºŽâ€œ%sâ€" #: g10/mainproc.c:1484 g10/mainproc.c:1532 -#, fuzzy, c-format +#, c-format msgid "Good signature from \"%s\"" -msgstr "ÍêºÃµÄÇ©×Ö£¬À´×ÔÓÚ\"" +msgstr "完好的签字，æ¥è‡ªäºŽâ€œ%sâ€" #: g10/mainproc.c:1536 msgid "[uncertain]" -msgstr "[²»È·¶¨]" +msgstr "[ä¸ç¡®å®š]" #: g10/mainproc.c:1568 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"" -msgstr " Ò༴ \"" +msgstr " 亦å³â€œ%sâ€" #: g10/mainproc.c:1662 #, c-format msgid "Signature expired %s\n" -msgstr "Õâ·ÝÇ©×ÖÒÑÓÚ %s ¹ýÆÚ¡£\n" +msgstr "这份签字已于 %s 过期。\n" #: g10/mainproc.c:1667 #, c-format msgid "Signature expires %s\n" -msgstr "Õâ·ÝÇ©×ÖÔÚ %s ¹ýÆÚ¡£\n" +msgstr "这份签字在 %s 过期。\n" #: g10/mainproc.c:1670 #, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "%sÇ©×Ö£¬É¢ÁÐËã·¨ %s\n" +msgstr "%s签字，散列算法 %s\n" #: g10/mainproc.c:1671 msgid "binary" -msgstr "¶þ½øÖÆ" +msgstr "二进制" #: g10/mainproc.c:1672 msgid "textmode" -msgstr "Îı¾Ä£Ê½" +msgstr "文本模å¼" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" -msgstr "δ֪" +msgstr "未知" #: g10/mainproc.c:1692 #, c-format msgid "Can't check signature: %s\n" -msgstr "ÎÞ·¨¼ì²éÇ©×Ö£º%s\n" +msgstr "无法检查签字：%s\n" #: g10/mainproc.c:1760 g10/mainproc.c:1776 g10/mainproc.c:1862 msgid "not a detached signature\n" -msgstr "²»ÊÇÒ»·Ý·ÖÀëµÄÇ©×Ö\n" +msgstr "ä¸æ˜¯ä¸€ä»½åˆ†ç¦»çš„签字\n" #: g10/mainproc.c:1803 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" -msgstr "¾¯¸æ£º¼ì²âµ½¶àÖØÇ©×Ö¡£Ö»¼ì²éµÚÒ»¸öÇ©×Ö¡£\n" +msgstr "警告：检测到多é‡ç­¾å­—。åªæ£€æŸ¥ç¬¬ä¸€ä¸ªç­¾å­—。\n" #: g10/mainproc.c:1811 #, c-format msgid "standalone signature of class 0x%02x\n" -msgstr "µÈ¼¶ 0x%02x µÄ¶ÀÁ¢Ç©×Ö\n" +msgstr "等级 0x%02x 的独立签字\n" #: g10/mainproc.c:1868 msgid "old style (PGP 2.x) signature\n" -msgstr "¾Éʽ(PGP 2.x)Ç©×Ö\n" +msgstr "æ—§å¼(PGP 2.x)签字\n" #: g10/mainproc.c:1878 msgid "invalid root packet detected in proc_tree()\n" -msgstr "ÔÚ proc_tree() Öмì²âµ½ÎÞЧµÄ¸ù°ü\n" +msgstr "在 proc_tree() 中检测到无效的根包\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" -msgstr "ÎÞ·¨½ûÓúËÐÄÄÚ´æת´¢£º%s\n" +msgstr "无法ç¦ç”¨æ ¸å¿ƒå†…存转储：%s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 -#, fuzzy, c-format +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 +#, c-format msgid "fstat of `%s' failed in %s: %s\n" -msgstr "ÎÞ·¨´ò¿ªÎļþ£º%s\n" +msgstr "‘%s’的 fstat 在 %s 中出错：%s\n" -#: g10/misc.c:186 -#, fuzzy, c-format +#: g10/misc.c:190 +#, c-format msgid "fstat(%d) failed in %s: %s\n" -msgstr "ÐÅÈζÈÊý¾Ý¿â£º¶Áȡʧ°Ü(n=%d)£º%s\n" +msgstr "fstat(%d) 在 %s 中出错：%s\n" + +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "无法æ“作公钥算法 %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "尚未实现的对称加密算法" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s签字，散列算法 %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "²»Ó¦Ê¹ÓÃʵÑéÐÔµÄËã·¨£¡\n" - -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "²»ÍƼöʹÓÃÕâ¸ö¼ÓÃÜËã·¨£»Çë»»Óøü·ûºÏ±ê×¼µÄËã·¨£¡\n" +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "警告：强行使用的 %s (%d)散列算法ä¸åœ¨æ”¶ä»¶è€…的首选项中\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" -msgstr "IDEA Ëã·¨²å¼þ²»´æÔÚ\n" +msgstr "IDEA 算法æ’件ä¸å­˜åœ¨\n" #: g10/misc.c:431 msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" -msgstr "Çë·ÃÎÊ http://www.gnupg.org/why-not-idea.html ÒÔ»ñµÃ¸üÏêϸµÄÐÅÏ¢\n" +msgstr "请访问 http://www.gnupg.org/why-not-idea.html 以获得更详细的信æ¯\n" #: g10/misc.c:664 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" -msgstr "%s:%d£º½¨Ò鲻ʹÓõÄÑ¡Ïî¡°%s¡±\n" +msgstr "%s:%d：ä¸å»ºè®®ä½¿ç”¨è¯¥é€‰é¡¹â€œ%sâ€\n" #: g10/misc.c:668 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" -msgstr "¾¯¸æ£º¡°%s¡±Ñ¡ÏîÒѲ»½¨ÒéʹÓÃ\n" +msgstr "警告：“%sâ€é€‰é¡¹å·²ä¸å»ºè®®ä½¿ç”¨\n" #: g10/misc.c:670 #, c-format msgid "please use \"%s%s\" instead\n" -msgstr "ÇëÒÔ¡°%s%s¡±´úÌæ\n" +msgstr "请以“%s%sâ€ä»£æ›¿\n" #: g10/misc.c:681 msgid "Uncompressed" -msgstr "δ¾­Ñ¹Ëõ" +msgstr "ä¸åŽ‹ç¼©" #: g10/misc.c:706 -#, fuzzy msgid "uncompressed|none" -msgstr "δ¾­Ñ¹Ëõ" +msgstr "未压缩|æ— " #: g10/misc.c:816 #, c-format msgid "this message may not be usable by %s\n" -msgstr "%s Ò²Ðí²»ÄÜʹÓÃÕâ¸ö±¨ÎÄ\n" +msgstr "%s 也许ä¸èƒ½ä½¿ç”¨è¿™ä¸ªæŠ¥æ–‡\n" #: g10/misc.c:973 -#, fuzzy, c-format +#, c-format msgid "ambiguous option `%s'\n" -msgstr "´Ó¡®%s¡¯¶ÁÈ¡Ñ¡Ïî\n" +msgstr "有歧义的选项‘%s’\n" #: g10/misc.c:998 -#, fuzzy, c-format +#, c-format msgid "unknown option `%s'\n" -msgstr "δ֪µÄĬÈÏÊÕ¼þÕß¡®%s¡¯\n" +msgstr "未知的选项 '%s'\n" #: g10/openfile.c:84 #, c-format msgid "File `%s' exists. " -msgstr "Îļþ¡®%s¡¯ÒÑ´æÔÚ¡£ " +msgstr "文件‘%s’已存在。 " #: g10/openfile.c:86 -#, fuzzy msgid "Overwrite? (y/N) " -msgstr "ÊÇ·ñ¸²¸Ç(y/N)£¿" +msgstr "是å¦è¦†ç›–？(y/N)" #: g10/openfile.c:119 #, c-format msgid "%s: unknown suffix\n" -msgstr "%s£ºÎ´ÖªµÄºó׺Ãû\n" +msgstr "%s：未知的åŽç¼€å\n" #: g10/openfile.c:141 msgid "Enter new filename" -msgstr "ÇëÊäÈëеÄÎļþÃû" +msgstr "请输入新的文件å" #: g10/openfile.c:184 msgid "writing to stdout\n" -msgstr "ÕýÔÚдÈëµ½±ê×¼Êä³ö\n" +msgstr "正在写入到标准输出\n" #: g10/openfile.c:296 #, c-format msgid "assuming signed data in `%s'\n" -msgstr "¼Ù¶¨±»Ç©×ÖµÄÊý¾ÝÔÚ¡®%s¡¯\n" +msgstr "å‡å®šè¢«ç­¾å­—çš„æ•°æ®æ˜¯â€˜%s’\n" #: g10/openfile.c:375 #, c-format msgid "new configuration file `%s' created\n" -msgstr "еÄÅäÖÃÎļþ¡®%s¡¯Òѽ¨Á¢\n" +msgstr "æ–°çš„é…置文件‘%s’已建立\n" #: g10/openfile.c:377 #, c-format msgid "WARNING: options in `%s' are not yet active during this run\n" -msgstr "¾¯¸æ£ºÔÚ¡®%s¡¯ÀïµÄÑ¡ÏîÓÚ´Ë´ÎÔËÐÐÆÚ¼äδ±»Ê¹ÓÃ\n" +msgstr "警告：在‘%s’里的选项于此次è¿è¡ŒæœŸé—´æœªè¢«ä½¿ç”¨\n" #: g10/openfile.c:409 -#, fuzzy, c-format +#, c-format msgid "directory `%s' created\n" -msgstr "%s£ºÒÑ´´½¨Ä¿Â¼\n" +msgstr "已创建目录‘%s’\n" #: g10/parse-packet.c:119 #, c-format msgid "can't handle public key algorithm %d\n" -msgstr "ÎÞ·¨²Ù×÷¹«Ô¿Ëã·¨ %d\n" +msgstr "无法æ“作公钥算法 %d\n" #: g10/parse-packet.c:688 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" -msgstr "¾¯¸æ£º´æÔÚDZÔÚ°²È«ÍþвµÄ¶Ô³Æ¼ÓÃܻỰÃÜÔ¿\n" +msgstr "警告：潜在ä¸å®‰å…¨çš„对称加密会è¯å¯†é’¥\n" #: g10/parse-packet.c:1112 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "%d Àà±ðµÄ×Ó°üÉ趨Á˹ؼü×Ö½Ú\n" +msgstr "%d 类别的å­åŒ…设定了关键ä½\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" -msgstr "gpg-agent ÔÚ´Ë´ÎÉá»°ÖÐÎÞ·¨Ê¹ÓÃ\n" +msgstr "gpg-agent 在此次èˆè¯ä¸­æ— æ³•ä½¿ç”¨\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" -msgstr "ÎÞ·¨É趨´úÀí³ÌÐò¿Í»§¶ËµÄ½ø³Ì±êʶ\n" +msgstr "无法设定代ç†ç¨‹åºå®¢æˆ·ç«¯çš„进程标识\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" -msgstr "ÎÞ·¨È¡µÃ´úÀí³ÌÐòËùÐèµÄ·þÎñÆ÷¶ÁÈ¡ÎļþÃèÊö·û\n" +msgstr "无法å–得代ç†ç¨‹åºæ‰€éœ€çš„æœåŠ¡å™¨è¯»å–文件æ述符\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" -msgstr "ÎÞ·¨È¡µÃ´úÀí³ÌÐòËùÐèµÄ·þÎñÆ÷дÈëÎļþÃèÊö·û\n" +msgstr "无法å–得代ç†ç¨‹åºæ‰€éœ€çš„æœåŠ¡å™¨å†™å…¥æ–‡ä»¶æ述符\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" -msgstr "GPG_AGENT_INFO »·¾³±äÁ¿¸ñʽ´íÎó\n" +msgstr "GPG_AGENT_INFO 环境å˜é‡æ ¼å¼é”™è¯¯\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" -msgstr "²»Ö§³Ö gpg-agent ЭÒé°æ±¾ %d\n" +msgstr "ä¸æ”¯æŒ gpg-agent å议版本 %d\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" -msgstr "ÎÞ·¨Á¬½ÓÖÁ¡®%s¡¯£º%s\n" +msgstr "无法连接至‘%s’：%s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" -msgstr "Óë gpg-agent ͨѶÓÐÎÊÌâ\n" +msgstr "与 gpg-agent 通讯有问题\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" -msgstr "´úÀí³ÌÐòµÄÎÊÌ⡪¡ªÕýÔÚÍ£ÓôúÀí³ÌÐò\n" +msgstr "代ç†ç¨‹åºçš„问题――正在åœç”¨ä»£ç†ç¨‹åº\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 -#, fuzzy, c-format +#: g10/passphrase.c:698 g10/passphrase.c:1203 +#, c-format msgid " (main key ID %s)" -msgstr "(Ö÷Ô¿³×ºÅ %08lX)" +msgstr "(ä¸»é’¥åŒ™å· %s)" -#: g10/passphrase.c:698 -#, fuzzy, c-format +#: g10/passphrase.c:712 +#, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" "\"%.*s\"\n" "%u-bit %s key, ID %s, created %s%s\n" msgstr "" -"ÄúÐèÒªÏÂÁÐÓû§µÄÃÜÂëÀ´½â¿ªË½Ô¿£º\n" -"¡°%.*s¡±\n" -"%u ×Ö½ÚµÄ %s ÃÜÔ¿£¬Ô¿³×ºÅ %08lX£¬½¨Á¢ÓÚ %s%s\n" +"您需è¦è¿™ä¸ªç”¨æˆ·çš„密ç æ¥è§£å¼€ç§é’¥ï¼š\n" +"“%.*sâ€\n" +"%u ä½çš„ %s å¯†é’¥ï¼Œé’¥åŒ™å· %s，建立于 %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" -msgstr "ÇëÔÙÊäÈëÒ»´ÎÃÜÂë\n" +msgstr "请å†è¾“入一次密ç \n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" -msgstr "ÇëÊäÈëÃÜÂë\n" +msgstr "请输入密ç \n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" -msgstr "ÃÜÂëÌ«³¤\n" +msgstr "密ç å¤ªé•¿\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" -msgstr "´úÀí³ÌÐòÏìÓ¦ÎÞЧ\n" +msgstr "代ç†ç¨‹åºå“应无效\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" -msgstr "Óû§È¡Ïû\n" +msgstr "用户å–消\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" -msgstr "´úÀí³ÌÐòµÄÎÊÌ⣺´úÀí³ÌÐò·µ»Ø 0x%lx\n" +msgstr "代ç†ç¨‹åºçš„问题：代ç†ç¨‹åºè¿”回 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 -#, fuzzy -msgid "can't query password in batch mode\n" -msgstr "ÔÚÅú´¦ÀíģʽÖÐÎÞ·¨Ñ¯ÎÊÃÜÂë\n" +#: g10/passphrase.c:1094 g10/passphrase.c:1256 +msgid "can't query passphrase in batch mode\n" +msgstr "在批处ç†æ¨¡å¼ä¸­æ— æ³•æŸ¥è¯¢å¯†ç \n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " -msgstr "ÇëÊäÈëÃÜÂ룺" +msgstr "请输入密ç ï¼š" -#: g10/passphrase.c:1141 -#, fuzzy, c-format +#: g10/passphrase.c:1184 +#, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" -msgstr "" -"\n" -"ÄúÐèÒªÏÂÁÐʹÓÃÕßµÄÃÜÂ룬²ÅÄܽ⿪˽Կ£º\n" -"\"" +msgstr "您需è¦è¾“入密ç ï¼Œæ‰èƒ½è§£å¼€è¿™ä¸ªç”¨æˆ·çš„ç§é’¥ï¼šâ€œ%sâ€\n" -#: g10/passphrase.c:1147 -#, fuzzy, c-format +#: g10/passphrase.c:1190 +#, c-format msgid "%u-bit %s key, ID %s, created %s" -msgstr "%u ×Ö½ÚµÄ %s ÃÜÔ¿£¬Ô¿³×ºÅ %08lX£¬½¨Á¢ÓÚ %s" +msgstr "%u ä½çš„ %s å¯†é’¥ï¼Œé’¥åŒ™å· %s，建立于 %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" -msgstr "" +msgstr " (主钥 %s çš„å­é’¥)" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " -msgstr "ÇëÔÙÊäÈëÒ»´ÎÃÜÂ룺" +msgstr "请å†è¾“入一次密ç ï¼š" #: g10/photoid.c:66 msgid "" @@ -4668,70 +4599,68 @@ "Keeping the image close to 240x288 is a good size to use.\n" msgstr "" "\n" -"ÇëÌôÑ¡Ò»ÕÅͼƬ×÷ΪÄúµÄÕÕƬ±êʶ ¡£ÕâÕÅͼƬһ¶¨ÒªÊÇJPEGÎļþ¡£\n" -"Çë¼ÇסÕâÕÅͼƬ»á±»´æ·ÅÔÚÄúµÄ¹«Ô¿Àï¡£Èç¹ûÄúÌôÁ˷dz£´óµÄͼƬµÄ»°£¬\n" -"ÄúµÄÃÜÔ¿Ò²»á±ä³É·Ç³£´ó£¡\n" -"Ç뾡Á¿°ÑͼƬ³ß´ç¿ØÖÆÔÚ240x288×óÓÒ£¬ÕâÊǸöÀíÏëµÄ³ß´ç¡£\n" +"请挑选一张图片作为您的照片标识 。这张图片一定è¦æ˜¯JPEG文件。请记ä½è¿™å¼ å›¾\n" +"片会被存放在您的公钥里。如果您挑了éžå¸¸å¤§çš„图片的è¯ï¼Œæ‚¨çš„密钥也会å˜å¾—éž\n" +"常大ï¼è¯·å°½é‡æŠŠå›¾ç‰‡å°ºå¯¸æŽ§åˆ¶åœ¨240x288å·¦å³ï¼Œè¿™æ˜¯ä¸ªç†æƒ³çš„尺寸。\n" #: g10/photoid.c:80 msgid "Enter JPEG filename for photo ID: " -msgstr "ÊäÈëÒªµ±×÷ÏàƬ±êʶµÄJPEGÎļþÃû£º " +msgstr "输入è¦å½“作相片标识的JPEG文件å： " #: g10/photoid.c:94 -#, fuzzy, c-format +#, c-format msgid "unable to open JPEG file `%s': %s\n" -msgstr "ÎÞ·¨´ò¿ªÎļþ£º%s\n" +msgstr "无法打开 JPEG 文件‘%s’：%s\n" #: g10/photoid.c:102 #, c-format msgid "This JPEG is really large (%d bytes) !\n" -msgstr "" +msgstr "这个 JPEG 文件太大了(%d 字节)ï¼\n" #: g10/photoid.c:104 -#, fuzzy msgid "Are you sure you want to use it? (y/N) " -msgstr "ÄúÈ·¶¨ÒªÓÃËüÂð£¿(y/N)" +msgstr "您确定è¦ç”¨å®ƒå—？(y/N)" #: g10/photoid.c:119 -#, fuzzy, c-format +#, c-format msgid "`%s' is not a JPEG file\n" -msgstr "¡°%s¡±²»ÊÇÒ»¸ö JPEG Îļþ\n" +msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ª JPEG 文件\n" #: g10/photoid.c:136 msgid "Is this photo correct (y/N/q)? " -msgstr "ÕâÕÅÕÕƬÕýÈ·Âð£¿(y/N/q)" +msgstr "这张照片正确å—？(y/N/q)" #: g10/photoid.c:338 msgid "unable to display photo ID!\n" -msgstr "ÎÞ·¨ÏÔʾÕÕƬ±êʶ£¡\n" +msgstr "无法显示照片标识ï¼\n" #: g10/pkclist.c:61 g10/revoke.c:580 msgid "No reason specified" -msgstr "δָ¶¨Ô­Òò" +msgstr "未指定原因" #: g10/pkclist.c:63 g10/revoke.c:582 msgid "Key is superseded" -msgstr "ÃÜÔ¿±»Ìæ»»" +msgstr "密钥被替æ¢" #: g10/pkclist.c:65 g10/revoke.c:581 msgid "Key has been compromised" -msgstr "ÃÜÔ¿ÒÑй©" +msgstr "密钥已泄æ¼" #: g10/pkclist.c:67 g10/revoke.c:583 msgid "Key is no longer used" -msgstr "ÃÜÔ¿²»ÔÙʹÓÃ" +msgstr "密钥ä¸å†ä½¿ç”¨" #: g10/pkclist.c:69 g10/revoke.c:584 msgid "User ID is no longer valid" -msgstr "Óû§±êʶ²»ÔÙÓÐЧ" +msgstr "用户标识ä¸å†æœ‰æ•ˆ" #: g10/pkclist.c:73 msgid "reason for revocation: " -msgstr "µõÏúÔ­Òò£º" +msgstr "åŠé”€åŽŸå› ï¼š" #: g10/pkclist.c:90 msgid "revocation comment: " -msgstr "µõÏú×¢ÊÍ£º" +msgstr "åŠé”€æ³¨é‡Šï¼š" # a string with valid answers #: g10/pkclist.c:205 @@ -4739,52 +4668,45 @@ msgstr "iImMqQsS" #: g10/pkclist.c:213 -#, fuzzy msgid "No trust value assigned to:\n" -msgstr "" -"ÏÂÁÐÏîĿûÓÐÖ¸¶¨ÐÅÈζȣº\n" -"%4u%c/%08lX %s \"" +msgstr "下列项目没有指定信任度：\n" #: g10/pkclist.c:245 -#, fuzzy, c-format +#, c-format msgid " aka \"%s\"\n" -msgstr " Ò༴ \"" +msgstr " 亦å³â€œ%sâ€\n" #: g10/pkclist.c:255 -#, fuzzy msgid "" "How much do you trust that this key actually belongs to the named user?\n" -msgstr "Õâ°ÑÃÜÔ¿ÓпÉÄÜÊôÓÚÕâ¸ö³ÖÓÐÕß\n" +msgstr "您是å¦ç›¸ä¿¡è¿™æŠŠå¯†é’¥å±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…？\n" #: g10/pkclist.c:270 -#, fuzzy, c-format +#, c-format msgid " %d = I don't know or won't say\n" -msgstr " %d = ²»ÖªµÀ\n" +msgstr " %d = 我ä¸çŸ¥é“或我ä¸ä½œç­”\n" #: g10/pkclist.c:272 -#, fuzzy, c-format +#, c-format msgid " %d = I do NOT trust\n" -msgstr " %d = ÎÒ²»ÐÅÈÎ\n" +msgstr " %d = 我ä¸ç›¸ä¿¡\n" #: g10/pkclist.c:278 -#, fuzzy, c-format +#, c-format msgid " %d = I trust ultimately\n" -msgstr " %d = ÎÒ¾ø¶ÔÐÅÈÎ\n" +msgstr " %d = 我ç»å¯¹ç›¸ä¿¡\n" #: g10/pkclist.c:284 -#, fuzzy msgid " m = back to the main menu\n" -msgstr " m = »Øµ½Ö÷²Ëµ¥\n" +msgstr " m = 回到主èœå•\n" #: g10/pkclist.c:287 -#, fuzzy msgid " s = skip this key\n" -msgstr " s = Ìø¹ýÕâ°ÑÃÜÔ¿\n" +msgstr " s = 跳过这把密钥\n" #: g10/pkclist.c:288 -#, fuzzy msgid " q = quit\n" -msgstr " q = Í˳ö\n" +msgstr " q = 退出\n" #: g10/pkclist.c:292 #, c-format @@ -4792,130 +4714,127 @@ "The minimum trust level for this key is: %s\n" "\n" msgstr "" +"这把密钥的最å°ä¿¡ä»»ç­‰çº§ä¸ºï¼š%s\n" +"\n" #: g10/pkclist.c:298 g10/revoke.c:609 msgid "Your decision? " -msgstr "ÄúµÄ¾ö¶¨ÊÇʲô£¿" +msgstr "您的决定是什么？" #: g10/pkclist.c:319 -#, fuzzy msgid "Do you really want to set this key to ultimate trust? (y/N) " -msgstr "ÄúÕæµÄÒª°ÑÕâ°ÑÃÜÔ¿Éè³É¾ø¶ÔÐÅÈΣ¿" +msgstr "您真的è¦æŠŠè¿™æŠŠå¯†é’¥è®¾æˆç»å¯¹ä¿¡ä»»ï¼Ÿ(y/N)" #: g10/pkclist.c:333 msgid "Certificates leading to an ultimately trusted key:\n" -msgstr "±»¾ø¶ÔÐÅÈεÄÃÜÔ¿µÄÖ¤Ê飺\n" +msgstr "被ç»å¯¹ä¿¡ä»»çš„密钥的è¯ä¹¦ï¼š\n" #: g10/pkclist.c:418 -#, fuzzy, c-format +#, c-format msgid "%s: There is no assurance this key belongs to the named user\n" -msgstr "%08lX£ºÃ»ÓÐÖ¤¾Ý±íÃ÷Õâ°ÑÃÜÔ¿ÕæµÄÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß\n" +msgstr "%s：没有è¯æ®è¡¨æ˜Žè¿™æŠŠå¯†é’¥çœŸçš„属于它所声称的æŒæœ‰è€…\n" #: g10/pkclist.c:423 -#, fuzzy, c-format +#, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" -msgstr "%08lX£ºÃ»ÓÐÖ¤¾Ý±íÃ÷Õâ°ÑÃÜÔ¿ÕæµÄÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß\n" +msgstr "%s：åªæœ‰æœ‰é™çš„è¯æ®è¡¨æ˜Žè¿™æŠŠå¯†é’¥å±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…\n" #: g10/pkclist.c:429 -#, fuzzy msgid "This key probably belongs to the named user\n" -msgstr "Õâ°ÑÃÜÔ¿ÓпÉÄÜÊôÓÚÕâ¸ö³ÖÓÐÕß\n" +msgstr "这把密钥有å¯èƒ½å±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…\n" #: g10/pkclist.c:434 msgid "This key belongs to us\n" -msgstr "Õâ°ÑÃÜÔ¿ÊÇÊôÓÚÎÒÃǵÄ\n" +msgstr "这把密钥是属于我们的\n" #: g10/pkclist.c:460 -#, fuzzy msgid "" "It is NOT certain that the key belongs to the person named\n" "in the user ID. If you *really* know what you are doing,\n" "you may answer the next question with yes.\n" msgstr "" -"Õâ°ÑÃÜÔ¿²¢²»Ò»¶¨ÊôÓÚÓû§±êʶÉù³ÆµÄÄǸöÈË¡£\n" -"Èç¹ûÄúÕæµÄÖªµÀ×Ô¼ºÔÚ×öʲô£¬\n" -"Äú¿ÉÒÔÔÚÏÂÒ»¸öÎÊÌâ»Ø´ðyes\n" +"这把密钥并ä¸ä¸€å®šå±žäºŽç”¨æˆ·æ ‡è¯†å£°ç§°çš„那个人。如果您真的知é“自\n" +"己在åšä»€ä¹ˆï¼Œæ‚¨å¯ä»¥åœ¨ä¸‹ä¸€ä¸ªé—®é¢˜å›žç­” yes。\n" #: g10/pkclist.c:467 -#, fuzzy msgid "Use this key anyway? (y/N) " -msgstr "ÎÞÂÛÈçºÎ»¹ÊÇʹÓÃÕâ°ÑÃÜÔ¿Â𣿠" +msgstr "无论如何还是使用这把密钥å—？(y/N)" #: g10/pkclist.c:501 msgid "WARNING: Using untrusted key!\n" -msgstr "¾¯¸æ£ºÕýÔÚʹÓò»±»ÐÅÈεÄÃÜÔ¿£¡\n" +msgstr "警告：正在使用ä¸è¢«ä¿¡ä»»çš„密钥ï¼\n" #: g10/pkclist.c:508 msgid "WARNING: this key might be revoked (revocation key not present)\n" -msgstr "¾¯¸æ£º´ËÃÜÔ¿¿ÉÄÜÒѱ»µõÏú (µõÏúÃÜÔ¿²»´æÔÚ)\n" +msgstr "警告：此密钥å¯èƒ½å·²è¢«åŠé”€(åŠé”€å¯†é’¥ä¸å­˜åœ¨)\n" #: g10/pkclist.c:517 msgid "WARNING: This key has been revoked by its designated revoker!\n" -msgstr "¾¯¸æ£ºÕâ°ÑÃÜÔ¿ÒѾ­±»ËüµÄÖ¸¶¨µõÏúÕßµõÏúÁË£¡\n" +msgstr "警告：这把密钥已ç»è¢«å®ƒçš„指定åŠé”€è€…åŠé”€äº†ï¼\n" #: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its owner!\n" -msgstr "¾¯¸æ£ºÕâ°ÑÃÜÔ¿ÒѾ­±»ËüµÄ³ÖÓÐÕßµõÏúÁË£¡\n" +msgstr "警告：这把密钥已ç»è¢«å®ƒçš„æŒæœ‰è€…åŠé”€äº†ï¼\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" -msgstr " Õâ±íÃ÷Õâ¸öÇ©×ÖÓпÉÄÜÊÇαÔìµÄ¡£\n" +msgid " This could mean that the signature is forged.\n" +msgstr " 这表明这个签字有å¯èƒ½æ˜¯ä¼ªé€ çš„。\n" #: g10/pkclist.c:527 msgid "WARNING: This subkey has been revoked by its owner!\n" -msgstr "¾¯¸æ£ºÕâ°Ñ×ÓÔ¿ÒѾ­±»ËüµÄ³ÖÓÐÈ˵õÏúÁË£¡\n" +msgstr "警告：这把å­é’¥å·²ç»è¢«å®ƒçš„æŒæœ‰äººåŠé”€äº†ï¼\n" #: g10/pkclist.c:532 msgid "Note: This key has been disabled.\n" -msgstr "×¢Ò⣺Õâ°ÑÃÜÔ¿ÒѾ­±»½ûÓÃÁË¡£\n" +msgstr "注æ„：这把密钥已ç»è¢«ç¦ç”¨äº†ã€‚\n" #: g10/pkclist.c:537 msgid "Note: This key has expired!\n" -msgstr "×¢Ò⣺Õâ°ÑÃÜÔ¿ÒѾ­¹ýÆÚÁË£¡\n" +msgstr "注æ„：这把密钥已ç»è¿‡æœŸäº†ï¼\n" #: g10/pkclist.c:548 msgid "WARNING: This key is not certified with a trusted signature!\n" -msgstr "¾¯¸æ£ºÕâ°ÑÃÜԿδ¾­ÊÜÐÅÈεÄÇ©×ÖÈÏÖ¤£¡\n" +msgstr "警告：这把密钥未ç»å—信任的签字认è¯ï¼\n" #: g10/pkclist.c:550 msgid "" " There is no indication that the signature belongs to the owner.\n" -msgstr " ûÓÐÖ¤¾Ý±íÃ÷Õâ¸öÇ©×ÖÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß¡£\n" +msgstr " 没有è¯æ®è¡¨æ˜Žè¿™ä¸ªç­¾å­—属于它所声称的æŒæœ‰è€…。\n" #: g10/pkclist.c:558 msgid "WARNING: We do NOT trust this key!\n" -msgstr "¾¯¸æ£ºÎÒÃDz»ÐÅÈÎÕâ°ÑÃÜÔ¿£¡\n" +msgstr "警告：我们ä¸ä¿¡ä»»è¿™æŠŠå¯†é’¥ï¼\n" #: g10/pkclist.c:559 msgid " The signature is probably a FORGERY.\n" -msgstr " Õâ¸öÇ©×ÖºÜÓпÉÄÜÊÇαÔìµÄ¡£\n" +msgstr " 这个签字很有å¯èƒ½æ˜¯ä¼ªé€ çš„。\n" #: g10/pkclist.c:567 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" -msgstr "¾¯¸æ£ºÕâ°ÑÃÜԿδ¾­ÓÐ×ã¹»ÐÅÈζȵÄÇ©×ÖËùÈÏÖ¤¡£\n" +msgstr "警告：这把密钥未ç»æœ‰è¶³å¤Ÿä¿¡ä»»åº¦çš„签字所认è¯ã€‚\n" #: g10/pkclist.c:569 msgid " It is not certain that the signature belongs to the owner.\n" -msgstr " Õâ·ÝÇ©×Ö²¢²»Ò»¶¨ÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß\n" +msgstr " 这份签字并ä¸ä¸€å®šå±žäºŽå®ƒæ‰€å£°ç§°çš„æŒæœ‰è€…\n" #: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996 #, c-format msgid "%s: skipped: %s\n" -msgstr "%s£ºÒÑÌø¹ý£º%s\n" +msgstr "%s：已跳过：%s\n" #: g10/pkclist.c:744 g10/pkclist.c:968 #, c-format msgid "%s: skipped: public key already present\n" -msgstr "%s: ÒÑÌø¹ý£º¹«Ô¿ÒÑ´æÔÚ\n" +msgstr "%s: 已跳过：公钥已存在\n" #: g10/pkclist.c:786 msgid "You did not specify a user ID. (you may use \"-r\")\n" -msgstr "ÄúûÓÐÖ¸¶¨Óû§±êʶ¡£(Äú¿ÉÒÔÔÚÃüÁîÐÐÖÐÓá°-r¡±Ö¸¶¨)\n" +msgstr "您没有指定用户标识。(您å¯ä»¥åœ¨å‘½ä»¤è¡Œä¸­ç”¨â€œ-râ€æŒ‡å®š)\n" #: g10/pkclist.c:802 msgid "Current recipients:\n" -msgstr "" +msgstr "当å‰æ”¶ä»¶äººï¼š\n" #: g10/pkclist.c:828 msgid "" @@ -4923,168 +4842,166 @@ "Enter the user ID. End with an empty line: " msgstr "" "\n" -"ÊäÈëÓû§±êʶ¡£ÒÔ¿Õ°×ÐнáÊø£º" +"输入用户标识。以空白行结æŸï¼š" #: g10/pkclist.c:844 msgid "No such user ID.\n" -msgstr "ûÓÐÕâ¸öÓû§±êʶ¡£\n" +msgstr "没有这个用户标识。\n" #: g10/pkclist.c:849 g10/pkclist.c:911 msgid "skipped: public key already set as default recipient\n" -msgstr "ÒÑÌø¹ý£º¹«Ô¿Òѱ»ÉèΪĬÈÏÊÕ¼þÕß\n" +msgstr "已跳过：公钥已被设为默认收件者\n" #: g10/pkclist.c:867 msgid "Public key is disabled.\n" -msgstr "¹«Ô¿±»½ûÓá£\n" +msgstr "公钥被ç¦ç”¨ã€‚\n" #: g10/pkclist.c:874 msgid "skipped: public key already set\n" -msgstr "ÒÑÌø¹ý£º¹«Ô¿Òѱ»É趨\n" +msgstr "已跳过：公钥已被设定\n" #: g10/pkclist.c:903 -#, fuzzy, c-format +#, c-format msgid "unknown default recipient \"%s\"\n" -msgstr "δ֪µÄĬÈÏÊÕ¼þÕß¡®%s¡¯\n" +msgstr "未知的默认收件者“%sâ€\n" #: g10/pkclist.c:948 #, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "%s£ºÒÑÌø¹ý£º¹«Ô¿Òѱ»½ûÓÃ\n" +msgstr "%s：已跳过：公钥已被ç¦ç”¨\n" #: g10/pkclist.c:1003 msgid "no valid addressees\n" -msgstr "ûÓÐÓÐЧµÄµØÖ·\n" +msgstr "没有有效的地å€\n" #: g10/plaintext.c:90 msgid "data not saved; use option \"--output\" to save it\n" -msgstr "Êý¾Ýδ±»±£´æ£»ÇëÓá°--output¡±Ñ¡ÏîÀ´±£´æËüÃÇ\n" +msgstr "æ•°æ®æœªè¢«ä¿å­˜ï¼›è¯·ç”¨â€œ--outputâ€é€‰é¡¹æ¥ä¿å­˜å®ƒä»¬\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" -msgstr "½¨Á¢¡®%s¡¯Ê±·¢Éú´íÎó£º%s\n" +msgstr "建立‘%s’时å‘生错误：%s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" -msgstr "·ÖÀëµÄÇ©×Ö¡£\n" +msgstr "分离的签字。\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " -msgstr "ÇëÊäÈëÊý¾ÝÎļþµÄÃû³Æ£º " +msgstr "请输入数æ®æ–‡ä»¶çš„å称： " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" -msgstr "ÕýÔÚ´Ó±ê×¼ÊäÈë¶ÁÈ¡ ...\n" +msgstr "æ­£åœ¨ä»Žæ ‡å‡†è¾“å…¥è¯»å– ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" -msgstr "²»º¬Ç©×ÖµÄÊý¾Ý\n" +msgstr "ä¸å«ç­¾å­—çš„æ•°æ®\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" -msgstr "ÎÞ·¨´ò¿ªÓÐÇ©×ÖµÄÊý¾Ý¡®%s¡¯\n" +msgstr "无法打开有签字的数æ®â€˜%s’\n" #: g10/pubkey-enc.c:103 -#, fuzzy, c-format +#, c-format msgid "anonymous recipient; trying secret key %s ...\n" -msgstr "ÄäÃûÊÕ¼þÕߣ»ÕýÔÚ³¢ÊÔʹÓÃ˽Կ %08lX ...\n" +msgstr "匿å收件者；正在å°è¯•ä½¿ç”¨ç§é’¥ %s ……\n" #: g10/pubkey-enc.c:119 msgid "okay, we are the anonymous recipient.\n" -msgstr "ºÜºÃ£¬ÎÒÃǾÍÊÇÄäÃûÊÕ¼þÕß¡£\n" +msgstr "很好，我们就是匿å收件者。\n" #: g10/pubkey-enc.c:207 msgid "old encoding of the DEK is not supported\n" -msgstr "²»Ö§³Ö¾ÉʽµÄ DEK ±àÂë\n" +msgstr "ä¸æ”¯æŒæ—§å¼çš„ DEK ç¼–ç \n" #: g10/pubkey-enc.c:228 #, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" -msgstr "¶Ô³Æ¼ÓÃÜËã·¨ %d%s δ֪»òÒÑÍ£ÓÃ\n" +msgstr "对称加密算法 %d%s 未知或已åœç”¨\n" #: g10/pubkey-enc.c:266 -#, fuzzy, c-format +#, c-format msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" -msgstr "×¢Ò⣺Ê×Ñ¡ÏîÖÐÕÒ²»µ½¼ÓÃÜËã·¨ %d\n" +msgstr "注æ„：收件人的首选项中找ä¸åˆ°åŠ å¯†ç®—法 %s\n" #: g10/pubkey-enc.c:286 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %s expired at %s\n" -msgstr "×¢Ò⣺˽Կ %08lX ÒÑÓÚ %s ¹ýÆÚ\n" +msgstr "注æ„：ç§é’¥ %s 已于 %s 过期\n" #: g10/pubkey-enc.c:292 msgid "NOTE: key has been revoked" -msgstr "×¢Ò⣺ÃÜÔ¿Òѱ»µõÏú" +msgstr "注æ„：密钥已被åŠé”€" #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175 #: g10/revoke.c:187 g10/revoke.c:545 #, c-format msgid "build_packet failed: %s\n" -msgstr "build_packet ʧ°Ü£º%s\n" +msgstr "build_packet 失败：%s\n" #: g10/revoke.c:146 -#, fuzzy, c-format +#, c-format msgid "key %s has no user IDs\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»ÓÐÓû§±êʶ\n" +msgstr "密钥 %s：没有有效的用户标识\n" #: g10/revoke.c:272 msgid "To be revoked by:\n" -msgstr "½«±»µõÏú£¬µõÏúÕߣº\n" +msgstr "将被åŠé”€ï¼ŒåŠé”€è€…：\n" #: g10/revoke.c:276 msgid "(This is a sensitive revocation key)\n" -msgstr "(ÕâÊÇÒ»°ÑÃô¸ÐµÄµõÏúÃÜÔ¿)\n" +msgstr "(这是一把æ•æ„Ÿçš„åŠé”€å¯†é’¥)\n" #: g10/revoke.c:280 -#, fuzzy msgid "Create a designated revocation certificate for this key? (y/N) " -msgstr "ҪΪÕâ°ÑÃÜÔ¿½¨Á¢Ò»·ÝµõÏúÖ¤ÊéÂ𣿠" +msgstr "è¦ä¸ºè¿™æŠŠå¯†é’¥å»ºç«‹ä¸€ä»½æŒ‡å®šåŠé”€è€…è¯ä¹¦å—？(y/N)" #: g10/revoke.c:293 g10/revoke.c:511 msgid "ASCII armored output forced.\n" -msgstr "ÒÑÇ¿ÐÐʹÓà ASCII ·â×°¹ýµÄÊä³ö¡£\n" +msgstr "已强行使用 ASCII å°è£…过的输出。\n" #: g10/revoke.c:307 g10/revoke.c:525 #, c-format msgid "make_keysig_packet failed: %s\n" -msgstr "make_keysig_packet ʧ°Ü£º %s\n" +msgstr "make_keysig_packet 失败： %s\n" #: g10/revoke.c:370 msgid "Revocation certificate created.\n" -msgstr "Òѽ¨Á¢µõÏúÖ¤Êé¡£\n" +msgstr "已建立åŠé”€è¯ä¹¦ã€‚\n" #: g10/revoke.c:376 -#, fuzzy, c-format +#, c-format msgid "no revocation keys found for \"%s\"\n" -msgstr "ûÓÐÕÒµ½¡®%s¡¯ÓõĵõÏúÃÜÔ¿\n" +msgstr "没有找到“%sâ€çš„åŠé”€å¯†é’¥\n" #: g10/revoke.c:432 -#, fuzzy, c-format +#, c-format msgid "secret key \"%s\" not found: %s\n" -msgstr "ÕÒ²»µ½¡®%s¡¯Ë½Ô¿£º%s\n" +msgstr "找ä¸åˆ°ç§é’¥â€œ%sâ€ï¼š%s\n" #: g10/revoke.c:461 #, c-format msgid "no corresponding public key: %s\n" -msgstr "ûÓÐÏà¶ÔÓ¦µÄ¹«Ô¿£º%s\n" +msgstr "没有相对应的公钥：%s\n" #: g10/revoke.c:472 msgid "public key does not match secret key!\n" -msgstr "¹«Ô¿Óë˽Կ²»ÎǺϣ¡\n" +msgstr "公钥与ç§é’¥ä¸å»åˆï¼\n" #: g10/revoke.c:479 -#, fuzzy msgid "Create a revocation certificate for this key? (y/N) " -msgstr "ҪΪÕâ°ÑÃÜÔ¿½¨Á¢Ò»·ÝµõÏúÖ¤ÊéÂ𣿠" +msgstr "è¦ä¸ºè¿™æŠŠå¯†é’¥å»ºç«‹ä¸€ä»½åŠé”€è¯ä¹¦å—？(y/N)" #: g10/revoke.c:496 msgid "unknown protection algorithm\n" -msgstr "δ֪µÄ±£»¤Ëã·¨\n" +msgstr "未知的ä¿æŠ¤ç®—法\n" #: g10/revoke.c:500 msgid "NOTE: This key is not protected!\n" -msgstr "×¢Ò⣺Õâ°ÑÃÜԿûÓб»±£»¤£¡\n" +msgstr "注æ„：这把密钥没有被ä¿æŠ¤ï¼\n" #: g10/revoke.c:551 msgid "" @@ -5096,245 +5013,237 @@ "your media become unreadable. But have some caution: The print system of\n" "your machine might store the data and make it available to others!\n" msgstr "" -"Òѽ¨Á¢µõÏúÖ¤Êé¡£\n" +"已建立åŠé”€è¯ä¹¦ã€‚\n" "\n" -"Çë°ÑÕâ¸öÎļþתÒƵ½Ò»¸ö¿ÉÒþ²ØÆðÀ´µÄ½éÖÊ(ÈçÈíÅÌ)ÉÏ£»\n" -"Èç¹û»µÈËÄܹ»È¡µÃÕâ·ÝÖ¤ÊéµÄ»°£¬ÄÇôËû¾ÍÄÜÈÃÄúµÄÃÜ\n" -"Ô¿ÎÞ·¨¼ÌÐøʹÓᣰÑÕâ·Ýƾ֤´òÓ¡³öÀ´Ôٲص½°²È«µÄµØ\n" -"·½Ò²ÊǺܺõķ½·¨£¬ÒÔÃâÄúµÄ±£´æýÌåËð»Ù¶øÎÞ·¨¶ÁÈ¡¡£\n" -"µ«ÊÇǧÍòСÐÄ£ºÄúµÄ»úÆ÷ÉϵĴòӡϵͳ¿ÉÄÜ»áÔÚ´òÓ¡¹ý\n" -"³ÌÖаÑÕâЩÊý¾ÝÁÙʱÔÚij¸öÆäËûÈËÒ²Äܹ»¿´µÃµ½µÄµØ·½£¡\n" +"请把这个文件转移到一个å¯éšè—èµ·æ¥çš„介质(如软盘)上；如果å人能够å–å¾—è¿™\n" +"份è¯ä¹¦çš„è¯ï¼Œé‚£ä¹ˆä»–就能让您的密钥无法继续使用。把这份凭è¯æ‰“å°å‡ºæ¥å†è—\n" +"到安全的地方也是很好的方法，以å…您的ä¿å­˜åª’体æŸæ¯è€Œæ— æ³•è¯»å–。但是åƒä¸‡\n" +"å°å¿ƒï¼šæ‚¨çš„机器上的打å°ç³»ç»Ÿå¯èƒ½ä¼šåœ¨æ‰“å°è¿‡ç¨‹ä¸­æŠŠè¿™äº›æ•°æ®ä¸´æ—¶åœ¨æŸä¸ªå…¶ä»–\n" +"人也能够看得到的地方ï¼\n" #: g10/revoke.c:592 msgid "Please select the reason for the revocation:\n" -msgstr "ÇëÑ¡ÔñµõÏúµÄÔ­Òò£º\n" +msgstr "请选择åŠé”€çš„原因：\n" #: g10/revoke.c:602 msgid "Cancel" -msgstr "È¡Ïû" +msgstr "å–消" #: g10/revoke.c:604 #, c-format msgid "(Probably you want to select %d here)\n" -msgstr "(Ò²ÐíÄú»áÏëÒªÔÚÕâÀïÑ¡Ôñ%d)\n" +msgstr "(也许您会想è¦åœ¨è¿™é‡Œé€‰æ‹© %d)\n" #: g10/revoke.c:645 msgid "Enter an optional description; end it with an empty line:\n" -msgstr "ÇëÊäÈëÃèÊö(¿ÉÑ¡)£»ÒÔ¿Õ°×ÐнáÊø£º\n" +msgstr "请输入æè¿°(å¯é€‰)；以空白行结æŸï¼š\n" #: g10/revoke.c:673 #, c-format msgid "Reason for revocation: %s\n" -msgstr "µõÏúÔ­Òò£º%s\n" +msgstr "åŠé”€åŽŸå› ï¼š%s\n" #: g10/revoke.c:675 msgid "(No description given)\n" -msgstr "(²»¸ø¶¨ÃèÊö)\n" +msgstr "(ä¸ç»™å®šæè¿°)\n" #: g10/revoke.c:680 -#, fuzzy msgid "Is this okay? (y/N) " -msgstr "ÕâÑù¿ÉÒÔÂ𣿠" +msgstr "这样å¯ä»¥å—？ " #: g10/seckey-cert.c:54 msgid "secret key parts are not available\n" -msgstr "˽Կ²¿·Ö²»¿ÉÓÃ\n" +msgstr "ç§é’¥éƒ¨åˆ†ä¸å¯ç”¨\n" #: g10/seckey-cert.c:60 #, c-format msgid "protection algorithm %d%s is not supported\n" -msgstr "±£»¤Ëã·¨ %d%s δ±»Ö§³Ö\n" +msgstr "ä¿æŠ¤ç®—法 %d%s 未被支æŒ\n" #: g10/seckey-cert.c:71 -#, fuzzy, c-format +#, c-format msgid "protection digest %d is not supported\n" -msgstr "±£»¤Ëã·¨ %d%s δ±»Ö§³Ö\n" +msgstr "ä¸æ”¯æŒä¿æŠ¤æ•£åˆ— %d\n" #: g10/seckey-cert.c:250 msgid "Invalid passphrase; please try again" -msgstr "ÎÞЧµÄÃÜÂ룻ÇëÔÙÊÔÒ»´Î" +msgstr "无效的密ç ï¼›è¯·å†è¯•ä¸€æ¬¡" #: g10/seckey-cert.c:251 #, c-format msgid "%s ...\n" -msgstr "%s ...\n" +msgstr "%s……\n" #: g10/seckey-cert.c:311 msgid "WARNING: Weak key detected - please change passphrase again.\n" -msgstr "¾¯¸æ£º¼ì²âµ½ÈõÃÜÔ¿¡ª¡ªÇë¸ü»»ÃÜÂë¡£\n" +msgstr "警告：检测到弱密钥――请更æ¢å¯†ç ã€‚\n" #: g10/seckey-cert.c:349 msgid "generating the deprecated 16-bit checksum for secret key protection\n" -msgstr "ÕýÔÚ²úÉú˽Կ±£»¤Ê¹ÓõľÉʽ 16 ×Ö½ÚУÑéºÍ\n" +msgstr "正在产生ç§é’¥ä¿æŠ¤ä½¿ç”¨çš„æ—§å¼ 16 ä½æ ¡éªŒå’Œ\n" #: g10/seskey.c:52 msgid "weak key created - retrying\n" -msgstr "½¨Á¢ÁËÈõÃÜÔ¿¡ª¡ªÕýÔÚÖØÊÔ\n" +msgstr "建立了弱密钥――正在é‡è¯•\n" #: g10/seskey.c:57 #, c-format msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" -msgstr "¶Ô³Æ¼ÓÃÜÎÞ·¨±ÜÃâÉú³ÉÈõÃÜÔ¿£»ÒѾ­³¢ÊÔ %d ´Î£¡\n" +msgstr "对称加密无法é¿å…生æˆå¼±å¯†é’¥ï¼›å·²ç»å°è¯• %d 次ï¼\n" #: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" -msgstr "DSA ÒªÇóʹÓà 160 ×Ö½ÚµÄÉ¢ÁÐËã·¨\n" +msgstr "DSA è¦æ±‚使用 160 ä½çš„散列算法\n" #: g10/sig-check.c:75 msgid "WARNING: signature digest conflict in message\n" -msgstr "¾¯¸æ£ºÇ©×ÖÉ¢ÁÐÖµÓ뱨ÎIJ»Ò»ÖÂ\n" +msgstr "警告：签字散列值与报文ä¸ä¸€è‡´\n" #: g10/sig-check.c:99 -#, fuzzy, c-format +#, c-format msgid "WARNING: signing subkey %s is not cross-certified\n" -msgstr "¾¯¸æ£ºÇ©×Ö×ÓÔ¿ %08lX δ¾­½»²æÑéÖ¤\n" +msgstr "警告：正è¦ç­¾å­—çš„å­é’¥ %s 未ç»äº¤å‰éªŒè¯\n" #: g10/sig-check.c:102 -#, fuzzy, c-format +#, c-format msgid "WARNING: signing subkey %s has an invalid cross-certification\n" -msgstr "¾¯¸æ£ºÇ©×Ö×ÓÔ¿ %08lX ½»²æÑéÖ¤ÎÞЧ\n" +msgstr "警告：正è¦ç­¾å­—çš„å­é’¥ %s 交å‰éªŒè¯æ— æ•ˆ\n" #: g10/sig-check.c:168 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu second newer than the signature\n" -msgstr "¹«Ô¿ %08lX ÔÚÆäÇ©×ÖÇ° %lu ÃëÉú³É\n" +msgstr "公钥 %s åœ¨å…¶ç­¾å­—åŽ %lu 秒生æˆ\n" #: g10/sig-check.c:169 -#, fuzzy, c-format +#, c-format msgid "public key %s is %lu seconds newer than the signature\n" -msgstr "¹«Ô¿ %08lX ÔÚÆäÇ©×ÖÇ° %lu ÃëÉú³É\n" +msgstr "公钥 %s åœ¨å…¶ç­¾å­—åŽ %lu 秒生æˆ\n" #: g10/sig-check.c:180 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" -msgstr "ÃÜÔ¿ÊÇÔÚ %lu ÃëºóµÄδÀ´Éú³ÉµÄ(¿ÉÄÜÊÇÒòΪʱ¿ÕŤÇú»òʱÖÓµÄÎÊÌâ)\n" +msgstr "密钥 %s 是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" #: g10/sig-check.c:182 -#, fuzzy, c-format +#, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" -msgstr "ÃÜÔ¿ÊÇÔÚ %lu ÃëºóµÄδÀ´Éú³ÉµÄ(¿ÉÄÜÊÇÒòΪʱ¿ÕŤÇú»òʱÖÓµÄÎÊÌâ)\n" +msgstr "密钥 %s 是在 %lu 秒åŽçš„未æ¥ç”Ÿæˆçš„(å¯èƒ½æ˜¯å› ä¸ºæ—¶ç©ºæ‰­æ›²æˆ–时钟的问题)\n" #: g10/sig-check.c:192 -#, fuzzy, c-format +#, c-format msgid "NOTE: signature key %s expired %s\n" -msgstr "×¢Ò⣺ǩ×ÖÃÜÔ¿ %08lX ÒÑÓÚ %s ¹ýÆÚ\n" +msgstr "注æ„：签字密钥 %s 已于 %s 过期\n" #: g10/sig-check.c:275 -#, fuzzy, c-format +#, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" -msgstr "¼Ù¶¨ÃÜÔ¿ %08lX µÄÇ©×ÖÓÉÓÚij¸öδ֪µÄ¹Ø¼ü×Ö½Ú³ö´í¶øµ¼ÖÂËð»µ\n" +msgstr "å‡å®šå¯†é’¥ %s 的签字由于æŸä¸ªæœªçŸ¥çš„关键ä½å‡ºé”™è€ŒæŸå\n" #: g10/sig-check.c:532 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey revocation signature\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»ÓÐ×ÓÔ¿µõÏú°üËùÐèµÄ×ÓÔ¿\n" +msgstr "密钥 %s：没有å­é’¥åŠé”€ç­¾å­—所需的å­é’¥\n" #: g10/sig-check.c:558 -#, fuzzy, c-format +#, c-format msgid "key %s: no subkey for subkey binding signature\n" -msgstr "ÃÜÔ¿ %08lX£ºÃ»ÓÐÓë×ÓÔ¿°ó¶¨Ç©×Ö¶ÔÓ¦µÄ×ÓÔ¿\n" +msgstr "密钥 %s：没有å­é’¥ç»‘定签字所需的å­é’¥\n" #: g10/sign.c:85 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -msgstr "ÎÞ·¨ÔÚ v3 (PGP 2.xÑùʽ)µÄÇ©×ÖÄÚ·ÅÈë±ê¼ÇÊý¾Ý\n" +msgstr "无法在 v3 (PGP 2.xæ ·å¼)的签字内放入标记数æ®\n" #: g10/sign.c:93 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "ÎÞ·¨ÔÚ v3 (PGP 2.xÑùʽ)µÄÃÜÔ¿Ç©×ÖÄÚ·ÅÈë±ê¼ÇÊý¾Ý\n" +msgstr "无法在 v3 (PGP 2.xæ ·å¼)的密钥签字内放入标记数æ®\n" #: g10/sign.c:112 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" -msgstr "¾¯¸æ£º±ê¼Ç %% ÎÞ·¨À©Õ¹(Ì«´óÁË)¡£ÏÖÔÚʹÓÃδÀ©Õ¹µÄ¡£\n" +msgstr "警告：标记 %% 无法扩展(太大了)。现在使用未扩展的。\n" #: g10/sign.c:138 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -msgstr "ÎÞ·¨ÔÚ v3 (PGP 2.xÑùʽ)µÄÇ©×ÖÄÚ·ÅÈë²ßÂÔ URL\n" +msgstr "无法在 v3 (PGP 2.xæ ·å¼)的签字内放入策略 URL\n" #: g10/sign.c:146 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -msgstr "ÎÞ·¨ÔÚ v3 (PGP 2.xÑùʽ)µÄÃÜÔ¿Ç©×ÖÄÚ·ÅÈë²ßÂÔ URL\n" +msgstr "无法在 v3 (PGP 2.xæ ·å¼)的密钥签字内放入策略 URL\n" #: g10/sign.c:159 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n" -msgstr "¾¯¸æ£º²ßÂÔ URL µÄ %% ÎÞ·¨À©Õ¹(Ì«´óÁË)¡£ÏÖÔÚʹÓÃδÀ©Õ¹µÄ¡£\n" +msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n" #: g10/sign.c:187 -#, fuzzy, c-format +#, c-format msgid "" "WARNING: unable to %%-expand preferred keyserver URL (too large). Using " "unexpanded.\n" -msgstr "¾¯¸æ£º²ßÂÔ URL µÄ %% ÎÞ·¨À©Õ¹(Ì«´óÁË)¡£ÏÖÔÚʹÓÃδÀ©Õ¹µÄ¡£\n" +msgstr "警告：无法 %%-扩展首选公钥æœåŠ¡å™¨ URL (太大了)。现在使用未扩展的。\n" #: g10/sign.c:364 #, c-format msgid "checking created signature failed: %s\n" -msgstr "¼ì²éÒѽ¨Á¢µÄÇ©×Öʱ·¢Éú´íÎó£º %s\n" +msgstr "检查已建立的签字时å‘生错误： %s\n" #: g10/sign.c:373 -#, fuzzy, c-format +#, c-format msgid "%s/%s signature from: \"%s\"\n" -msgstr "%sÇ©×ÖÀ´×Ô£º¡°%s¡±\n" +msgstr "%s/%s 签字æ¥è‡ªï¼šâ€œ%sâ€\n" #: g10/sign.c:741 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" -msgstr "ÄúÔÚ --pgp2 ģʽÏÂÖ»Äܹ»Ê¹Óà PGP 2.x ÑùʽµÄÃÜÔ¿À´×ö·ÖÀëÇ©×Ö\n" - -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "ÕýÔÚдÈë¡®%s¡¯\n" +msgstr "您在 --pgp2 模å¼ä¸‹åªèƒ½å¤Ÿä½¿ç”¨ PGP 2.x æ ·å¼çš„密钥æ¥åšåˆ†ç¦»ç­¾å­—\n" -#: g10/sign.c:807 -#, fuzzy, c-format +#: g10/sign.c:808 +#, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" -msgstr "Ç¿ÐÐʹÓÃµÄ %s (%d)É¢ÁÐËã·¨²»ÔÚÊÕ¼þÕßµÄÊ×Ñ¡ÏîÖÐ\n" +msgstr "警告：强行使用的 %s (%d)散列算法ä¸åœ¨æ”¶ä»¶è€…的首选项中\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" -msgstr "ÕýÔÚÇ©×Ö£º" +msgstr "正在签字：" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" -msgstr "ÄúÔÚ --pgp2 ģʽÏÂÖ»Äܹ»Ê¹Óà PGP 2.x ÑùʽµÄÃÜÔ¿À´×öÃ÷ÎÄÇ©×Ö\n" +msgstr "您在 --pgp2 模å¼ä¸‹åªèƒ½å¤Ÿä½¿ç”¨ PGP 2.x æ ·å¼çš„密钥æ¥åšæ˜Žæ–‡ç­¾å­—\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" -msgstr "%s ¼ÓÃܽ«±»²ÉÓÃ\n" +msgstr "%s 加密将被采用\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" -msgstr "ÃÜԿδ±»±êʾΪ²»°²È«¡ª¡ª²»ÄÜÓë¼ÙµÄËæ»úÊý·¢ÉúÆ÷¹²Í¬Ê¹Óã¡\n" +msgstr "密钥未被标示为ä¸å®‰å…¨â€•â€•ä¸èƒ½ä¸Žå‡çš„éšæœºæ•°å‘生器共åŒä½¿ç”¨ï¼\n" -#: g10/skclist.c:158 -#, fuzzy, c-format +#: g10/skclist.c:157 +#, c-format msgid "skipped \"%s\": duplicated\n" -msgstr "¡®%s¡¯ÒÑÌø¹ý£ºÖظ´\n" +msgstr "“%sâ€å·²è·³è¿‡ï¼šé‡å¤\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 -#, fuzzy, c-format +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 +#, c-format msgid "skipped \"%s\": %s\n" -msgstr "¡®%s¡¯ÒÑÌø¹ý£º%s\n" +msgstr "“%sâ€å·²è·³è¿‡ï¼š%s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" -msgstr "ÒÑÌø¹ý£ºË½Ô¿ÒÑ´æÔÚ\n" +msgstr "已跳过：ç§é’¥å·²å­˜åœ¨\n" -#: g10/skclist.c:186 -#, fuzzy +#: g10/skclist.c:185 msgid "this is a PGP generated Elgamal key which is not secure for signatures!" -msgstr "¡®%s¡¯ÒÑÌø¹ý£ºÕâÊÇÒ»°ÑÓÉ PGP Éú³ÉµÄ ElGamal ÃÜÔ¿£¬ÓÃÓÚÇ©×Ö²»°²È«£¡\n" +msgstr "这是一把由 PGP 生æˆçš„ ElGamal 密钥，用于签字ä¸å®‰å…¨ï¼" #: g10/tdbdump.c:59 g10/trustdb.c:365 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" -msgstr "ÐÅÈμǼ %lu£¬Àà±ð %d£ºÐ´Èëʧ°Ü£º%s\n" +msgstr "信任记录 %lu，类别 %d：写入失败：%s\n" #: g10/tdbdump.c:104 #, c-format @@ -5342,313 +5251,347 @@ "# List of assigned trustvalues, created %s\n" "# (Use \"gpg --import-ownertrust\" to restore them)\n" msgstr "" -"# ÒÑÖ¸¶¨µÄÐÅÈζȵÄÇåµ¥£¬½¨Á¢ÓÚ %s \n" -"# (ÇëÓá°gpg --import-ownertrust¡±µ¼ÈëÕâЩÐÅÈζÈ)\n" +"# 已指定的信任度的清å•ï¼Œå»ºç«‹äºŽ %s \n" +"# (请用“gpg --import-ownertrustâ€å¯¼å…¥è¿™äº›ä¿¡ä»»åº¦)\n" #: g10/tdbdump.c:159 g10/tdbdump.c:167 g10/tdbdump.c:172 g10/tdbdump.c:177 -#, fuzzy, c-format +#, c-format msgid "error in `%s': %s\n" -msgstr "¶ÁÈ¡¡®%s¡¯Ê±³ö´í£º%s\n" +msgstr "‘%s’中出错：%s\n" #: g10/tdbdump.c:159 -#, fuzzy msgid "line too long" -msgstr "ÐÐÌ«³¤\n" +msgstr "列太长" #: g10/tdbdump.c:167 msgid "colon missing" -msgstr "" +msgstr "冒å·ç¼ºå¤±" #: g10/tdbdump.c:173 -#, fuzzy msgid "invalid fingerprint" -msgstr "´íÎó£ºÎÞЧµÄÖ¸ÎÆ\n" +msgstr "指纹无效" #: g10/tdbdump.c:178 -#, fuzzy msgid "ownertrust value missing" -msgstr "µ¼ÈëÐÅÈζÈ" +msgstr "没有信任度" #: g10/tdbdump.c:214 -#, fuzzy, c-format +#, c-format msgid "error finding trust record in `%s': %s\n" -msgstr "Ñ°ÕÒÐÅÈζȼǼʱ³ö´í£º%s\n" +msgstr "在‘%s’中寻找信任度记录时出错：%s\n" #: g10/tdbdump.c:218 -#, fuzzy, c-format +#, c-format msgid "read error in `%s': %s\n" -msgstr "¶ÁÈ¡´íÎó£º%s\n" +msgstr "读å–‘%s’错误：%s\n" #: g10/tdbdump.c:227 g10/trustdb.c:380 #, c-format msgid "trustdb: sync failed: %s\n" -msgstr "ÐÅÈζÈÊý¾Ý¿â£ºÍ¬²½Ê§°Ü£º%s\n" +msgstr "信任度数æ®åº“：åŒæ­¥å¤±è´¥ï¼š%s\n" #: g10/tdbio.c:128 g10/tdbio.c:1440 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "ÐÅÈζÈÊý¾Ý¿â¼Ç¼ %lu£º±¾µØËÑË÷ʧ°Ü£º%s\n" +msgstr "信任度数æ®åº“记录 %lu：本地æœç´¢å¤±è´¥ï¼š%s\n" #: g10/tdbio.c:134 g10/tdbio.c:1447 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" -msgstr "ÐÅÈζÈÊý¾Ý¿â¼Ç¼ %lu£ºÐ´Èëʧ°Ü (n=%d): %s\n" +msgstr "信任度数æ®åº“记录 %lu：写入失败 (n=%d): %s\n" #: g10/tdbio.c:244 msgid "trustdb transaction too large\n" -msgstr "ÐÅÈζÈÊý¾Ý¿â´¦ÀíÁ¿¹ý´ó\n" +msgstr "信任度数æ®åº“处ç†é‡è¿‡å¤§\n" #: g10/tdbio.c:497 -#, fuzzy, c-format +#, c-format msgid "can't access `%s': %s\n" -msgstr "ÎÞ·¨¹Ø±Õ¡®%s¡¯£º%s\n" +msgstr "无法存å–‘%s’：%s\n" #: g10/tdbio.c:512 #, c-format msgid "%s: directory does not exist!\n" -msgstr "%s£ºÄ¿Â¼²»´æÔÚ£¡\n" +msgstr "%s：目录ä¸å­˜åœ¨ï¼\n" #: g10/tdbio.c:522 g10/tdbio.c:545 g10/tdbio.c:588 -#, fuzzy, c-format +#, c-format msgid "can't create lock for `%s'\n" -msgstr "ÎÞ·¨½¨Á¢¡®%s¡¯£º%s\n" +msgstr "ä¸èƒ½ä¸ºâ€˜%s’创建é”定\n" #: g10/tdbio.c:524 g10/tdbio.c:591 -#, fuzzy, c-format +#, c-format msgid "can't lock `%s'\n" -msgstr "ÎÞ·¨´ò¿ª¡®%s¡¯\n" +msgstr "无法é”定‘%s’\n" #: g10/tdbio.c:550 #, c-format msgid "%s: failed to create version record: %s" -msgstr "%s£º½¨Á¢°æ±¾¼Ç¼ʧ°Ü£º%s" +msgstr "%s：建立版本记录失败：%s" #: g10/tdbio.c:554 #, c-format msgid "%s: invalid trustdb created\n" -msgstr "%s£º½¨Á¢ÁËÎÞЧµÄÐÅÈζÈÊý¾Ý¿â\n" +msgstr "%s：建立了无效的信任度数æ®åº“\n" #: g10/tdbio.c:557 #, c-format msgid "%s: trustdb created\n" -msgstr "%s£º½¨Á¢ÁËÐÅÈζÈÊý¾Ý¿â\n" +msgstr "%s：建立了信任度数æ®åº“\n" #: g10/tdbio.c:597 msgid "NOTE: trustdb not writable\n" -msgstr "×¢Ò⣺ÐÅÈζÈÊý¾Ý¿â²»¿ÉдÈë\n" +msgstr "注æ„：信任度数æ®åº“ä¸å¯å†™å…¥\n" #: g10/tdbio.c:614 #, c-format msgid "%s: invalid trustdb\n" -msgstr "%s£ºÎÞЧµÄÐÅÈζÈÊý¾Ý¿â\n" +msgstr "%s：无效的信任度数æ®åº“\n" #: g10/tdbio.c:646 #, c-format msgid "%s: failed to create hashtable: %s\n" -msgstr "%s£º½¨Á¢É¢Áбíʧ°Ü£º%s\n" +msgstr "%s：建立散列表失败：%s\n" #: g10/tdbio.c:654 #, c-format msgid "%s: error updating version record: %s\n" -msgstr "%s£º¸üа汾¼Ç¼ʱ³ö´í£º %s\n" +msgstr "%s：更新版本记录时出错： %s\n" #: g10/tdbio.c:671 g10/tdbio.c:691 g10/tdbio.c:707 g10/tdbio.c:721 #: g10/tdbio.c:751 g10/tdbio.c:1373 g10/tdbio.c:1400 #, c-format msgid "%s: error reading version record: %s\n" -msgstr "%s£º¶ÁÈ¡°æ±¾¼Ç¼ʱ³ö´í£º %s\n" +msgstr "%s：读å–版本记录时出错： %s\n" #: g10/tdbio.c:730 #, c-format msgid "%s: error writing version record: %s\n" -msgstr "%s£ºÐ´Èë°æ±¾¼Ç¼ʱ³ö´í£º%s\n" +msgstr "%s：写入版本记录时出错：%s\n" #: g10/tdbio.c:1169 #, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "ÐÅÈζÈÊý¾Ý¿â£º±¾µØËÑË÷ʧ°Ü£º%s\n" +msgstr "信任度数æ®åº“：本地æœç´¢å¤±è´¥ï¼š%s\n" #: g10/tdbio.c:1177 #, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "ÐÅÈζÈÊý¾Ý¿â£º¶Áȡʧ°Ü(n=%d)£º%s\n" +msgstr "信任度数æ®åº“：读å–失败(n=%d)：%s\n" #: g10/tdbio.c:1198 #, c-format msgid "%s: not a trustdb file\n" -msgstr "%s£º²»ÊÇÒ»¸öÐÅÈζÈÊý¾Ý¿âÎļþ\n" +msgstr "%s：ä¸æ˜¯ä¸€ä¸ªä¿¡ä»»åº¦æ•°æ®åº“文件\n" #: g10/tdbio.c:1216 #, c-format msgid "%s: version record with recnum %lu\n" -msgstr "%s£º¼Ç¼±àºÅΪ%luµÄ°æ±¾¼Ç¼\n" +msgstr "%s：记录编å·ä¸º%lu的版本记录\n" #: g10/tdbio.c:1221 #, c-format msgid "%s: invalid file version %d\n" -msgstr "%s£ºÎÞЧµÄÎļþ°æ±¾%d\n" +msgstr "%s：无效的文件版本%d\n" #: g10/tdbio.c:1406 #, c-format msgid "%s: error reading free record: %s\n" -msgstr "%s£º¶ÁÈ¡×ÔÓɼǼʱ³ö´í£º%s\n" +msgstr "%s：读å–自由记录时出错：%s\n" #: g10/tdbio.c:1414 #, c-format msgid "%s: error writing dir record: %s\n" -msgstr "%s£ºÐ´ÈëĿ¼¼Ç¼ʱ³ö´í£º%s\n" +msgstr "%s：写入目录记录时出错：%s\n" #: g10/tdbio.c:1424 #, c-format msgid "%s: failed to zero a record: %s\n" -msgstr "%s£º¼Ç¼¹éÁãʱʧ°Ü£º%s\n" +msgstr "%s：记录归零时失败：%s\n" #: g10/tdbio.c:1454 #, c-format msgid "%s: failed to append a record: %s\n" -msgstr "%s£º¸½¼Ó¼Ç¼ʱʧ°Ü£º%s\n" +msgstr "%s：附加记录时失败：%s\n" #: g10/tdbio.c:1499 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "ÐÅÈζÈÊý¾Ý¿âÒÑË𻵣»ÇëÖ´ÐС°gpg --fix-trustdb¡±¡£\n" +msgstr "信任度数æ®åº“å·²æŸå；请执行“gpg --fix-trustdbâ€ã€‚\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" -msgstr "ÎÞ·¨´¦Àí³¤ÓÚ %d ×Ö·ûµÄÎı¾ÐÐ\n" +msgstr "无法处ç†é•¿äºŽ %d 字符的文本行\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" -msgstr "ÊäÈëÐг¤¶È³¬¹ý %d ×Ö·û\n" +msgstr "输入行长度超过 %d 字符\n" #: g10/trustdb.c:226 #, c-format msgid "`%s' is not a valid long keyID\n" -msgstr "¡®%s¡¯²»ÊÇÒ»¸öÓÐЧµÄ³¤Ê½Ô¿³×ºÅ\n" +msgstr "‘%s’ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„é•¿å¼é’¥åŒ™å·\n" #: g10/trustdb.c:257 -#, fuzzy, c-format +#, c-format msgid "key %s: accepted as trusted key\n" -msgstr "ÃÜÔ¿ %08lX£ºÊÜÐÅÈΣ¬ÒѽÓÊÜ\n" +msgstr "密钥 %s：å—信任，已接å—\n" #: g10/trustdb.c:295 -#, fuzzy, c-format +#, c-format msgid "key %s occurs more than once in the trustdb\n" -msgstr "ÃÜÔ¿ %08lX ÔÚÐÅÈζÈÊý¾Ý¿âÖÐÖظ´³öÏÖ\n" +msgstr "密钥 %s 在信任度数æ®åº“中é‡å¤å‡ºçŽ°\n" #: g10/trustdb.c:310 -#, fuzzy, c-format +#, c-format msgid "key %s: no public key for trusted key - skipped\n" -msgstr "ÃÜÔ¿ %08lX£ºÊÜÐÅÈεÄÃÜԿûÓй«Ô¿¡ª¡ªÒÑÌø¹ý\n" +msgstr "密钥 %s：å—信任的密钥没有公钥――已跳过\n" #: g10/trustdb.c:320 -#, fuzzy, c-format +#, c-format msgid "key %s marked as ultimately trusted\n" -msgstr "ÃÜÔ¿Òѱ»±ê¼Ç³É¾ø¶ÔÐÅÈΡ£\n" +msgstr "密钥 %s 被标记为ç»å¯¹ä¿¡ä»»\n" #: g10/trustdb.c:344 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "ÐÅÈμǼ %lu£¬ÇëÇóÀà±ð %d£º¶Áȡʧ°Ü£º%s\n" +msgstr "信任记录 %lu，请求类别 %d：读å–失败：%s\n" #: g10/trustdb.c:350 #, c-format msgid "trust record %lu is not of requested type %d\n" -msgstr "ÐÅÈμǼ %lu ²»ÊôÓÚËùÇëÇóµÄÀà±ð %d\n" +msgstr "信任记录 %lu ä¸å±žäºŽæ‰€è¯·æ±‚的类别 %d\n" #: g10/trustdb.c:446 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" -msgstr "" +msgstr "无法使用未知的信任模型(%d)――å‡å®šä½¿ç”¨ %s 信任模型\n" #: g10/trustdb.c:452 #, c-format msgid "using %s trust model\n" +msgstr "使用 %s 信任模型\n" + +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:501 -msgid "undefined" +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "å·²åŠé”€" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "已过期" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "未知" + +#: g10/trustdb.c:512 +msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:513 #, fuzzy +msgid "[marginal]" +msgstr "勉强" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +#, fuzzy +msgid "[ultimate]" +msgstr "ç»å¯¹" + +#: g10/trustdb.c:530 +msgid "undefined" +msgstr "未定义" + +#: g10/trustdb.c:531 msgid "never" -msgstr "ÓÀ²»¹ýÆÚ" +msgstr "从ä¸" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" -msgstr "" +msgstr "勉强" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" -msgstr "" +msgstr "完全" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" -msgstr "" +msgstr "ç»å¯¹" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" -msgstr "²»ÐèÒª¼ì²éÐÅÈζÈÊý¾Ý¿â\n" +msgstr "ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" -msgstr "Ï´ÎÐÅÈζÈÊý¾Ý¿â¼ì²é½«ÓÚ %s ½øÐÐ\n" +msgstr "下次信任度数æ®åº“检查将于 %s 进行\n" -#: g10/trustdb.c:560 -#, fuzzy, c-format +#: g10/trustdb.c:589 +#, c-format msgid "no need for a trustdb check with `%s' trust model\n" -msgstr "²»ÐèÒª¼ì²éÐÅÈζÈÊý¾Ý¿â\n" +msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:575 -#, fuzzy, c-format +#: g10/trustdb.c:604 +#, c-format msgid "no need for a trustdb update with `%s' trust model\n" -msgstr "²»ÐèÒª¼ì²éÐÅÈζÈÊý¾Ý¿â\n" +msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ›´æ–°ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 -#, fuzzy, c-format +#: g10/trustdb.c:822 g10/trustdb.c:1260 +#, c-format msgid "public key %s not found: %s\n" -msgstr "¹«Ô¿ %08lX δ±»ÕÒµ½£º%s\n" +msgstr "找ä¸åˆ°å…¬é’¥ %s：%s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" -msgstr "ÇëÖ´ÐÐÒ»´Î --check-trustdb\n" +msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" -msgstr "ÕýÔÚ¼ì²éÐÅÈζÈÊý¾Ý¿â\n" +msgstr "正在检查信任度数æ®åº“\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" -msgstr "ÒѾ­´¦ÀíÁË %d °ÑÃÜÔ¿(¹²¼ÆÒѽâ¾öÁË %d ·ÝµÄÓÐЧÐÔ)\n" +msgstr "å·²ç»å¤„ç†äº† %d 把密钥(共计已解决了 %d 份的有效性)\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" -msgstr "ûÓÐÕÒµ½Èκξø¶ÔÐÅÈεÄÃÜÔ¿\n" +msgstr "没有找到任何ç»å¯¹ä¿¡ä»»çš„密钥\n" -#: g10/trustdb.c:1934 -#, fuzzy, c-format +#: g10/trustdb.c:1963 +#, c-format msgid "public key of ultimately trusted key %s not found\n" -msgstr "¾ø¶ÔÐÅÈεÄÃÜÔ¿ %08lX µÄ¹«Ô¿Î´±»ÕÒµ½\n" +msgstr "ç»å¯¹ä¿¡ä»»çš„密钥 %s 的公钥未被找到\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" -msgstr "" +msgstr "éœ€è¦ %d 份勉强信任和 %d 份完全信任，%s 信任模型\n" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" +"深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n" -#: g10/trustdb.c:2118 -#, fuzzy, c-format +#: g10/trustdb.c:2147 +#, c-format msgid "unable to update trustdb version record: write failed: %s\n" -msgstr "ÐÅÈμǼ %lu£¬Àà±ð %d£ºÐ´Èëʧ°Ü£º%s\n" +msgstr "无法更新信任度数æ®åº“版本记录：写入失败：%s\n" #: g10/verify.c:116 msgid "" @@ -5656,250 +5599,248 @@ "Please remember that the signature file (.sig or .asc)\n" "should be the first file given on the command line.\n" msgstr "" -"Ç©×ÖÎÞ·¨±»ÑéÖ¤¡£\n" -"Çë¼Çסǩ×ÖÎļþ(.sig»ò.asc)\n" -"Ó¦¸ÃÊÇÔÚÃüÁîÐÐÖиø¶¨µÄµÚÒ»¸öÎļþ¡£\n" +"签字无法被验è¯ã€‚\n" +"请记ä½ç­¾å­—文件(.sig或.asc)\n" +"应该是在命令行中给定的第一个文件。\n" #: g10/verify.c:189 #, c-format msgid "input line %u too long or missing LF\n" -msgstr "ÊäÈëÐÐ %u Ì«³¤»òÕßÐÐÄ©µÄ»»Ðзû LF ÒÅʧ\n" +msgstr "输入行 %u 太长或者行末的æ¢è¡Œç¬¦ LF é—失\n" #: util/errors.c:54 msgid "general error" -msgstr "³£¹æ´íÎó" +msgstr "常规错误" #: util/errors.c:55 msgid "unknown packet type" -msgstr "δ֪µÄ°üÀàÐÍ" +msgstr "未知的包类型" #: util/errors.c:56 msgid "unknown version" -msgstr "δ֪µÄ°æ±¾" +msgstr "未知的版本" #: util/errors.c:57 msgid "unknown pubkey algorithm" -msgstr "δ֪µÄ¹«Ô¿Ëã·¨" +msgstr "未知的公钥算法" #: util/errors.c:58 msgid "unknown digest algorithm" -msgstr "δ֪µÄÉ¢ÁÐËã·¨" +msgstr "未知的散列算法" #: util/errors.c:59 msgid "bad public key" -msgstr "¹«Ô¿ÒѾ­Ëð»µ" +msgstr "公钥已ç»æŸå" #: util/errors.c:60 msgid "bad secret key" -msgstr "˽ԿÒѾ­Ëð»µ" +msgstr "ç§é’¥å·²ç»æŸå" #: util/errors.c:61 msgid "bad signature" -msgstr "Ç©×ÖÒѾ­Ëð»µ" +msgstr "签字已ç»æŸå" #: util/errors.c:62 msgid "checksum error" -msgstr "УÑéºÍ´íÎó" +msgstr "校验和错误" #: util/errors.c:63 msgid "bad passphrase" -msgstr "´íÎóµÄÃÜÂë" +msgstr "错误的密ç " #: util/errors.c:64 msgid "public key not found" -msgstr "ÕÒ²»µ½¹«Ô¿" +msgstr "找ä¸åˆ°å…¬é’¥" #: util/errors.c:65 msgid "unknown cipher algorithm" -msgstr "δ֪µÄ¶Ô³Æ¼ÓÃÜËã·¨" +msgstr "未知的对称加密算法" #: util/errors.c:66 msgid "can't open the keyring" -msgstr "ÎÞ·¨´ò¿ªÔ¿³×»·" +msgstr "无法打开钥匙环" #: util/errors.c:67 msgid "invalid packet" -msgstr "ÎÞЧ°ü" +msgstr "无效包" #: util/errors.c:68 msgid "invalid armor" -msgstr "ÎÞЧµÄ ASCII ·â×°¸ñʽ" +msgstr "无效的 ASCII å°è£…æ ¼å¼" #: util/errors.c:69 msgid "no such user id" -msgstr "ûÓÐÕâ¸öÓû§±êʶ" +msgstr "没有这个用户标识" #: util/errors.c:70 msgid "secret key not available" -msgstr "˽Կ²»¿ÉÓÃ" +msgstr "ç§é’¥ä¸å¯ç”¨" #: util/errors.c:71 msgid "wrong secret key used" -msgstr "ʹÓÃÁË´íÎóµÄ˽Կ" +msgstr "使用了错误的ç§é’¥" #: util/errors.c:72 msgid "not supported" -msgstr "δ±»Ö§³Ö" +msgstr "未被支æŒ" #: util/errors.c:73 msgid "bad key" -msgstr "ÃÜÔ¿ÒÑËð»µ" +msgstr "密钥已æŸå" #: util/errors.c:74 msgid "file read error" -msgstr "Îļþ¶ÁÈ¡´íÎó" +msgstr "文件读å–错误" #: util/errors.c:75 msgid "file write error" -msgstr "ÎļþдÈë´íÎó" +msgstr "文件写入错误" #: util/errors.c:76 msgid "unknown compress algorithm" -msgstr "δ֪µÄѹËõËã·¨" +msgstr "未知的压缩算法" #: util/errors.c:77 msgid "file open error" -msgstr "Îļþ´ò¿ª´íÎó" +msgstr "文件打开错误" #: util/errors.c:78 msgid "file create error" -msgstr "Îļþ½¨Á¢´íÎó" +msgstr "文件建立错误" #: util/errors.c:79 msgid "invalid passphrase" -msgstr "ÎÞЧµÄÃÜÂë" +msgstr "无效的密ç " #: util/errors.c:80 msgid "unimplemented pubkey algorithm" -msgstr "ÉÐδʵÏֵĹ«Ô¿Ëã·¨" +msgstr "尚未实现的公钥算法" #: util/errors.c:81 msgid "unimplemented cipher algorithm" -msgstr "ÉÐδʵÏֵĶԳƼÓÃÜËã·¨" +msgstr "尚未实现的对称加密算法" #: util/errors.c:82 msgid "unknown signature class" -msgstr "δ֪µÄÇ©×ֵȼ¶" +msgstr "未知的签字等级" #: util/errors.c:83 msgid "trust database error" -msgstr "ÐÅÈζÈÊý¾Ý¿â´íÎó" +msgstr "信任度数æ®åº“错误" #: util/errors.c:84 msgid "bad MPI" -msgstr "Ë𻵵Ķྫ¶ÈÕûÊý(MPI)" +msgstr "æŸå的多精度整数(MPI)" #: util/errors.c:85 msgid "resource limit" -msgstr "×ÊÔ´ÏÞÖÆ" +msgstr "资æºé™åˆ¶" #: util/errors.c:86 msgid "invalid keyring" -msgstr "ÎÞЧµÄÔ¿³×»·" +msgstr "无效的钥匙环" #: util/errors.c:87 msgid "bad certificate" -msgstr "Ö¤ÊéÒÑËð»µ" +msgstr "è¯ä¹¦å·²æŸå" #: util/errors.c:88 msgid "malformed user id" -msgstr "±»±äÔì¹ýµÄÓû§±êʶ" +msgstr "被å˜é€ è¿‡çš„用户标识" #: util/errors.c:89 msgid "file close error" -msgstr "Îļþ¹Ø±Õ´íÎó" +msgstr "文件关闭错误" #: util/errors.c:90 msgid "file rename error" -msgstr "ÎļþÖØÃüÃû´íÎó" +msgstr "文件é‡å‘½å错误" #: util/errors.c:91 msgid "file delete error" -msgstr "Îļþɾ³ý´íÎó" +msgstr "文件删除错误" #: util/errors.c:92 msgid "unexpected data" -msgstr "δԤÆÚµÄÊý¾Ý" +msgstr "未预期的数æ®" #: util/errors.c:93 msgid "timestamp conflict" -msgstr "ʱ¼ä´ÁÓÐì¶Ü" +msgstr "时间戳有矛盾" #: util/errors.c:94 msgid "unusable pubkey algorithm" -msgstr "ÎÞ·¨Ê¹ÓõĹ«Ô¿Ëã·¨" +msgstr "无法使用的公钥算法" #: util/errors.c:95 msgid "file exists" -msgstr "ÎļþÒÑ´æÔÚ" +msgstr "文件已存在" #: util/errors.c:96 msgid "weak key" -msgstr "ÈõÃÜÔ¿" +msgstr "弱密钥" #: util/errors.c:97 msgid "invalid argument" -msgstr "ÎÞЧµÄ²ÎÊý" +msgstr "无效的å‚æ•°" #: util/errors.c:98 msgid "bad URI" -msgstr "URI ÒÑËð»µ" +msgstr "URI å·²æŸå" #: util/errors.c:99 msgid "unsupported URI" -msgstr "δ±»Ö§³ÖµÄ URI" +msgstr "未被支æŒçš„ URI" #: util/errors.c:100 msgid "network error" -msgstr "ÍøÂç´íÎó" +msgstr "网络错误" #: util/errors.c:102 msgid "not encrypted" -msgstr "δ±»¼ÓÃÜ" +msgstr "未被加密" #: util/errors.c:103 msgid "not processed" -msgstr "δ±»´¦Àí" +msgstr "未被处ç†" #: util/errors.c:105 msgid "unusable public key" -msgstr "²»¿ÉÓõĹ«Ô¿" +msgstr "ä¸å¯ç”¨çš„公钥" #: util/errors.c:106 msgid "unusable secret key" -msgstr "²»¿ÉÓõÄ˽Կ" +msgstr "ä¸å¯ç”¨çš„ç§é’¥" #: util/errors.c:107 msgid "keyserver error" -msgstr "¹«Ô¿·þÎñÆ÷´íÎó" +msgstr "公钥æœåŠ¡å™¨é”™è¯¯" #: util/errors.c:108 -#, fuzzy msgid "canceled" -msgstr "È¡Ïû" +msgstr "å·²å–消" #: util/errors.c:109 -#, fuzzy msgid "no card" -msgstr "δ±»¼ÓÃÜ" +msgstr "没有å¡" #: util/logger.c:157 msgid "ERROR: " -msgstr "" +msgstr "错误：" #: util/logger.c:160 msgid "WARNING: " -msgstr "" +msgstr "警告：" #: util/logger.c:223 #, c-format msgid "... this is a bug (%s:%d:%s)\n" -msgstr "¡­¡­ÕâÊǸö³ÌÐòȱÏÝ(%s:%d:%s)\n" +msgstr "……这是个程åºç¼ºé™·(%s:%d:%s)\n" #: util/logger.c:229 #, c-format msgid "you found a bug ... (%s:%d)\n" -msgstr "ÄúÕÒµ½Ò»¸ö³ÌÐòȱÏÝÁË¡­¡­(%s:%d)\n" +msgstr "您找到一个程åºç¼ºé™·äº†â€¦â€¦(%s:%d)\n" #: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" @@ -5923,485 +5864,84 @@ #: util/miscutil.c:384 msgid "okay|okay" -msgstr "" +msgstr "okay|ok" #: util/miscutil.c:386 msgid "cancel|cancel" -msgstr "" +msgstr "cancel|cancel" #: util/miscutil.c:387 msgid "oO" -msgstr "" +msgstr "oO" #: util/miscutil.c:388 -#, fuzzy msgid "cC" -msgstr "c" +msgstr "cC" #: util/secmem.c:90 msgid "WARNING: using insecure memory!\n" -msgstr "¾¯¸æ£ºÕýÔÚʹÓò»°²È«µÄÄڴ棡\n" +msgstr "警告：正在使用ä¸å®‰å…¨çš„内存ï¼\n" #: util/secmem.c:91 msgid "please see http://www.gnupg.org/faq.html for more information\n" -msgstr "Çë·ÃÎÊ http://www.gnupg.org/faq.html ÒÔ»ñµÃ¸üÏêϸµÄÐÅÏ¢\n" +msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信æ¯\n" #: util/secmem.c:340 msgid "operation is not possible without initialized secure memory\n" -msgstr "°²È«ÄÚ´æδ³õʼ»¯£¬²»ÄܽøÐвÙ×÷\n" +msgstr "安全内存未åˆå§‹åŒ–，ä¸èƒ½è¿›è¡Œæ“作\n" #: util/secmem.c:341 msgid "(you may have used the wrong program for this task)\n" -msgstr "(Äú¿ÉÄÜʹÓÃÁË´íÎóµÄ³ÌÐòÀ´Íê³É´ËÏîÈÎÎñ)\n" - -#~ msgid "sorry, can't do this in batch mode\n" -#~ msgstr "±§Ç¸£¬ÔÚÅú´¦ÀíģʽÖÐÎÞ·¨Íê³É´Ë²Ù×÷\n" - -#~ msgid "key `%s' not found: %s\n" -#~ msgstr "ÕÒ²»µ½¡®%s¡¯ÃÜÔ¿£º%s\n" - -#, fuzzy -#~ msgid "can't create file `%s': %s\n" -#~ msgstr "ÎÞ·¨½¨Á¢¡®%s¡¯£º%s\n" - -#, fuzzy -#~ msgid "can't open file `%s': %s\n" -#~ msgstr "ÎÞ·¨´ò¿ªÎļþ£º%s\n" - -#, fuzzy -#~ msgid " \"" -#~ msgstr " Ò༴ \"" +msgstr "(您å¯èƒ½ä½¿ç”¨äº†é”™è¯¯çš„程åºæ¥å®Œæˆæ­¤é¡¹ä»»åŠ¡)\n" -#~ msgid " i = please show me more information\n" -#~ msgstr " i = Çë¸æËßÎÒ¸ü¶àÐÅÏ¢\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "‘%s’散列算法在本å‘行版本中åªè¯»\n" -#~ msgid "key %08lX: key has been revoked!\n" -#~ msgstr "ÃÜÔ¿ %08lX£ºÒѾ­±»µõÏúÁË£¡\n" +#~ msgid "[%8.8s] " +#~ msgstr "[%4.4s]" -#~ msgid "key %08lX: subkey has been revoked!\n" -#~ msgstr "ÃÜÔ¿ %08lX£º×ÓÔ¿ÒѾ­±»µõÏúÁË£¡\n" - -#~ msgid "%08lX: key has expired\n" -#~ msgstr "%08lX: ÃÜÔ¿ÒѾ­¹ýÆÚÁË\n" - -#~ msgid "%08lX: We do NOT trust this key\n" -#~ msgstr "%08lX£ºÎÒÃDz»ÐÅÈÎÕâ°ÑÃÜÔ¿\n" - -#~ msgid " (%d) RSA (sign and encrypt)\n" -#~ msgstr " (%d) RSA (ÓÃÓÚÇ©×Ö¼°¼ÓÃÜ)\n" - -#, fuzzy -#~ msgid " (%d) RSA (auth only)\n" -#~ msgstr " (%d) RSA (½öÓÃÓÚÇ©×Ö)\n" - -#, fuzzy -#~ msgid " (%d) RSA (sign and auth)\n" -#~ msgstr " (%d) RSA (ÓÃÓÚÇ©×Ö¼°¼ÓÃÜ)\n" - -#, fuzzy -#~ msgid " (%d) RSA (encrypt and auth)\n" -#~ msgstr " (%d) RSA (½öÓÃÓÚ¼ÓÃÜ)\n" - -#, fuzzy -#~ msgid " (%d) RSA (sign, encrypt and auth)\n" -#~ msgstr " (%d) RSA (ÓÃÓÚÇ©×Ö¼°¼ÓÃÜ)\n" - -#~ msgid "%s: can't open: %s\n" -#~ msgstr "%s£ºÎÞ·¨´ò¿ª£º%s\n" - -#~ msgid "%s: WARNING: empty file\n" -#~ msgstr "%s£º¾¯¸æ£º¿ÕÎļþ\n" - -#~ msgid "can't open %s: %s\n" -#~ msgstr "ÎÞ·¨´ò¿ª %s£º%s\n" - -#, fuzzy -#~ msgid " (%d) I trust marginally\n" -#~ msgstr " %d = ÎÒÃãÇ¿ÐÅÈÎ\n" - -#, fuzzy -#~ msgid " (%d) I trust fully\n" -#~ msgstr " %d = ÎÒÍêÈ«ÐÅÈÎ\n" - -#, fuzzy -#~ msgid "expires" -#~ msgstr "expire" - -#, fuzzy #~ msgid "" -#~ "\"\n" -#~ "locally signed with your key %s at %s\n" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" #~ msgstr "" -#~ "¡±\n" -#~ "ÒѾ­Ê¹ÓÃÄúµÄÃÜÔ¿ %08lX ÓÚ %s Ìí¼Ó±¾µØÇ©×Ö\n" - -#, fuzzy -#~ msgid " signed by %s on %s%s\n" -#~ msgstr " ÓÉ %08lX ÓÚ %s%s Ìí¼ÓÇ©×Ö\n" - -#~ msgid "%s: can't access: %s\n" -#~ msgstr "%s£ºÎÞ·¨´æÈ¡£º%s\n" - -#~ msgid "%s: can't create lock\n" -#~ msgstr "%s£ºÎÞ·¨Ëø¶¨\n" - -#~ msgid "%s: can't make lock\n" -#~ msgstr "%s£ºÎÞ·¨Ëø¶¨\n" - -#~ msgid "%s: can't create: %s\n" -#~ msgstr "%s£ºÎÞ·¨½¨Á¢£º%s\n" - -#~ msgid "%s: can't create directory: %s\n" -#~ msgstr "%s£ºÎÞ·¨½¨Á¢Ä¿Â¼£º%s\n" - -#~ msgid "If you want to use this revoked key anyway, answer \"yes\"." -#~ msgstr "Èç¹ûÄúÎÞÂÛÈçºÎҪʹÓÃÕâ°Ñ±»µõÏúÁ˵ÄÃÜÔ¿£¬Çë»Ø´ð¡°yes¡±¡£" - -#~ msgid "Unable to open photo \"%s\": %s\n" -#~ msgstr "ÎÞ·¨´ò¿ªÕÕƬ¡°%s¡±£º%s\n" - -#~ msgid "can't open file: %s\n" -#~ msgstr "ÎÞ·¨´ò¿ªÎļþ£º%s\n" - -#~ msgid "error: missing colon\n" -#~ msgstr "´íÎó£ºÃ°ºÅȱ©\n" - -#~ msgid "error: no ownertrust value\n" -#~ msgstr "´íÎó£ºÃ»ÓÐÐÅÈζÈ\n" - -#~ msgid " (main key ID %08lX)" -#~ msgstr "(Ö÷Ô¿³×ºÅ %08lX)" - -#~ msgid "rev! subkey has been revoked: %s\n" -#~ msgstr "rev! ×ÓÔ¿ÒѾ­±»µõÏú£º%s\n" - -#~ msgid "rev- faked revocation found\n" -#~ msgstr "rev- ·¢ÏÖαÔìµÄµõÏú\n" - -#~ msgid "rev? problem checking revocation: %s\n" -#~ msgstr "rev? ¼ì²éµõÏúʱ·¢ÉúÎÊÌ⣺%s\n" - -#~ msgid "[revoked] " -#~ msgstr "[ÒѵõÏú]" - -#~ msgid "[expired] " -#~ msgstr "[ÒѹýÆÚ]" - -# of subkey -#, fuzzy -#~ msgid " [expired: %s]" -#~ msgstr " [ÓÐЧÆÚÖÁ£º%s]" - -# of subkey -#~ msgid " [expires: %s]" -#~ msgstr " [ÓÐЧÆÚÖÁ£º%s]" - -#, fuzzy -#~ msgid " [revoked: %s]" -#~ msgstr "[ÒѵõÏú]" - -#~ msgid "can't create %s: %s\n" -#~ msgstr "ÎÞ·¨½¨Á¢ %s£º%s\n" - -#~ msgid "" -#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" -#~ msgstr "¾¯¸æ£ºÉ¢ÁÐËã·¨¡®%s¡¯²¢²»ÊÇ OpenPGP µÄÒ»²¿·Ö¡£ÈçҪʹÓ㬺ó¹û×Ô¸º£¡\n" - -#~ msgid "|[files]|encrypt files" -#~ msgstr "|[ÎļþÃû]|¼ÓÃÜÎļþ" - -#~ msgid "store only" -#~ msgstr "½ö±£´æ" - -#~ msgid "|[files]|decrypt files" -#~ msgstr "|[ÎļþÃû]|½âÃÜÎļþ" - -#~ msgid "sign a key non-revocably" -#~ msgstr "Ϊij°ÑÃÜÔ¿Ìí¼Ó²»¿ÉµõÏúµÄÇ©×Ö" - -#~ msgid "sign a key locally and non-revocably" -#~ msgstr "Ϊij°ÑÃÜÔ¿Ìí¼Ó²»¿ÉµõÏúµÄ±¾µØÇ©×Ö" - -#~ msgid "list only the sequence of packets" -#~ msgstr "½öÁгö°üÐòÁÐ" - -#~ msgid "export the ownertrust values" -#~ msgstr "µ¼³öÐÅÈζÈ" - -#~ msgid "unattended trust database update" -#~ msgstr "²»ÊܸÉÔ¤µØ¸üÐÂÐÅÈζÈÊý¾Ý¿â" - -#~ msgid "fix a corrupted trust database" -#~ msgstr "ÐÞ¸´Ä³¸öÒÑË𻵵ÄÐÅÈζÈÊý¾Ý¿â" - -#~ msgid "De-Armor a file or stdin" -#~ msgstr "ΪÎļþ»ò±ê×¼ÊäÈë½â¿ª ASCII ·â×°" - -#~ msgid "En-Armor a file or stdin" -#~ msgstr "ΪÎļþ»ò±ê×¼ÊäÈë½øÐÐ ASCII ·â×°" - -#~ msgid "|NAME|use NAME as default recipient" -#~ msgstr "|ij¼×|½«¡°Ä³¼×¡±Ñ¡ÎªÄ¬ÈϵÄÊÕ¼þÕß" - -#~ msgid "use the default key as default recipient" -#~ msgstr "°ÑĬÈϵÄÃÜÔ¿µ±×÷ĬÈϵÄÊÕ¼þÕß" - -#~ msgid "don't use the terminal at all" -#~ msgstr "ÍêÈ«²»ÒªÊ¹ÓÃÖÕ¶Ë" +#~ "å°†è¦ç”Ÿæˆä¸€å‰¯æ–°çš„%s密钥对。\n" +#~ " 最å°çš„密钥尺寸是 768 ä½\n" +#~ " 默认的密钥尺寸是 1024 ä½\n" +#~ " 推è的最大密钥尺寸是 2048 ä½\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA 的密钥尺寸åªèƒ½ä»‹äºŽ 512 å’Œ 1024 之间\n" -#~ msgid "force v3 signatures" -#~ msgstr "Ç¿ÐÐʹÓà v3 Ç©×Ö" +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "密钥尺寸太å°ï¼šRSA 密钥尺寸至少è¦æœ‰ 1024。\n" -#~ msgid "do not force v3 signatures" -#~ msgstr "²»ÒªÇ¿ÐÐʹÓà v3 Ç©×Ö" +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "密钥尺寸太å°ï¼›è‡³å°‘è¦æœ‰ 768。\n" -#~ msgid "force v4 key signatures" -#~ msgstr "Ç¿ÐÐʹÓà v4 ÃÜÔ¿Ç©×Ö" - -#~ msgid "do not force v4 key signatures" -#~ msgstr "²»ÒªÇ¿ÐÐʹÓà v4 ÃÜÔ¿Ç©×Ö" - -#~ msgid "always use a MDC for encryption" -#~ msgstr "¼ÓÃÜʱ×ÜʹÓñ䶯Õì²âÂë" - -#~ msgid "never use a MDC for encryption" -#~ msgstr "¼ÓÃÜʱÓÀÔ¶²»Ê¹Óñ䶯Õì²âÂë" - -#~ msgid "use the gpg-agent" -#~ msgstr "ʹÓà gpg-agent ´úÀí³ÌÐò" - -#~ msgid "batch mode: never ask" -#~ msgstr "Åú´¦Àíģʽ£ºÓÀÔ¶²»Ñ¯ÎÊ" - -#~ msgid "assume yes on most questions" -#~ msgstr "¼Ù¶¨´ó¶àÊýÎÊÌâµÄ»Ø´ðΪ¡°ÊÇ¡±" - -#~ msgid "assume no on most questions" -#~ msgstr "¼Ù¶¨´ó¶àÊýÎÊÌâµÄ»Ø´ðΪ¡°·ñ¡±" - -#~ msgid "add this keyring to the list of keyrings" -#~ msgstr "°ÑÕâ¸öÔ¿³×»·¼Ó½øÔ¿³×»·Çåµ¥ÖÐ" - -#~ msgid "add this secret keyring to the list" -#~ msgstr "°ÑÕâ¸ö˽ԿԿ³×»·¼Ó½øÇåµ¥ÖÐ" - -#~ msgid "show which keyring a listed key is on" -#~ msgstr "ÏÔʾ±»ÁгöµÄÃÜÔ¿ÔÚÄÄÒ»¸öÔ¿³×»·ÉÏ" - -#~ msgid "|NAME|use NAME as default secret key" -#~ msgstr "|ij¼×|½«¡°Ä³¼×¡±ÉèΪĬÈÏ˽Կ" - -#~ msgid "|HOST|use this keyserver to lookup keys" -#~ msgstr "|Ö÷»úÃû|ʹÓÃÕâ¸ö¹«Ô¿·þÎñÆ÷À´Ñ°ÕÒÃÜÔ¿" - -#~ msgid "|NAME|set terminal charset to NAME" -#~ msgstr "|×Ö·û¼¯Ãû|É趨ÖÕ¶ËʹÓõÄ×Ö·û¼¯" - -#~ msgid "read options from file" -#~ msgstr "´ÓÎļþ¶ÁÈ¡Ñ¡Ïî" - -#~ msgid "|[file]|write status info to file" -#~ msgstr "|[ÎļþÃû]|°Ñ״̬ÐÅϢдÈëÎļþ" - -#~ msgid "|KEYID|ultimately trust this key" -#~ msgstr "|Ô¿³×ºÅ|¾ø¶ÔÐÅÈδËÃÜÔ¿" - -#~ msgid "|FILE|load extension module FILE" -#~ msgstr "|ÎļþÃû|ÔØÈëÀ©Õ¹Ä£¿é" - -#~ msgid "emulate the mode described in RFC1991" -#~ msgstr "·ÂÕæ RFC1991 ÀïËùÃèÊöµÄģʽ" - -#~ msgid "set all packet, cipher and digest options to OpenPGP behavior" -#~ msgstr "°ü¡¢¼ÓÃܺÍÉ¢ÁÐËã·¨µÄÑ¡Ïîµ÷ÕûΪ OpenPGP Ñùʽ" - -#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior" -#~ msgstr "°ü¡¢¼ÓÃܺÍÉ¢ÁÐËã·¨µÄÑ¡Ïîµ÷ÕûΪ PGP 2.x Ñùʽ" - -#~ msgid "|N|use passphrase mode N" -#~ msgstr "|N|ʹÓÃģʽ N µÄÃÜÂë" - -#~ msgid "|NAME|use message digest algorithm NAME for passphrases" -#~ msgstr "|Ëã·¨Ãû|Ö¸¶¨ÃÜÂëʹÓõı¨ÎÄÉ¢ÁÐËã·¨" - -#~ msgid "|NAME|use cipher algorithm NAME for passphrases" -#~ msgstr "|Ëã·¨Ãû|Ö¸¶¨ÃÜÂëʹÓõĶԳƼÓÃÜËã·¨" - -#~ msgid "|NAME|use cipher algorithm NAME" -#~ msgstr "|Ëã·¨Ãû|Ö¸¶¨Ê¹ÓõĶԳƼÓÃÜËã·¨" - -#~ msgid "|NAME|use message digest algorithm NAME" -#~ msgstr "|Ëã·¨Ãû|Ö¸¶¨Ê¹Óõı¨ÎÄÉ¢ÁÐËã·¨" - -#~ msgid "|N|use compress algorithm N" -#~ msgstr "|N|ʹÓÃµÚ N ºÅѹËõËã·¨" - -#~ msgid "throw keyid field of encrypted packets" -#~ msgstr "²»½«ÊÕ¼þÈËÔ¿³×ºÅ¼ÓÈë¼ÓÃÜ°üÖÐ" - -#~ msgid "Show Photo IDs" -#~ msgstr "ÏÔʾÕÕƬ±êʶ" - -#~ msgid "Don't show Photo IDs" -#~ msgstr "²»ÏÔʾÕÕƬ±êʶ" - -#~ msgid "Set command line to view Photo IDs" -#~ msgstr "É趨²é¿´ÕÕƬ±êʶʱʹÓõÄÃüÁîÐÐ" - -#~ msgid "compress algorithm `%s' is read-only in this release\n" -#~ msgstr "¡®%s¡¯Ñ¹ËõËã·¨ÔÚ±¾·¢Ðа汾ÖÐÖ»¶Á\n" - -#~ msgid "compress algorithm must be in range %d..%d\n" -#~ msgstr "ѹËõËã·¨Ò»¶¨Òª½éÓÚ %d µ½ %d Ö®¼ä\n" +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "密钥尺寸太大；最大åªèƒ½å¤Ÿç”¨åˆ° %d。\n" #~ msgid "" -#~ "%08lX: It is not sure that this key really belongs to the owner\n" -#~ "but it is accepted anyway\n" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" #~ msgstr "" -#~ "%08lX: ÎÞ·¨È·¶¨Õâ°ÑÃÜÔ¿ÊÇ·ñÕæµÄÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß\n" -#~ "µ«ÊÇÃÜÔ¿ÈԾɱ»½ÓÊÜÁË\n" - -#~ msgid "preference %c%lu is not valid\n" -#~ msgstr "Ê×Ñ¡Ïî %c%lu ÎÞЧ\n" - -#~ msgid "key %08lX: not a rfc2440 key - skipped\n" -#~ msgstr "ÃÜÔ¿ %08lX£º²»ÊÇÒ»°Ñ rfc2440 ÃÜÔ¿¡ª¡ªÒÑÌø¹ý\n" - -#~ msgid "" -#~ "NOTE: Elgamal primary key detected - this may take some time to import\n" -#~ msgstr "×¢Ò⣺¼ì²âµ½ Elgamal Ö÷Ô¿¡ª¡ªµ¼ÈëÕâ°ÑÖ÷Ô¿¿ÉÄÜ»áÏûºÄÒ»¶Îʱ¼ä\n" - -#~ msgid " (default)" -#~ msgstr " (ĬÈÏ)" - -#~ msgid "%s%c %4u%c/%08lX created: %s expires: %s" -#~ msgstr "%s%c %4u%c/%08lX Éú³ÉÓÚ£º%s ÓÐЧÖÁ£º%s" - -#~ msgid "Notation: " -#~ msgstr "±ê¼Ç£º" +#~ "ä¸å»ºè®®ä½¿ç”¨å°ºå¯¸å¤§äºŽ 2048 的密钥，\n" +#~ "因为计算真的会花去很多时间ï¼\n" -#~ msgid "Policy: " -#~ msgstr "²ßÂÔ£º" - -#~ msgid "can't get key from keyserver: %s\n" -#~ msgstr "ÎÞ·¨´Ó¹«Ô¿·þÎñÆ÷È¡µÃÃÜÔ¿£º %s\n" - -#~ msgid "error sending to `%s': %s\n" -#~ msgstr "ÉÏ´«µ½¡®%s¡¯µÄʱºò·¢Éú´íÎó£º%s\n" - -#~ msgid "success sending to `%s' (status=%u)\n" -#~ msgstr "³É¹¦ÉÏ´«ÖÁ¡®%s¡¯(״̬ = %u)\n" - -#~ msgid "failed sending to `%s': status=%u\n" -#~ msgstr "ÉÏ´«µ½¡®%s¡¯Ê§°Ü£º×´Ì¬ = %u\n" - -#~ msgid "this keyserver does not support --search-keys\n" -#~ msgstr "´Ë¹«Ô¿·þÎñÆ÷²»Ö§³Ö --search-keys\n" - -#~ msgid "can't search keyserver: %s\n" -#~ msgstr "ÎÞ·¨ËÑÑ°¹«Ô¿·þÎñÆ÷£º%s\n" - -#~ msgid "" -#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for " -#~ "signatures!\n" -#~ msgstr "ÃÜÔ¿ %08lX£ºÕâÊÇÓÉ PGP ²úÉúµÄ ElGamal ÃÜÔ¿£¬ÓÃÓÚÇ©×Ö²»°²È«£¡\n" +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "您确定è¦ç”¨è¿™ä¸ªå¯†é’¥å°ºå¯¸å—？(y/N)" #~ msgid "" -#~ "key %08lX has been created %lu second in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "ÃÜÔ¿ %08lX ÊÇÔÚ %lu ÃëºóµÄδÀ´Éú³ÉµÄ(ʱ¿ÕŤÇú»òʱÖÓµÄÎÊÌâ)\n" - -#~ msgid "" -#~ "key %08lX has been created %lu seconds in future (time warp or clock " -#~ "problem)\n" -#~ msgstr "ÃÜÔ¿ %08lX ÊÇÔÚ %lu ÃëºóµÄδÀ´Éú³ÉµÄ(ʱ¿ÕŤÇú»òʱÖÓµÄÎÊÌâ)\n" - -#~ msgid "key %08lX marked as ultimately trusted\n" -#~ msgstr "ÃÜÔ¿ %08lX ±»±ê¼ÇΪ¾ø¶ÔÐÅÈÎ\n" - -#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n" -#~ msgstr "ÓÉ Elgamal Ç©×ÖÃÜÔ¿ %08lX Ϊ %08lX Ëù×öÇ©×Ö±»Ìø¹ý\n" - -# FIXME: I added the format string at the end to avoid a format string vulnerability. This should be fixed properly of course - wk -#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n" -#~ msgstr "ÓÉ %08lX Ϊ Elgamal Ç©×ÖÃÜÔ¿Ëù×öÇ©×Ö±»Ìø¹ý (%08lX)\n" - -#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" -#~ msgstr "¼ì²éÉî¶ÈΪ %d£¬Ç©×Ö=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" - -#~ msgid "" -#~ "Select the algorithm to use.\n" -#~ "\n" -#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n" -#~ "for signatures. This is the suggested algorithm because verification of\n" -#~ "DSA signatures are much faster than those of ElGamal.\n" -#~ "\n" -#~ "ElGamal is an algorithm which can be used for signatures and encryption.\n" -#~ "OpenPGP distinguishs between two flavors of this algorithms: an encrypt " -#~ "only\n" -#~ "and a sign+encrypt; actually it is the same, but some parameters must be\n" -#~ "selected in a special way to create a safe key for signatures: this " -#~ "program\n" -#~ "does this but other OpenPGP implementations are not required to " -#~ "understand\n" -#~ "the signature+encryption flavor.\n" -#~ "\n" -#~ "The first (primary) key must always be a key which is capable of " -#~ "signing;\n" -#~ "this is the reason why the encryption only ElGamal key is not available " -#~ "in\n" -#~ "this menu." -#~ msgstr "" -#~ "Ñ¡ÔñҪʹÓõÄËã·¨¡£\n" -#~ "\n" -#~ "DSA (Ò༴DSS)ÊÇÒ»ÖÖÖ»ÄÜÓÃÓÚÇ©×ÖµÄÊý×ÖÇ©×ÖËã·¨¡£ÕâÒ²ÊÇÍƼöʹÓõÄËã·¨£¬\n" -#~ "ÒòΪÑéÖ¤ DSA Ç©×ÖÔ¶±È ElGamal Ç©×Ö¿ì¡£\n" -#~ "\n" -#~ "ElGamal ÊÇÒ»ÖּȿÉÓÃÓÚÇ©×ÖºÍÒ²¿ÉÓÃÓÚ¼ÓÃܵÄËã·¨¡£\n" -#~ "OpenPGP °ÑÕâÖÖËã·¨Çø·Ö³ÉÁ½ÖÖÑùʽ£ºÖ»ÄÜÓÃÓÚ¼ÓÃܵģ¬ºÍÄÜÇ©×Ö¼°¼ÓÃܵģ»\n" -#~ "¾¡¹ÜËüÃÇÔ­ÀíÒ»Ö£¬µ«ÎªÉú³É°²È«µÄÓÃÓÚÇ©×ÖµÄÃÜÔ¿£¬±ØÐëÏÈÒÔÌض¨µÄ·½·¨\n" -#~ "Ñ¡ÔñһЩ²ÎÊý£º±¾³ÌÐòʵÏÖÁ˴˹¦ÄÜ£¬µ«ÆäËûʵÏÖ OpenPGP µÄ³ÌÐò¿ÉÄܲ»ÄÜ\n" -#~ "ʶ±ðÕâÖÖ¼æ¾ßÇ©×Ö¼°¼ÓÃܹ¦ÄܵÄÑùʽ¡£\n" -#~ "\n" -#~ "µÚÒ»¸öÃÜÔ¿(Ö÷ÃÜÔ¿)±ØÐëÒª¾ß±¸Ç©×ÖµÄÄÜÁ¦£»Òò´Ë\n" -#~ "Ö»ÄÜÓÃÓÚ¼ÓÃÜµÄ ElGamal ÃÜÔ¿ÔÚÕâ¸ö²Ëµ¥ÀïÎÞ·¨Ê¹Óá£" - -#~ msgid "" -#~ "Although these keys are defined in RFC2440 they are not suggested\n" -#~ "because they are not supported by all programs and signatures created\n" -#~ "with them are quite large and very slow to verify." +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" #~ msgstr "" -#~ "ËäÈ»ÔÚ RFC2440 Öж¨ÒåÁËÕâЩÃÜÔ¿£¬µ«²¢²»ÍƼö²ÉÓÃËüÃÇ£¬\n" -#~ "ÒòΪËüÃDz¢²»±»ËùÓеijÌÐòËùÖ§³Ö£¬²¢ÇÒÓÉËüÃÇËùÉú³ÉµÄÇ©×Ö\n" -#~ "Ê®·ÖÅÓ´ó£¬ÑéÖ¤ÆðÀ´¸üÊÇ»ºÂý¡£" +#~ "好å§ï¼Œä½†æ˜¯è¯·è®°ä½ï¼Œæ‚¨çš„å±å¹•å’Œé”®ç›˜æ‰€å‘出的无线电波也是å¯ä»¥è¢«ä¾¦æµ‹çš„ï¼\n" -#~ msgid "%lu keys so far checked (%lu signatures)\n" -#~ msgstr "ÒѼì²é %lu °ÑÃÜÔ¿(%lu ·ÝÇ©×Ö)\n" - -#~ msgid "key incomplete\n" -#~ msgstr "ÃÜÔ¿²»ÍêÕû\n" - -#~ msgid "key %08lX incomplete\n" -#~ msgstr "ÃÜÔ¿ %08lX ²»ÍêÕû\n" - -#~ msgid " (%d) ElGamal (sign and encrypt)\n" -#~ msgstr " (%d) ElGamal (ÓÃÓÚÇ©×Ö¼°¼ÓÃÜ)\n" +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "ä¸åº”使用实验性的算法ï¼\n" #~ msgid "" -#~ "The use of this algorithm is only supported by GnuPG. You will not be\n" -#~ "able to use this key to communicate with PGP users. This algorithm is " -#~ "also\n" -#~ "very slow, and may not be as secure as the other choices.\n" -#~ msgstr "" -#~ "Çë×¢Ò⣬ֻÓÐ GnuPG ²ÅÖ§³ÖÕâ¸öËã·¨¡£ÓÃÕâ¸öËã·¨Éú³ÉµÄÃÜÔ¿\n" -#~ "ÎÞ·¨¸ú PGP ʹÓÃÕß»¥Í¨¡£Í¬Ê±Õâ¸öËã·¨·Ç³£»ºÂý£¬\n" -#~ "¶øÇÒ¿ÉÄÜÒ²²»ÈçÆäËûËã·¨°²È«¡£\n" - -#~ msgid "Create anyway? " -#~ msgstr "ÎÞÂÛÈçºÎ»¹ÊÇÒªÉú³ÉÂ𣿠" - -#~ msgid "invalid symkey algorithm detected (%d)\n" -#~ msgstr "¼ì²âµ½ÎÞЧµÄ¶Ô³Æ¼ÓÃÜËã·¨ (%d)\n" - -#~ msgid "this keyserver is not fully HKP compatible\n" -#~ msgstr "Õâ¸ö¹«Ô¿·þÎñÆ÷²¢·ÇÍêÈ«Óë HKP ¼æÈÝ\n" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "ä¸æŽ¨è使用这个加密算法；请æ¢ç”¨æ›´ç¬¦åˆæ ‡å‡†çš„算法ï¼\n" Index: gnupg/po/zh_TW.po diff -u gnupg/po/zh_TW.po:1.7 gnupg/po/zh_TW.po:1.8 --- gnupg/po/zh_TW.po:1.7 Thu Oct 28 11:06:49 2004 +++ gnupg/po/zh_TW.po Fri Dec 10 23:20:40 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-10-28 10:59+0200\n" +"POT-Creation-Date: 2004-12-10 20:16+0100\n" "PO-Revision-Date: 2003-05-13 15:48+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -17,11 +17,6 @@ "Content-Type: text/plain; charset=BIG5\n" "Content-Transfer-Encoding: 8bit\n" -#: cipher/md.c:137 -#, c-format -msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "`%s' ºK­nºtºâªk¦b³o¦¸ÄÀ¥Xªºª©¥»¤¤°ßŪ\n" - #: cipher/primegen.c:120 #, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" @@ -36,11 +31,12 @@ msgid "no entropy gathering module detected\n" msgstr "°»´ú¤£¨ì¶Ã¼Æ»`¶°¼Ò²Õ\n" -#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109 -#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175 -#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 -#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020 -#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 +#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 +#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 +#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 +#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 #: g10/tdbio.c:600 #, c-format msgid "can't open `%s': %s\n" @@ -73,9 +69,9 @@ msgid "note: random_seed file not updated\n" msgstr "½Ðª`·N¡G random_seed ÀÉ®×¥¼³Q§ó·s\n" -#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734 -#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348 -#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 +#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" msgstr "µLªk«Ø¥ß `%s' ¡G %s\n" @@ -128,90 +124,150 @@ "ÀH¾÷¦ì¤¸²Õ¤£°÷¦h¡C½Ð¦h°µ¤@¨Ç¦³ªº¨Sªº¨Æ±¡¡A\n" "³o¼Ë§@·~¨t²ÎÅׯà»`¶°¨ì§ó¦hªº¶Ã¼Æ¡I(Áٻݭn %d ¦ì¤¸²Õ)\n" -#: g10/app-openpgp.c:534 +#: g10/app-openpgp.c:539 #, fuzzy, c-format msgid "failed to store the fingerprint: %s\n" msgstr "«H¥ô¸ê®Æ®w±Ò©l¥¢±Ñ¡G %s\n" -#: g10/app-openpgp.c:547 +#: g10/app-openpgp.c:552 #, fuzzy, c-format msgid "failed to store the creation date: %s\n" msgstr "­«·s«Ø¥ßÆ_°Í°é§Ö¨ú¥¢±Ñ¡G %s\n" -#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313 +#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 #, c-format msgid "PIN callback returned error: %s\n" msgstr "" -#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319 +#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "" -#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837 -#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342 +#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 +#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 #, fuzzy, c-format msgid "verify CHV%d failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/app-openpgp.c:784 +#: g10/app-openpgp.c:828 msgid "access to admin commands is not configured\n" msgstr "" -#: g10/app-openpgp.c:801 +#: g10/app-openpgp.c:845 msgid "error retrieving CHV status from card\n" msgstr "" -#: g10/app-openpgp.c:807 +#: g10/app-openpgp.c:851 msgid "card is permanently locked!\n" msgstr "" -#: g10/app-openpgp.c:814 +#: g10/app-openpgp.c:858 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "" -#: g10/app-openpgp.c:818 -msgid "Admin PIN" +#: g10/app-openpgp.c:865 +msgid "|A|Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|AN|New Admin PIN" +msgstr "" + +#: g10/app-openpgp.c:1021 +msgid "|N|New PIN" +msgstr "" + +#: g10/app-openpgp.c:1025 +#, fuzzy, c-format +msgid "error getting new PIN: %s\n" +msgstr "«Ø¥ß±K½X¦êªº®É­Ôµo¥Í¿ù»~¡G %s\n" + +#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#, fuzzy +msgid "error reading application data\n" +msgstr "Ū¨úª÷Æ_°Ï¶ô®Éµo¥Í¿ù»~¡G %s\n" + +#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#, fuzzy +msgid "error reading fingerprint DO\n" +msgstr "%s: Ū¨ú¦Û¥Ñ°O¿ý®É¿ù»~¡G %s\n" + +#: g10/app-openpgp.c:1107 +#, fuzzy +msgid "key already exists\n" +msgstr "`%s' ¤w¸g³QÀ£ÁY¤F\n" + +#: g10/app-openpgp.c:1111 +msgid "existing key will be replaced\n" +msgstr "" + +#: g10/app-openpgp.c:1113 +#, fuzzy +msgid "generating new key\n" +msgstr "²£¥Í¤@¥÷·sªºª÷Æ_¹ï" + +#: g10/app-openpgp.c:1123 +msgid "please wait while key is being generated ...\n" msgstr "" -#: g10/app-openpgp.c:1301 +#: g10/app-openpgp.c:1138 +#, fuzzy +msgid "generating key failed\n" +msgstr "§R°£ª÷Æ_°Ï¶ô®É¥¢±Ñ¤F¡G %s\n" + +#: g10/app-openpgp.c:1141 +#, fuzzy, c-format +msgid "key generation completed (%d seconds)\n" +msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" + +#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +msgid "response does not contain the public key data\n" +msgstr "" + +#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +msgid "response does not contain the RSA modulus\n" +msgstr "" + +#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +msgid "response does not contain the RSA public exponent\n" +msgstr "" + +#: g10/app-openpgp.c:1198 +msgid "invalid structure of OpenPGP card (DO 0x93)\n" +msgstr "" + +#: g10/app-openpgp.c:1359 +#, c-format +msgid "signatures created so far: %lu\n" +msgstr "" + +#: g10/app-openpgp.c:1367 #, c-format msgid "PIN [sigs done: %lu]" msgstr "" -#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597 +#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 #, fuzzy, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "§ä¤£¨ì¦³®Äªº OpenPGP ¸ê®Æ¡C\n" -#: g10/app-openpgp.c:1668 +#: g10/app-openpgp.c:1734 #, fuzzy, c-format msgid "error getting serial number: %s\n" msgstr "«Ø¥ß±K½X¦êªº®É­Ôµo¥Í¿ù»~¡G %s\n" -#: g10/app-openpgp.c:1763 +#: g10/app-openpgp.c:1829 #, fuzzy, c-format msgid "failed to store the key: %s\n" msgstr "«H¥ô¸ê®Æ®w±Ò©l¥¢±Ñ¡G %s\n" -#: g10/app-openpgp.c:1805 +#: g10/app-openpgp.c:1871 #, fuzzy msgid "reading the key failed\n" msgstr "§R°£ª÷Æ_°Ï¶ô®É¥¢±Ñ¤F¡G %s\n" -#: g10/app-openpgp.c:1812 -msgid "response does not contain the public key data\n" -msgstr "" - -#: g10/app-openpgp.c:1820 -msgid "response does not contain the RSA modulus\n" -msgstr "" - -#: g10/app-openpgp.c:1831 -msgid "response does not contain the RSA public exponent\n" -msgstr "" - #: g10/armor.c:317 #, c-format msgid "armor: %s\n" @@ -297,15 +353,15 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314 -#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" msgstr "µLªk¦b§å¦¸¼Ò¦¡¤¤¨º¼Ë°µ\n" -#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059 +#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1361 +#: g10/keygen.c:1363 msgid "Your selection? " msgstr "©p­n¿ï­þ¤@­Ó¡H " @@ -313,141 +369,150 @@ msgid "[not set]" msgstr "" -#: g10/card-util.c:376 +#: g10/card-util.c:378 #, fuzzy msgid "male" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "female" msgstr "enable" -#: g10/card-util.c:377 +#: g10/card-util.c:379 #, fuzzy msgid "unspecified" msgstr "¥¼«ü©w­ì¦]" -#: g10/card-util.c:396 +#: g10/card-util.c:406 #, fuzzy msgid "not forced" msgstr "¥¼³Q³B²z" -#: g10/card-util.c:396 +#: g10/card-util.c:406 msgid "forced" msgstr "" -#: g10/card-util.c:439 +#: g10/card-util.c:458 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "" -#: g10/card-util.c:441 +#: g10/card-util.c:460 msgid "Error: The \"<\" character may not be used.\n" msgstr "" -#: g10/card-util.c:443 +#: g10/card-util.c:462 msgid "Error: Double spaces are not allowed.\n" msgstr "" -#: g10/card-util.c:460 +#: g10/card-util.c:479 msgid "Cardholder's surname: " msgstr "" -#: g10/card-util.c:462 +#: g10/card-util.c:481 msgid "Cardholder's given name: " msgstr "" -#: g10/card-util.c:480 +#: g10/card-util.c:499 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:502 +#: g10/card-util.c:521 #, fuzzy msgid "URL to retrieve public key: " msgstr "¨S¦³¬Û¹ïÀ³ªº¤½Æ_¡G %s\n" -#: g10/card-util.c:510 +#: g10/card-util.c:529 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:603 g10/import.c:261 +#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 #, c-format msgid "error reading `%s': %s\n" msgstr "Ū¨ú `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/card-util.c:611 +#: g10/card-util.c:630 msgid "Login data (account name): " msgstr "" -#: g10/card-util.c:621 +#: g10/card-util.c:640 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "" -#: g10/card-util.c:641 +#: g10/card-util.c:699 +msgid "Private DO data: " +msgstr "" + +#: g10/card-util.c:709 +#, c-format +msgid "Error: Private DO too long (limit is %d characters).\n" +msgstr "" + +#: g10/card-util.c:729 #, fuzzy msgid "Language preferences: " msgstr "§ó·s¹Lªº°¾¦n" -#: g10/card-util.c:649 +#: g10/card-util.c:737 #, fuzzy msgid "Error: invalid length of preference string.\n" msgstr "°¾¦n³]©w¦r¦ê¸Ì¦³µL®Äªº¦r²Å\n" -#: g10/card-util.c:658 +#: g10/card-util.c:746 #, fuzzy msgid "Error: invalid characters in preference string.\n" msgstr "°¾¦n³]©w¦r¦ê¸Ì¦³µL®Äªº¦r²Å\n" -#: g10/card-util.c:679 +#: g10/card-util.c:767 msgid "Sex ((M)ale, (F)emale or space): " msgstr "" -#: g10/card-util.c:693 +#: g10/card-util.c:781 #, fuzzy msgid "Error: invalid response.\n" msgstr "¿ù»~¡GµL®Äªº«ü¯¾\n" -#: g10/card-util.c:714 +#: g10/card-util.c:802 #, fuzzy msgid "CA fingerprint: " msgstr "Åã¥Ü«ü¯¾" -#: g10/card-util.c:737 +#: g10/card-util.c:825 #, fuzzy msgid "Error: invalid formatted fingerprint.\n" msgstr "¿ù»~¡GµL®Äªº«ü¯¾\n" -#: g10/card-util.c:785 +#: g10/card-util.c:873 #, fuzzy, c-format msgid "key operation not possible: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/card-util.c:786 +#: g10/card-util.c:874 #, fuzzy msgid "not an OpenPGP card" msgstr "§ä¤£¨ì¦³®Äªº OpenPGP ¸ê®Æ¡C\n" -#: g10/card-util.c:795 +#: g10/card-util.c:883 #, fuzzy, c-format msgid "error getting current key info: %s\n" msgstr "¼g¤J¨pÆ_Æ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/card-util.c:878 +#: g10/card-util.c:966 msgid "Replace existing key? (y/N) " msgstr "" -#: g10/card-util.c:899 g10/card-util.c:908 +#: g10/card-util.c:987 g10/card-util.c:996 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "" -#: g10/card-util.c:920 +#: g10/card-util.c:1008 msgid "Replace existing keys? (y/N) " msgstr "" -#: g10/card-util.c:929 +#: g10/card-util.c:1017 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -455,232 +520,254 @@ "You should change them using the command --change-pin\n" msgstr "" -#: g10/card-util.c:968 +#: g10/card-util.c:1056 #, fuzzy msgid "Please select the type of key to generate:\n" msgstr "½Ð¿ï¾Ü©p­n¨Ï¥Îªºª÷Æ_ºØÃþ¡G\n" -#: g10/card-util.c:970 g10/card-util.c:1050 +#: g10/card-util.c:1058 g10/card-util.c:1138 #, fuzzy msgid " (1) Signature key\n" msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n" -#: g10/card-util.c:971 g10/card-util.c:1052 +#: g10/card-util.c:1059 g10/card-util.c:1140 #, fuzzy msgid " (2) Encryption key\n" msgstr " (%d) RSA (¶È¯à¥[±K¥Î)\n" -#: g10/card-util.c:972 g10/card-util.c:1054 +#: g10/card-util.c:1060 g10/card-util.c:1142 msgid " (3) Authentication key\n" msgstr "" -#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907 -#: g10/keygen.c:1395 g10/revoke.c:642 +#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 +#: g10/keygen.c:1402 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "µL®Äªº¿ï¾Ü¡C\n" -#: g10/card-util.c:1047 +#: g10/card-util.c:1135 #, fuzzy msgid "Please select where to store the key:\n" msgstr "½Ð¿ï¾ÜºM¾Pªº­ì¦]¡G\n" -#: g10/card-util.c:1082 +#: g10/card-util.c:1170 #, fuzzy msgid "unknown key protection algorithm\n" msgstr "¥¼ª¾ªº«OÅ@ºtºâªk\n" -#: g10/card-util.c:1087 +#: g10/card-util.c:1175 #, fuzzy msgid "secret parts of key are not available\n" msgstr "¥DÆ_ªº¨pÆ_³¡¤À¨S¿ìªk¨ú¥Î¡C\n" -#: g10/card-util.c:1092 +#: g10/card-util.c:1180 #, fuzzy msgid "secret key already stored on a card\n" msgstr "¤w¸õ¹L¡G¨pÆ_¤w¸g¦s¦b\n" -#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348 +#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 msgid "quit" msgstr "quit" -#: g10/card-util.c:1162 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "Â÷¶}³o­Ó¿ï³æ" -#: g10/card-util.c:1163 g10/keyedit.c:1246 +#: g10/card-util.c:1251 g10/keyedit.c:1246 msgid "q" msgstr "q" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 msgid "admin" msgstr "" -#: g10/card-util.c:1164 +#: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "help" msgstr "help" -#: g10/card-util.c:1165 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "Åã¥Ü³o¥÷½u¤W»¡©ú" -#: g10/card-util.c:1167 g10/keyedit.c:1251 +#: g10/card-util.c:1255 g10/keyedit.c:1251 msgid "list" msgstr "list" -#: g10/card-util.c:1167 +#: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "¨S¦³¥i¥Îªº»¡©ú" -#: g10/card-util.c:1168 g10/keyedit.c:1252 +#: g10/card-util.c:1256 g10/keyedit.c:1252 msgid "l" msgstr "l" -#: g10/card-util.c:1169 g10/keyedit.c:1263 +#: g10/card-util.c:1257 g10/keyedit.c:1263 msgid "debug" msgstr "debug" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 #, fuzzy msgid "name" msgstr "enable" -#: g10/card-util.c:1170 +#: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "url" msgstr "" -#: g10/card-util.c:1171 +#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" -#: g10/card-util.c:1172 +#: g10/card-util.c:1260 msgid "fetch" msgstr "" -#: g10/card-util.c:1173 +#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "login" msgstr "lsign" -#: g10/card-util.c:1174 +#: g10/card-util.c:1262 #, fuzzy msgid "change the login name" msgstr "§ó§ï¨Ï¥Î´Á­­" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 msgid "lang" msgstr "" -#: g10/card-util.c:1175 +#: g10/card-util.c:1263 #, fuzzy msgid "change the language preferences" msgstr "§ó§ï¥DÆ[«H¥ô" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "sex" msgstr "" -#: g10/card-util.c:1176 +#: g10/card-util.c:1264 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "cafpr" msgstr "fpr" -#: g10/card-util.c:1177 +#: g10/card-util.c:1265 #, fuzzy msgid "change a CA fingerprint" msgstr "Åã¥Ü«ü¯¾" -#: g10/card-util.c:1178 +#: g10/card-util.c:1266 #, fuzzy msgid "forcesig" msgstr "revsig" -#: g10/card-util.c:1179 +#: g10/card-util.c:1267 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1180 +#: g10/card-util.c:1268 #, fuzzy msgid "generate" msgstr "¤@¯ë©Ê¿ù»~" -#: g10/card-util.c:1181 +#: g10/card-util.c:1269 #, fuzzy msgid "generate new keys" msgstr "²£¥Í¤@¥÷·sªºª÷Æ_¹ï" -#: g10/card-util.c:1182 g10/keyedit.c:1287 +#: g10/card-util.c:1270 g10/keyedit.c:1287 msgid "passwd" msgstr "passwd" -#: g10/card-util.c:1182 +#: g10/card-util.c:1270 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1246 g10/keyedit.c:1397 +#: g10/card-util.c:1272 +msgid "privatedo" +msgstr "" + +#: g10/card-util.c:1336 g10/keyedit.c:1397 msgid "Command> " msgstr "«ü¥O> " -#: g10/card-util.c:1281 +#: g10/card-util.c:1371 #, fuzzy msgid "Admin-only command\n" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/card-util.c:1297 +#: g10/card-util.c:1387 #, fuzzy msgid "Admin commands are allowed\n" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/card-util.c:1299 +#: g10/card-util.c:1389 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/card-util.c:1360 g10/keyedit.c:1864 +#: g10/card-util.c:1458 g10/keyedit.c:1864 msgid "Invalid command (try \"help\")\n" msgstr "µL®Äªº«ü¥O (¸Õ¸Õ¬Ý \"help\")\n" -#: g10/cardglue.c:280 +#: g10/cardglue.c:287 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:364 +#: g10/cardglue.c:371 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -#: g10/cardglue.c:372 +#: g10/cardglue.c:379 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:687 +msgid "Enter New Admin PIN: " +msgstr "" + +#: g10/cardglue.c:688 +msgid "Enter New PIN: " +msgstr "" + +#: g10/cardglue.c:689 msgid "Enter Admin PIN: " msgstr "" -#: g10/cardglue.c:638 +#: g10/cardglue.c:690 msgid "Enter PIN: " msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376 +#: g10/cardglue.c:704 +#, fuzzy +msgid "Repeat this PIN: " +msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê¡G " + +#: g10/cardglue.c:718 +#, fuzzy +msgid "PIN not correctly repeated; try again" +msgstr "±K½X¦ê¦A¦¸¿é¤J®É¨S¦³¥¿½T­«½Æ¡F½Ð¦A¸Õ¤@¦¸" + +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -690,13 +777,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ¦b³o­Ó©R¥O¤¤¨S¦³§@¥Î\n" -#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "§ä¤£¨ì `%s' ª÷Æ_¡G %s\n" -#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -739,7 +826,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "½Ð¥ý¥H \"--delete-secret-keys\" ¿ï¶µ¨Ó§R°£¥¦¡C\n" -#: g10/encode.c:210 g10/sign.c:1184 +#: g10/encode.c:210 g10/sign.c:1186 #, c-format msgid "error creating passphrase: %s\n" msgstr "«Ø¥ß±K½X¦êªº®É­Ôµo¥Í¿ù»~¡G %s\n" @@ -758,7 +845,7 @@ msgid "`%s' already compressed\n" msgstr "`%s' ¤w¸g³QÀ£ÁY¤F\n" -#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550 +#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ĵ§i¡G `%s' ¬O¤@­ÓªÅÀÉ®×\n" @@ -783,7 +870,7 @@ "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "±j­¢¨Ï¥Î %s (%d) ¹ïºÙ¦¡½s±Kªk·|¹H¤Ï¦¬¥óªÌ°¾¦n³]©w\n" -#: g10/encode.c:648 g10/sign.c:876 +#: g10/encode.c:648 g10/sign.c:877 #, fuzzy, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -881,27 +968,27 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "ĵ§i¡GµLªk²¾°£¼È¦s¥Ø¿ý `%s': %s\n" -#: g10/export.c:176 +#: g10/export.c:182 #, fuzzy msgid "exporting secret keys not allowed\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/export.c:206 +#: g10/export.c:211 #, fuzzy, c-format msgid "key %s: not protected - skipped\n" msgstr "ª÷Æ_ %08lX: ¥¼³Q«OÅ@ ¢w ¤w¸õ¹L\n" -#: g10/export.c:214 +#: g10/export.c:219 #, fuzzy, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "ª÷Æ_ %08lX: PGP 2.x ¼Ë¦¡ªºª÷Æ_ ¢w ¤w¸õ¹L\n" -#: g10/export.c:361 +#: g10/export.c:384 #, fuzzy, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "½Ð§i¡G¨pÆ_ %08lX ¨Ã¨S¦³¥ôªº¦ó³æ¤@ SK ¥[Á`Àˬd\n" -#: g10/export.c:393 +#: g10/export.c:416 msgid "WARNING: nothing exported\n" msgstr "ĵ§i¡G¨S¦³¶×¥X¥ô¦óªF¦è\n" @@ -1080,15 +1167,15 @@ msgid "prompt before overwriting" msgstr "Âмg«e¥ý¸ß°Ý" -#: g10/g10.c:511 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:512 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:537 +#: g10/g10.c:533 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1096,7 +1183,7 @@ "@\n" "(½Ð°Ñ·Ó½u¤W»¡©ú­¶­±¨Ó¨ú±o©Ò¦³©R¥O©M¿ï¶µªº§¹¾ã²M³æ)\n" -#: g10/g10.c:540 +#: g10/g10.c:536 msgid "" "@\n" "Examples:\n" @@ -1116,15 +1203,15 @@ " --list-keys [¦W¦r] Åã¥Üª÷Æ_\n" " --fingerprint [¦W¦r] Åã¥Ü«ü¯¾\n" -#: g10/g10.c:726 g10/gpgv.c:92 +#: g10/g10.c:716 g10/gpgv.c:92 msgid "Please report bugs to .\n" msgstr "½Ð¦V ¦^³øµ{¦¡·å²«¡C\n" -#: g10/g10.c:743 +#: g10/g10.c:733 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "¥Îªk¡G gpg [¿ï¶µ] [ÀÉ®×] (©Î¥Î -h ¨D§U)" -#: g10/g10.c:746 +#: g10/g10.c:736 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1134,7 +1221,7 @@ "ñ¸p¡BÀˬd¡B¥[±K©Î¸Ñ±K\n" "¹w³]ªº¾Þ§@·|¨Ì¿é¤J¸ê®Æ¦Ó©w\n" -#: g10/g10.c:757 +#: g10/g10.c:747 msgid "" "\n" "Supported algorithms:\n" @@ -1142,483 +1229,483 @@ "\n" "¤w³Q¤ä´©ªººtºâªk¡G\n" -#: g10/g10.c:760 +#: g10/g10.c:750 msgid "Pubkey: " msgstr "¤½Æ_¡G " -#: g10/g10.c:766 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1901 msgid "Cipher: " msgstr "½s±Kªk¡G " -#: g10/g10.c:772 +#: g10/g10.c:762 msgid "Hash: " msgstr "Âø´ê¡G " -#: g10/g10.c:778 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1947 msgid "Compression: " msgstr "À£ÁY¡G " -#: g10/g10.c:861 +#: g10/g10.c:851 msgid "usage: gpg [options] " msgstr "¥Îªk¡G gpg [¿ï¶µ] " -#: g10/g10.c:964 +#: g10/g10.c:999 msgid "conflicting commands\n" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/g10.c:982 +#: g10/g10.c:1017 #, fuzzy, c-format msgid "no = sign found in group definition `%s'\n" msgstr "¦b¡u%s¡v¸s²Õ©w¸q¸Ì§ä¤£¨ì = °O¸¹\n" -#: g10/g10.c:1179 +#: g10/g10.c:1214 #, fuzzy, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1182 +#: g10/g10.c:1217 #, fuzzy, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1185 +#: g10/g10.c:1220 #, fuzzy, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1191 +#: g10/g10.c:1226 #, fuzzy, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1194 +#: g10/g10.c:1229 #, fuzzy, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1197 +#: g10/g10.c:1232 #, fuzzy, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1203 +#: g10/g10.c:1238 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1206 +#: g10/g10.c:1241 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1209 +#: g10/g10.c:1244 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý©Ò¦³Åv¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1215 +#: g10/g10.c:1250 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1218 +#: g10/g10.c:1253 #, fuzzy, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1221 +#: g10/g10.c:1256 #, fuzzy, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "ĵ§i¡G %s \"%s\" ªº«Ê¤J¥Ø¿ý³\¥i¨Ã¤£¦w¥þ\n" -#: g10/g10.c:1362 +#: g10/g10.c:1397 #, fuzzy, c-format msgid "unknown configuration item `%s'\n" msgstr "·sªº³]©wÀÉ `%s' ³Q«Ø¥ß¤F\n" -#: g10/g10.c:1762 +#: g10/g10.c:1797 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "½Ðª`·N¡G¦³ªº¹w³]¿ï¶µÀÉ `%s' ¤w³Q©¿²¤\n" -#: g10/g10.c:1804 +#: g10/g10.c:1839 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "½Ðª`·N¡G¨S¦³¹w³]¿ï¶µÀÉ `%s'\n" -#: g10/g10.c:1808 +#: g10/g10.c:1843 #, c-format msgid "option file `%s': %s\n" msgstr "¿ï¶µÀÉ `%s' ¡G %s\n" -#: g10/g10.c:1815 +#: g10/g10.c:1850 #, c-format msgid "reading options from `%s'\n" msgstr "±q `%s' Ū¨ú¿ï¶µ\n" -#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562 +#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "½Ðª`·N¡G¤@¯ë±¡ªp¤U¤£·|¥Î¨ì %s¡I\n" -#: g10/g10.c:2048 +#: g10/g10.c:2079 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "½s±Kªk©µ¦ù¼Ò²Õ \"%s\" ¦]¬°³\¥i¤£¦w¥þ¦Ó¥¼³Q¸ü¤J\n" -#: g10/g10.c:2260 +#: g10/g10.c:2293 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ¤£¬O¤@­Ó¦³®Äªº¦r¤¸¶°\n" -#: g10/g10.c:2279 g10/keyedit.c:3437 +#: g10/g10.c:2312 g10/keyedit.c:3434 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n" -#: g10/g10.c:2285 +#: g10/g10.c:2318 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2288 +#: g10/g10.c:2321 #, fuzzy msgid "invalid keyserver options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2295 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2298 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2305 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2308 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2315 +#: g10/g10.c:2348 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2318 +#: g10/g10.c:2351 #, fuzzy msgid "invalid list options\n" msgstr "µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2340 +#: g10/g10.c:2373 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2343 +#: g10/g10.c:2376 #, fuzzy msgid "invalid verify options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2350 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "µLªk§â°õ¦æÀɸô®|³]¦¨ %s\n" -#: g10/g10.c:2540 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "ĵ§i¡Gµ{¦¡¥i¯à·|¶É¦L¥X®Ö¤ßÀÉ¡I\n" -#: g10/g10.c:2544 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ĵ§i¡G %s ·|¨Ï±o %s ¥¢®Ä\n" -#: g10/g10.c:2553 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ¤£³Q¤¹³\¸ò %s ¨Ö¥Î\n" -#: g10/g10.c:2556 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n" -#: g10/g10.c:2577 +#: g10/g10.c:2610 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "©p¬é¦³¦b --pgp2 ¼Ò¦¡¤UÅׯవ¥X¤ÀÂ÷¦¡©Î©ú¤åñ³¹\n" -#: g10/g10.c:2583 +#: g10/g10.c:2616 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U®É¡A¤£¯à¦P®Éñ¸p©M¥[±K\n" -#: g10/g10.c:2589 +#: g10/g10.c:2622 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "±Ò¥Î --pgp2 ®É©p¬éÀ³¸Ó¨Ï¥ÎÀɮסA¦Ó«DºÞ¹D\n" -#: g10/g10.c:2602 +#: g10/g10.c:2635 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¦b --pgp2 ¼Ò¦¡¤U¥[±K°T®§»Ý­n IDEA ½s±Kªk\n" -#: g10/g10.c:2672 g10/g10.c:2696 +#: g10/g10.c:2705 g10/g10.c:2729 msgid "selected cipher algorithm is invalid\n" msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n" -#: g10/g10.c:2678 g10/g10.c:2702 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected digest algorithm is invalid\n" msgstr "©Ò¿ïªººK­nºtºâªkµL®Ä\n" -#: g10/g10.c:2684 +#: g10/g10.c:2717 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n" -#: g10/g10.c:2690 +#: g10/g10.c:2723 msgid "selected certification digest algorithm is invalid\n" msgstr "©Ò¿ïªº¾ÌÃÒºK­nºtºâªkµL®Ä\n" -#: g10/g10.c:2705 +#: g10/g10.c:2738 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ¤@©w­n¤j©ó 0\n" -#: g10/g10.c:2707 +#: g10/g10.c:2740 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ¤@©w­n¤j©ó 1\n" -#: g10/g10.c:2709 +#: g10/g10.c:2742 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ¤@©w­n¤¶©ó 1 ©M 255 ¤§¶¡\n" -#: g10/g10.c:2711 +#: g10/g10.c:2744 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n" -#: g10/g10.c:2713 +#: g10/g10.c:2746 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n" -#: g10/g10.c:2716 +#: g10/g10.c:2749 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "½Ðª`·N¡G±j¯P¤£«Øij¨Ï¥Î³æ¯Âªº S2K ¼Ò¦¡ (0)\n" -#: g10/g10.c:2720 +#: g10/g10.c:2753 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "µL®Äªº S2K ¼Ò¦¡¡F¤@©w­n¬O 0 ¡B 1 ©Î 3\n" -#: g10/g10.c:2727 +#: g10/g10.c:2760 msgid "invalid default preferences\n" msgstr "µL®Äªº¹w³]°¾¦n\n" -#: g10/g10.c:2736 +#: g10/g10.c:2769 msgid "invalid personal cipher preferences\n" msgstr "µL®Äªº­Ó¤H½s±Kªk°¾¦n\n" -#: g10/g10.c:2740 +#: g10/g10.c:2773 msgid "invalid personal digest preferences\n" msgstr "µL®Äªº­Ó¤HºK­n°¾¦n\n" -#: g10/g10.c:2744 +#: g10/g10.c:2777 msgid "invalid personal compress preferences\n" msgstr "µL®Äªº­Ó¤HÀ£ÁY°¾¦n\n" -#: g10/g10.c:2777 +#: g10/g10.c:2810 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n" -#: g10/g10.c:2824 +#: g10/g10.c:2857 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2829 +#: g10/g10.c:2862 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2834 +#: g10/g10.c:2867 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2930 +#: g10/g10.c:2963 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "«H¥ô¸ê®Æ®w±Ò©l¥¢±Ñ¡G %s\n" -#: g10/g10.c:2941 +#: g10/g10.c:2974 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "ĵ§i¡Gµ¹©wªº¦¬¥óªÌ (-r) ¥¼¨Ï¥Î¤½Æ_¥[±K\n" -#: g10/g10.c:2952 +#: g10/g10.c:2985 msgid "--store [filename]" msgstr "--store [ÀɦW]" -#: g10/g10.c:2959 +#: g10/g10.c:2992 msgid "--symmetric [filename]" msgstr "--symmetric [ÀɦW]" -#: g10/g10.c:2961 +#: g10/g10.c:2994 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "¸Ñ±K¥¢±Ñ¡G %s\n" -#: g10/g10.c:2971 +#: g10/g10.c:3004 msgid "--encrypt [filename]" msgstr "--encrypt [ÀɦW]" -#: g10/g10.c:2984 +#: g10/g10.c:3017 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:2986 +#: g10/g10.c:3019 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:2989 +#: g10/g10.c:3022 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:3007 +#: g10/g10.c:3040 msgid "--sign [filename]" msgstr "--sign [ÀɦW]" -#: g10/g10.c:3020 +#: g10/g10.c:3053 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3035 +#: g10/g10.c:3068 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3037 +#: g10/g10.c:3070 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3073 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:3060 +#: g10/g10.c:3093 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ÀɦW]" -#: g10/g10.c:3069 +#: g10/g10.c:3102 msgid "--clearsign [filename]" msgstr "--clearsign [ÀɦW]" -#: g10/g10.c:3094 +#: g10/g10.c:3127 msgid "--decrypt [filename]" msgstr "--decrypt [ÀɦW]" -#: g10/g10.c:3102 +#: g10/g10.c:3135 msgid "--sign-key user-id" msgstr "--sign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3106 +#: g10/g10.c:3139 msgid "--lsign-key user-id" msgstr "--lsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3110 +#: g10/g10.c:3143 msgid "--nrsign-key user-id" msgstr "--nrsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3114 +#: g10/g10.c:3147 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3138 +#: g10/g10.c:3171 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¨Ï¥ÎªÌID [«ü¥O]" -#: g10/g10.c:3209 +#: g10/g10.c:3242 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¨Ï¥ÎªÌID] [Æ_°Í°é]" -#: g10/g10.c:3246 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3248 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3250 +#: g10/g10.c:3283 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3261 +#: g10/g10.c:3294 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3271 +#: g10/g10.c:3304 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3312 +#: g10/g10.c:3345 #, c-format msgid "dearmoring failed: %s\n" msgstr "¸Ñ¶}«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:3320 +#: g10/g10.c:3353 #, c-format msgid "enarmoring failed: %s\n" msgstr "¶i¦æ«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:3407 +#: g10/g10.c:3440 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "µL®Äªº `%s' Âø´êºtºâªk\n" -#: g10/g10.c:3530 +#: g10/g10.c:3563 msgid "[filename]" msgstr "[ÀɦW]" -#: g10/g10.c:3534 +#: g10/g10.c:3567 msgid "Go ahead and type your message ...\n" msgstr "½Ð¶}©lÁä¤J©pªº°T®§ ...\n" -#: g10/g10.c:3824 +#: g10/g10.c:3857 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "¼Ð°O¦WºÙ¤@©w­n±Ä¥Î¥i¦L¥Xªº¦r²Å©ÎªÅ¥Õ¡A¨Ã¥H¤@­Ó¡u=¡v¨Óµ²§À\n" -#: g10/g10.c:3832 +#: g10/g10.c:3865 msgid "a user notation name must contain the '@' character\n" msgstr "¨Ï¥ÎªÌ¼Ð°O¦WºÙ¤@©w­n§t¦³¡u@¡v¦r²Å\n" -#: g10/g10.c:3842 +#: g10/g10.c:3875 msgid "a notation value must not use any control characters\n" msgstr "¼Ð°O­È¤@©w¤£¯à¨Ï¥Î¥ô¦óªº±±¨î¦r²Å\n" -#: g10/g10.c:3876 +#: g10/g10.c:3909 msgid "the given certification policy URL is invalid\n" msgstr "µ¹©wªºªº¾ÌÃÒ­ì«h URL µL®Ä\n" -#: g10/g10.c:3878 +#: g10/g10.c:3911 msgid "the given signature policy URL is invalid\n" msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n" -#: g10/g10.c:3911 +#: g10/g10.c:3944 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n" @@ -1627,27 +1714,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk §Ö¨ú¸Ì¦³¤Ó¦h¶µ¥Ø ¢w ¤w¸T¥Î\n" -#: g10/getkey.c:186 g10/getkey.c:2691 +#: g10/getkey.c:186 g10/getkey.c:2711 #, fuzzy msgid "[User ID not found]" msgstr "[§ä¤£¨ì¨Ï¥ÎªÌ ID]" -#: g10/getkey.c:1614 +#: g10/getkey.c:1639 #, fuzzy, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid ¯àÅýµL®Äªºª÷Æ_ %08lX ¥Í®Ä\n" -#: g10/getkey.c:2169 +#: g10/getkey.c:2189 #, fuzzy, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "¤½Æ_ %08lX ¨S¦³¬Û¹ïÀ³ªº¨pÆ_ ¢w ¥¿¦b©¿²¤\n" -#: g10/getkey.c:2400 +#: g10/getkey.c:2420 #, fuzzy, c-format msgid "using secondary key %s instead of primary key %s\n" msgstr "¥¿¦b¨Ï¥Î¦¸Æ_ %08lX ¨Ó´À´«¥DÆ_ %08lX\n" -#: g10/getkey.c:2447 +#: g10/getkey.c:2467 #, fuzzy, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "ª÷Æ_ %08lX: ¬é¦³¨pÆ_¦Ó¨S¦³¤½Æ_ ¢w ¤w¸õ¹L\n" @@ -1990,374 +2077,374 @@ msgid "No help available for `%s'" msgstr "`%s' ¨S¦³¥i¥Îªº»¡©ú" -#: g10/import.c:247 +#: g10/import.c:249 #, c-format msgid "skipping block of type %d\n" msgstr "¥¿¦b¸õ¹L %d «¬ºAªº°Ï¶ô\n" -#: g10/import.c:256 +#: g10/import.c:258 #, fuzzy, c-format msgid "%lu keys processed so far\n" msgstr "¤w¦³ %lu §âª÷Æ_³Q³B²z¤F\n" -#: g10/import.c:273 +#: g10/import.c:275 #, c-format msgid "Total number processed: %lu\n" msgstr "Á`¦@³Q³B²zªº¼Æ¶q¡G %lu\n" -#: g10/import.c:275 +#: g10/import.c:277 #, c-format msgid " skipped new keys: %lu\n" msgstr " ¤w¸õ¹Lªº·sª÷Æ_¡G %lu\n" -#: g10/import.c:278 +#: g10/import.c:280 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ¨S¦³¨Ï¥ÎªÌªº ID¡G %lu\n" -#: g10/import.c:280 +#: g10/import.c:282 #, c-format msgid " imported: %lu" msgstr " ¤w¶×¤J¡G %lu" -#: g10/import.c:286 +#: g10/import.c:288 #, c-format msgid " unchanged: %lu\n" msgstr " ¥¼§ïÅܪº¡G %lu\n" -#: g10/import.c:288 +#: g10/import.c:290 #, c-format msgid " new user IDs: %lu\n" msgstr " ·sªº¨Ï¥ÎªÌ ID¡G %lu\n" -#: g10/import.c:290 +#: g10/import.c:292 #, c-format msgid " new subkeys: %lu\n" msgstr " ·sªº¤lÆ_¡G %lu\n" -#: g10/import.c:292 +#: g10/import.c:294 #, c-format msgid " new signatures: %lu\n" msgstr " ·sªºÃ±³¹¡G %lu\n" -#: g10/import.c:294 +#: g10/import.c:296 #, c-format msgid " new key revocations: %lu\n" msgstr " ·sªºª÷Æ_ºM¾P¡G %lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " secret keys read: %lu\n" msgstr " ³QŪ¨úªº¨pÆ_¡G %lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " secret keys imported: %lu\n" msgstr " ¤w¶×¤Jªº¨pÆ_¡G %lu\n" -#: g10/import.c:300 +#: g10/import.c:302 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " ¥¼§ïÅܪº¨pÆ_¡G %lu\n" -#: g10/import.c:302 +#: g10/import.c:304 #, c-format msgid " not imported: %lu\n" msgstr " ¥¼³Q¶×¤J¡G %lu\n" -#: g10/import.c:543 +#: g10/import.c:545 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:545 +#: g10/import.c:547 #, fuzzy msgid "algorithms on these user IDs:\n" msgstr "©p¤w¸gñ¸p¤F³o¨Ç¨Ï¥ÎªÌ ID¡G \n" -#: g10/import.c:582 +#: g10/import.c:584 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:594 +#: g10/import.c:596 #, fuzzy, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr "%s ñ³¹¡AºK­nºtºâªk %s\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:619 +#: g10/import.c:621 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:621 +#: g10/import.c:623 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:645 +#: g10/import.c:647 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:693 g10/import.c:1047 +#: g10/import.c:695 g10/import.c:1049 #, fuzzy, c-format msgid "key %s: no user ID\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/import.c:713 +#: g10/import.c:715 #, fuzzy, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "ª÷Æ_ %08lX: HKP ¤lÆ_ªº³_»~¤w³Q­×´_\n" -#: g10/import.c:728 +#: g10/import.c:730 #, fuzzy, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "ª÷Æ_ %08lX: «D¦Û§Úñ¸pªº¨Ï¥ÎªÌ ID `%s' ¤w³Q±µ¨ü\n" -#: g10/import.c:734 +#: g10/import.c:736 #, fuzzy, c-format msgid "key %s: no valid user IDs\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¦³®Äªº¨Ï¥ÎªÌ ID\n" -#: g10/import.c:736 +#: g10/import.c:738 msgid "this may be caused by a missing self-signature\n" msgstr "³o¥i¯à¬O¥Ñ©ó¿ò¥¢¦Û§Úñ³¹©Ò¾É­Pªº«áªG\n" -#: g10/import.c:746 g10/import.c:1168 +#: g10/import.c:748 g10/import.c:1170 #, fuzzy, c-format msgid "key %s: public key not found: %s\n" msgstr "ª÷Æ_ %08lX: §ä¤£¨ì¤½Æ_¡G %s\n" -#: g10/import.c:752 +#: g10/import.c:754 #, fuzzy, c-format msgid "key %s: new key - skipped\n" msgstr "ª÷Æ_ %08lX: ·sª÷Æ_ ¢w ¤w¸õ¹L\n" -#: g10/import.c:761 +#: g10/import.c:763 #, c-format msgid "no writable keyring found: %s\n" msgstr "§ä¤£¨ì¥i¼gªºÆ_°Í°é¡G %s\n" -#: g10/import.c:766 g10/openfile.c:261 +#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "¥¿¦b¼g¨ì `%s'\n" -#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229 +#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "¼g¨ìÆ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/import.c:791 +#: g10/import.c:793 #, fuzzy, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "ª÷Æ_ %08lX: ¤½Æ_ \"%s\" ¤w³Q¶×¤J\n" -#: g10/import.c:815 +#: g10/import.c:817 #, fuzzy, c-format msgid "key %s: doesn't match our copy\n" msgstr "ª÷Æ_ %08lX: ¸ò§Ú­Ìªº°Æ¥»¤£§k¦X\n" -#: g10/import.c:832 g10/import.c:1186 +#: g10/import.c:834 g10/import.c:1188 #, fuzzy, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "ª÷Æ_ %08lX: µLªk©w¦ì­ì©lªºª÷Æ_°Ï¶ô¡G %s\n" -#: g10/import.c:840 g10/import.c:1193 +#: g10/import.c:842 g10/import.c:1195 #, fuzzy, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "ª÷Æ_ %08lX: µLªkŪ¨ú­ì©lªºª÷Æ_°Ï¶ô¡G %s\n" -#: g10/import.c:872 +#: g10/import.c:874 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "ª÷Æ_ %08lX: \"%s\" 1 ­Ó·sªº¨Ï¥ÎªÌ ID\n" -#: g10/import.c:875 +#: g10/import.c:877 #, fuzzy, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "ª÷Æ_ %08lX: \"%s\" %d ­Ó·sªº¨Ï¥ÎªÌ ID\n" -#: g10/import.c:878 +#: g10/import.c:880 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "ª÷Æ_ %08lX: \"%s\" 1 ­Ó·sªºÃ±³¹\n" -#: g10/import.c:881 +#: g10/import.c:883 #, fuzzy, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "ª÷Æ_ %08lX: \"%s\" %d ­Ó·sªºÃ±³¹\n" -#: g10/import.c:884 +#: g10/import.c:886 #, fuzzy, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "ª÷Æ_ %08lX: \"%s\" 1 ­Ó·sªº¤lÆ_\n" -#: g10/import.c:887 +#: g10/import.c:889 #, fuzzy, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "ª÷Æ_ %08lX: \"%s\" %d ­Ó·sªº¤lÆ_\n" -#: g10/import.c:908 +#: g10/import.c:910 #, fuzzy, c-format msgid "key %s: \"%s\" not changed\n" msgstr "ª÷Æ_ %08lX: \"%s\" ¨S¦³³Q§ïÅÜ\n" -#: g10/import.c:1053 +#: g10/import.c:1055 #, fuzzy, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "ª÷Æ_ %08lX: ¨pÆ_¨Ï¥Î¤FµL®Äªº½s±Kªk %d ¢w ¤w¸õ¹L\n" -#: g10/import.c:1064 +#: g10/import.c:1066 #, fuzzy msgid "importing secret keys not allowed\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/import.c:1081 +#: g10/import.c:1083 #, c-format msgid "no default secret keyring: %s\n" msgstr "¨S¦³¹w³]ªº¨pÆ_Æ_°Í°é¡G %s\n" -#: g10/import.c:1092 +#: g10/import.c:1094 #, fuzzy, c-format msgid "key %s: secret key imported\n" msgstr "ª÷Æ_ %08lX: ¨pÆ_³Q¶×¤J¤F\n" -#: g10/import.c:1121 +#: g10/import.c:1123 #, fuzzy, c-format msgid "key %s: already in secret keyring\n" msgstr "ª÷Æ_ %08lX: ¤w¸g¦b¨pÆ_Æ_°Í°é¤¤¤F\n" -#: g10/import.c:1131 +#: g10/import.c:1133 #, fuzzy, c-format msgid "key %s: secret key not found: %s\n" msgstr "ª÷Æ_ %08lX: §ä¤£¨ì¨pÆ_¡G %s\n" -#: g10/import.c:1161 +#: g10/import.c:1163 #, fuzzy, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¤½Æ_ ¢w µLªk®M¥ÎºM¾P¾ÌÃÒ\n" -#: g10/import.c:1204 +#: g10/import.c:1206 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "ª÷Æ_ %08lX: µL®ÄªººM¾P¾ÌÃÒ¡G %s ¢w ¤w»é¦^\n" -#: g10/import.c:1236 +#: g10/import.c:1238 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "ª÷Æ_ %08lX: \"%s\" ºM¾P¾ÌÃÒ¤w³Q¶×¤J\n" -#: g10/import.c:1301 +#: g10/import.c:1303 #, fuzzy, c-format msgid "key %s: no user ID for signature\n" msgstr "ª÷Æ_ %08lX: ñ³¹¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/import.c:1316 +#: g10/import.c:1318 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "ª÷Æ_ %08lX: ¨Ï¥ÎªÌ ID \"%s\" ¨Ï¥Î¤F¥¼³Q¤ä´©ªº¤½¶}ª÷Æ_ºtºâªk\n" -#: g10/import.c:1318 +#: g10/import.c:1320 #, fuzzy, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "ª÷Æ_ %08lX: ¨Ï¥ÎªÌ ID \"%s\" ¦³µL®Äªº¦Û§Úñ³¹\n" -#: g10/import.c:1336 +#: g10/import.c:1338 #, fuzzy, c-format msgid "key %s: no subkey for key binding\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¤lÆ_¥i¨Ñªþ±a\n" -#: g10/import.c:1347 g10/import.c:1397 +#: g10/import.c:1349 g10/import.c:1399 #, fuzzy, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "ª÷Æ_ %08lX: ¥¼³Q¤ä´©ªº¤½¶}ª÷Æ_ºtºâªk\n" -#: g10/import.c:1349 +#: g10/import.c:1351 #, fuzzy, c-format msgid "key %s: invalid subkey binding\n" msgstr "ª÷Æ_ %08lX: µL®Äªºªþ±a¤lÆ_\n" -#: g10/import.c:1364 +#: g10/import.c:1366 #, fuzzy, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "ª÷Æ_ %08lX: ¦h­«ªþ±a¤lÆ_¤w³Q²¾°£\n" -#: g10/import.c:1386 +#: g10/import.c:1388 #, fuzzy, c-format msgid "key %s: no subkey for key revocation\n" msgstr "ª÷Æ_ %08lX: ¨S¦³¤lÆ_¥i¨Ñª÷Æ_ºM¾P\n" -#: g10/import.c:1399 +#: g10/import.c:1401 #, fuzzy, c-format msgid "key %s: invalid subkey revocation\n" msgstr "ª÷Æ_ %08lX: µL®Äªº¤lÆ_ºM¾P\n" -#: g10/import.c:1414 +#: g10/import.c:1416 #, fuzzy, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "ª÷Æ_ %08lX: ¦h­«¤lÆ_ºM¾P¤w²¾°£\n" -#: g10/import.c:1456 +#: g10/import.c:1458 #, fuzzy, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "ª÷Æ_ %08lX: ¤w¸õ¹L¨Ï¥ÎªÌ ID '" -#: g10/import.c:1477 +#: g10/import.c:1479 #, fuzzy, c-format msgid "key %s: skipped subkey\n" msgstr "ª÷Æ_ %08lX: ¤lÆ_¤w¸õ¹L\n" -#: g10/import.c:1504 +#: g10/import.c:1506 #, fuzzy, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "ª÷Æ_ %08lX: ¤£¥i¶×¥XªºÃ±³¹ (µ¥¯Å %02x) ¢w ¤w¸õ¹L\n" -#: g10/import.c:1514 +#: g10/import.c:1516 #, fuzzy, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "ª÷Æ_ %08lX: ºM¾P¾ÌÃÒ¦b¿ù»~ªº¦a¤è ¢w ¤w¸õ¹L\n" -#: g10/import.c:1531 +#: g10/import.c:1533 #, fuzzy, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "ª÷Æ_ %08lX: µL®ÄªººM¾P¾ÌÃÒ¡G %s ¢w ¤w¸õ¹L\n" -#: g10/import.c:1545 +#: g10/import.c:1547 #, fuzzy, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "ª÷Æ_ %08lX: ¤lÆ_ñ³¹¦b¿ù»~ªº¦a¤è ¢w ¤w¸õ¹L\n" -#: g10/import.c:1553 +#: g10/import.c:1555 #, fuzzy, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "ª÷Æ_ %08lX: «D¹w´ÁªºÃ±³¹µ¥¯Å (0x%02X) ¢w ¤w¸õ¹L\n" -#: g10/import.c:1653 +#: g10/import.c:1655 #, fuzzy, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "ª÷Æ_ %08lX: °»´ú¨ì­«½Æªº¨Ï¥ÎªÌ ID ¢w ¤w¦X¨Ö\n" -#: g10/import.c:1715 +#: g10/import.c:1717 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "ĵ§i¡Gª÷Æ_ %08lX ¥i¯à³QºM¾P¤F¡G¥¿¦b¨ú¦^ºM¾Pª÷Æ_ %08lX\n" -#: g10/import.c:1729 +#: g10/import.c:1731 #, fuzzy, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "ĵ§i¡Gª÷Æ_ %08lX ¥i¯à³QºM¾P¤F¡GºM¾Pª÷Æ_ %08lX ¥¼¥X²{¡C\n" -#: g10/import.c:1788 +#: g10/import.c:1790 #, fuzzy, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "ª÷Æ_ %08lX: ¤w·s¼WºM¾P¾ÌÃÒ \"%s\"\n" -#: g10/import.c:1822 +#: g10/import.c:1824 #, fuzzy, c-format msgid "key %s: direct key signature added\n" msgstr "ª÷Æ_ %08lX: ¤w·s¼Wª½±µª÷Æ_ñ³¹\n" @@ -2590,7 +2677,7 @@ msgstr " (3) §Ú«D±`¤p¤ß¦aÀˬd¹L¤F¡C %s\n" #: g10/keyedit.c:894 -msgid "Your selection? (enter '?' for more information): " +msgid "Your selection? (enter `?' for more information): " msgstr "" #: g10/keyedit.c:918 @@ -2663,7 +2750,7 @@ msgid "Really sign? (y/N) " msgstr "¯uªº­nñ¸p¶Ü¡H " -#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049 +#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2694,7 +2781,7 @@ "¿é¤J­nµ¹³o§â¨pÆ_¥Îªº·s±K½X¦ê¡C\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1806 +#: g10/keyedit.c:1127 g10/keygen.c:1818 msgid "passphrase not correctly repeated; try again" msgstr "±K½X¦ê¦A¦¸¿é¤J®É¨S¦³¥¿½T­«½Æ¡F½Ð¦A¸Õ¤@¦¸" @@ -3173,83 +3260,67 @@ msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2243 -#, c-format -msgid "This key may be revoked by %s key " +#: g10/keyedit.c:2245 +#, fuzzy, c-format +msgid "This key may be revoked by %s key %s" msgstr "³o§âª÷Æ_¥i¯à³Q %s ª÷Æ_ºM¾P¤F " -#: g10/keyedit.c:2247 -msgid " (sensitive)" +#: g10/keyedit.c:2251 +#, fuzzy +msgid "(sensitive)" msgstr " ¡]¾÷±Kªº¡^" -#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "µLªk«Ø¥ß %s: %s\n" -#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929 +#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[¤wºM¾P]" -#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829 +#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856 +#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keyedit.c:2270 +#: g10/keyedit.c:2276 #, fuzzy, c-format msgid "usage: %s" msgstr " «H¥ô¡G %c/%c" -#: g10/keyedit.c:2285 +#: g10/keyedit.c:2291 #, fuzzy, c-format msgid "trust: %s" msgstr " «H¥ô¡G %c/%c" -#: g10/keyedit.c:2289 +#: g10/keyedit.c:2295 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2302 msgid "This key has been disabled" msgstr "³o§âª÷Æ_¤w¸g³Q¸T¥Î¤F" -#: g10/keyedit.c:2324 +#: g10/keyedit.c:2330 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363 -#, c-format -msgid "[%8.8s] " -msgstr "" - -#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376 -#: g10/mainproc.c:1575 g10/trustdb.c:1133 -#, fuzzy -msgid "revoked" -msgstr "[¤wºM¾P]" - -#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380 -#: g10/mainproc.c:1577 g10/trustdb.c:500 -#, fuzzy -msgid "expired" -msgstr "expire" - -#: g10/keyedit.c:2400 +#: g10/keyedit.c:2397 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x «¬ºAªº¨Ï¥ÎªÌ ID ¨S¦³°¾¦n¡C\n" -#: g10/keyedit.c:2408 +#: g10/keyedit.c:2405 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3257,13 +3328,25 @@ "½Ðª`·NÅã¥Ü¥X¨Óªºª÷Æ_¦³®Ä©Ê¤£»Ý­n§ó¥¿¡A\n" "°£«D©p­«·s°õ¦æµ{¦¡¡C\n" -#: g10/keyedit.c:2539 +#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1162 +#, fuzzy +msgid "revoked" +msgstr "[¤wºM¾P]" + +#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:529 +#, fuzzy +msgid "expired" +msgstr "expire" + +#: g10/keyedit.c:2536 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2599 +#: g10/keyedit.c:2596 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3272,45 +3355,45 @@ "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[·Ó¤ù ID ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2604 g10/keyedit.c:2882 +#: g10/keyedit.c:2601 g10/keyedit.c:2879 msgid "Are you sure you still want to add it? (y/N) " msgstr "©p½T©w¤´µM·Q­n¼W¥[¶Ü¡H (y/N) " -#: g10/keyedit.c:2610 +#: g10/keyedit.c:2607 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "©p¤£¥i¥H§â·Ó¤ù ID ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2750 +#: g10/keyedit.c:2747 msgid "Delete this good signature? (y/N/q)" msgstr "§R°£³o­Ó§¹¦nªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2760 +#: g10/keyedit.c:2757 msgid "Delete this invalid signature? (y/N/q)" msgstr "§R°£³o­ÓµL®ÄªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2764 +#: g10/keyedit.c:2761 msgid "Delete this unknown signature? (y/N/q)" msgstr "§R°£³o­Ó¥¼ª¾ªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2770 +#: g10/keyedit.c:2767 msgid "Really delete this self-signature? (y/N)" msgstr "¯uªº­n§R°£³o­Ó¦Û§Úñ³¹¶Ü¡H (y/N)" -#: g10/keyedit.c:2784 +#: g10/keyedit.c:2781 #, c-format msgid "Deleted %d signature.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signatures.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2788 +#: g10/keyedit.c:2785 msgid "Nothing deleted.\n" msgstr "¨S¦³ªF¦è³Q§R°£¡C\n" -#: g10/keyedit.c:2877 +#: g10/keyedit.c:2874 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3319,159 +3402,159 @@ "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[«ü©wºM¾PªÌ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2888 +#: g10/keyedit.c:2885 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "©p¤£¥i¥H§â«ü©wºM¾PªÌ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:2905 msgid "Enter the user ID of the designated revoker: " msgstr "¿é¤J«ü©wºM¾PªÌªº¨Ï¥ÎªÌ ID ¡G " -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2928 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2943 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "©p¤£¯à«ü¬£¬Y§âª÷Æ_¬°¥¦¦Û¤vªº«ü©wºM¾PªÌ\n" -#: g10/keyedit.c:2968 +#: g10/keyedit.c:2965 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "ĵ§i¡G³o§âª÷Æ_¤w¸g³Q¥¦ªº«ù¦³¤HºM¾P¤F¡I\n" -#: g10/keyedit.c:2987 +#: g10/keyedit.c:2984 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "ĵ§i¡G¤@¥¹§â¬Y§âª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ«á¡A´NµLªk¤Ï®¬¤F¡I\n" -#: g10/keyedit.c:2993 +#: g10/keyedit.c:2990 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "©p½T©w­n«ü¬£³o§âª÷Æ_¬°«ü©wºM¾PªÌ¶Ü¡H (y/N): " -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3051 msgid "Please remove selections from the secret keys.\n" msgstr "½Ð±q¨pÆ_¤¤²¾°£¿ï¾Ü¡C\n" -#: g10/keyedit.c:3060 +#: g10/keyedit.c:3057 msgid "Please select at most one secondary key.\n" msgstr "½Ð¦Ü¦h¿ï¾Ü¤@§â¦¸Æ_¡C\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3061 msgid "Changing expiration time for a secondary key.\n" msgstr "¥¿¦bÅܧó¬Y§â¦¸Æ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:3067 +#: g10/keyedit.c:3064 msgid "Changing expiration time for the primary key.\n" msgstr "¥¿¦bÅܧó¥DÆ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:3113 +#: g10/keyedit.c:3110 msgid "You can't change the expiration date of a v3 key\n" msgstr "©p¤£¯àÅܧó v3 ª÷Æ_ªº¨Ï¥Î´Á­­\n" -#: g10/keyedit.c:3129 +#: g10/keyedit.c:3126 msgid "No corresponding signature in secret ring\n" msgstr "¦b¨pÆ_°é¸Ì¨S¦³¤@­PªºÃ±³¹\n" -#: g10/keyedit.c:3209 +#: g10/keyedit.c:3206 msgid "Please select exactly one user ID.\n" msgstr "½Ðºë½T¦a¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n" -#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477 +#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "¥¿¦b¨Ï¥ÎªÌ ID \"%s\" ¸õ¹L v3 ¦Û§Úñ³¹\n" -#: g10/keyedit.c:3419 +#: g10/keyedit.c:3416 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3498 +#: g10/keyedit.c:3495 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3558 #, c-format msgid "No user ID with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/keyedit.c:3607 +#: g10/keyedit.c:3604 #, c-format msgid "No secondary key with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¦¸Æ_\n" -#: g10/keyedit.c:3724 +#: g10/keyedit.c:3721 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "¨Ï¥ÎªÌ ID¡G \"" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " ¥Ñ %08lX ñ¸p©ó %s%s%s\n" -#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836 +#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 msgid " (non-exportable)" msgstr " (¤£¥i¶×¥X)" -#: g10/keyedit.c:3733 +#: g10/keyedit.c:3730 #, c-format msgid "This signature expired on %s.\n" msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n" -#: g10/keyedit.c:3737 +#: g10/keyedit.c:3734 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "©p½T©w©p¤´µM·Q­nºM¾P¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3741 +#: g10/keyedit.c:3738 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "­n¬°³o¥÷ñ³¹«Ø¥ß¤@¥÷ºM¾P¾ÌÃҶܡH (y/N) " -#: g10/keyedit.c:3768 +#: g10/keyedit.c:3765 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "©p¤w¸gñ¸p¤F³o¨Ç¨Ï¥ÎªÌ ID¡G \n" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3791 #, fuzzy msgid " (non-revocable)" msgstr " (¤£¥i¶×¥X)" -#: g10/keyedit.c:3801 +#: g10/keyedit.c:3798 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " ¥Ñ %08lX ºM¾P©ó %s\n" -#: g10/keyedit.c:3823 +#: g10/keyedit.c:3820 msgid "You are about to revoke these signatures:\n" msgstr "©p¥¿¦bºM¾P³o¨Çñ³¹¡G\n" -#: g10/keyedit.c:3843 +#: g10/keyedit.c:3840 msgid "Really create the revocation certificates? (y/N) " msgstr "¯uªº­n«Ø¥ßºM¾P¾ÌÃҶܡH (y/N) " -#: g10/keyedit.c:3873 +#: g10/keyedit.c:3870 msgid "no secret key\n" msgstr "¨S¦³¨pÆ_\n" -#: g10/keyedit.c:3943 +#: g10/keyedit.c:3940 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C\n" -#: g10/keyedit.c:3960 +#: g10/keyedit.c:3957 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "ĵ§i¡G¦³¤@¥÷¨Ï¥ÎªÌ ID ñ³¹ªº¤é´Á¼Ð°O¬° %d ¬í«áªº¥¼¨Ó\n" -#: g10/keyedit.c:4129 +#: g10/keyedit.c:4126 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "¥¿¦bÅã¥Ü %s ¤Ø¤o¬° %ld ªºª÷Æ_ 0x%08lX (uid %d) ªº·Ó¤ù ID\n" @@ -3513,12 +3596,12 @@ msgid "writing key binding signature\n" msgstr "¥¿¦b¼g¤JªþÆ_ñ³¹\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613 +#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "ª÷Æ_¤Ø¤oµL®Ä¡F§ï¥Î %u ¦ì¤¸\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619 +#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "ª÷Æ_¤Ø¤o¼W¤j¨ì %u ¦ì¤¸\n" @@ -3586,88 +3669,60 @@ #: g10/keygen.c:1353 #, fuzzy, c-format +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) RSA (¶È¯à¥[±K¥Î)\n" + +#: g10/keygen.c:1355 +#, fuzzy, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (¶È¯à¥[±K¥Î)\n" -#: g10/keygen.c:1354 +#: g10/keygen.c:1356 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (¶È¯àñ¸p¥Î)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (¶È¯à¥[±K¥Î)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, fuzzy, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (¶È¯à¥[±K¥Î)\n" -#: g10/keygen.c:1409 +#: g10/keygen.c:1429 g10/keygen.c:2502 +#, fuzzy, c-format +msgid "DSA keypair will have %u bits.\n" +msgstr "DSA ª÷Æ_¹ï·|¦³ 1024 ¦ì¤¸¡C\n" + +#: g10/keygen.c:1439 #, c-format -msgid "" -"About to generate a new %s keypair.\n" -" minimum keysize is 768 bits\n" -" default keysize is 1024 bits\n" -" highest suggested keysize is 2048 bits\n" +msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -"Ãö©ó²£¥Í¤@°Æ·sªº %s ª÷Æ_¹ï¡C\n" -" ³Ì°_½Xªºª÷Æ_¤Ø¤o¬O 768 ¦ì¤¸\n" -" ¹w³]ªºª÷Æ_¤Ø¤o¬O 1024 ¦ì¤¸\n" -" «Øijªº³Ì¤jª÷Æ_¤Ø¤o¬O 2048 ¦ì¤¸\n" -#: g10/keygen.c:1418 -msgid "What keysize do you want? (1024) " +#: g10/keygen.c:1446 +#, fuzzy, c-format +msgid "What keysize do you want? (%u) " msgstr "©p·Q­n¥Î¦h¤jªºª÷Æ_¤Ø¤o¡H (1024) " -#: g10/keygen.c:1423 -msgid "DSA only allows keysizes from 512 to 1024\n" -msgstr "DSA ªºª÷Æ_¤Ø¤o¬é¯à¤¶©ó 512 ©M 1024 ¤§¶¡\n" - -#: g10/keygen.c:1425 -msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "ª÷Æ_¤Ø¤o¤Ó¤p¡F RSA ªºª÷Æ_¤Ø¤o³Ì°_½X¥²¶·­n¦³ 1024 ¡C\n" - -#: g10/keygen.c:1428 -msgid "keysize too small; 768 is smallest value allowed.\n" -msgstr "ª÷Æ_¤Ø¤o¤Ó¤p¡F³Ì°_½X¥²¶·­n¦³ 768 ¡C\n" - -#: g10/keygen.c:1439 +#: g10/keygen.c:1460 #, c-format -msgid "keysize too large; %d is largest value allowed.\n" -msgstr "ª÷Æ_¤Ø¤o¤Ó¤j¡F³Ì¤j¬é¯à°÷¥Î¨ì %d ¡C\n" - -#: g10/keygen.c:1444 -msgid "" -"Keysizes larger than 2048 are not suggested because\n" -"computations take REALLY long!\n" +msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -"¤£«Øij¨Ï¥Î¤j©ó 2048 ªºª÷Æ_¤Ø¤o¡A\n" -"¦]¬°­pºâ *¯uªº* ·|ªá¥h«Ü¦h®É¶¡¡I\n" - -#: g10/keygen.c:1447 -#, fuzzy -msgid "Are you sure that you want this keysize? (y/N) " -msgstr "©p½T©w­n¥Î³o­Óª÷Æ_¤Ø¤o¶Ü¡H " - -#: g10/keygen.c:1449 -msgid "" -"Okay, but keep in mind that your monitor and keyboard radiation is also very " -"vulnerable to attacks!\n" -msgstr "¦n¡A¦ý¬O½Ð°O¦í©pªº¿Ã¹õ©MÁä½L¤]¬O¬Û·í®e©ö³Q¿sµøªº®zÂI¡I\n" -#: g10/keygen.c:1458 +#: g10/keygen.c:1466 #, c-format msgid "Requested keysize is %u bits\n" msgstr "©p©Ò­n¨Dªºª÷Æ_¤Ø¤o¬O %u ¦ì¤¸\n" -#: g10/keygen.c:1461 g10/keygen.c:1465 +#: g10/keygen.c:1471 g10/keygen.c:1476 #, c-format msgid "rounded up to %u bits\n" msgstr "¥[¤j¨ì %u ¦ì¤¸\n" -#: g10/keygen.c:1516 +#: g10/keygen.c:1528 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3683,7 +3738,7 @@ " m = ª÷Æ_¦b n ¤ë«á·|¹L´Á\n" " y = ª÷Æ_¦b n ¦~«á·|¹L´Á\n" -#: g10/keygen.c:1525 +#: g10/keygen.c:1537 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3699,29 +3754,29 @@ " m = ñ³¹¦b n ¤ë«á·|¹L´Á\n" " y = ñ³¹¦b n ¦~«á·|¹L´Á\n" -#: g10/keygen.c:1547 +#: g10/keygen.c:1559 msgid "Key is valid for? (0) " msgstr "ª÷Æ_ªº¦³®Ä´Á­­¬O¦h¤[¡H (0) " -#: g10/keygen.c:1549 +#: g10/keygen.c:1561 msgid "Signature is valid for? (0) " msgstr "ñ³¹ªº¦³®Ä´Á­­¬O¦h¤[¡H (0) " -#: g10/keygen.c:1554 +#: g10/keygen.c:1566 msgid "invalid value\n" msgstr "µL®Äªº¼Æ­È\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1571 #, c-format msgid "%s does not expire at all\n" msgstr "%s §¹¥þ¤£·|¹L´Á\n" -#: g10/keygen.c:1566 +#: g10/keygen.c:1578 #, c-format msgid "%s expires at %s\n" msgstr "%s ±N·|¦b %s ¹L´Á\n" -#: g10/keygen.c:1572 +#: g10/keygen.c:1584 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3729,12 +3784,12 @@ "©pªº¨t²ÎµLªkÅã¥Ü 2038 ¦~¥H«áªº¤é´Á¡C\n" "¤£¹L¡A¥¦¥i¥H¥¿½T³B²zª½¨ì 2106 ¦~¤§«eªº¦~¥÷¡C\n" -#: g10/keygen.c:1577 +#: g10/keygen.c:1589 #, fuzzy msgid "Is this correct? (y/N) " msgstr "¥H¤W¥¿½T¶Ü¡H (y/n) " -#: g10/keygen.c:1620 +#: g10/keygen.c:1632 #, fuzzy msgid "" "\n" @@ -3750,44 +3805,44 @@ " \"Heinrich Heine (Der Dichter) \"\n" "\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1644 msgid "Real name: " msgstr "¯u¹ê©m¦W¡G " -#: g10/keygen.c:1640 +#: g10/keygen.c:1652 msgid "Invalid character in name\n" msgstr "©m¦W§t¦³µL®Äªº¦r²Å\n" -#: g10/keygen.c:1642 +#: g10/keygen.c:1654 msgid "Name may not start with a digit\n" msgstr "©m¦W¤£¥i¥H¥Î¼Æ¦r¶}ÀY\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1656 msgid "Name must be at least 5 characters long\n" msgstr "©m¦W¦Ü¤Ö­n¦³¤­­Ó¦r²Åªø\n" -#: g10/keygen.c:1652 +#: g10/keygen.c:1664 msgid "Email address: " msgstr "¹q¤l¶l¥ó¦a§}¡G " -#: g10/keygen.c:1663 +#: g10/keygen.c:1675 msgid "Not a valid email address\n" msgstr "¤£¬O¦³®Äªº¹q¤l¶l¥ó¦a§}\n" -#: g10/keygen.c:1671 +#: g10/keygen.c:1683 msgid "Comment: " msgstr "µùÄÀ¡G " -#: g10/keygen.c:1677 +#: g10/keygen.c:1689 msgid "Invalid character in comment\n" msgstr "µùÄÀ§t¦³µL®Äªº¦r²Å\n" -#: g10/keygen.c:1700 +#: g10/keygen.c:1712 #, c-format msgid "You are using the `%s' character set.\n" msgstr "©p¥¿¦b¨Ï¥Î `%s' ¦r¤¸¶°¡C\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1718 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3798,27 +3853,27 @@ " \"%s\"\n" "\n" -#: g10/keygen.c:1711 +#: g10/keygen.c:1723 msgid "Please don't put the email address into the real name or the comment\n" msgstr "½Ð¤£­n§â¹q¤l¶l¥ó¦a§}©ñ¶i©pªº¯u¹ê©m¦W©ÎµùÄÀ¸Ì\n" -#: g10/keygen.c:1727 +#: g10/keygen.c:1739 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1737 +#: g10/keygen.c:1749 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Åܧó©m¦W(N) ¡BµùÄÀ(C) ¡B¹q¤l¶l¥ó¦a§}(E)©Î°h¥X(Q)¡H " -#: g10/keygen.c:1738 +#: g10/keygen.c:1750 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Åܧó©m¦W(N) ¡BµùÄÀ(C) ¡B¹q¤l¶l¥ó¦a§}(E)©Î½T©w(O)/°h¥X(Q)¡H " -#: g10/keygen.c:1757 +#: g10/keygen.c:1769 msgid "Please correct the error first\n" msgstr "½Ð¥ý­q¥¿¿ù»~\n" -#: g10/keygen.c:1797 +#: g10/keygen.c:1809 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3826,12 +3881,12 @@ "©p»Ý­n¤@­Ó±K½X¦ê¨Ó«OÅ@©pªº¨pÆ_¡C\n" "\n" -#: g10/keygen.c:1807 +#: g10/keygen.c:1819 g10/passphrase.c:1099 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1813 +#: g10/keygen.c:1825 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3843,7 +3898,7 @@ "¶È»Ý­n¦A¦¸°õ¦æ³o­Óµ{¦¡¡A¨Ã¥B¨Ï¥Î \"--edit-key\" ¿ï¶µ§Y¥i¡C\n" "\n" -#: g10/keygen.c:1835 +#: g10/keygen.c:1847 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3854,54 +3909,50 @@ "¡]¹³¬OºV¥´Áä½L¡B²¾°Ê·Æ¹«¡BŪ¼gµwºÐ¤§Ãþªº¡^\n" "³o·|ÅýÀH¾÷¼Æ¦r²£¥Í¾¹¦³§ó¦hªº¾÷·|Àò±o°÷¦hªº¶Ã¼Æ¡C\n" -#: g10/keygen.c:2490 -msgid "DSA keypair will have 1024 bits.\n" -msgstr "DSA ª÷Æ_¹ï·|¦³ 1024 ¦ì¤¸¡C\n" - -#: g10/keygen.c:2559 +#: g10/keygen.c:2571 msgid "Key generation canceled.\n" msgstr "¤w¨ú®øª÷Æ_²£¥Í¡C\n" -#: g10/keygen.c:2747 g10/keygen.c:2884 +#: g10/keygen.c:2759 g10/keygen.c:2896 #, c-format msgid "writing public key to `%s'\n" msgstr "¥¿¦b±N¤½Æ_¼g¦Ü `%s'\n" -#: g10/keygen.c:2749 g10/keygen.c:2887 +#: g10/keygen.c:2761 g10/keygen.c:2899 #, fuzzy, c-format msgid "writing secret key stub to `%s'\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/keygen.c:2752 g10/keygen.c:2890 +#: g10/keygen.c:2764 g10/keygen.c:2902 #, c-format msgid "writing secret key to `%s'\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/keygen.c:2873 +#: g10/keygen.c:2885 #, c-format msgid "no writable public keyring found: %s\n" msgstr "§ä¤£¨ì¥i¼gªº¤½Æ_Æ_°Í°é¡G %s\n" -#: g10/keygen.c:2879 +#: g10/keygen.c:2891 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "§ä¤£¨ì¥i¼gªº¨pÆ_Æ_°Í°é¡G %s\n" -#: g10/keygen.c:2897 +#: g10/keygen.c:2909 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "¼g¤J¤½Æ_Æ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keygen.c:2904 +#: g10/keygen.c:2916 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "¼g¤J¨pÆ_Æ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keygen.c:2927 +#: g10/keygen.c:2939 msgid "public and secret key created and signed.\n" msgstr "¤½Æ_©M¨pÆ_¤w¸g³Q«Ø¥ß¤Îñ¸p¤F¡C\n" -#: g10/keygen.c:2938 +#: g10/keygen.c:2950 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -3909,57 +3960,57 @@ "½Ðª`·N³o§âª÷Æ_¤£¯à¥Î¨Ó¥[±K¤§¥Î¡C©p¥²¶·¥Î \"--edit-key\" «ü¥O\n" "¨Ó²£¥Í¦¸Æ_Åצæ¡C\n" -#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180 +#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 #, c-format msgid "Key generation failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290 +#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "ª÷Æ_¤w¸g¦b %lu ¬í«áªº¥¼¨Ó»s³y¥X¨Ó¤F (¥i¯à¬O¦]¬°®É¥ú®È¦æ©Î®ÉÄÁªº°ÝÃD)\n" -#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292 +#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "ª÷Æ_¤w¸g¦b %lu ¬í«áªº¥¼¨Ó»s³y¥X¨Ó¤F (¥i¯à¬O¦]¬°®É¥ú®È¦æ©Î®ÉÄÁªº°ÝÃD)\n" -#: g10/keygen.c:3012 g10/keygen.c:3129 +#: g10/keygen.c:3024 g10/keygen.c:3141 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "½Ðª`·N¡G¹ï v3 ª÷Æ_»s³y¤lÆ_·|¥¢¥h OpenPGP ¬Û®e©Ê\n" -#: g10/keygen.c:3040 g10/keygen.c:3162 +#: g10/keygen.c:3052 g10/keygen.c:3174 #, fuzzy msgid "Really create? (y/N) " msgstr "¯uªº­n«Ø¥ß¶Ü¡H " -#: g10/keygen.c:3315 +#: g10/keygen.c:3327 #, fuzzy, c-format msgid "storing key onto card failed: %s\n" msgstr "§R°£ª÷Æ_°Ï¶ô®É¥¢±Ñ¤F¡G %s\n" -#: g10/keygen.c:3362 +#: g10/keygen.c:3374 #, fuzzy, c-format msgid "can't create backup file `%s': %s\n" msgstr "µLªk«Ø¥ß `%s' ¡G %s\n" -#: g10/keygen.c:3385 +#: g10/keygen.c:3397 #, fuzzy, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "½Ðª`·N¡G¨pÆ_ %08lX ¦b %s ¹L´Á¤F\n" -#: g10/keygen.c:3452 +#: g10/keygen.c:3464 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "" -#: g10/keygen.c:3458 +#: g10/keygen.c:3470 msgid "public exponent too large (more than 32 bits)\n" msgstr "" -#: g10/keygen.c:3464 g10/keygen.c:3470 +#: g10/keygen.c:3476 g10/keygen.c:3482 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "" @@ -4005,28 +4056,28 @@ msgid "expired: %s)" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keylist.c:1431 +#: g10/keylist.c:1425 msgid "Primary key fingerprint:" msgstr "¥DÆ_«ü¯¾¡G" -#: g10/keylist.c:1433 +#: g10/keylist.c:1427 msgid " Subkey fingerprint:" msgstr " ¤lÆ_«ü¯¾¡G" -#: g10/keylist.c:1440 +#: g10/keylist.c:1434 msgid " Primary key fingerprint:" msgstr " ¥DÆ_«ü¯¾¡G" -#: g10/keylist.c:1442 +#: g10/keylist.c:1436 msgid " Subkey fingerprint:" msgstr " ¤lÆ_«ü¯¾¡G" -#: g10/keylist.c:1446 g10/keylist.c:1450 +#: g10/keylist.c:1440 g10/keylist.c:1444 #, fuzzy msgid " Key fingerprint =" msgstr " ª÷Æ_«ü¯¾ =" -#: g10/keylist.c:1517 +#: g10/keylist.c:1511 msgid " Card serial no. =" msgstr "" @@ -4380,7 +4431,7 @@ msgid "textmode" msgstr "¤å¦r¼Ò¦¡" -#: g10/mainproc.c:1672 g10/trustdb.c:499 +#: g10/mainproc.c:1672 g10/trustdb.c:528 msgid "unknown" msgstr "¥¼ª¾" @@ -4411,28 +4462,40 @@ msgid "invalid root packet detected in proc_tree()\n" msgstr "¦b proc_tree() ¤¤°»´ú¨ìµL®Äªº root «Ê¥]\n" -#: g10/misc.c:101 +#: g10/misc.c:105 #, c-format msgid "can't disable core dumps: %s\n" msgstr "µLªkÅý¨t²Î°±¤î¶É¦L®Ö¤ßÀÉ¡G %s\n" -#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221 +#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 #, fuzzy, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "µLªk¶}±ÒÀɮסG %s\n" -#: g10/misc.c:186 +#: g10/misc.c:190 #, fuzzy, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "«H¥ô¸ê®Æ®w¡GŪ¨ú¥¢±Ñ (n=%d): %s\n" -#: g10/misc.c:294 -msgid "Experimental algorithms should not be used!\n" -msgstr "¤£¸Ó¨Ï¥Î¹êÅç©Êªººtºâªk¡I\n" - -#: g10/misc.c:324 -msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "¤£«Øij¨Ï¥Î³o­Ó½s±Kºtºâªk¡F½Ð´«¥Î§ó¥¿¦¡ªº¡I\n" +#: g10/misc.c:299 +#, fuzzy, c-format +msgid "WARNING: using experimental public key algorithm %s\n" +msgstr "µLªk¾Þ§@¤½¶}ª÷Æ_ºtºâªk %d\n" + +#: g10/misc.c:314 +#, fuzzy, c-format +msgid "WARNING: using experimental cipher algorithm %s\n" +msgstr "¥¼³Q±Ä¥Îªº½s±Kºtºâªk" + +#: g10/misc.c:329 +#, fuzzy, c-format +msgid "WARNING: using experimental digest algorithm %s\n" +msgstr "%s ñ³¹¡AºK­nºtºâªk %s\n" + +#: g10/misc.c:334 +#, fuzzy, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "±j­¢¨Ï¥Î %s (%d) ºK­nºtºâªk·|¹H¤Ï¦¬¥óªÌ°¾¦n³]©w\n" #: g10/misc.c:430 msgid "the IDEA cipher plugin is not present\n" @@ -4540,50 +4603,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "%d Ãþ§Oªº¤l«Ê¥]³]©w¤FÃöÁä¦ì¤¸\n" -#: g10/passphrase.c:465 g10/passphrase.c:512 +#: g10/passphrase.c:475 g10/passphrase.c:522 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ¦b¦¹¶¥¬qµLªk¨Ï¥Î\n" -#: g10/passphrase.c:473 +#: g10/passphrase.c:483 msgid "can't set client pid for the agent\n" msgstr "µLªk³]©w¥N²zµ{¦¡¤¤ªº¨Ï¥ÎªÌºÝ pid\n" -#: g10/passphrase.c:481 +#: g10/passphrase.c:491 msgid "can't get server read FD for the agent\n" msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹Åª¨úÀÉ®×´y­z\n" -#: g10/passphrase.c:488 +#: g10/passphrase.c:498 msgid "can't get server write FD for the agent\n" msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹¼g¤JÀÉ®×´y­z\n" -#: g10/passphrase.c:521 +#: g10/passphrase.c:531 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "³QÅܳyªº GPG_AGENT_INFO Àô¹ÒÅܼÆ\n" -#: g10/passphrase.c:534 +#: g10/passphrase.c:544 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent ¨ó©wª©¥» %d ¥¼³Q¤ä´©\n" -#: g10/passphrase.c:555 +#: g10/passphrase.c:565 #, c-format msgid "can't connect to `%s': %s\n" msgstr "µLªk³s±µ¦Ü `%s' ¡G %s\n" -#: g10/passphrase.c:577 +#: g10/passphrase.c:587 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ªº³q°T°ÝÃD\n" -#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004 +#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 msgid "problem with the agent - disabling agent use\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD ¢w ¥¿¦b°±¥Î¥N²zµ{¦¡\n" -#: g10/passphrase.c:684 g10/passphrase.c:1160 +#: g10/passphrase.c:698 g10/passphrase.c:1203 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (¥D­nª÷Æ_ ID %08lX)" -#: g10/passphrase.c:698 +#: g10/passphrase.c:712 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4594,41 +4657,41 @@ "\"%.*s\"\n" "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s%s\n" -#: g10/passphrase.c:723 +#: g10/passphrase.c:737 msgid "Repeat passphrase\n" msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê\n" -#: g10/passphrase.c:725 +#: g10/passphrase.c:739 msgid "Enter passphrase\n" msgstr "½Ð¿é¤J±K½X¦ê\n" -#: g10/passphrase.c:763 +#: g10/passphrase.c:777 msgid "passphrase too long\n" msgstr "±K½X¦ê¤Óªø\n" -#: g10/passphrase.c:776 +#: g10/passphrase.c:790 msgid "invalid response from agent\n" msgstr "¥N²zµ{¦¡¶Ç¦^µL®Äªº¦^À³\n" -#: g10/passphrase.c:791 g10/passphrase.c:886 +#: g10/passphrase.c:805 g10/passphrase.c:924 msgid "cancelled by user\n" msgstr "¥Ñ¨Ï¥ÎªÌ¨ú®ø¤F\n" -#: g10/passphrase.c:796 g10/passphrase.c:975 +#: g10/passphrase.c:810 g10/passphrase.c:1013 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD¡G¥N²zµ{¦¡¶Ç¦^ 0x%lx\n" -#: g10/passphrase.c:1053 g10/passphrase.c:1211 +#: g10/passphrase.c:1094 g10/passphrase.c:1256 #, fuzzy -msgid "can't query password in batch mode\n" +msgid "can't query passphrase in batch mode\n" msgstr "¦b§å¦¸¼Ò¦¡¤¤µLªk¸ß°Ý±K½X\n" -#: g10/passphrase.c:1058 g10/passphrase.c:1216 +#: g10/passphrase.c:1101 g10/passphrase.c:1261 msgid "Enter passphrase: " msgstr "½Ð¿é¤J±K½X¦ê¡G " -#: g10/passphrase.c:1141 +#: g10/passphrase.c:1184 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4638,17 +4701,17 @@ "©p»Ý­n¤U¦C¨Ï¥ÎªÌªº±K½X¦ê¡AÅׯà¸Ñ¶}¨pÆ_¡G\n" "\"" -#: g10/passphrase.c:1147 +#: g10/passphrase.c:1190 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s" -#: g10/passphrase.c:1156 +#: g10/passphrase.c:1199 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1220 +#: g10/passphrase.c:1265 msgid "Repeat passphrase: " msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê¡G " @@ -4852,7 +4915,8 @@ msgstr "ĵ§i¡G³o§âª÷Æ_¤w¸g³Q¥¦ªº«ù¦³¤HºM¾P¤F¡I\n" #: g10/pkclist.c:521 -msgid " This could mean that the signature is forgery.\n" +#, fuzzy +msgid " This could mean that the signature is forged.\n" msgstr " ³o«Ü¦³¥i¯àªí¥Ü³o­Óñ³¹¬O³Q°°³yªº¡C\n" #: g10/pkclist.c:527 @@ -4953,28 +5017,28 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "¸ê®Æ¥¼³QÀx¦s¡F½Ð¥Î \"--output\" ¿ï¶µ¨ÓÀx¦s¥¦­Ì\n" -#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "«Ø¥ß `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/plaintext.c:445 +#: g10/plaintext.c:446 msgid "Detached signature.\n" msgstr "¤ÀÂ÷ªºÃ±³¹¡C\n" -#: g10/plaintext.c:449 +#: g10/plaintext.c:450 msgid "Please enter name of data file: " msgstr "½Ð¿é¤J¸ê®ÆÀɪº¦WºÙ¡G " -#: g10/plaintext.c:477 +#: g10/plaintext.c:478 msgid "reading stdin ...\n" msgstr "¥¿¦b±q¼Ð·Ç¿é¤JŪ¨ú ...\n" -#: g10/plaintext.c:511 +#: g10/plaintext.c:512 msgid "no signed data\n" msgstr "¨S¦³³Qñ¸p¹Lªº¸ê®Æ\n" -#: g10/plaintext.c:525 +#: g10/plaintext.c:526 #, c-format msgid "can't open signed data `%s'\n" msgstr "µLªk¶}±Ò³Qñ¸p¹Lªº¸ê®Æ `%s'\n" @@ -5278,49 +5342,44 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U¬é¯à°÷¨Ï¥Î PGP 2.x «¬ºAªºª÷Æ_¨Ó°µ¤ÀÂ÷ñ¸p\n" -#: g10/sign.c:783 g10/sign.c:1040 -#, fuzzy, c-format -msgid "writing to file `%s'\n" -msgstr "¥¿¦b¼g¨ì `%s'\n" - -#: g10/sign.c:807 +#: g10/sign.c:808 #, fuzzy, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "±j­¢¨Ï¥Î %s (%d) ºK­nºtºâªk·|¹H¤Ï¦¬¥óªÌ°¾¦n³]©w\n" -#: g10/sign.c:899 +#: g10/sign.c:900 msgid "signing:" msgstr "ñ¸p¡G" -#: g10/sign.c:1006 +#: g10/sign.c:1007 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U¬é¯à°÷¨Ï¥Î PGP 2.x «¬ºAªºª÷Æ_¨Ó°µ©ú¤åñ¸p\n" -#: g10/sign.c:1178 +#: g10/sign.c:1180 #, c-format msgid "%s encryption will be used\n" msgstr "%s ¥[±K±N³Q±Ä¥Î\n" -#: g10/skclist.c:129 g10/skclist.c:191 +#: g10/skclist.c:126 g10/skclist.c:190 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "ª÷Æ_¥¼³Q¼Ð¥Ü¬°¤£¦w¥þ ¢w ¤£¯à°÷®³¨Ó¸ò°²ªºÀH¾÷¼Æ¦r²£¥Í¾¹¨Ö¥Î¡I\n" -#: g10/skclist.c:158 +#: g10/skclist.c:157 #, fuzzy, c-format msgid "skipped \"%s\": duplicated\n" msgstr "`%s' ¤w¸õ¹L¡G­«½Æ¤F\n" -#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185 +#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 #, fuzzy, c-format msgid "skipped \"%s\": %s\n" msgstr "`%s' ¤w¸õ¹L¡G %s\n" -#: g10/skclist.c:171 +#: g10/skclist.c:170 msgid "skipped: secret key already present\n" msgstr "¤w¸õ¹L¡G¨pÆ_¤w¸g¦s¦b\n" -#: g10/skclist.c:186 +#: g10/skclist.c:185 #, fuzzy msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "`%s' ¤w¸õ¹L¡G³o¬O¤@§â¥Ñ PGP ²£¥Íªº ElGamal ª÷Æ_¡A¥Î©óñ³¹¨Ã¤£¦w¥þ¡I\n" @@ -5506,12 +5565,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "«H¥ô¸ê®Æ®w·l·´¤F¡F½Ð°õ¦æ \"gpg --fix-trustdb\" ¡C\n" -#: g10/textfilter.c:134 +#: g10/textfilter.c:143 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "µLªk³B²zªø©ó %d ¦r²Åªº¤å¦r¦C\n" -#: g10/textfilter.c:231 +#: g10/textfilter.c:240 #, c-format msgid "input line longer than %d characters\n" msgstr "¿é¤J¦C¤ñ %d ¦r²ÅÁÙªø\n" @@ -5561,85 +5620,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:501 +#: g10/trustdb.c:503 +msgid "10 translator see trustdb.c:uid_trust_string_fixed" +msgstr "" + +#: g10/trustdb.c:505 +#, fuzzy +msgid "[ revoked]" +msgstr "[¤wºM¾P]" + +#: g10/trustdb.c:507 +#, fuzzy +msgid "[ expired]" +msgstr "[¤w¹L´Á]" + +#: g10/trustdb.c:511 +#, fuzzy +msgid "[ unknown]" +msgstr "¥¼ª¾" + +#: g10/trustdb.c:512 +msgid "[ undef ]" +msgstr "" + +#: g10/trustdb.c:513 +msgid "[marginal]" +msgstr "" + +#: g10/trustdb.c:514 +msgid "[ full ]" +msgstr "" + +#: g10/trustdb.c:515 +msgid "[ultimate]" +msgstr "" + +#: g10/trustdb.c:530 msgid "undefined" msgstr "" -#: g10/trustdb.c:502 +#: g10/trustdb.c:531 #, fuzzy msgid "never" msgstr "¥Ã»·¤£¹L´Á" -#: g10/trustdb.c:503 +#: g10/trustdb.c:532 msgid "marginal" msgstr "" -#: g10/trustdb.c:504 +#: g10/trustdb.c:533 msgid "full" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:534 msgid "ultimate" msgstr "" -#: g10/trustdb.c:545 +#: g10/trustdb.c:574 msgid "no need for a trustdb check\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:551 g10/trustdb.c:2112 +#: g10/trustdb.c:580 g10/trustdb.c:2141 #, c-format msgid "next trustdb check due at %s\n" msgstr "¤U¦¸«H¥ô¸ê®Æ®wÀˬd±N©ó %s ¶i¦æ\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:589 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:575 +#: g10/trustdb.c:604 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:793 g10/trustdb.c:1231 +#: g10/trustdb.c:822 g10/trustdb.c:1260 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "¤½Æ_ %08lX ¨S¦³³Q§ä¨ì¡G %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:1017 msgid "please do a --check-trustdb\n" msgstr "½Ð°µ¤@¦¸ --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:1021 msgid "checking the trustdb\n" msgstr "¥¿¦bÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:1856 +#: g10/trustdb.c:1885 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "¤w¸g³B²z¤F %d §âª÷Æ_¡]¦@­p¤w¸Ñ¨M¤F %d ¥÷¦³®Ä©Ê¡^\n" -#: g10/trustdb.c:1920 +#: g10/trustdb.c:1949 msgid "no ultimately trusted keys found\n" msgstr "¨S¦³§ä¨ì¥ô¦ó¹ý©³«H¥ôªºª÷Æ_\n" -#: g10/trustdb.c:1934 +#: g10/trustdb.c:1963 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "¹ý©³«H¥ôª÷Æ_ %08lX ªº¤½Æ_¨S¦³³Q§ä¨ì\n" -#: g10/trustdb.c:1957 +#: g10/trustdb.c:1986 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2043 +#: g10/trustdb.c:2072 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2118 +#: g10/trustdb.c:2147 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "«H¥ô°O¿ý %lu ¡AÃþ§O %d: ¼g¤J¥¢±Ñ¡G %s\n" @@ -5949,6 +6043,59 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(¤]³\©p¿ï¿ùµ{¦¡¨Ó°µ³o¥ó¨Æ¤F)\n" +#~ msgid "digest algorithm `%s' is read-only in this release\n" +#~ msgstr "`%s' ºK­nºtºâªk¦b³o¦¸ÄÀ¥Xªºª©¥»¤¤°ßŪ\n" + +#~ msgid "" +#~ "About to generate a new %s keypair.\n" +#~ " minimum keysize is 768 bits\n" +#~ " default keysize is 1024 bits\n" +#~ " highest suggested keysize is 2048 bits\n" +#~ msgstr "" +#~ "Ãö©ó²£¥Í¤@°Æ·sªº %s ª÷Æ_¹ï¡C\n" +#~ " ³Ì°_½Xªºª÷Æ_¤Ø¤o¬O 768 ¦ì¤¸\n" +#~ " ¹w³]ªºª÷Æ_¤Ø¤o¬O 1024 ¦ì¤¸\n" +#~ " «Øijªº³Ì¤jª÷Æ_¤Ø¤o¬O 2048 ¦ì¤¸\n" + +#~ msgid "DSA only allows keysizes from 512 to 1024\n" +#~ msgstr "DSA ªºª÷Æ_¤Ø¤o¬é¯à¤¶©ó 512 ©M 1024 ¤§¶¡\n" + +#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" +#~ msgstr "ª÷Æ_¤Ø¤o¤Ó¤p¡F RSA ªºª÷Æ_¤Ø¤o³Ì°_½X¥²¶·­n¦³ 1024 ¡C\n" + +#~ msgid "keysize too small; 768 is smallest value allowed.\n" +#~ msgstr "ª÷Æ_¤Ø¤o¤Ó¤p¡F³Ì°_½X¥²¶·­n¦³ 768 ¡C\n" + +#~ msgid "keysize too large; %d is largest value allowed.\n" +#~ msgstr "ª÷Æ_¤Ø¤o¤Ó¤j¡F³Ì¤j¬é¯à°÷¥Î¨ì %d ¡C\n" + +#~ msgid "" +#~ "Keysizes larger than 2048 are not suggested because\n" +#~ "computations take REALLY long!\n" +#~ msgstr "" +#~ "¤£«Øij¨Ï¥Î¤j©ó 2048 ªºª÷Æ_¤Ø¤o¡A\n" +#~ "¦]¬°­pºâ *¯uªº* ·|ªá¥h«Ü¦h®É¶¡¡I\n" + +#, fuzzy +#~ msgid "Are you sure that you want this keysize? (y/N) " +#~ msgstr "©p½T©w­n¥Î³o­Óª÷Æ_¤Ø¤o¶Ü¡H " + +#~ msgid "" +#~ "Okay, but keep in mind that your monitor and keyboard radiation is also " +#~ "very vulnerable to attacks!\n" +#~ msgstr "¦n¡A¦ý¬O½Ð°O¦í©pªº¿Ã¹õ©MÁä½L¤]¬O¬Û·í®e©ö³Q¿sµøªº®zÂI¡I\n" + +#~ msgid "Experimental algorithms should not be used!\n" +#~ msgstr "¤£¸Ó¨Ï¥Î¹êÅç©Êªººtºâªk¡I\n" + +#~ msgid "" +#~ "this cipher algorithm is deprecated; please use a more standard one!\n" +#~ msgstr "¤£«Øij¨Ï¥Î³o­Ó½s±Kºtºâªk¡F½Ð´«¥Î§ó¥¿¦¡ªº¡I\n" + +#, fuzzy +#~ msgid "writing to file `%s'\n" +#~ msgstr "¥¿¦b¼g¨ì `%s'\n" + #~ msgid "sorry, can't do this in batch mode\n" #~ msgstr "©êºp¡AµLªk¦b§å¦¸¼Ò¦¡¤¤³o¼Ë°µ\n" @@ -6076,12 +6223,6 @@ #~ msgid "rev? problem checking revocation: %s\n" #~ msgstr "rev? ÀˬdºM¾P®Éµo¥Í°ÝÃD¡G %s\n" -#~ msgid "[revoked] " -#~ msgstr "[¤wºM¾P]" - -#~ msgid "[expired] " -#~ msgstr "[¤w¹L´Á]" - #, fuzzy #~ msgid " [expired: %s]" #~ msgstr " [¦³®Ä´Á­­¡G %s]" From cvs at cvs.gnupg.org Thu Dec 16 08:44:58 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:55:02 2004 Subject: dirmngr (NEWS src/ChangeLog src/ldap.c) Message-ID: Date: Thursday, December 16, 2004 @ 08:49:25 Author: wk Path: /cvs/dirmngr/dirmngr Modified: NEWS src/ChangeLog src/ldap.c (ldap_wrapper): Peek on the output to detect empty output early. ---------------+ NEWS | 2 ++ src/ChangeLog | 5 +++++ src/ldap.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) Index: dirmngr/NEWS diff -u dirmngr/NEWS:1.30 dirmngr/NEWS:1.31 --- dirmngr/NEWS:1.30 Thu Nov 25 12:37:38 2004 +++ dirmngr/NEWS Thu Dec 16 08:49:25 2004 @@ -18,6 +18,8 @@ * SIGHUP may be used to reread the configuration and to flush the certificate cache. + * An authorithyKeyIdentifier in a CRL is now handled correctly. + Noteworthy changes in version 0.5.6 (2004-09-28) ------------------------------------------------ Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.36 dirmngr/src/ChangeLog:1.37 --- dirmngr/src/ChangeLog:1.36 Wed Dec 15 23:11:59 2004 +++ dirmngr/src/ChangeLog Thu Dec 16 08:49:25 2004 @@ -1,3 +1,8 @@ +2004-12-16 Werner Koch + + * ldap.c (ldap_wrapper): Peek on the output to detect empty output + early. + 2004-12-15 Werner Koch * ldap.c (ldap_wrapper): Print a diagnostic after forking for the Index: dirmngr/src/ldap.c diff -u dirmngr/src/ldap.c:1.43 dirmngr/src/ldap.c:1.44 --- dirmngr/src/ldap.c:1.43 Wed Dec 15 23:11:59 2004 +++ dirmngr/src/ldap.c Thu Dec 16 08:49:25 2004 @@ -94,6 +94,14 @@ static struct wrapper_context_s *wrapper_list; +/* Prototypes. */ +static gpg_error_t read_buffer (ksba_reader_t reader, + unsigned char *buffer, size_t count); + + + + + /* Add HOST and PORT to our list of LDAP servers. Fixme: We should better use an extra list of servers. */ static void @@ -686,6 +694,29 @@ wrapper_list = ctx; if (opt.verbose) log_info (_("ldap wrapper %d started\n"), (int)ctx->pid); + + /* Need to wait for the first byte so we are able todetect an empty + output and not let the consumer se an EOF without further error + indications. The CRL loading logic assumes that after return + from this function, a failed search (e.g. host not found ) is + indicated right away. */ + { + unsigned char c; + + err = read_buffer (*reader, &c, 1); + if (err) + { + ldap_wrapper_release_context (*reader); + ksba_reader_release (*reader); + *reader = NULL; + if (gpg_err_code (err) == GPG_ERR_EOF) + return gpg_error (GPG_ERR_NO_DATA); + else + return err; + } + ksba_reader_unread (*reader, &c, 1); + } + return 0; } From cvs at cvs.gnupg.org Thu Dec 16 11:08:34 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:55:16 2004 Subject: gnupg/doc (ChangeLog TRANSLATE gpg.texi) Message-ID: Date: Thursday, December 16, 2004 @ 11:13:02 Author: wk Path: /cvs/gnupg/gnupg/doc Modified: ChangeLog TRANSLATE gpg.texi Add a note on how to send translations. -----------+ ChangeLog | 4 ++ TRANSLATE | 23 ++++++++++++--- gpg.texi | 90 ++++++++++++++++++++++++++++++++---------------------------- 3 files changed, 71 insertions(+), 46 deletions(-) Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.89 gnupg/doc/ChangeLog:1.90 --- gnupg/doc/ChangeLog:1.89 Thu Dec 16 07:01:19 2004 +++ gnupg/doc/ChangeLog Thu Dec 16 11:13:02 2004 @@ -1,3 +1,7 @@ +2004-12-16 Werner Koch + + * TRANSLATE: Add a note on how to send translations. + 2004-12-16 David Shaw * gpg.sgml: Document --require-secmem/--no-require-secmem. Note Index: gnupg/doc/TRANSLATE diff -u gnupg/doc/TRANSLATE:1.2 gnupg/doc/TRANSLATE:1.3 --- gnupg/doc/TRANSLATE:1.2 Fri Nov 21 02:26:29 2003 +++ gnupg/doc/TRANSLATE Thu Dec 16 11:13:02 2004 @@ -1,4 +1,4 @@ -$Id: TRANSLATE,v 1.2 2003/11/21 01:26:29 dshaw Exp $ +$Id: TRANSLATE,v 1.3 2004/12/16 10:13:02 wk Exp $ Note for translators -------------------- @@ -7,12 +7,27 @@ strings can accept multiple values that mean essentially the same thing. -For example, the string "yes" in English is "sí" in Spanish. However, +For example, the string "yes" in English is "sí" in Spanish. However, some users will type "si" (without the accent). To accomodate both -users, you can translate the string "yes" as "sí|si". You can have +users, you can translate the string "yes" as "sí|si". You can have any number of alternate matches seperated by the | character like -"sí|si|seguro". +"sí|si|seguro". The strings that can be handled in this way are of the form "yes|yes", (or "no|no", etc.) There should also be a comment in the .po file directing you to this file. + + + +Sending new or updated translations +----------------------------------- + +Please note that we do not use the TP Robot but require that +translations are to be send by mail to translations@gnupg.org. We +also strongly advise to get subscribed to i18n@gnupg.org and request +assistance if it is not clear on how to translate certain strings. A +wrongly translated string may lead to a security problem. + +A copyright disclaimer to the FSF is required by all translators. + + Index: gnupg/doc/gpg.texi diff -u gnupg/doc/gpg.texi:1.8 gnupg/doc/gpg.texi:1.9 --- gnupg/doc/gpg.texi:1.8 Tue Oct 26 21:33:41 2004 +++ gnupg/doc/gpg.texi Thu Dec 16 11:13:02 2004 @@ -141,11 +141,12 @@ each signature. From left to right, they are the numbers 1-3 for certificate check level (see --ask-cert-level), "L" for a local or non-exportable signature (see --lsign-key), "R" for a nonRevocable -signature (see --nrsign-key), "P" for a signature that contains a -policy URL (see --cert-policy-url), "N" for a signature that contains -a notation (see --cert-notation), "X" for an eXpired signature (see ---ask-cert-expire), and the numbers 1-9 or "T" for 10 and above to -indicate trust signature levels (see the --edit-key command "tsign"). +signature (see the --edit-key command "nrsign"), "P" for a signature +that contains a policy URL (see --cert-policy-url), "N" for a +signature that contains a notation (see --cert-notation), "X" for an +eXpired signature (see --ask-cert-expire), and the numbers 1-9 or "T" +for 10 and above to indicate trust signature levels (see the +--edit-key command "tsign"). @item --check-sigs Same as --list-sigs, but the signatures are verified. @@ -177,35 +178,34 @@ @table @asis @item sign -Make a signature on key of user @code{name} -If the key is not yet signed by the default -user (or the users given with -u), the -program displays the information of the key -again, together with its fingerprint and -asks whether it should be signed. This -question is repeated for all users specified -with -u. +Make a signature on key of user @code{name} If the key is not yet +signed by the default user (or the users given with -u), the program +displays the information of the key again, together with its +fingerprint and asks whether it should be signed. This question is +repeated for all users specified with +-u. @item lsign -Same as --sign but the signature is marked as -non-exportable and will therefore never be used -by others. This may be used to make keys valid -only in the local environment. +Same as "sign" but the signature is marked as non-exportable and will +therefore never be used by others. This may be used to make keys +valid only in the local environment. @item nrsign -Same as --sign but the signature is marked as non-revocable and can +Same as "sign" but the signature is marked as non-revocable and can therefore never be revoked. -@item nrlsign -Combines the functionality of nrsign and lsign to make a signature -that is both non-revocable and -non-exportable. - @item tsign Make a trust signature. This is a signature that combines the notions of certification (like a regular signature), and trust (like the "trust" command). It is generally only useful in distinct communities or groups. +@end table + +Note that "l" (for local / non-exportable), "nr" (for non-revocable, +and "t" (for trust) may be freely mixed and prefixed to "sign" to +create a signature of any type desired. + +@table @asis @item revsig Revoke a signature. For every signature which has been generated by @@ -330,10 +330,10 @@ @item keyserver Set a preferred keyserver for the specified user ID(s). This allows other users to know where you prefer they get your key from. See ---keyserver-option honor-keyserver-url. Note that some versions of -PGP interpret the presence of a keyserver URL as an instruction to -enable PGP/MIME mail encoding. Setting a value of "none" removes a -existing preferred keyserver. +--keyserver-option honor-keyserver-url for more on how this works. +Note that some versions of PGP interpret the presence of a keyserver +URL as an instruction to enable PGP/MIME mail encoding. Setting a +value of "none" removes a existing preferred keyserver. @item toggle Toggle between public and secret key listing. @@ -387,10 +387,6 @@ non-exportable. This is a shortcut version of the subcommand "lsign" from --edit. -@item --nrsign-key @code{name} -Signs a public key with your secret key but marks it as non-revocable. -This is a shortcut version of the subcommand "nrsign" from --edit. - @item --delete-key @code{name} Remove key from the public keyring. In batch mode either --yes is required or the key must be specified by fingerprint. This is a @@ -844,10 +840,11 @@ --recv-keys command as a whole. Defaults to 30 seconds. @item http-proxy -For keyserver schemes that use HTTP (such as HKP), try to access the -keyserver over a proxy. If a @code{value} is specified, use this as -the HTTP proxy. If no @code{value} is specified, try to use the value -of the environment variable "http_proxy". +For HTTP-like keyserver schemes that (such as HKP and HTTP itself), +try to access the keyserver over a proxy. If a @code{value} is +specified, use this as the HTTP proxy. If no @code{value} is +specified, try to use the value of the environment variable +"http_proxy". @item auto-key-retrieve This option enables the automatic retrieving of keys from a keyserver @@ -868,7 +865,7 @@ @table @asis -@item allow-local-sigs +@item import-local-sigs Allow importing key signatures marked as "local". This is not generally useful unless a shared keyring scheme is being used. Defaults to no. @@ -893,19 +890,23 @@ @table @asis -@item include-local-sigs +@item export-local-sigs Allow exporting key signatures marked as "local". This is not generally useful unless a shared keyring scheme is being used. Defaults to no. -@item include-attributes +@item export-attributes Include attribute user IDs (photo IDs) while exporting. This is useful to export keys if they are going to be used by an OpenPGP program that does not accept attribute user IDs. Defaults to yes. -@item include-sensitive-revkeys +@item export-sensitive-revkeys Include designated revoker information that was marked as "sensitive". Defaults to no. + +@item export-minimal +Export the smallest key possible. Currently this is done by leaving +out any signatures that are not self-signatures. Defaults to no. @end table @item --list-options @code{parameters} @@ -1577,6 +1578,11 @@ @item --no-mdc-warning Suppress the warning about missing MDC integrity protection. +@item --require-secmem +@itemx --no-require-secmem +Refuse to run if GnuPG cannot get secure memory. Defaults to no +(i.e. run, but give a warning). + @item --no-armor Assume the input data is not in ASCII armored format. @@ -1663,9 +1669,9 @@ @itemx --no-expert Allow the user to do certain nonsensical or "silly" things like signing an expired or revoked key, or certain potentially incompatible -things like generating deprecated key types. This also disables -certain warning messages about potentially incompatible actions. As -the name implies, this option is for experts only. If you don't fully +things like generating unusual key types. This also disables certain +warning messages about potentially incompatible actions. As the name +implies, this option is for experts only. If you don't fully understand the implications of what it allows you to do, leave this off. --no-expert disables this option. From cvs at cvs.gnupg.org Thu Dec 16 11:24:22 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:55:18 2004 Subject: gnupg (THANKS doc/Makefile.am) Message-ID: Date: Thursday, December 16, 2004 @ 11:28:50 Author: wk Path: /cvs/gnupg/gnupg Modified: THANKS doc/Makefile.am Minor fixes -----------------+ THANKS | 11 ++++++----- doc/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) Index: gnupg/THANKS diff -u gnupg/THANKS:1.77 gnupg/THANKS:1.78 --- gnupg/THANKS:1.77 Mon Dec 6 11:32:20 2004 +++ gnupg/THANKS Thu Dec 16 11:28:50 2004 @@ -1,7 +1,7 @@ -GnuPG was originally written by Werner Koch. Other people contributed by -reporting problems, suggesting various improvements or submitting actual -code. Here is a list of those people. Help me keep it complete and free of -errors. +GnuPG was originally written by Werner Koch. Other people contributed +by reporting problems, suggesting various improvements or submitting +actual code. Here is a list of those people. Help us keep it complete +and free of errors. Adam Mitchell adam@cafe21.org Albert Chin china@thewrittenword.com @@ -232,7 +232,8 @@ Many thanks to my wife Gerlinde for having so much patience with me while hacking late in the evening. - Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002, 2003, + 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without Index: gnupg/doc/Makefile.am diff -u gnupg/doc/Makefile.am:1.25 gnupg/doc/Makefile.am:1.26 --- gnupg/doc/Makefile.am:1.25 Thu Oct 28 11:18:34 2004 +++ gnupg/doc/Makefile.am Thu Dec 16 11:28:50 2004 @@ -22,7 +22,7 @@ EXTRA_DIST = DETAILS gpg.sgml gpg.1 gpgv.sgml gpgv.1 faq.raw FAQ faq.html \ HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 gnupg-w32.reg \ - TRANSLATE gpg.ru.sgml gpg.ru.1 + TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1 From cvs at cvs.gnupg.org Thu Dec 16 11:48:58 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:55:21 2004 Subject: gnupg (NEWS configure.ac) Message-ID: Date: Thursday, December 16, 2004 @ 11:53:25 Author: wk Path: /cvs/gnupg/gnupg Modified: NEWS configure.ac post release updates --------------+ NEWS | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) Index: gnupg/NEWS diff -u gnupg/NEWS:1.225 gnupg/NEWS:1.226 --- gnupg/NEWS:1.225 Thu Dec 16 11:04:36 2004 +++ gnupg/NEWS Thu Dec 16 11:53:25 2004 @@ -1,3 +1,7 @@ +Noteworthy changes in version 1.4.1 +------------------------------------------------- + + Noteworthy changes in version 1.4.0 (2004-12-16) ------------------------------------------------- Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.115 gnupg/configure.ac:1.116 --- gnupg/configure.ac:1.115 Thu Dec 16 11:04:36 2004 +++ gnupg/configure.ac Thu Dec 16 11:53:25 2004 @@ -19,14 +19,14 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.115 $)dnl +dnlAC_REVISION($Revision: 1.116 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.4.0, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.4.1-cvs, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. From cvs at cvs.gnupg.org Tue Dec 7 22:05:35 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Thu Dec 16 14:55:30 2004 Subject: gpgme (121 files) Message-ID: Date: Tuesday, December 7, 2004 @ 22:13:39 Author: marcus Path: /cvs/gpgme/gpgme Modified: COPYING.LESSER ChangeLog Makefile.am README README.CVS TODO acinclude.m4 assuan/ChangeLog assuan/README.1st configure.ac doc/ChangeLog doc/Makefile.am doc/gpgme.texi doc/lesser.texi gpgme.spec.in gpgme/ChangeLog gpgme/Makefile.am gpgme/ath-compat.c gpgme/ath-pth-compat.c gpgme/ath-pth.c gpgme/ath-pthread-compat.c gpgme/ath-pthread.c gpgme/ath.c gpgme/ath.h gpgme/context.h gpgme/conversion.c gpgme/data-compat.c gpgme/data-fd.c gpgme/data-mem.c gpgme/data-stream.c gpgme/data-user.c gpgme/data.c gpgme/data.h gpgme/debug.c gpgme/debug.h gpgme/decrypt-verify.c gpgme/decrypt.c gpgme/delete.c gpgme/edit.c gpgme/encrypt-sign.c gpgme/encrypt.c gpgme/engine-backend.h gpgme/engine-gpgsm.c gpgme/engine.c gpgme/engine.h gpgme/error.c gpgme/export.c gpgme/funopen.c gpgme/genkey.c gpgme/get-env.c gpgme/gpgme.c gpgme/gpgme.h gpgme/import.c gpgme/io.h gpgme/isascii.c gpgme/key.c gpgme/keylist.c gpgme/memrchr.c gpgme/mkstatus gpgme/op-support.c gpgme/ops.h gpgme/passphrase.c gpgme/posix-io.c gpgme/posix-sema.c gpgme/posix-util.c gpgme/progress.c gpgme/putc_unlocked.c gpgme/rungpg.c gpgme/sema.h gpgme/sign.c gpgme/signers.c gpgme/stpcpy.c gpgme/trust-item.c gpgme/trustlist.c gpgme/util.h gpgme/verify.c gpgme/version.c gpgme/w32-io.c gpgme/w32-sema.c gpgme/w32-util.c gpgme/wait-global.c gpgme/wait-private.c gpgme/wait-user.c gpgme/wait.c gpgme/wait.h tests/ChangeLog tests/Makefile.am tests/gpg/Makefile.am tests/gpg/mkdemodirs tests/gpg/t-decrypt-verify.c tests/gpg/t-decrypt.c tests/gpg/t-edit.c tests/gpg/t-encrypt-sign.c tests/gpg/t-encrypt-sym.c tests/gpg/t-encrypt.c tests/gpg/t-eventloop.c tests/gpg/t-export.c tests/gpg/t-genkey.c tests/gpg/t-import.c tests/gpg/t-keylist-sig.c tests/gpg/t-keylist.c tests/gpg/t-sign.c tests/gpg/t-signers.c tests/gpg/t-support.h tests/gpg/t-thread1.c tests/gpg/t-trustlist.c tests/gpg/t-verify.c tests/gpgsm/Makefile.am tests/gpgsm/t-decrypt.c tests/gpgsm/t-encrypt.c tests/gpgsm/t-export.c tests/gpgsm/t-genkey.c tests/gpgsm/t-import.c tests/gpgsm/t-keylist.c tests/gpgsm/t-sign.c tests/gpgsm/t-support.h tests/gpgsm/t-verify.c tests/t-data.c tests/t-engine-info.c tests/t-version.c Removed: doc/gpl.texi 2004-12-07 Marcus Brinkmann * README: Refer to COPYING.LESSER and "each file" instead of COPYING. * COPYING.LESSER: New file. * gpgme.spec.in (%doc): Add COPYING.LESSER. * acinclude.m4, configure.ac, Makefile.am: Change license to LGPL 2.1 or later. * TODO: Add copyright notice. * README.CVS: Likewise. assuan/ 2004-12-07 Marcus Brinkmann * README.1st: Add copyright notice. doc/ 2004-12-07 Marcus Brinkmann * Makefile.am: Change license to LGPL. (gpgme_TEXINFOS): Replace gpl.texi with lesser.texi. * gpgme.texi: Change license to LGPL (also for documentation of GPGME's license). * lesser.texi: New file. * gpl.texi: File removed. gpgme/ 2004-12-07 Marcus Brinkmann * putc_unlocked.c, funopen.c: I just claim copyright on these files and change their license to LGPL, because they are totally trivial wrapper functions. * isascii.c: Change copyright notice to the one from ctype/ctype.h in the GNU C Library (CVS Head 2004-10-10), where isascii is defined as a macro doing exactly the same as the function in this file. * memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06). * stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10). * ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c, ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c, data.c, data-compat.c, data-fd.c, data.h, data-mem.c, data-stream.c, data-user.c, debug.c, debug.h, decrypt.c, decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c, engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c, export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h, key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c, passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c, rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c, util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c, wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change license to LGPL. tests/ 2004-12-07 Marcus Brinkmann * gpg/mkdemodirs: Add copyright notice. * gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c, gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c, gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c, gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c, gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c, gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c, gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c, gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c, gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c, gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c, t-version.c: Change license to LGPL. ------------------------------+ COPYING.LESSER | 510 +++++++++++++++++++++++++++++++++++++ ChangeLog | 9 Makefile.am | 23 - README | 3 README.CVS | 8 TODO | 12 acinclude.m4 | 20 - assuan/ChangeLog | 6 assuan/README.1st | 11 configure.ac | 24 - doc/ChangeLog | 8 doc/Makefile.am | 24 - doc/gpgme.texi | 35 +- doc/gpl.texi | 397 ---------------------------- doc/lesser.texi | 565 +++++++++++++++++++++++++++++++++++++++++ gpgme.spec.in | 2 gpgme/ChangeLog | 25 + gpgme/Makefile.am | 22 - gpgme/ath-compat.c | 36 +- gpgme/ath-pth-compat.c | 36 +- gpgme/ath-pth.c | 21 - gpgme/ath-pthread-compat.c | 36 +- gpgme/ath-pthread.c | 22 - gpgme/ath.c | 21 - gpgme/ath.h | 21 - gpgme/context.h | 21 - gpgme/conversion.c | 21 - gpgme/data-compat.c | 19 - gpgme/data-fd.c | 21 - gpgme/data-mem.c | 21 - gpgme/data-stream.c | 19 - gpgme/data-user.c | 21 - gpgme/data.c | 21 - gpgme/data.h | 21 - gpgme/debug.c | 21 - gpgme/debug.h | 36 +- gpgme/decrypt-verify.c | 21 - gpgme/decrypt.c | 19 - gpgme/delete.c | 21 - gpgme/edit.c | 21 - gpgme/encrypt-sign.c | 21 - gpgme/encrypt.c | 21 - gpgme/engine-backend.h | 23 - gpgme/engine-gpgsm.c | 19 - gpgme/engine.c | 21 - gpgme/engine.h | 23 - gpgme/error.c | 21 - gpgme/export.c | 21 - gpgme/funopen.c | 43 +-- gpgme/genkey.c | 21 - gpgme/get-env.c | 21 - gpgme/gpgme.c | 21 - gpgme/gpgme.h | 19 - gpgme/import.c | 21 - gpgme/io.h | 21 - gpgme/isascii.c | 37 +- gpgme/key.c | 21 - gpgme/keylist.c | 21 - gpgme/memrchr.c | 229 ++++++++++++++-- gpgme/mkstatus | 24 - gpgme/op-support.c | 21 - gpgme/ops.h | 21 - gpgme/passphrase.c | 21 - gpgme/posix-io.c | 21 - gpgme/posix-sema.c | 21 - gpgme/posix-util.c | 21 - gpgme/progress.c | 21 - gpgme/putc_unlocked.c | 36 +- gpgme/rungpg.c | 21 - gpgme/sema.h | 21 - gpgme/sign.c | 21 - gpgme/signers.c | 21 - gpgme/stpcpy.c | 39 +- gpgme/trust-item.c | 21 - gpgme/trustlist.c | 21 - gpgme/util.h | 21 - gpgme/verify.c | 19 - gpgme/version.c | 21 - gpgme/w32-io.c | 21 - gpgme/w32-sema.c | 21 - gpgme/w32-util.c | 21 - gpgme/wait-global.c | 21 - gpgme/wait-private.c | 21 - gpgme/wait-user.c | 23 - gpgme/wait.c | 21 - gpgme/wait.h | 21 - tests/ChangeLog | 26 + tests/Makefile.am | 23 - tests/gpg/Makefile.am | 22 - tests/gpg/mkdemodirs | 23 + tests/gpg/t-decrypt-verify.c | 21 - tests/gpg/t-decrypt.c | 21 - tests/gpg/t-edit.c | 21 - tests/gpg/t-encrypt-sign.c | 23 - tests/gpg/t-encrypt-sym.c | 21 - tests/gpg/t-encrypt.c | 21 - tests/gpg/t-eventloop.c | 23 - tests/gpg/t-export.c | 21 - tests/gpg/t-genkey.c | 23 - tests/gpg/t-import.c | 23 - tests/gpg/t-keylist-sig.c | 21 - tests/gpg/t-keylist.c | 21 - tests/gpg/t-sign.c | 21 - tests/gpg/t-signers.c | 21 - tests/gpg/t-support.h | 21 - tests/gpg/t-thread1.c | 21 - tests/gpg/t-trustlist.c | 21 - tests/gpg/t-verify.c | 21 - tests/gpgsm/Makefile.am | 20 - tests/gpgsm/t-decrypt.c | 22 - tests/gpgsm/t-encrypt.c | 21 - tests/gpgsm/t-export.c | 21 - tests/gpgsm/t-genkey.c | 23 - tests/gpgsm/t-import.c | 21 - tests/gpgsm/t-keylist.c | 21 - tests/gpgsm/t-sign.c | 21 - tests/gpgsm/t-support.h | 21 - tests/gpgsm/t-verify.c | 21 - tests/t-data.c | 36 +- tests/t-engine-info.c | 21 - tests/t-version.c | 38 +- 121 files changed, 2646 insertions(+), 1610 deletions(-) Index: gpgme/COPYING.LESSER diff -u /dev/null gpgme/COPYING.LESSER:1.2 --- /dev/null Tue Dec 7 22:13:40 2004 +++ gpgme/COPYING.LESSER Tue Dec 7 22:13:36 2004 @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. +^L + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. +^L + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. +^L + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. +^L + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. +^L + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. +^L + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. +^L + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS +^L + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library 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 library 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 library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.108 gpgme/ChangeLog:1.109 --- gpgme/ChangeLog:1.108 Tue Dec 7 16:30:36 2004 +++ gpgme/ChangeLog Tue Dec 7 22:13:36 2004 @@ -1,5 +1,14 @@ 2004-12-07 Marcus Brinkmann + * README: Refer to COPYING.LESSER and "each file" instead of + COPYING. + * COPYING.LESSER: New file. + * gpgme.spec.in (%doc): Add COPYING.LESSER. + * acinclude.m4, configure.ac, Makefile.am: Change license to LGPL + 2.1 or later. + * TODO: Add copyright notice. + * README.CVS: Likewise. + * configure.ac (GPGSM_VERSION): Fix filter to get it. 2004-10-22 Marcus Brinkmann Index: gpgme/Makefile.am diff -u gpgme/Makefile.am:1.17 gpgme/Makefile.am:1.18 --- gpgme/Makefile.am:1.17 Thu Sep 30 03:30:10 2004 +++ gpgme/Makefile.am Tue Dec 7 22:13:36 2004 @@ -1,20 +1,21 @@ +# Makefile.am - Top level Makefile for GPGME. # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002 g10 Code GmbH +# Copyright (C) 2001, 2002, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/README diff -u gpgme/README:1.29 gpgme/README:1.30 --- gpgme/README:1.29 Thu Sep 30 04:37:13 2004 +++ gpgme/README Tue Dec 7 22:13:36 2004 @@ -28,7 +28,8 @@ GPGME runs best on GNU/Linux or *BSD systems. Other Unices may require small portability fixes, send us your patches. -See the file COPYING for copyright and warranty information. +See the file COPYING.LESSER and each file for copyright and warranty +information. Installation Index: gpgme/README.CVS diff -u gpgme/README.CVS:1.1 gpgme/README.CVS:1.2 --- gpgme/README.CVS:1.1 Mon Jan 12 14:41:20 2004 +++ gpgme/README.CVS Tue Dec 7 22:13:36 2004 @@ -47,5 +47,13 @@ to copy the files and not merely use symlinks. +Copyright 2004 g10 Code GmbH +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. +This file is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. Index: gpgme/TODO diff -u gpgme/TODO:1.96 gpgme/TODO:1.97 --- gpgme/TODO:1.96 Tue Dec 7 19:49:35 2004 +++ gpgme/TODO Tue Dec 7 22:13:36 2004 @@ -152,3 +152,15 @@ * Error checking ** engine-gpgsm, with-validation Add error checking some time after releasing a new gpgsm. + + +Copyright 2004 g10 Code GmbH + +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. + +This file is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. Index: gpgme/acinclude.m4 diff -u gpgme/acinclude.m4:1.12 gpgme/acinclude.m4:1.13 --- gpgme/acinclude.m4:1.12 Tue Sep 14 20:30:23 2004 +++ gpgme/acinclude.m4 Tue Dec 7 22:13:36 2004 @@ -3,18 +3,18 @@ dnl dnl This file is part of GPGME. dnl -dnl GPGME is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. +dnl GPGME is free software; you can redistribute it and/or modify it +dnl under the terms of the GNU Lesser General Public License as +dnl published by the Free Software Foundation; either version 2.1 of the +dnl License, or (at your option) any later version. dnl -dnl GPGME is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. +dnl GPGME is distributed in the hope that it will be useful, but WITHOUT +dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +dnl or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +dnl Public License for more details. dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl GNUPG_FIX_HDR_VERSION(FILE, NAME) Index: gpgme/assuan/ChangeLog diff -u gpgme/assuan/ChangeLog:1.22 gpgme/assuan/ChangeLog:1.23 --- gpgme/assuan/ChangeLog:1.22 Wed Jun 23 16:11:46 2004 +++ gpgme/assuan/ChangeLog Tue Dec 7 22:13:36 2004 @@ -1,3 +1,7 @@ +2004-12-07 Marcus Brinkmann + + * README.1st: Add copyright notice. + 2004-06-23 Marcus Brinkmann * assuan-domain-connect.c [HAVE_SYS_UIO_H]: Include . @@ -499,7 +503,7 @@ * assuan-defs.h: Add space in the context for this. - Copyright 2001, 2002 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without Index: gpgme/assuan/README.1st diff -u gpgme/assuan/README.1st:1.4 gpgme/assuan/README.1st:1.5 --- gpgme/assuan/README.1st:1.4 Mon Oct 6 18:17:12 2003 +++ gpgme/assuan/README.1st Tue Dec 7 22:13:36 2004 @@ -23,3 +23,14 @@ * assuan-pipe-connect.c ** Do not install SIGPIPE signal handler here. + + + Copyright 2004 g10 Code GmbH + + This file is free software; as a special exception the author gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.93 gpgme/configure.ac:1.94 --- gpgme/configure.ac:1.93 Tue Dec 7 16:30:36 2004 +++ gpgme/configure.ac Tue Dec 7 22:13:36 2004 @@ -1,21 +1,21 @@ -# configure.in for GPGME +# configure.ac for GPGME # Copyright (C) 2000 Werner Koch (dd9jn) # Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # (Process this file with autoconf to produce a configure script.) @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.93 $) +AC_REVISION($Revision: 1.94 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION Index: gpgme/doc/ChangeLog diff -u gpgme/doc/ChangeLog:1.132 gpgme/doc/ChangeLog:1.133 --- gpgme/doc/ChangeLog:1.132 Tue Dec 7 20:05:18 2004 +++ gpgme/doc/ChangeLog Tue Dec 7 22:13:36 2004 @@ -1,5 +1,13 @@ 2004-12-07 Marcus Brinkmann + * Makefile.am: Change license to LGPL. + (gpgme_TEXINFOS): Replace gpl.texi with lesser.texi. + + * gpgme.texi: Change license to LGPL (also for documentation of + GPGME's license). + * lesser.texi: New file. + * gpl.texi: File removed. + * gpgme.texi (Creating Contexts): Fix cut&paste error. Reported by Noel Torres . Index: gpgme/doc/Makefile.am diff -u gpgme/doc/Makefile.am:1.5 gpgme/doc/Makefile.am:1.6 --- gpgme/doc/Makefile.am:1.5 Thu Sep 30 04:11:18 2004 +++ gpgme/doc/Makefile.am Tue Dec 7 22:13:36 2004 @@ -1,20 +1,20 @@ # doc - Automake template -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in @@ -22,4 +22,4 @@ DISTCLEANFILES = gpgme.tmp info_TEXINFOS = gpgme.texi -gpgme_TEXINFOS = gpl.texi +gpgme_TEXINFOS = lesser.texi Index: gpgme/doc/gpgme.texi diff -u gpgme/doc/gpgme.texi:1.134 gpgme/doc/gpgme.texi:1.135 --- gpgme/doc/gpgme.texi:1.134 Tue Dec 7 20:05:18 2004 +++ gpgme/doc/gpgme.texi Tue Dec 7 22:13:36 2004 @@ -24,18 +24,18 @@ Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH. The GPGME reference manual is free software; you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. +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. The GPGME reference manual 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 -General Public License for more details. +Lesser General Public License for more details. -You should have received a copy of the GNU General Public License -along with this manual; if not, write to the Free Software Foundation, -Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +You should have received a copy of the GNU Lesser General Public +License along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA @end ifinfo @@ -56,19 +56,20 @@ @vskip 0pt plus 1filll Copyright @copyright{} 2002, 2003, 2004 g10 Code GmbH. + The GPGME reference manual is free software; you can redistribute it -and/or modify it under the terms of the GNU General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. +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. The GPGME reference manual 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 -General Public License for more details. +Lesser General Public License for more details. -You should have received a copy of the GNU General Public License -along with this manual; if not, write to the Free Software Foundation, -Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. +You should have received a copy of the GNU Lesser General Public +License along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA @end titlepage @page @@ -91,8 +92,8 @@ Appendices -* Copying:: The GNU General Public License says how you - can copy and share `GnuPG Made Easy'. +* Library Copying:: The GNU Lesser General Public License says + how you can copy and share `GnuPG Made Easy'. Indices @@ -5050,7 +5051,7 @@ @end deftypefun -@include gpl.texi +@include lesser.texi @node Concept Index Index: gpgme/doc/gpl.texi diff -u gpgme/doc/gpl.texi:1.1 gpgme/doc/gpl.texi:removed --- gpgme/doc/gpl.texi:1.1 Wed Jan 16 01:41:10 2002 +++ gpgme/doc/gpl.texi Tue Dec 7 22:13:40 2004 @@ -1,397 +0,0 @@ -@node Copying -@appendix GNU GENERAL PUBLIC LICENSE - -@cindex GPL, GNU General Public License -@center Version 2, June 1991 - -@display -Copyright @copyright{} 1989, 1991 Free Software Foundation, Inc. -59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -@end display - -@appendixsubsec Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software---to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - -@iftex -@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end iftex -@ifinfo -@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -@end ifinfo - -@enumerate -@item -This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The ``Program'', below, -refers to any such program or work, and a ``work based on the Program'' -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term ``modification''.) Each licensee is addressed as ``you''. - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - -@item -You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - -@item -You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - -@enumerate a -@item -You must cause the modified files to carry prominent notices -stating that you changed the files and the date of any change. - -@item -You must cause any work that you distribute or publish, that in -whole or in part contains or is derived from the Program or any -part thereof, to be licensed as a whole at no charge to all third -parties under the terms of this License. - -@item -If the modified program normally reads commands interactively -when run, you must cause it, when started running for such -interactive use in the most ordinary way, to print or display an -announcement including an appropriate copyright notice and a -notice that there is no warranty (or else, saying that you provide -a warranty) and that users may redistribute the program under -these conditions, and telling the user how to view a copy of this -License. (Exception: if the Program itself is interactive but -does not normally print such an announcement, your work based on -the Program is not required to print an announcement.) -@end enumerate - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -@item -You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - -@enumerate a -@item -Accompany it with the complete corresponding machine-readable -source code, which must be distributed under the terms of Sections -1 and 2 above on a medium customarily used for software interchange; or, - -@item -Accompany it with a written offer, valid for at least three -years, to give any third party, for a charge no more than your -cost of physically performing source distribution, a complete -machine-readable copy of the corresponding source code, to be -distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - -@item -Accompany it with the information you received as to the offer -to distribute corresponding source code. (This alternative is -allowed only for noncommercial distribution and only if you -received the program in object code or executable form with such -an offer, in accord with Subsection b above.) -@end enumerate - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - -@item -You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - -@item -You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - -@item -Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - -@item -If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - -@item -If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - -@item -The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and ``any -later version'', you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - -@item -If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - -@iftex -@heading NO WARRANTY -@end iftex -@ifinfo -@center NO WARRANTY -@end ifinfo - -@item -BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM ``AS IS'' WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - -@item -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. -@end enumerate - -@iftex -@heading END OF TERMS AND CONDITIONS -@end iftex -@ifinfo -@center END OF TERMS AND CONDITIONS -@end ifinfo - -@page -@unnumberedsec How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the ``copyright'' line and a pointer to where the full notice is found. - -@smallexample -@var{one line to give the program's name and an idea of what it does.} -Copyright (C) 19@var{yy} @var{name of author} - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -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 General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -@end smallexample - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - -@smallexample -Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author} -Gnomovision comes with ABSOLUTELY NO WARRANTY; for details -type `show w'. This is free software, and you are welcome -to redistribute it under certain conditions; type `show c' -for details. -@end smallexample - -The hypothetical commands @samp{show w} and @samp{show c} should show -the appropriate parts of the General Public License. Of course, the -commands you use may be called something other than @samp{show w} and -@samp{show c}; they could even be mouse-clicks or menu items---whatever -suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a ``copyright disclaimer'' for the program, if -necessary. Here is a sample; alter the names: - -@smallexample -@group -Yoyodyne, Inc., hereby disclaims all copyright -interest in the program `Gnomovision' -(which makes passes at compilers) written -by James Hacker. - -@var{signature of Ty Coon}, 1 April 1989 -Ty Coon, President of Vice -@end group -@end smallexample - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Index: gpgme/doc/lesser.texi diff -u /dev/null gpgme/doc/lesser.texi:1.2 --- /dev/null Tue Dec 7 22:13:40 2004 +++ gpgme/doc/lesser.texi Tue Dec 7 22:13:36 2004 @@ -0,0 +1,565 @@ +@node Library Copying +@appendixsec GNU LESSER GENERAL PUBLIC LICENSE + +@cindex LGPL, Lesser General Public License +@center Version 2.1, February 1999 + +@display +Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc. +59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts +as the successor of the GNU Library Public License, version 2, hence the +version number 2.1.] +@end display + +@appendixsubsec Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software---to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software---typically libraries---of the Free +Software Foundation and other authors who decide to use it. You can use +it too, but we suggest you first think carefully about whether this +license or the ordinary General Public License is the better strategy to +use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of it +in new free programs; and that you are informed that you can do these +things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the @dfn{Lesser} General Public License because it +does @emph{Less} to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +``work based on the library'' and a ``work that uses the library''. The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + +@iftex +@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +@end iftex +@ifinfo +@center GNU LESSER GENERAL PUBLIC LICENSE +@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +@end ifinfo + +@enumerate 0 +@item +This License Agreement applies to any software library or other program +which contains a notice placed by the copyright holder or other +authorized party saying it may be distributed under the terms of this +Lesser General Public License (also called ``this License''). Each +licensee is addressed as ``you''. + + A ``library'' means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The ``Library'', below, refers to any such software library or work +which has been distributed under these terms. A ``work based on the +Library'' means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term ``modification''.) + + ``Source code'' for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + +@item +You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + +@item +You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +@enumerate a +@item +The modified work must itself be a software library. + +@item +You must cause the files modified to carry prominent notices +stating that you changed the files and the date of any change. + +@item +You must cause the whole of the work to be licensed at no +charge to all third parties under the terms of this License. + +@item +If a facility in the modified Library refers to a function or a +table of data to be supplied by an application program that uses +the facility, other than as an argument passed when the facility +is invoked, then you must make a good faith effort to ensure that, +in the event an application does not supply such function or +table, the facility still operates, and performs whatever part of +its purpose remains meaningful. + +(For example, a function in a library to compute square roots has +a purpose that is entirely well-defined independent of the +application. Therefore, Subsection 2d requires that any +application-supplied function or table used by this function must +be optional: if the application does not supply it, the square +root function must still compute square roots.) +@end enumerate + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +@item +You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + +@item +You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + +@item +A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a ``work that uses the Library''. Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a ``work that uses the Library'' with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a ``work that uses the +library''. The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a ``work that uses the Library'' uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + +@item +As an exception to the Sections above, you may also combine or +link a ``work that uses the Library'' with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + +@enumerate a +@item +Accompany the work with the complete corresponding +machine-readable source code for the Library including whatever +changes were used in the work (which must be distributed under +Sections 1 and 2 above); and, if the work is an executable linked +with the Library, with the complete machine-readable ``work that +uses the Library'', as object code and/or source code, so that the +user can modify the Library and then relink to produce a modified +executable containing the modified Library. (It is understood +that the user who changes the contents of definitions files in the +Library will not necessarily be able to recompile the application +to use the modified definitions.) + +@item +Use a suitable shared library mechanism for linking with the Library. A +suitable mechanism is one that (1) uses at run time a copy of the +library already present on the user's computer system, rather than +copying library functions into the executable, and (2) will operate +properly with a modified version of the library, if the user installs +one, as long as the modified version is interface-compatible with the +version that the work was made with. + +@item +Accompany the work with a written offer, valid for at +least three years, to give the same user the materials +specified in Subsection 6a, above, for a charge no more +than the cost of performing this distribution. + +@item +If distribution of the work is made by offering access to copy +from a designated place, offer equivalent access to copy the above +specified materials from the same place. + +@item +Verify that the user has already received a copy of these +materials or that you have already sent this user a copy. +@end enumerate + + For an executable, the required form of the ``work that uses the +Library'' must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies the +executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + +@item +You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + +@enumerate a +@item +Accompany the combined library with a copy of the same work +based on the Library, uncombined with any other library +facilities. This must be distributed under the terms of the +Sections above. + +@item +Give prominent notice with the combined library of the fact +that part of it is a work based on the Library, and explaining +where to find the accompanying uncombined form of the same work. +@end enumerate + +@item +You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +@item +You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + +@item +Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + +@item +If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +@item +If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + +@item +The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +``any later version'', you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + +@item +If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + +@iftex +@heading NO WARRANTY +@end iftex +@ifinfo +@center NO WARRANTY +@end ifinfo + +@item +BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +@item +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. +@end enumerate + +@iftex +@heading END OF TERMS AND CONDITIONS +@end iftex +@ifinfo +@center END OF TERMS AND CONDITIONS +@end ifinfo + +@page +@appendixsubsec How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +``copyright'' line and a pointer to where the full notice is found. + +@smallexample +@var{one line to give the library's name and an idea of what it does.} +Copyright (C) @var{year} @var{name of author} + +This library 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 library 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 library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, +USA. +@end smallexample + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a ``copyright disclaimer'' for the library, if +necessary. Here is a sample; alter the names: + +@smallexample +Yoyodyne, Inc., hereby disclaims all copyright interest in the library +`Frob' (a library for tweaking knobs) written by James Random Hacker. + +@var{signature of Ty Coon}, 1 April 1990 +Ty Coon, President of Vice +@end smallexample + +That's all there is to it! Index: gpgme/gpgme.spec.in diff -u gpgme/gpgme.spec.in:1.3 gpgme/gpgme.spec.in:1.4 --- gpgme/gpgme.spec.in:1.3 Tue Sep 2 20:04:22 2003 +++ gpgme/gpgme.spec.in Tue Dec 7 22:13:36 2004 @@ -49,7 +49,7 @@ %files %defattr(-,root,root) -%doc COPYING AUTHORS README INSTALL NEWS ChangeLog TODO THANKS +%doc COPYING COPYING.LESSER AUTHORS README INSTALL NEWS ChangeLog TODO THANKS %attr(0755,root,root) %{_bindir}/gpgme-config %attr(0755,root,root) %{_libdir}/*gpgme.so* %attr(0755,root,root) %{_libdir}/*gpgme.la Index: gpgme/gpgme/ChangeLog diff -u gpgme/gpgme/ChangeLog:1.387 gpgme/gpgme/ChangeLog:1.388 --- gpgme/gpgme/ChangeLog:1.387 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/ChangeLog Tue Dec 7 22:13:36 2004 @@ -1,5 +1,30 @@ 2004-12-07 Marcus Brinkmann + * putc_unlocked.c, funopen.c: I just claim copyright on these + files and change their license to LGPL, because they are totally + trivial wrapper functions. + * isascii.c: Change copyright notice to the one from ctype/ctype.h + in the GNU C Library (CVS Head 2004-10-10), where isascii is + defined as a macro doing exactly the same as the function in this + file. + * memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06). + * stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10). + * ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c, + ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c, + data.c, data-compat.c, data-fd.c, data.h, data-mem.c, + data-stream.c, data-user.c, debug.c, debug.h, decrypt.c, + decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c, + engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c, + export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h, + key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c, + passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c, + rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c, + util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c, + wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change + license to LGPL. + +2004-12-07 Marcus Brinkmann + * libgpgme.vers (GPGME_1.1): New version. * engine-backend.h (struct engine_ops): Add argument FILE_NAME to member get_version(). Add arguments FILE_NAME and HOME_DIR to Index: gpgme/gpgme/Makefile.am diff -u gpgme/gpgme/Makefile.am:1.54 gpgme/gpgme/Makefile.am:1.55 --- gpgme/gpgme/Makefile.am:1.54 Sat Sep 13 19:45:04 2003 +++ gpgme/gpgme/Makefile.am Tue Dec 7 22:13:36 2004 @@ -1,20 +1,20 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001, 2002, 2003 g10 Code GmbH +# Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/gpgme/ath-compat.c diff -u gpgme/gpgme/ath-compat.c:1.3 gpgme/gpgme/ath-compat.c:1.4 --- gpgme/gpgme/ath-compat.c:1.3 Mon Apr 5 13:53:55 2004 +++ gpgme/gpgme/ath-compat.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,22 @@ /* ath.c - self-adapting thread-safeness library - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/ath-pth-compat.c diff -u gpgme/gpgme/ath-pth-compat.c:1.1 gpgme/gpgme/ath-pth-compat.c:1.2 --- gpgme/gpgme/ath-pth-compat.c:1.1 Wed Aug 20 22:20:46 2003 +++ gpgme/gpgme/ath-pth-compat.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,22 @@ /* ath-pth.c - Pth module for self-adapting thread-safeness library - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/gpgme/ath-pth.c diff -u gpgme/gpgme/ath-pth.c:1.4 gpgme/gpgme/ath-pth.c:1.5 --- gpgme/gpgme/ath-pth.c:1.4 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath-pth.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* ath-pth.c - Pth module for self-adapting thread-safeness library - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H Index: gpgme/gpgme/ath-pthread-compat.c diff -u gpgme/gpgme/ath-pthread-compat.c:1.1 gpgme/gpgme/ath-pthread-compat.c:1.2 --- gpgme/gpgme/ath-pthread-compat.c:1.1 Wed Aug 20 22:20:46 2003 +++ gpgme/gpgme/ath-pthread-compat.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,22 @@ /* ath-pthread.c - pthread module for self-adapting thread-safeness library - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/gpgme/ath-pthread.c diff -u gpgme/gpgme/ath-pthread.c:1.4 gpgme/gpgme/ath-pthread.c:1.5 --- gpgme/gpgme/ath-pthread.c:1.4 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath-pthread.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,22 @@ /* ath-pthread.c - pthread module for self-adapting thread-safeness library - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/ath.c diff -u gpgme/gpgme/ath.c:1.4 gpgme/gpgme/ath.c:1.5 --- gpgme/gpgme/ath.c:1.4 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* ath.c - Thread-safeness library. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/ath.h diff -u gpgme/gpgme/ath.h:1.6 gpgme/gpgme/ath.h:1.7 --- gpgme/gpgme/ath.h:1.6 Mon Oct 6 16:06:31 2003 +++ gpgme/gpgme/ath.h Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* ath.h - Interfaces for thread-safeness library. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef ATH_H #define ATH_H Index: gpgme/gpgme/context.h diff -u gpgme/gpgme/context.h:1.57 gpgme/gpgme/context.h:1.58 --- gpgme/gpgme/context.h:1.57 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/context.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* context.h - Definitions for a GPGME context. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef CONTEXT_H #define CONTEXT_H Index: gpgme/gpgme/conversion.c diff -u gpgme/gpgme/conversion.c:1.20 gpgme/gpgme/conversion.c:1.21 --- gpgme/gpgme/conversion.c:1.20 Mon Apr 5 15:49:29 2004 +++ gpgme/gpgme/conversion.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* conversion.c - String conversion helper functions. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-compat.c diff -u gpgme/gpgme/data-compat.c:1.8 gpgme/gpgme/data-compat.c:1.9 --- gpgme/gpgme/data-compat.c:1.8 Sun Feb 1 14:39:45 2004 +++ gpgme/gpgme/data-compat.c Tue Dec 7 22:13:36 2004 @@ -4,18 +4,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-fd.c diff -u gpgme/gpgme/data-fd.c:1.3 gpgme/gpgme/data-fd.c:1.4 --- gpgme/gpgme/data-fd.c:1.3 Sun May 18 22:44:52 2003 +++ gpgme/gpgme/data-fd.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* data-fd.c - A file descripor based data object. - Copyright (C) 2002 g10 Code GmbH + Copyright (C) 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-mem.c diff -u gpgme/gpgme/data-mem.c:1.8 gpgme/gpgme/data-mem.c:1.9 --- gpgme/gpgme/data-mem.c:1.8 Sun Jun 22 22:56:48 2003 +++ gpgme/gpgme/data-mem.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* data-mem.c - A memory based data object. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-stream.c diff -u gpgme/gpgme/data-stream.c:1.5 gpgme/gpgme/data-stream.c:1.6 --- gpgme/gpgme/data-stream.c:1.5 Thu Sep 23 19:54:26 2004 +++ gpgme/gpgme/data-stream.c Tue Dec 7 22:13:36 2004 @@ -4,18 +4,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data-user.c diff -u gpgme/gpgme/data-user.c:1.4 gpgme/gpgme/data-user.c:1.5 --- gpgme/gpgme/data-user.c:1.4 Sun May 18 22:44:52 2003 +++ gpgme/gpgme/data-user.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* data-user.c - A user callback based data object. - Copyright (C) 2002 g10 Code GmbH + Copyright (C) 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data.c diff -u gpgme/gpgme/data.c:1.41 gpgme/gpgme/data.c:1.42 --- gpgme/gpgme/data.c:1.41 Thu Sep 30 02:19:22 2004 +++ gpgme/gpgme/data.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* data.c - An abstraction for data objects. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/data.h diff -u gpgme/gpgme/data.h:1.5 gpgme/gpgme/data.h:1.6 --- gpgme/gpgme/data.h:1.5 Thu Sep 23 19:54:26 2004 +++ gpgme/gpgme/data.h Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* data.h - Internal data object abstraction interface. - Copyright (C) 2002 g10 Code GmbH + Copyright (C) 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef DATA_H #define DATA_H Index: gpgme/gpgme/debug.c diff -u gpgme/gpgme/debug.c:1.12 gpgme/gpgme/debug.c:1.13 --- gpgme/gpgme/debug.c:1.12 Mon Oct 6 16:50:19 2003 +++ gpgme/gpgme/debug.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* debug.c - helpful output in desperate situations Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/debug.h diff -u gpgme/gpgme/debug.h:1.2 gpgme/gpgme/debug.h:1.3 --- gpgme/gpgme/debug.h:1.2 Thu Jul 25 19:51:42 2002 +++ gpgme/gpgme/debug.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,22 @@ /* debug.h - interface to debugging functions - * Copyright (C) 2002 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2002, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef DEBUG_H #define DEBUG_H Index: gpgme/gpgme/decrypt-verify.c diff -u gpgme/gpgme/decrypt-verify.c:1.19 gpgme/gpgme/decrypt-verify.c:1.20 --- gpgme/gpgme/decrypt-verify.c:1.19 Thu Apr 8 11:53:01 2004 +++ gpgme/gpgme/decrypt-verify.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* decrypt-verify.c - Decrypt and verify function. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/decrypt.c diff -u gpgme/gpgme/decrypt.c:1.41 gpgme/gpgme/decrypt.c:1.42 --- gpgme/gpgme/decrypt.c:1.41 Fri May 21 21:17:25 2004 +++ gpgme/gpgme/decrypt.c Tue Dec 7 22:13:36 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/delete.c diff -u gpgme/gpgme/delete.c:1.24 gpgme/gpgme/delete.c:1.25 --- gpgme/gpgme/delete.c:1.24 Fri Jun 6 01:19:58 2003 +++ gpgme/gpgme/delete.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* delete.c - Delete a key. - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/edit.c diff -u gpgme/gpgme/edit.c:1.19 gpgme/gpgme/edit.c:1.20 --- gpgme/gpgme/edit.c:1.19 Thu Oct 2 17:03:01 2003 +++ gpgme/gpgme/edit.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* edit.c - Key edit function. - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/encrypt-sign.c diff -u gpgme/gpgme/encrypt-sign.c:1.23 gpgme/gpgme/encrypt-sign.c:1.24 --- gpgme/gpgme/encrypt-sign.c:1.23 Tue Jul 29 21:34:03 2003 +++ gpgme/gpgme/encrypt-sign.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* encrypt-sign.c - encrypt and verify functions Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/encrypt.c diff -u gpgme/gpgme/encrypt.c:1.46 gpgme/gpgme/encrypt.c:1.47 --- gpgme/gpgme/encrypt.c:1.46 Tue Jul 29 21:34:03 2003 +++ gpgme/gpgme/encrypt.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* encrypt.c - Encrypt function. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/engine-backend.h diff -u gpgme/gpgme/engine-backend.h:1.16 gpgme/gpgme/engine-backend.h:1.17 --- gpgme/gpgme/engine-backend.h:1.16 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/engine-backend.h Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ -/* engine-backend.h - A crypto backend for the engine interface. - Copyright (C) 2002, 2003 g10 Code GmbH +/* engine-backend.h - A crypto backend for the engine interface. + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef ENGINE_BACKEND_H #define ENGINE_BACKEND_H Index: gpgme/gpgme/engine-gpgsm.c diff -u gpgme/gpgme/engine-gpgsm.c:1.101 gpgme/gpgme/engine-gpgsm.c:1.102 --- gpgme/gpgme/engine-gpgsm.c:1.101 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/engine-gpgsm.c Tue Dec 7 22:13:36 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/engine.c diff -u gpgme/gpgme/engine.c:1.45 gpgme/gpgme/engine.c:1.46 --- gpgme/gpgme/engine.c:1.45 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/engine.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* engine.c - GPGME engine support. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/engine.h diff -u gpgme/gpgme/engine.h:1.35 gpgme/gpgme/engine.h:1.36 --- gpgme/gpgme/engine.h:1.35 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/engine.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ -/* engine.h - GPGME engine interface. +/* engine.h - GPGME engine interface. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef ENGINE_H #define ENGINE_H Index: gpgme/gpgme/error.c diff -u gpgme/gpgme/error.c:1.3 gpgme/gpgme/error.c:1.4 --- gpgme/gpgme/error.c:1.3 Tue Sep 30 21:36:20 2003 +++ gpgme/gpgme/error.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* error.c - Error handling for GPGME. - Copyright (C) 2003 g10 Code GmbH + Copyright (C) 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/export.c diff -u gpgme/gpgme/export.c:1.26 gpgme/gpgme/export.c:1.27 --- gpgme/gpgme/export.c:1.26 Fri Jun 6 01:19:58 2003 +++ gpgme/gpgme/export.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* export.c - Export a key. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/funopen.c diff -u gpgme/gpgme/funopen.c:1.1 gpgme/gpgme/funopen.c:1.2 --- gpgme/gpgme/funopen.c:1.1 Mon Aug 18 21:17:08 2003 +++ gpgme/gpgme/funopen.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,22 @@ /* funopen.c - Replacement for funopen. - * Copyright (C) 2003 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2004 g10 Code GmbH + + This file is part of GPGME + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include @@ -32,12 +32,11 @@ cookie_close_function_t *closefn) { cookie_io_functions_t io = { read: readfn, write: writefn, - seek: seekfn, - close: closefn }; + seek: seekfn, close: closefn }; return fopencookie ((void *) cookie, - readfn ? ( writefn ? "rw" : "r" ) - : ( writefn ? "w" : ""), io); + readfn ? (writefn ? "rw" : "r") + : (writefn ? "w" : ""), io); } #else #error No known way to implement funopen. Index: gpgme/gpgme/genkey.c diff -u gpgme/gpgme/genkey.c:1.30 gpgme/gpgme/genkey.c:1.31 --- gpgme/gpgme/genkey.c:1.30 Fri Oct 10 11:08:23 2003 +++ gpgme/gpgme/genkey.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* genkey.c - Key generation. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/get-env.c diff -u gpgme/gpgme/get-env.c:1.1 gpgme/gpgme/get-env.c:1.2 --- gpgme/gpgme/get-env.c:1.1 Sat Sep 13 19:45:04 2003 +++ gpgme/gpgme/get-env.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* get_env.c - A getenv() replacement. - Copyright (C) 2003 g10 Code GmbH + Copyright (C) 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/gpgme.c diff -u gpgme/gpgme/gpgme.c:1.77 gpgme/gpgme/gpgme.c:1.78 --- gpgme/gpgme/gpgme.c:1.77 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/gpgme.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* gpgme.c - GnuPG Made Easy. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/gpgme.h diff -u gpgme/gpgme/gpgme.h:1.150 gpgme/gpgme/gpgme.h:1.151 --- gpgme/gpgme/gpgme.h:1.150 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/gpgme.h Tue Dec 7 22:13:36 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef GPGME_H #define GPGME_H Index: gpgme/gpgme/import.c diff -u gpgme/gpgme/import.c:1.31 gpgme/gpgme/import.c:1.32 --- gpgme/gpgme/import.c:1.31 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/import.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* import.c - Import a key. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/io.h diff -u gpgme/gpgme/io.h:1.11 gpgme/gpgme/io.h:1.12 --- gpgme/gpgme/io.h:1.11 Mon Oct 6 18:17:13 2003 +++ gpgme/gpgme/io.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* io.h - Interface to the I/O functions. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef IO_H #define IO_H Index: gpgme/gpgme/isascii.c diff -u gpgme/gpgme/isascii.c:1.1 gpgme/gpgme/isascii.c:1.2 --- gpgme/gpgme/isascii.c:1.1 Mon Aug 18 21:17:08 2003 +++ gpgme/gpgme/isascii.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,21 @@ -/* isascii.c - Replacement for isascii. - * Copyright (C) 2002 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library 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. + + The GNU C Library 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 the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/key.c diff -u gpgme/gpgme/key.c:1.53 gpgme/gpgme/key.c:1.54 --- gpgme/gpgme/key.c:1.53 Wed Jun 23 23:15:21 2004 +++ gpgme/gpgme/key.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* key.c - Key objects. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/keylist.c diff -u gpgme/gpgme/keylist.c:1.67 gpgme/gpgme/keylist.c:1.68 --- gpgme/gpgme/keylist.c:1.67 Fri May 21 17:15:19 2004 +++ gpgme/gpgme/keylist.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* keylist.c - Listing keys. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/memrchr.c diff -u gpgme/gpgme/memrchr.c:1.2 gpgme/gpgme/memrchr.c:1.3 --- gpgme/gpgme/memrchr.c:1.2 Sun Feb 15 17:02:36 2004 +++ gpgme/gpgme/memrchr.c Tue Dec 7 22:13:36 2004 @@ -1,39 +1,210 @@ -/* memrchr.c - Replacement for memrchr. - * Copyright (C) 2002, 2004 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* memrchr -- find the last occurrence of a byte in a memory block + Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Based on strlen implementation by Torbjorn Granlund (tege@sics.se), + with help from Dan Sahlin (dan@sics.se) and + commentary by Jim Blandy (jimb@ai.mit.edu); + adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), + and implemented by Roland McGrath (roland@ai.mit.edu). + + The GNU C Library 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. + + The GNU C Library 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 the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include #ifdef HAVE_CONFIG_H -#include +# include +#endif + +#undef __ptr_t +#if defined __cplusplus || (defined __STDC__ && __STDC__) +# define __ptr_t void * +#else /* Not C++ or ANSI C. */ +# define __ptr_t char * +#endif /* C++ or ANSI C. */ + +#if defined _LIBC +# include +# include +#else +# define reg_char char +#endif + +#if defined HAVE_LIMITS_H || defined _LIBC +# include +#endif + +#define LONG_MAX_32_BITS 2147483647 + +#ifndef LONG_MAX +# define LONG_MAX LONG_MAX_32_BITS #endif -#include +#include -void * -memrchr (const void *block, int c, size_t size) +#undef __memrchr +#undef memrchr + +#ifndef weak_alias +# define __memrchr memrchr +#endif + +/* Search no more than N bytes of S for C. */ +__ptr_t +__memrchr (s, c_in, n) + const __ptr_t s; + int c_in; + size_t n; { - const unsigned char *p = block; + const unsigned char *char_ptr; + const unsigned long int *longword_ptr; + unsigned long int longword, magic_bits, charmask; + unsigned reg_char c; + + c = (unsigned char) c_in; + + /* Handle the last few characters by reading one character at a time. + Do this until CHAR_PTR is aligned on a longword boundary. */ + for (char_ptr = (const unsigned char *) s + n; + n > 0 && ((unsigned long int) char_ptr + & (sizeof (longword) - 1)) != 0; + --n) + if (*--char_ptr == c) + return (__ptr_t) char_ptr; + + /* All these elucidatory comments refer to 4-byte longwords, + but the theory applies equally well to 8-byte longwords. */ + + longword_ptr = (const unsigned long int *) char_ptr; + + /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits + the "holes." Note that there is a hole just to the left of + each byte, with an extra at the end: + + bits: 01111110 11111110 11111110 11111111 + bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD + + The 1-bits make sure that carries propagate to the next 0-bit. + The 0-bits provide holes for carries to fall into. */ + + if (sizeof (longword) != 4 && sizeof (longword) != 8) + abort (); - if (size) +#if LONG_MAX <= LONG_MAX_32_BITS + magic_bits = 0x7efefeff; +#else + magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; +#endif + + /* Set up a longword, each of whose bytes is C. */ + charmask = c | (c << 8); + charmask |= charmask << 16; +#if LONG_MAX > LONG_MAX_32_BITS + charmask |= charmask << 32; +#endif + + /* Instead of the traditional loop which tests each character, + we will test a longword at a time. The tricky part is testing + if *any of the four* bytes in the longword in question are zero. */ + while (n >= sizeof (longword)) { - for (p += size - 1; size; p--, size--) - if (*p == c) - return (void *)p; + /* We tentatively exit the loop if adding MAGIC_BITS to + LONGWORD fails to change any of the hole bits of LONGWORD. + + 1) Is this safe? Will it catch all the zero bytes? + Suppose there is a byte with all zeros. Any carry bits + propagating from its left will fall into the hole at its + least significant bit and stop. Since there will be no + carry from its most significant bit, the LSB of the + byte to the left will be unchanged, and the zero will be + detected. + + 2) Is this worthwhile? Will it ignore everything except + zero bytes? Suppose every byte of LONGWORD has a bit set + somewhere. There will be a carry into bit 8. If bit 8 + is set, this will carry into bit 16. If bit 8 is clear, + one of bits 9-15 must be set, so there will be a carry + into bit 16. Similarly, there will be a carry into bit + 24. If one of bits 24-30 is set, there will be a carry + into bit 31, so all of the hole bits will be changed. + + The one misfire occurs when bits 24-30 are clear and bit + 31 is set; in this case, the hole at bit 31 is not + changed. If we had access to the processor carry flag, + we could close this loophole by putting the fourth hole + at bit 32! + + So it ignores everything except 128's, when they're aligned + properly. + + 3) But wait! Aren't we looking for C, not zero? + Good point. So what we do is XOR LONGWORD with a longword, + each of whose bytes is C. This turns each byte that is C + into a zero. */ + + longword = *--longword_ptr ^ charmask; + + /* Add MAGIC_BITS to LONGWORD. */ + if ((((longword + magic_bits) + + /* Set those bits that were unchanged by the addition. */ + ^ ~longword) + + /* Look at only the hole bits. If any of the hole bits + are unchanged, most likely one of the bytes was a + zero. */ + & ~magic_bits) != 0) + { + /* Which of the bytes was C? If none of them were, it was + a misfire; continue the search. */ + + const unsigned char *cp = (const unsigned char *) longword_ptr; + +#if LONG_MAX > 2147483647 + if (cp[7] == c) + return (__ptr_t) &cp[7]; + if (cp[6] == c) + return (__ptr_t) &cp[6]; + if (cp[5] == c) + return (__ptr_t) &cp[5]; + if (cp[4] == c) + return (__ptr_t) &cp[4]; +#endif + if (cp[3] == c) + return (__ptr_t) &cp[3]; + if (cp[2] == c) + return (__ptr_t) &cp[2]; + if (cp[1] == c) + return (__ptr_t) &cp[1]; + if (cp[0] == c) + return (__ptr_t) cp; + } + + n -= sizeof (longword); } - return NULL; + + char_ptr = (const unsigned char *) longword_ptr; + + while (n-- > 0) + { + if (*--char_ptr == c) + return (__ptr_t) char_ptr; + } + + return 0; } +#ifdef weak_alias +weak_alias (__memrchr, memrchr) +#endif Index: gpgme/gpgme/mkstatus diff -u gpgme/gpgme/mkstatus:1.7 gpgme/gpgme/mkstatus:1.8 --- gpgme/gpgme/mkstatus:1.7 Sun May 18 22:44:52 2003 +++ gpgme/gpgme/mkstatus Tue Dec 7 22:13:36 2004 @@ -6,18 +6,18 @@ # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# GPGME 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# GPGME 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. +# +# GPGME 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, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # resetting collate is important, so that the bsearch works properly Index: gpgme/gpgme/op-support.c diff -u gpgme/gpgme/op-support.c:1.16 gpgme/gpgme/op-support.c:1.17 --- gpgme/gpgme/op-support.c:1.16 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/op-support.c Tue Dec 7 22:13:36 2004 @@ -1,21 +1,22 @@ /* op-support.c - Copyright (C) 2002, 2003 g10 Code GmbH + Copyright (C) 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/ops.h diff -u gpgme/gpgme/ops.h:1.56 gpgme/gpgme/ops.h:1.57 --- gpgme/gpgme/ops.h:1.56 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/ops.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* ops.h - Internal operation support. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef OPS_H #define OPS_H Index: gpgme/gpgme/passphrase.c diff -u gpgme/gpgme/passphrase.c:1.23 gpgme/gpgme/passphrase.c:1.24 --- gpgme/gpgme/passphrase.c:1.23 Wed Aug 18 02:48:49 2004 +++ gpgme/gpgme/passphrase.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* passphrase.c - Passphrase callback. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/posix-io.c diff -u gpgme/gpgme/posix-io.c:1.26 gpgme/gpgme/posix-io.c:1.27 --- gpgme/gpgme/posix-io.c:1.26 Mon Oct 6 18:17:13 2003 +++ gpgme/gpgme/posix-io.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* posix-io.c - Posix I/O functions Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/posix-sema.c diff -u gpgme/gpgme/posix-sema.c:1.8 gpgme/gpgme/posix-sema.c:1.9 --- gpgme/gpgme/posix-sema.c:1.8 Wed Jan 29 21:00:32 2003 +++ gpgme/gpgme/posix-sema.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* posix-sema.c Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/posix-util.c diff -u gpgme/gpgme/posix-util.c:1.8 gpgme/gpgme/posix-util.c:1.9 --- gpgme/gpgme/posix-util.c:1.8 Wed Jan 29 21:00:32 2003 +++ gpgme/gpgme/posix-util.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* posix-util.c - Utility functions for Posix Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/progress.c diff -u gpgme/gpgme/progress.c:1.11 gpgme/gpgme/progress.c:1.12 --- gpgme/gpgme/progress.c:1.11 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/progress.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* progress.c - status handler for progress status Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/putc_unlocked.c diff -u gpgme/gpgme/putc_unlocked.c:1.1 gpgme/gpgme/putc_unlocked.c:1.2 --- gpgme/gpgme/putc_unlocked.c:1.1 Mon Aug 18 21:17:08 2003 +++ gpgme/gpgme/putc_unlocked.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,22 @@ /* putc_unlocked.c - Replacement for putc_unlocked. - * Copyright (C) 2002 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/rungpg.c diff -u gpgme/gpgme/rungpg.c:1.102 gpgme/gpgme/rungpg.c:1.103 --- gpgme/gpgme/rungpg.c:1.102 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/rungpg.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* rungpg.c - Gpg Engine. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/sema.h diff -u gpgme/gpgme/sema.h:1.3 gpgme/gpgme/sema.h:1.4 --- gpgme/gpgme/sema.h:1.3 Sun May 18 23:08:43 2003 +++ gpgme/gpgme/sema.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* sema.h - Definitions for semaphores. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef SEMA_H #define SEMA_H Index: gpgme/gpgme/sign.c diff -u gpgme/gpgme/sign.c:1.41 gpgme/gpgme/sign.c:1.42 --- gpgme/gpgme/sign.c:1.41 Mon Jan 12 14:28:31 2004 +++ gpgme/gpgme/sign.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* sign.c - Signing function. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/signers.c diff -u gpgme/gpgme/signers.c:1.15 gpgme/gpgme/signers.c:1.16 --- gpgme/gpgme/signers.c:1.15 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/signers.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* signers.c - Maintain signer sets. Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/stpcpy.c diff -u gpgme/gpgme/stpcpy.c:1.1 gpgme/gpgme/stpcpy.c:1.2 --- gpgme/gpgme/stpcpy.c:1.1 Wed Aug 21 00:42:48 2002 +++ gpgme/gpgme/stpcpy.c Tue Dec 7 22:13:36 2004 @@ -1,23 +1,20 @@ -/* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995, 1997, 2002, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@prep.ai.mit.edu. + The GNU C Library 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 free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, + The GNU C Library 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 General Public License for more details. + 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 General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #ifdef HAVE_CONFIG_H # include @@ -34,7 +31,9 @@ /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ char * -__stpcpy (char *dest, const char *src) +__stpcpy (dest, src) + char *dest; + const char *src; { register char *d = dest; register const char *s = src; @@ -45,6 +44,12 @@ return d - 1; } +#ifdef libc_hidden_def +libc_hidden_def (__stpcpy) +#endif #ifdef weak_alias weak_alias (__stpcpy, stpcpy) #endif +#ifdef libc_hidden_builtin_def +libc_hidden_builtin_def (stpcpy) +#endif Index: gpgme/gpgme/trust-item.c diff -u gpgme/gpgme/trust-item.c:1.4 gpgme/gpgme/trust-item.c:1.5 --- gpgme/gpgme/trust-item.c:1.4 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/trust-item.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* trust-item.c - Trust item objects. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/trustlist.c diff -u gpgme/gpgme/trustlist.c:1.24 gpgme/gpgme/trustlist.c:1.25 --- gpgme/gpgme/trustlist.c:1.24 Fri Jun 6 01:19:59 2003 +++ gpgme/gpgme/trustlist.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* trustlist.c - Trust item listing. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/util.h diff -u gpgme/gpgme/util.h:1.27 gpgme/gpgme/util.h:1.28 --- gpgme/gpgme/util.h:1.27 Wed Nov 19 16:15:21 2003 +++ gpgme/gpgme/util.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* util.h Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef UTIL_H #define UTIL_H Index: gpgme/gpgme/verify.c diff -u gpgme/gpgme/verify.c:1.69 gpgme/gpgme/verify.c:1.70 --- gpgme/gpgme/verify.c:1.69 Fri Oct 22 19:57:56 2004 +++ gpgme/gpgme/verify.c Tue Dec 7 22:13:36 2004 @@ -5,18 +5,19 @@ This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/version.c diff -u gpgme/gpgme/version.c:1.26 gpgme/gpgme/version.c:1.27 --- gpgme/gpgme/version.c:1.26 Tue Dec 7 19:25:53 2004 +++ gpgme/gpgme/version.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* version.c - Version check routines. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/w32-io.c diff -u gpgme/gpgme/w32-io.c:1.29 gpgme/gpgme/w32-io.c:1.30 --- gpgme/gpgme/w32-io.c:1.29 Sat Sep 13 19:45:04 2003 +++ gpgme/gpgme/w32-io.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* w32-io.c - W32 API I/O functions. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/w32-sema.c diff -u gpgme/gpgme/w32-sema.c:1.6 gpgme/gpgme/w32-sema.c:1.7 --- gpgme/gpgme/w32-sema.c:1.6 Sun May 18 23:08:43 2003 +++ gpgme/gpgme/w32-sema.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* w32-sema.c Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002 g10 Code GmbH + Copyright (C) 2001, 2002, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/w32-util.c diff -u gpgme/gpgme/w32-util.c:1.10 gpgme/gpgme/w32-util.c:1.11 --- gpgme/gpgme/w32-util.c:1.10 Wed Jan 29 21:00:32 2003 +++ gpgme/gpgme/w32-util.c Tue Dec 7 22:13:36 2004 @@ -1,23 +1,24 @@ /* w32-util.c - Utility functions for the W32 API Copyright (C) 1999 Free Software Foundation, Inc Copyright (C) 2001 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/gpgme/wait-global.c diff -u gpgme/gpgme/wait-global.c:1.10 gpgme/gpgme/wait-global.c:1.11 --- gpgme/gpgme/wait-global.c:1.10 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait-global.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* wait-global.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait-private.c diff -u gpgme/gpgme/wait-private.c:1.9 gpgme/gpgme/wait-private.c:1.10 --- gpgme/gpgme/wait-private.c:1.9 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait-private.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* wait-private.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait-user.c diff -u gpgme/gpgme/wait-user.c:1.5 gpgme/gpgme/wait-user.c:1.6 --- gpgme/gpgme/wait-user.c:1.5 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait-user.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ -/* wait.c +/* wait-user.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait.c diff -u gpgme/gpgme/wait.c:1.42 gpgme/gpgme/wait.c:1.43 --- gpgme/gpgme/wait.c:1.42 Thu Jul 31 17:44:02 2003 +++ gpgme/gpgme/wait.c Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* wait.c Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #if HAVE_CONFIG_H #include Index: gpgme/gpgme/wait.h diff -u gpgme/gpgme/wait.h:1.10 gpgme/gpgme/wait.h:1.11 --- gpgme/gpgme/wait.h:1.10 Sun May 18 23:08:43 2003 +++ gpgme/gpgme/wait.h Tue Dec 7 22:13:36 2004 @@ -1,22 +1,23 @@ /* wait.h - Definitions for the wait queue interface. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifndef WAIT_H #define WAIT_H Index: gpgme/tests/ChangeLog diff -u gpgme/tests/ChangeLog:1.100 gpgme/tests/ChangeLog:1.101 --- gpgme/tests/ChangeLog:1.100 Tue Aug 17 23:13:20 2004 +++ gpgme/tests/ChangeLog Tue Dec 7 22:13:39 2004 @@ -1,3 +1,19 @@ +2004-12-07 Marcus Brinkmann + + * gpg/mkdemodirs: Add copyright notice. + + * gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c, + gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c, + gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c, + gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c, + gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c, + gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c, + gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c, + gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c, + gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c, + gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c, + t-version.c: Change license to LGPL. + 2004-08-17 Marcus Brinkmann * gpgsm/t-keylist.c (struct): Add new fields VALIDITY and @@ -630,7 +646,7 @@ * tests/t-verify.c (print_sig_stat): Print info about the keys. - Copyright 2001 g10 Code GmbH + Copyright 2001, 2004 g10 Code GmbH This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without @@ -639,11 +655,3 @@ This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - - - - - - - \ No newline at end of file Index: gpgme/tests/Makefile.am diff -u gpgme/tests/Makefile.am:1.21 gpgme/tests/Makefile.am:1.22 --- gpgme/tests/Makefile.am:1.21 Tue Jul 22 13:40:47 2003 +++ gpgme/tests/Makefile.am Tue Dec 7 22:13:39 2004 @@ -1,20 +1,21 @@ +# Makefile.am - Makefile for GPGME tests. # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/tests/gpg/Makefile.am diff -u gpgme/tests/gpg/Makefile.am:1.19 gpgme/tests/gpg/Makefile.am:1.20 --- gpgme/tests/gpg/Makefile.am:1.19 Sun Sep 14 03:32:41 2003 +++ gpgme/tests/gpg/Makefile.am Tue Dec 7 22:13:39 2004 @@ -1,20 +1,20 @@ # Copyright (C) 2000 Werner Koch (dd9jn) -# Copyright (C) 2001 g10 Code GmbH +# Copyright (C) 2001, 2004 g10 Code GmbH # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/tests/gpg/mkdemodirs diff -u gpgme/tests/gpg/mkdemodirs:1.1 gpgme/tests/gpg/mkdemodirs:1.2 --- gpgme/tests/gpg/mkdemodirs:1.1 Thu Nov 22 04:01:26 2001 +++ gpgme/tests/gpg/mkdemodirs Tue Dec 7 22:13:39 2004 @@ -1,4 +1,21 @@ #!/bin/sh +# Copyright (C) 2004 g10 Code GmbH +# +# This file is part of GPGME. +# +# GPGME 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. +# +# GPGME 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA set -e @@ -36,9 +53,3 @@ echo "." [ -f ./tdb.tmp ] && rm ./tdb.tmp rm pubdemo.gpg secdemo.gpg - - - - - - Index: gpgme/tests/gpg/t-decrypt-verify.c diff -u gpgme/tests/gpg/t-decrypt-verify.c:1.14 gpgme/tests/gpg/t-decrypt-verify.c:1.15 --- gpgme/tests/gpg/t-decrypt-verify.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-decrypt-verify.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-decrypt-verify.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-decrypt.c diff -u gpgme/tests/gpg/t-decrypt.c:1.11 gpgme/tests/gpg/t-decrypt.c:1.12 --- gpgme/tests/gpg/t-decrypt.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-decrypt.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-decrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-edit.c diff -u gpgme/tests/gpg/t-edit.c:1.13 gpgme/tests/gpg/t-edit.c:1.14 --- gpgme/tests/gpg/t-edit.c:1.13 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-edit.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-edit.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-encrypt-sign.c diff -u gpgme/tests/gpg/t-encrypt-sign.c:1.15 gpgme/tests/gpg/t-encrypt-sign.c:1.16 --- gpgme/tests/gpg/t-encrypt-sign.c:1.15 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-encrypt-sign.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ -/* t-encrypt.c - Regression test. +/* t-encrypt-sign.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-encrypt-sym.c diff -u gpgme/tests/gpg/t-encrypt-sym.c:1.11 gpgme/tests/gpg/t-encrypt-sym.c:1.12 --- gpgme/tests/gpg/t-encrypt-sym.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-encrypt-sym.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-encrypt-sym.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-encrypt.c diff -u gpgme/tests/gpg/t-encrypt.c:1.11 gpgme/tests/gpg/t-encrypt.c:1.12 --- gpgme/tests/gpg/t-encrypt.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-encrypt.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-encrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-eventloop.c diff -u gpgme/tests/gpg/t-eventloop.c:1.11 gpgme/tests/gpg/t-eventloop.c:1.12 --- gpgme/tests/gpg/t-eventloop.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-eventloop.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ -/* t-eventloop.c - regression test +/* t-eventloop.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-export.c diff -u gpgme/tests/gpg/t-export.c:1.8 gpgme/tests/gpg/t-export.c:1.9 --- gpgme/tests/gpg/t-export.c:1.8 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-export.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-export.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-genkey.c diff -u gpgme/tests/gpg/t-genkey.c:1.9 gpgme/tests/gpg/t-genkey.c:1.10 --- gpgme/tests/gpg/t-genkey.c:1.9 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-genkey.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ -/* t-genkey.c - regression test +/* t-genkey.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-import.c diff -u gpgme/tests/gpg/t-import.c:1.12 gpgme/tests/gpg/t-import.c:1.13 --- gpgme/tests/gpg/t-import.c:1.12 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-import.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ -/* t-import.c - regression test +/* t-import.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-keylist-sig.c diff -u gpgme/tests/gpg/t-keylist-sig.c:1.9 gpgme/tests/gpg/t-keylist-sig.c:1.10 --- gpgme/tests/gpg/t-keylist-sig.c:1.9 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-keylist-sig.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-keylist-sig.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-keylist.c diff -u gpgme/tests/gpg/t-keylist.c:1.11 gpgme/tests/gpg/t-keylist.c:1.12 --- gpgme/tests/gpg/t-keylist.c:1.11 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-keylist.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-keylist.c - regression test Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-sign.c diff -u gpgme/tests/gpg/t-sign.c:1.14 gpgme/tests/gpg/t-sign.c:1.15 --- gpgme/tests/gpg/t-sign.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-sign.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-sign.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-signers.c diff -u gpgme/tests/gpg/t-signers.c:1.14 gpgme/tests/gpg/t-signers.c:1.15 --- gpgme/tests/gpg/t-signers.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-signers.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-signers.c - Regression tests for the multiple signers interface. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-support.h diff -u gpgme/tests/gpg/t-support.h:1.4 gpgme/tests/gpg/t-support.h:1.5 --- gpgme/tests/gpg/t-support.h:1.4 Wed Nov 19 16:15:32 2003 +++ gpgme/tests/gpg/t-support.h Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-support.h - Helper routines for regression tests. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/tests/gpg/t-thread1.c diff -u gpgme/tests/gpg/t-thread1.c:1.4 gpgme/tests/gpg/t-thread1.c:1.5 --- gpgme/tests/gpg/t-thread1.c:1.4 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-thread1.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-thread1.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-trustlist.c diff -u gpgme/tests/gpg/t-trustlist.c:1.7 gpgme/tests/gpg/t-trustlist.c:1.8 --- gpgme/tests/gpg/t-trustlist.c:1.7 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-trustlist.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-trustlist.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpg/t-verify.c diff -u gpgme/tests/gpg/t-verify.c:1.14 gpgme/tests/gpg/t-verify.c:1.15 --- gpgme/tests/gpg/t-verify.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpg/t-verify.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-verify.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/Makefile.am diff -u gpgme/tests/gpgsm/Makefile.am:1.23 gpgme/tests/gpgsm/Makefile.am:1.24 --- gpgme/tests/gpgsm/Makefile.am:1.23 Mon Apr 5 20:40:09 2004 +++ gpgme/tests/gpgsm/Makefile.am Tue Dec 7 22:13:39 2004 @@ -3,18 +3,18 @@ # # This file is part of GPGME. # -# GPGME is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# GPGME 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. # -# GPGME 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 General Public License for more details. +# GPGME 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 General Public License -# along with this program; if not, write to the Free Software +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in Index: gpgme/tests/gpgsm/t-decrypt.c diff -u gpgme/tests/gpgsm/t-decrypt.c:1.7 gpgme/tests/gpgsm/t-decrypt.c:1.8 --- gpgme/tests/gpgsm/t-decrypt.c:1.7 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-decrypt.c Tue Dec 7 22:13:39 2004 @@ -1,23 +1,23 @@ /* t-encrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-encrypt.c diff -u gpgme/tests/gpgsm/t-encrypt.c:1.14 gpgme/tests/gpgsm/t-encrypt.c:1.15 --- gpgme/tests/gpgsm/t-encrypt.c:1.14 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-encrypt.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-encrypt.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-export.c diff -u gpgme/tests/gpgsm/t-export.c:1.9 gpgme/tests/gpgsm/t-export.c:1.10 --- gpgme/tests/gpgsm/t-export.c:1.9 Wed Mar 3 16:15:35 2004 +++ gpgme/tests/gpgsm/t-export.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-export.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-genkey.c diff -u gpgme/tests/gpgsm/t-genkey.c:1.7 gpgme/tests/gpgsm/t-genkey.c:1.8 --- gpgme/tests/gpgsm/t-genkey.c:1.7 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-genkey.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ -/* t-genkey.c - regression test +/* t-genkey.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-import.c diff -u gpgme/tests/gpgsm/t-import.c:1.11 gpgme/tests/gpgsm/t-import.c:1.12 --- gpgme/tests/gpgsm/t-import.c:1.11 Tue Aug 17 23:13:20 2004 +++ gpgme/tests/gpgsm/t-import.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-import.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-keylist.c diff -u gpgme/tests/gpgsm/t-keylist.c:1.14 gpgme/tests/gpgsm/t-keylist.c:1.15 --- gpgme/tests/gpgsm/t-keylist.c:1.14 Tue Aug 17 23:13:20 2004 +++ gpgme/tests/gpgsm/t-keylist.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-keylist.c - regression test Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-sign.c diff -u gpgme/tests/gpgsm/t-sign.c:1.10 gpgme/tests/gpgsm/t-sign.c:1.11 --- gpgme/tests/gpgsm/t-sign.c:1.10 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-sign.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-sign.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2003 g10 Code GmbH + Copyright (C) 2001, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/gpgsm/t-support.h diff -u gpgme/tests/gpgsm/t-support.h:1.3 gpgme/tests/gpgsm/t-support.h:1.4 --- gpgme/tests/gpgsm/t-support.h:1.3 Wed Nov 19 16:15:32 2003 +++ gpgme/tests/gpgsm/t-support.h Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-support.h - Helper routines for regression tests. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include #include Index: gpgme/tests/gpgsm/t-verify.c diff -u gpgme/tests/gpgsm/t-verify.c:1.15 gpgme/tests/gpgsm/t-verify.c:1.16 --- gpgme/tests/gpgsm/t-verify.c:1.15 Tue Feb 17 18:26:19 2004 +++ gpgme/tests/gpgsm/t-verify.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,23 @@ /* t-verify.c - Regression test. Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/t-data.c diff -u gpgme/tests/t-data.c:1.10 gpgme/tests/t-data.c:1.11 --- gpgme/tests/t-data.c:1.10 Tue Feb 17 18:26:20 2004 +++ gpgme/tests/t-data.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,22 @@ /* t-data - Regression tests for the gpgme_data_t abstraction. - * Copyright (C) 2001 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2001, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ /* We need to include config.h so that we know whether we are building with large file system (LFS) support. */ Index: gpgme/tests/t-engine-info.c diff -u gpgme/tests/t-engine-info.c:1.3 gpgme/tests/t-engine-info.c:1.4 --- gpgme/tests/t-engine-info.c:1.3 Sun May 18 22:45:03 2003 +++ gpgme/tests/t-engine-info.c Tue Dec 7 22:13:39 2004 @@ -1,21 +1,22 @@ /* t-engine-info.c - Regression test for gpgme_get_engine_info. - Copyright (C) 2003 g10 Code GmbH + Copyright (C) 2003, 2004 g10 Code GmbH This file is part of GPGME. GPGME is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + 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. + GPGME 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GPGME; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include Index: gpgme/tests/t-version.c diff -u gpgme/tests/t-version.c:1.5 gpgme/tests/t-version.c:1.6 --- gpgme/tests/t-version.c:1.5 Thu Jul 31 17:44:31 2003 +++ gpgme/tests/t-version.c Tue Dec 7 22:13:39 2004 @@ -1,22 +1,22 @@ -/* t-version.c - regression test - * Copyright (C) 2001 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ +/* t-version.c - Regression test. + Copyright (C) 2001, 2004 g10 Code GmbH + + This file is part of GPGME. + + GPGME 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. + + GPGME 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include From cvs at cvs.gnupg.org Sun Dec 12 16:59:43 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:55:46 2004 Subject: gnupg/doc (ChangeLog mksamplekeys samplekeys.asc) Message-ID: Date: Sunday, December 12, 2004 @ 17:03:47 Author: wk Path: /cvs/gnupg/gnupg/doc Modified: ChangeLog mksamplekeys samplekeys.asc (keys): Removed my old 621CC013 key which expires at the end of this year. Add g10 Code's source code signing key 37D92FFB. ----------------+ ChangeLog | 6 mksamplekeys | 2 samplekeys.asc | 3159 +++++++++++++++++++++++++++++++++---------------------- 3 files changed, 1916 insertions(+), 1251 deletions(-) Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.87 gnupg/doc/ChangeLog:1.88 --- gnupg/doc/ChangeLog:1.87 Thu Dec 9 14:17:48 2004 +++ gnupg/doc/ChangeLog Sun Dec 12 17:03:47 2004 @@ -1,3 +1,9 @@ +2004-12-12 Werner Koch + + * samplekeys.asc, mksamplekeys (keys): Removed my old 621CC013 key + which expires at the end of this year. Add g10 Code's source code + signing key 37D92FFB. + 2004-12-09 David Shaw * highlights-1.4.txt: New. Index: gnupg/doc/mksamplekeys diff -u gnupg/doc/mksamplekeys:1.2 gnupg/doc/mksamplekeys:1.3 --- gnupg/doc/mksamplekeys:1.2 Thu Dec 9 14:17:48 2004 +++ gnupg/doc/mksamplekeys Sun Dec 12 17:03:47 2004 @@ -1,7 +1,7 @@ #/bin/sh # Generate a samplekeys.asc -keys="5B0358A2 57548DCD 621CC013 99242560 CA57AD7C B2D7795E" +keys="5B0358A2 57548DCD 99242560 CA57AD7C B2D7795E 37D92FFB" for i in $keys; do gpg --list-keys $i | awk ' { print " " $0 }' Index: gnupg/doc/samplekeys.asc diff -u gnupg/doc/samplekeys.asc:1.9 gnupg/doc/samplekeys.asc:1.10 --- gnupg/doc/samplekeys.asc:1.9 Thu Dec 9 14:17:48 2004 +++ gnupg/doc/samplekeys.asc Sun Dec 12 17:03:46 2004 @@ -1,15 +1,13 @@ - pub 1024D/5B0358A2 1999-03-15 [expires: 2005-12-31] + pub 1024D/5B0358A2 1999-03-15 [expires: 2009-07-11] uid Werner Koch + uid Werner Koch uid Werner Koch + sub 1024D/010A57ED 2004-03-21 [expires: 2007-12-31] + sub 2048R/B604F148 2004-03-21 [expires: 2005-12-31] - pub 1024D/57548DCD 1998-07-07 [expired: 2003-12-30)] + pub 1024D/57548DCD 1998-07-07 [expires: 2005-12-31] uid Werner Koch (gnupg sig) - pub 1024D/621CC013 1998-07-07 [expired: 2003-12-31)] - uid Werner Koch - uid Werner Koch - uid Werner Koch - pub 4096R/99242560 2002-01-28 uid David M. Shaw sub 2048g/1643B926 2002-01-28 [expires: 2012-01-26] @@ -24,1253 +22,1914 @@ uid Philip R. Zimmermann uid [jpeg image of size 3369] uid [jpeg image of size 3457] + uid Philip R. Zimmermann sub 3072g/A8E92834 2001-01-04 + pub 1024R/37D92FFB 2003-11-17 [expires: 2009-12-31] + uid g10 Code (code signing key 1) + -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.3.93-cvs (GNU/Linux) +Version: GnuPG v1.3.92 (GNU/Linux) -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 -7wAKCRCe3S/TMCo4dsE0AKCtLNULkuWeRKJgdrI06Hp5ME6HzgCggkMeIKIKyhko -tJhazNkesxAwTYyIRgQTEQIABgUCP2mmPQAKCRD7K/90Ou4UIZCeAJkBnd1b5IOi -p1JmMncNdp/sxUKB2QCgndXJNLk4WrMGhV+vGnzwaqFEopKIRgQTEQIABgUCP2oW -cgAKCRCMsYtH4EE5YX1CAJsEZkElql7bFhbaLXRe4y80LAoyewCcDi2RKFOF44yC -7zH1UIXYE9yuPcGIRgQTEQIABgUCP2pSOAAKCRD7AD7VxQYeqbLgAJ4wcQm6E4+o -38xOsbdATKbu6KBKqACdFCL0mSaydaYfF6uB4rYETtRBJEGIRgQTEQIABgUCP2qU -wAAKCRB999a6hsd8RHBCAJ4s9aoSE26ViV7hx/rjTCvXlq1JfACgimVNZ3Yxb1AM -Vs1CK+Q/lHQyPKaIRgQTEQIABgUCP2rtxwAKCRCJUnY0IJ3w08GNAJ9ZxCT3nTY5 -BbaYW+QTI3YYnCNkbQCfdbffn2C6vlofhGQekocCko4iqQCIRgQTEQIABgUCP2sD -1AAKCRD6z0HVcbkTHC1KAKCxrwjSB1sCF9InYGy4lu7ieXucRQCgkU0UzHW8PGV8 -lWjGlQuv4vlh8ZqIRgQTEQIABgUCP5TcRwAKCRB7Tl1hmnthcsvbAKCOFNmrraji -eQAxcHT1BRufTInNIQCdFEsyqVVjZziOpIhqDvvjFhYf476IlQQTEQIAVQUCPigi -sU4aaHR0cDovL3d3dy5wb2JveC5jb20vfnBrYWhsZS9wZ3AvcG9saWN5L0Q2ODVE -Mzk3NjlBMzhBREUtREI2OThENzE5OTI0MjU2MC5hc2MACgkQ1oXTl2mjit7dvQCe -LP1Jt4y98+pso+hNhmgg2o3zUs0An1gpEE/1rVpYxh8QPjnkoAdLl8w7iJkEExEC -AFkFAj4m6WxSGmh0dHA6Ly93d3cudm9sdGEuZHluZG5zLm9yZy9+bXdsL3BncC9w -b2xpY3kvQ0ZCMEEwNEMyMDIwRUVENS1EQjY5OEQ3MTk5MjQyNTYwLmFzYwAKCRDP -sKBMICDu1ZUcAJ9x4myZskZjkV7zIwVDkeaD5DcMUACguU9kordVZCyvfRrkblgz -wh1JBiqIRgQQEQIABgUCQBCPqQAKCRCnUhCQq7QRIFIkAKDyq/NaOZyN3PpplhUj -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 +TR641BceGHNdYiR/PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxY +urUIBACi7d1rUlHr4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnq +bAAW+EUUX2xpb54CevAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9 +quf0yvby63kFCanQKc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtv +Y2ggKGdudXBnIHNpZykgPGRkOWpuQGdudS5vcmc+iGIEExECACICGwMECwcDAgMV +AgMDFgIBAh4BAheABQI/6YJpBQkMMyPLAAoJEGi3q4lXVI3Nou8AnAuw9XXJ9zYP +7JP7ZbXUf9+00wO/AJsHB45GEJv878Q6SDZRNckFHh6SgIhGBBARAgAGBQI1oic8 +AAoJEGx+4bhiHMATftYAn1fOaKDUOt+dS38rB+CJ2Q+iElWJAKDRPpp8q5GylbM8 +DPlMpClWN3TYqYhGBBARAgAGBQI27U5sAAoJEF3iSZZbA1iiarYAn35qU3ZOlVEC +ELE/3V6q98Q30eAaAKCtO+lacH0Qq1E6v4BP/9y6MoLIhohdBBMRAgAdAwsEAwUV +AwIGAQMWAgECF4AFAj/pgnMFCQwzI8sACgkQaLeriVdUjc2CugCfZn7gqBWjafNb +vZOAInCQA/Rw5zYAnRkyKWw5abGYQboHiwcwuQHiKvgYiF0EExECAB0DCwQDBRUD +AgYBAxYCAQIXgAUCP+mCcwUJDDMjywAKCRBot6uJV1SNzYK6AJ9Gs4h+WWneZKYa +keAjG+DlXy+0xwCfQG8pV6E6f7XZi+f0EId+DfiNRluIYQQTEQIAIQIXgAUJDhSH +/QUCQbxoXgYLCQgHAwIDFQIDAxYCAQIeAQAKCRBot6uJV1SNzQSTAJ9Nd9d2oNLY +I6xlGbQ5SmG5jSHjHgCdFKVbI8acpQXEo7DxPDAJIux29keIRgQQEQIABgUCNuj6 +3QAKCRAHAyqWiQTI4hKYAKDNyIrKze113YZz/ZZsdFCShO0rBQCcDFiAZxivd6I7 +ll4fWIA0ckmSmaiIRgQQEQIABgUCOcwPPAAKCRAyw1uAR7qTV/b8AJ9WUVGMiFle +V6EVCKuxKc9YnfoQ1QCgzGUqNeYfb3xgI68racTrOXJVvhuIPwMFED1dFpBsryRo +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 +wQEBS2cIAJIDAv8YprJDoy/wsYIYHZElpAxXaRK912Ic1HS3rFoDeADNvJhmWSgP +ZWu3V10aymJMYV/JqS+At0PS562nz/mZ9XPJk7jSMV/Oo+4mQCJLKGeA9nLDfDUj +GE/aSiuo2T9SDnJAhQQSNFv8jBlBrpQ4rVo+E8CAK39sUJFe9/////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////+JAhwEEAECAAYFAkAnci0ACgkQdEiKwUmJ +0lzteg/+NmuDO+cC7017u+C77+eF/fm4PGoQxKVUkwfgI1bd6SkRvYcjtUxAjJ3/ +6+Hra+P8lxo/WV2BCfkVy4YKzhOC2pdTtdlNq+1WiCJ39g6ve2mzWCPnhHpnuXKb +L42lDASmz9MjYzEppKK7vm3Z8KgG6TnbIQRWkxDU8PL18QTZpYWlyrv56yjJMOsH ++20i1GBtpP3R3+Dtd5dwLVHKLBd3EzircRjixvI+FV2IAVzSSpOaLxrjBDtxpWe9 +7TpTNcgCNKiTns7QzmIN4/XSQs+93SDmMcYAU8JIp2Wr1z1ESKFytdAI/UBVzSuc +qPgyBraDG43CWXhCtZgFkLjRB6Tr6K0jrB2qFBaauUFa6kTyEVIdWGKe5DR6ZO6d +h/eh4vIllkgeZdO0jjBofv2KX3vrVBGroeD7Ul5+JGmcZRfDtG7io+vqR7ffNDYp +Gc3Ev19gd7ScgAQC1knBhj0ZmICzLsShgZ7RPpNeCtAMEa7RaNQKbotBDrcP4N6Y +YpdAm8mR8K457x3PsmnTX421vI744UdS5cnfIFNaD9+JRTIdE4E9fp8XieMAy9oS +H5PqCg4+ncS8AAmKvGuo5VPNDi7kXV/hoUTQK5EQRiyJIC0w3qY72XahVSx4PPC1 +3P2ZDwz3iW9EcZQWQpVFWBziNqhm3T0iGcZRwcgJX9/RevMxSfSJARwEEwECAAYF +AkEJvKIACgkQM/1xV/7OZk7+5gf/c6W6RoJVWRxj79QtIMXZ9fmfYogPOTKgHji1 +Z7/4dtX1Tw9AfPJlGODYYj33azaRzk8LVLVkMul7VAJ41oRVoP91eqKhvk+JNNqU +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 -H+IzWg/hU93XNsYAoPeZaStezssja/GvGnx9y3jhK65hiEYEEBECAAYFAjqqoLwA -CgkQ7tDfcL9n0usM8wCguAxh3azdnnRTtRcY9+sgEzJ9wGwAoIVIgE4WXdpIjvMz -VdHRyAq1TNqw0cx//wAADToBEAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQEA -AAEAAQAA/9sAQwAKBwcIBwYKCAgICwoKCw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3 -LyYpNCkhIjBBMTQ5Oz4+PiUuRElDPEg3PT47/9sAQwEKCwsODQ4cEBAcOygiKDs7 -Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 -/8AAEQgAkAB4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYH -CAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGh -CCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldY -WVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1 -tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8B -AAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAEC -dwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBka -JicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWG -h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ -2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A6ilxSg0hIAyTgV0nnh2q -Ca6iiHzMKpXmp8lIvzrIuLnajSzPhFGSTTSJb7GpLqo52Gs288SpaKSzh2H8KmuU -v/ELzsY7cmNc9e5rKlmaRgM7s9cD+tS5roaxpN7nR3HjvUS+IEjQehG41VPjXXd2 -BIq/VBXPpy2AuPY1oW7eVFtESBm6cis7s25Yrobln451MN++8qUL975Nv611WleK -NO1RQolEM3eNz/I9681aZyxEiIB6KKWSSGCMTw4PPVW+7TUmS6aZ7CCGAIII9RSm -uF0Pxu6+Xb3sSNEeFlU4I+o6V28cqzRrJGdyMMgg9RVp3MWmtxduKDS0UySMiinn -FFMB461m6pdmP9yh5PWtPOBz2rmbu4E1y7HpnihIJMi5rkvE2ql5jZRt8qH58Hqa -6e6nW2tZZ26RoWrzx98jeax+eQ7iTSqPSxdGN3dk9rE7fvHX5T0GM5NbcGiSvAHl -QsX5CjjFQaNaiS5iUj5B8x967uG0SZV4xXO2diVzgbnQZSMhGAHr2qvBZC0bJXeS -evcV6Q2jQuTwcn3wKpSeG/MJBYj046UnIv2ZwN3Fw25nLEZBJqCCxlmJKbvc1348 -JM4BlKlR7VoW2hW1soxGu72FJSH7M8vntbixIZ432N144rtvBHiWSd10qcblVMxS -dx7GtHVNNiMDAoCO/FcRHAdJ8QJ5TlA3zxn0NaRepjUjdHrtJUNnOLmzimH8aBqm -rY4xtFLRTEE7BYHY9lNcxgdjn8K6DU3K2T478Vz+acSZGZ4hfZos+f4sL+tcQPml -Azkd8d66vxdIVsIYx/HJk/gK5iCLzZkiXg+tZVNzqor3Tp9CjUz7lOccYHQV2dkw -CDntWBo9iLS2GBk4rUiu4IXIaQZPYVg9TqirGwnJHtVpHXGCBVGGaNyNrg59KthS -CMd6RstSRwCQABzVaQruJHAqRSWmYDooqCZtr7ehPSkMz72QFCBzXC+I4wtxav3D -kfhXbXR5x61x/iUozJnsT/KqizGodb4KuJLjwzbmXOYy0YJ7gHit7PpWJ4Nj2eGL -QHkncef941uV1LY86W7Gk0Up4opklHWZgsKxd25rFrQ1o/6Sg/2azc1S2Ie5U1Ww -hvLUNcBiik4KHke9chpljcz3aS2/zbHzhuMiu9vl36FNtGPLiZiT7nH+NYHht/ME -jEcKQorlbvJ3PSUVGEUjaF6oh8sIyTsvyx9SfYVnK2nhQbqdI5yNxVV3H8q2L6BJ -rEnaC6kENjkcilXQ0XJjRDkc9j+dZttGkY3MuS9JiiFpqVqVXPJh2tjPHPetDT9a -vYY2EkiTMvOcHp7YP86YdDkgieO1AjSQAOCQc/pVb+zWslJVdwxtOGxnNQ5djSMb -LU6KLVWjBZWhJmOFBJGfYVT1LWUtpVNwI9w4wj5x/KqetL5Flawx5DKFC46HFYs0 -Vw8QeNWkmyS4dQVI7Y75pphLQ1ZPEFiy7g/PYNxmuW8Q3HmNBIuQCWOD61fZoreN -I7jT12yD53jUjafoay73TvOkhgibAeT5dzevGBVxZjK/U9L8Nps8O2I65hB/PmtO -orWJIbaOJF2rGgUD6CpDXUeexD0ooNFMkx9bBF0h7Fazc1u6tbmaASL1SsKrWxL3 -H3nz6DdRqQA0eMntz/8AXrA0BGiR1PdzxWzcz+Xptyu0tuTpWbpsRRlwRnOSPc8m -uWUbNnoQnzJHSW6rNC0TfdYYNaUELQwgSjzCONy9/esi3k2se1XRqyW6kZVn7A1i -2dcVoT3FxbxIWaGUY/L86oITPcKDHtQfMqHt7n3qOaQ3KG4luE3KcqueB9ahg1tG -l3hVITglTmkmupbRNrcLm2WZR80LBgPWltVguoFcFXU9PX6Go9T122ni8tQqs3G1 -e9OsoImULOGhZxlJIzg/Q+tEmmCuF3p1uYidnP1rnFSV9asxHziZVB+nJrqXiWNc -NdSMPTj/AArEjYDXoERcgvwAOmaumlc56+kTt+B2pKOT1GKK6zzBDRSGigAkGYmG -OorlnBWQqexrq+tc/qkPk3JbHDc04kyKMi742XpkEVS004n8soFK9eelXs5rG1Ay -2N2JQ2EkPB9Kmqro1oStI6NsKA5PA61zrPJfXk3kByNxII5GKqXGuHyzHGxDKMcn -jNO0S+Nrfr5pO1uoricWj0U03YddG6VTA7tHk8g56fWqtna3X2hWjYYHJCsAcV2l -ysLR+dsBA7kVjSalYBij2yDaOWA60kzblit2YN/DePJvYktkkANnGKvWmqXSQiG5 -Z4yp+Vh2q99hs7sb40wD2BxSau1tapBDwG6YFHkTJW2Zah1I3VtnILg4OOn1pdCi -e48SFiMrBHuJx3qtaGGKzUg9BnFbnhSAiG4umGDNJlc/3e1bUlqcteXunQE0hpCa -Ttmuk4RSaKaTRQIY9zFH95hWRql1HcugTBC1PBolxMQ13LtHdV5Nadvp0FsP3MIB -/vNyaq1has56Kwu5xlIGC/3m4H61X1XRmvNIdVGZUBZcd8V10+0ROu8lyO3SqyJs -QMO3NPdAtHc8SBZJNkmc5wcmr9rJJNKhQ84yx9MV1Xi7wczMdQsQNjnLKOxNcXbS -Pazukg29jXI10PQUrq6O20++Mts9qzZAOM5zUraTa3shmU7SUx16VyUd6bRVIcjc -M8etaEHiL7PH5aHJxgnFZtWN4zT3NOJk0kShnDY+4PpXOajfPe3T3B4OeMdhTbvU -JLuQbuFyafpukXutTCK2Q7I+XkbhR9acY6kTn9xq+HrS51S9C8hOrN2Ar0S3hS1t -0hThUUAVR0PSIbOyMSKC+cs3Qk1eMbxNw/4OK6owsjz5z5nckJB/Ggmmb9vLLj1x -zShgRkHNOzIA5+lFITRQBpqh5LHHsKY5yeKmYZSmYyfwpl2K7RYUsw5J/pTFjwBj -oRxVyVMqR6/4VFHtLeWRyRlf6ii4rCQ7SpjYAqeMHp9K5fxD4EtLrdPaxYzklF+8 -vuPUe1dQyeW+f4TVbW9Zh0XR5bydsbcKnGcsegrOSTNISaZ5FqGgXltOduWjBwP8 -KqwaFqFzMEjiO5jgAckmuon1vVtSgEgS3t7cHm4YAn8DTYvF0Ol4KSm5l6fu4gob -2zWHU6ebTQs6R8OrkmOXUZ1Vc/NEhySPc12YsbXTrEQ2kKQx54VR1PrUlhci+so5 -xuUSD5kbhkPdT7g0Hdc3OAMqldMUkckpOW5HHHsjB5Bzmp1jdhycjrzUoiABz71L -gAL78VVybFZYuCAcEdR6017c564z7VYZMvn1FO52gn1FO4rFBoWXo2fbFFXHQscY -7daKegrFrP7v8qRR834UvQY96U9cioNBcBgfxquwKuGHUcirSDINROvT1GKQwfDI -G7GsbWdOTWIV06fIt5M7yOo9MfzrVLgRlD9aoySeQr3M0qxonLMx4Ue9MXU8u1y0 -utMvG0eY5ihjDREcBx/eq94H0e2meTWbxS/2d9sEZHG4DJY/TPFQ6nqNtrfiWS9l -dxat+6jPQ7QMZ/Emun8LQLp2rT6aziS3uU863f3Aww/Ln8KxVuaxs2+U29McC2nd -QQrSFgCMdQKswoyAMDhj1qKIM8rp8oUkfdFXxH/Q1tsYdSD94zkZPWp1RvLG48in -4ANPXncKLhYifhh+IpdmVI70P2+tPUjdimAuABnsaKZMx8sgdaKEgbP/2YhOBBAR -AgAGBQI6Vo8iABIJEMdGNjmy13leB2VHUEcAAQEH0QCgkp8d7aB4RbAgGiLAkZJh -XSOB5/YAmwQyiKrwRI8m3J2gVvombn3IwM7HiEwEEBECAAwFAjpWj24FAxDtcoAA -CgkQY8tpHfrr1fwb+wCfcjVRJC80wQLR03USX4WIezMZOE8An2A7L3Qt/8rgHf0n -mwcxiCffQnJAiEYEEBECAAYFAjpXJ98ACgkQ14y85WanSzH2bACgp+OZ5SJKlUO1 -9ihz1yHlyZ/M+HoAoPI7Fe2hxijKqiPc61xy9eESMerOiEYEEBECAAYFAjpa5sUA -CgkQZ5BPrQp5FhBRqQCfTE8X0I5XhHYvH+IzWg/hU93XNsYAoPeZaStezssja/Gv -Gnx9y3jhK65h0czX/wAADZIBEAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQEA -AAEAAQAA/9sAQwAKBwcIBwYKCAgICwoKCw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3 -LyYpNCkhIjBBMTQ5Oz4+PiUuRElDPEg3PT47/9sAQwEKCwsODQ4cEBAcOygiKDs7 -Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 -/8AAEQgAjwB1AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYH -CAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGh -CCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldY -WVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1 -tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8B -AAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAEC -dwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBka -JicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWG -h4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ -2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9mooooAKKKKACsjW/Eum -6FGTdS7pcfLEv3j/AIfjWV428XHQrf7HY4e/lHXIxEvqfevH7y8lupXmmuJppWOZ -JC+AD9aly7GkIX1Z3OpfE3Up3K2EUVumcdN7fy/pWLL4415wPM1GWPJyNpK/0Fc5 -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 -00vJw2APoAGu7ACfeuRYvpX6m1+prhxlL4yzHvjeHukAn3AUME5pxT4tkhx3miT4 -AagryB7Y0cye/wAADVkBEAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQEAAAEA -AQAA/9sAQwAKBwcIBwYKCAgICwoKCw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3LyYp -NCkhIjBBMTQ5Oz4+PiUuRElDPEg3PT47/9sAQwEKCwsODQ4cEBAcOygiKDs7Ozs7 -Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7/8AA -EQgAkAB4AwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkK -C//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNC -scEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpj -ZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4 -ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMB -AQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwAB -AgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJico -KSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJ -ipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj -5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9moqtf30Gm2cl3cvtijGSa4a -++LNlGStlZvKR0ZuBWkKU6nwomU4x3PQqK8guPinrEzYhhihX86ns/Ffia/XzElJ -UHOV4/rW/wBUqJXlZEe2i9j1iivMP+Ex1q3+/KCw6gip4PiXdREC5tUkHcrwaTwl -VbK4e1iekUVzmheNdO1ycWyK8U5Gdrf410QOa55RcXaSNE09ULRRRUjCiiigAooo -oAKKKKAOY+IblfCN1g9cA/rXh1fQPiXT4dU0o2dwXEcrclCARgE8ZB9K4J/AGkKe -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 -NkWnRRRFZce2DmVZSI8S+Oy3Qdc3SdbYIDVAD7o= -=f41D +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 +IMEPVTT5G+EY7lDH08Ehs7TJrlD0zz7FPhMKPmdDKt9EnVa/AVBemnTRur9lkvKu +rqieHua0LhKJkKyWg/PFGu+HlNFWjSbszQsNQxcxjB7EhbvCaf0LM1CKl8333DIP +0nnuB7/HKZg1LkyCrMJ0xIhTAkjntJCiASP2gauhV8ansbT1VaMumbumSj87Fj6B +HB+emNY8Dk1tyaFPtAcz1b69svUtdRg2SLV3nzasaLfGvJ4mR6zXI1QNcvw3KSCG +iaKXOkRllgQ7+qAFyqOTm7CfV1WMbfzbEL7lay9AwpTYKNOpylfADrClLt9IQ22b +xChY30dYcSxlkGTMu2/T/4QYMU/FYmVExnnROrvwiscz3lOIr/CyIHNpbCh9ZFHV +yZnlV7c6t1+KN1m4cfVSh9MiEXw6AKBA41x0XycB7QmDPqcFF2dpp9A1jUm3Wan5 +/D4NVpaMyMnwOGuTFpSedfJhAlLhlut6u3uDN99A9UWfWYjb5IKRuK+E2w6PHgbB +NVKf23YBTL5/AglqzNIye4kCHAQQAQIABgUCPMB74QAKCRBi0N4mLUEP6+IhD/43 +YLSRc8fRqjS+K7ykoF2AeNiggARZATergK4KAw1cy8gewaNM0VDCaq8DBss7IvUU +QBULGjCO0rOIa5eu4oNzWaNRKxaEkOANz1tMkput4w6SlnWdTElE1P9OMolQ9mLM +UwyHtlxr3Ut943mSzO6NDFMQf060UZrud39bfY7CrYnjymCVUpU7oRBvviKmk4C4 +V6Zzlp32y6yMVlRPlX/7xCXtE26vU4sDK/7R6QA6XvKXxyvn9zXsE8I2LVlzEk7q +klYizzoZouC9zJKIuRkQ90+t4qm1wvoQH8X+99pDkXP0a1/dEp/xgrwxKh4usxwb +8vhSIsf1l3A1q/4Xol0LIQP9d1w2q4YWP9mt+EDkVRkiSi+91MbQZ7jBkTHyUeQk +FU+Vo/uYEOHtUkIs84QXoCc8jSLlMjihDFyzVnc+854d1oNG5ddsFJdP0xLSbLv9 +1T6KPbbgGeFCcLmmbFo3i8/wytNOSqL3qrhQy8x552i0r0syvrQWEcFYAMbcDccZ +mTLcjPrqWPQ0YDFFAG+QnG7sTEnIH91MQdXaNVY/yv////////////////////// +//////////////////////////////////////////////////////////////// +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 +SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWm +p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5 ++v/aAAwDAQACEQMRAD8A6ilxSg0hIAyTgV0nnh2qCa6iiHzMKpXmp8lIvzrIuLna +jSzPhFGSTTSJb7GpLqo52Gs288SpaKSzh2H8KmuUv/ELzsY7cmNc9e5rKlmaRgM7 +s9cD+tS5roaxpN7nR3HjvUS+IEjQehG41VPjXXd2BIq/VBXPpy2AuPY1oW7eVFtE +SBm6cis7s25Yrobln451MN++8qUL975Nv611WleKNO1RQolEM3eNz/I9681aZyxE +iIB6KKWSSGCMTw4PPVW+7TUmS6aZ7CCGAIII9RSmuF0Pxu6+Xb3sSNEeFlU4I+o6 +V28cqzRrJGdyMMgg9RVp3MWmtxduKDS0UySMiinnFFMB461m6pdmP9yh5PWtPOBz +2rmbu4E1y7HpnihIJMi5rkvE2ql5jZRt8qH58Hqa6e6nW2tZZ26RoWrzx98jeax+ +eQ7iTSqPSxdGN3dk9rE7fvHX5T0GM5NbcGiSvAHlQsX5CjjFQaNaiS5iUj5B8x96 +7uG0SZV4xXO2diVzgbnQZSMhGAHr2qvBZC0bJXeSevcV6Q2jQuTwcn3wKpSeG/MJ +BYj046UnIv2ZwN3Fw25nLEZBJqCCxlmJKbvc1348JM4BlKlR7VoW2hW1soxGu72F +JSH7M8vntbixIZ432N144rtvBHiWSd10qcblVMxSdx7GtHVNNiMDAoCO/FcRHAdJ +8QJ5TlA3zxn0NaRepjUjdHrtJUNnOLmzimH8aBqmrY4xtFLRTEE7BYHY9lNcxgdj +n8K6DU3K2T478Vz+acSZGZ4hfZos+f4sL+tcQPmlAzkd8d66vxdIVsIYx/HJk/gK +5iCLzZkiXg+tZVNzqor3Tp9CjUz7lOccYHQV2dkwCDntWBo9iLS2GBk4rUiu4IXI +aQZPYVg9TqirGwnJHtVpHXGCBVGGaNyNrg59KthSCMd6RstSRwCQABzVaQruJHAq +RSWmYDooqCZtr7ehPSkMz72QFCBzXC+I4wtxav3DkfhXbXR5x61x/iUozJnsT/Kq +izGodb4KuJLjwzbmXOYy0YJ7gHit7PpWJ4Nj2eGLQHkncef941uV1LY86W7Gk0Up +4opklHWZgsKxd25rFrQ1o/6Sg/2azc1S2Ie5U1WwhvLUNcBiik4KHke9chpljcz3 +aS2/zbHzhuMiu9vl36FNtGPLiZiT7nH+NYHht/MEjEcKQorlbvJ3PSUVGEUjaF6o +h8sIyTsvyx9SfYVnK2nhQbqdI5yNxVV3H8q2L6BJrEnaC6kENjkcilXQ0XJjRDkc +9j+dZttGkY3MuS9JiiFpqVqVXPJh2tjPHPetDT9avYY2EkiTMvOcHp7YP86YdDkg +ieO1AjSQAOCQc/pVb+zWslJVdwxtOGxnNQ5djSMbLU6KLVWjBZWhJmOFBJGfYVT1 +LWUtpVNwI9w4wj5x/KqetL5Flawx5DKFC46HFYs0Vw8QeNWkmyS4dQVI7Y75pphL +Q1ZPEFiy7g/PYNxmuW8Q3HmNBIuQCWOD61fZoreNI7jT12yD53jUjafoay73TvOk +hgibAeT5dzevGBVxZjK/U9L8Nps8O2I65hB/PmtOorWJIbaOJF2rGgUD6CpDXUee +xD0ooNFMkx9bBF0h7Fazc1u6tbmaASL1SsKrWxL3H3nz6DdRqQA0eMntz/8AXrA0 +BGiR1PdzxWzcz+Xptyu0tuTpWbpsRRlwRnOSPc8muWUbNnoQnzJHSW6rNC0TfdYY +NaUELQwgSjzCONy9/esi3k2se1XRqyW6kZVn7A1i2dcVoT3FxbxIWaGUY/L86oIT +PcKDHtQfMqHt7n3qOaQ3KG4luE3KcqueB9ahg1tGl3hVITglTmkmupbRNrcLm2WZ +R80LBgPWltVguoFcFXU9PX6Go9T122ni8tQqs3G1e9OsoImULOGhZxlJIzg/Q+tE +mmCuF3p1uYidnP1rnFSV9asxHziZVB+nJrqXiWNcNdSMPTj/AArEjYDXoERcgvwA +Omaumlc56+kTt+B2pKOT1GKK6zzBDRSGigAkGYmGOorlnBWQqexrq+tc/qkPk3Jb +HDc04kyKMi742XpkEVS004n8soFK9eelXs5rG1Ay2N2JQ2EkPB9Kmqro1oStI6Ns +KA5PA61zrPJfXk3kByNxII5GKqXGuHyzHGxDKMcnjNO0S+Nrfr5pO1uoricWj0U0 +3YddG6VTA7tHk8g56fWqtna3X2hWjYYHJCsAcV2lysLR+dsBA7kVjSalYBij2yDa +OWA60kzblit2YN/DePJvYktkkANnGKvWmqXSQiG5Z4yp+Vh2q99hs7sb40wD2BxS +au1tapBDwG6YFHkTJW2Zah1I3VtnILg4OOn1pdCie48SFiMrBHuJx3qtaGGKzUg9 +BnFbnhSAiG4umGDNJlc/3e1bUlqcteXunQE0hpCaTtmuk4RSaKaTRQIY9zFH95hW +Rql1HcugTBC1PBolxMQ13LtHdV5Nadvp0FsP3MIB/vNyaq1has56Kwu5xlIGC/3m +4H61X1XRmvNIdVGZUBZcd8V10+0ROu8lyO3SqyJsQMO3NPdAtHc8SBZJNkmc5wcm +r9rJJNKhQ84yx9MV1Xi7wczMdQsQNjnLKOxNcXbSPazukg29jXI10PQUrq6O20++ +Mts9qzZAOM5zUraTa3shmU7SUx16VyUd6bRVIcjcM8etaEHiL7PH5aHJxgnFZtWN +4zT3NOJk0kShnDY+4PpXOajfPe3T3B4OeMdhTbvUJLuQbuFyafpukXutTCK2Q7I+ +XkbhR9acY6kTn9xq+HrS51S9C8hOrN2Ar0S3hS1t0hThUUAVR0PSIbOyMSKC+cs3 +Qk1eMbxNw/4OK6owsjz5z5nckJB/Ggmmb9vLLj1xzShgRkHNOzIA5+lFITRQBpqh +5LHHsKY5yeKmYZSmYyfwpl2K7RYUsw5J/pTFjwBjoRxVyVMqR6/4VFHtLeWRyRlf +6ii4rCQ7SpjYAqeMHp9K5fxD4EtLrdPaxYzklF+8vuPUe1dQyeW+f4TVbW9Zh0XR +5bydsbcKnGcsegrOSTNISaZ5FqGgXltOduWjBwP8KqwaFqFzMEjiO5jgAckmuon1 +vVtSgEgS3t7cHm4YAn8DTYvF0Ol4KSm5l6fu4gob2zWHU6ebTQs6R8OrkmOXUZ1V +c/NEhySPc12YsbXTrEQ2kKQx54VR1PrUlhci+so5xuUSD5kbhkPdT7g0Hdc3OAMq +ldMUkckpOW5HHHsjB5Bzmp1jdhycjrzUoiABz71LgAL78VVybFZYuCAcEdR6017c +564z7VYZMvn1FO52gn1FO4rFBoWXo2fbFFXHQscY7daKegrFrP7v8qRR834UvQY9 +6U9cioNBcBgfxquwKuGHUcirSDINROvT1GKQwfDIG7GsbWdOTWIV06fIt5M7yOo9 +MfzrVLgRlD9aoySeQr3M0qxonLMx4Ue9MXU8u1y0utMvG0eY5ihjDREcBx/eq94H +0e2meTWbxS/2d9sEZHG4DJY/TPFQ6nqNtrfiWS9ldxat+6jPQ7QMZ/Emun8LQLp2 +rT6aziS3uU863f3Aww/Ln8KxVuaxs2+U29McC2ndQQrSFgCMdQKswoyAMDhj1qKI +M8rp8oUkfdFXxH/Q1tsYdSD94zkZPWp1RvLG48in4ANPXncKLhYifhh+IpdmVI70 +P2+tPUjdimAuABnsaKZMx8sgdaKEgbP/2YhOBBARAgAGBQI6Vo8iABIJEMdGNjmy +13leB2VHUEcAAQEH0QCgkp8d7aB4RbAgGiLAkZJhXSOB5/YAmwQyiKrwRI8m3J2g +Vvombn3IwM7HiEwEEBECAAwFAjpWj24FAxDtcoAACgkQY8tpHfrr1fwb+wCfcjVR +JC80wQLR03USX4WIezMZOE8An2A7L3Qt/8rgHf0nmwcxiCffQnJAiEYEEBECAAYF +AjpXJ98ACgkQ14y85WanSzH2bACgp+OZ5SJKlUO19ihz1yHlyZ/M+HoAoPI7Fe2h +xijKqiPc61xy9eESMerOiEYEEBECAAYFAjpa5sUACgkQZ5BPrQp5FhBRqQCfTE8X +0I5XhHYvH+IzWg/hU93XNsYAoPeZaStezssja/GvGnx9y3jhK65h0czX/wAADZIB +EAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQEAAAEAAQAA/9sAQwAKBwcIBwYK +CAgICwoKCw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3LyYpNCkhIjBBMTQ5Oz4+PiUu +RElDPEg3PT47/9sAQwEKCwsODQ4cEBAcOygiKDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 +Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7/8AAEQgAjwB1AwEiAAIRAQMR +Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMF +BQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX +GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6 +g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV +1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB +AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXET +IjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJ +SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWm +p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5 ++v/aAAwDAQACEQMRAD8A9mooooAKKKKACsjW/Eum6FGTdS7pcfLEv3j/AIfjWV42 +8XHQrf7HY4e/lHXIxEvqfevH7y8lupXmmuJppWOZJC+AD9aly7GkIX1Z3OpfE3Up +3K2EUVumcdN7fy/pWLL4415wPM1GWPJyNpK/0Fc5btG/Pktkfx7yTVhYAGLsAxbr +yf5c5rNvzNlG3Q6yz8ZaxEyudQkcZ+7JtYH867PRfG9nfIsd7/o8p/iI+U/4V5EI +/IGV+YZ5QjGavWEoZvL8w7ex7g0JtClFM92R1kUOjBlPQg5Bp1eVWesX+hSeak5W +PPzIeVYfSu+0DX4tbhJCbJFGSOxHqK0UrmMo2NeiiiqICiiigAooooAKzte1VNF0 +ee+bBZFwin+Jj0FaNcB8V73ydMs7cPjfIXYdyBwP50nsOKuzzXU9Rmvb6S4uJGmm +kclmPCg0WFgl5LhuUHPoM1nvJlgFGM9fU1vaWxiQEnGeprCbsjtpxuzTj063MYQD +HTpjiqd3oN+jlrMNKmOMdq1YJMpyMn64rXtGygwawTaN2jjrbw1q93cDz4xCgzkt +XSW3hSWGP91KisRguUyf1rfhXceBzWjFEpTPcitU2zCdkcFqPhrV3jImmS5QcgqN +pqbwjqU2g6yqXRJgPysSMFc+tdq0eDz1rntd0+EXMFwVAVmCOQOmehpqTTJsmrHo +4IYAg5B5Bpaw/Cd3JPpX2eZt0lq3l7v7y/wn8v5VuV0J3ORqzCiiimIKKKKACvI/ +ixeGTXIbZgAkEIxg8knn8uleo6nqMGladPfXJxHCu4+/oK8F8Y6tca9qL6mEVFfA +2gk7QO1TJrY1pwb94zIIzNMAFJxW3ArRxhRznr7VHpNkYrFJpMEtzuByKnlk2j93 +tBz8zHpn8K5pO7O6FkrmrZOwUBu9b9vDhVKYx7dq4+11q3h/dTSxlj0O1v6ium03 +WLOSIBbiPJ4xmo5bD5rm7a5jBlbgKOauxsVjHGQR+dZ5lQ2iKjKRKwyQe1XFn/fG +PsF4PY1aMJak7SKRj+lY/ijb/wAI9cuMblAK/XIxWox5x1rL8Rug0oo/Idx+nNMl +FvwI7v5+8YO0Z+oJFdhXNeC4NtjLMw+dyAT39a6WuiOxzS3CiiiqJCiiigDkPiXI +R4bjiDEebcLn6AE15IzpI6qgBy2AM8V6t8S4pJdLsygJAmIOPUrxXmEdobW6iicj +dyTg5zXPN+8zupfw0jTi3oo8rsu3BGc1RudI1G7Jlik2pk58tRkc1eEwD7VGfpWt +p8iWwVpmaIEnAYYH51jexvY5q30e/wDO2SXavBg8PErn+lUbV7m31BYzGUfIwE4z +9K9I32zDO1Cx74FcpdwRT63iAq7k4JU8Lz6+tPm7iitTXinuUt1uZYmjZhwU4Cn1 +P/1qSfxNd22FScTPjJxGMituSyjbT7ZDwiuFP0zWBfeCIp7ln3FFY7g8ZwQaSE2u +xqab4rS52pcWc0bHjeqZBP07VL4jlW5gtI4XUhpPm9ulZRs9T0qZBFc/bLYYBjf7 +6+4auj0+0Go6vaLOGSNAX2AdQDnB/wA960jq7GM1ZXOm0K2a10eBHXa5Xcw9z/kV +o0UV1HEFFFFABRRRQBjeK9Om1PQZYbZd0yEOqjq2Ow/CvH762lt9SVZkdGUD5WGC +Pwr3mvKviFYtD4ha4JyJowVGPz/lWU49Tooz+ycj9p/0jJzwfXpXV6Vf+ZCEbG30 +PSuMkzG4ZsjJ71INRaBmMiOExwF6D0/nWDjc7XJJG9r+vWcEiWtvaoC3+sm2D5R7 +e/vUOiXVgNTVoGATHQVzs039ondGhYN2p1vpdxZL9rZnC9QP8KOVWEpfcevoIZ7M +IHBDjnHb3plrO80B4EjIxRivqDXGaXfypeQrdSTCFQDgPjP1rRs7tdJ1x1jm3W12 +fMQk9z1U0rkch08pjdUHlEsGHG2tXR7dVuWdsb1ToPc//WFZgufNxjjPQVraE3nL +czfwmTYvuB/+utadrnPUuomtRRRXQcwUUUUAFFFYuseL9B0MH7dqMSuP+WaHc35D +p+NAG1XF/Eqx3aOmpIPntm2tj+6f/r/zrA1b44WMLNHpWmSzt2eZtoP4DP8AOudu +fiPrfiEPp98sENvdKw8tI8EDGRyTnrUvY0inc5u4vlEgJYZGeeg69a3dL8uaPa+H +Lr83IOeK4y8zb3BTGOecVt6HfBSseBkfMzHpms5RujeM3zGqdNigumxHEyejcfrW +7pj2Mka2/wC/iXP3QRIoPsGHFNtBbakoLrjHGe5rQsfD6wzGRpCVRsgfyrn9Tpcu +xI+l3Mnm4ENyGU7XZdjg9unFYsNpcXkq2smE8s5JU524Pb3rp9S1FNNtSA2+Q8Iv +r71zmlXyCWSTeCxfGB7mnZk8x06mRLf93kyBcIO5btXZ6XZ/YNOit+4GW+p6159J +r1ro3lajqCPJbRuvyx8kt2/xrttE8UaN4gjDadepI+MmJvlcf8BNdFNWRyVnd6Gv +RRRWpgFFFFAHhfij4o6rqyNBat9itz2ib5j9Wrz24uZLmQliTk8n1pszszYp8MQU +bj17UjQnt4UiAYjL/wAqdb3G3U4ZG6eYM/SmMxC/WoHBO71zQ9R3sbOq2nnElQN4 +5Ge9Z1nctalo5Bt7EEVpQXYvLUPnLr8rj3FRTLHN8sq89j/9esotrRnROKfvI1rH +xDDbFNx+73/vdq3bfxcoiOGXJ7ehrz5rMr9xweOpOM1IkE0Shd4ABznd3ocIvUlT +klax0+p6480mDICVI5JzioLGZ0uDKzFUXq2P85NZmnwJctlt0gHJYDaDVjzWlvpF +A2xRfKqL0B7n6/4VahZE81zRvr97+U+aMRquFjPQCsZTJYXgktZXjZDuQq2COfWt +Fzj7wH19azdTjzyAeUwfpVEnpHhf4qTRKlrrSm4QcCdR84+o7/5616Vp2sadq0Qk +sbuKcEZwrcj6jqK+YbeRtw3Gtm1vprVxJBM8bA5DLkGgnlTPpKivFrD4j69aweW1 +yJsdDKm4j8aKLk8jPNI4fMcsR8oNSlcdasRBHjXyuRSOnrimVYquSBSQxmQPjnHN +LIpPQVWmDKmVJBXnI4xSJLELSWU+/ohI3D0ret1tZlDSEYxXPWV4bg+RcEEsMK3v +6Gt62lt/sZRsFj69RUVI9UbUpdBpltY3ZVgjc9mP+NMggTUGYo6tGjbSqf1/z+dZ +15OESXamATySRyau+GtselzOCNzScjOOn+TWkIJMmVRvQ0b+4TT7FvKUD+FQO5P/ +AOuoNOh8u3XJyW5JPcnrVPU2aa/ih5ynztn16CtC2KmIdcemaqT1JiSsuOc/l2ql +fAFEPPcdOlXnHBwOvPeq10m62Y91INSUY2CrEH161cV/l4PuKglUEA9DToSWHHU0 +hLRllZCMhVP4LRSRhMsGwOevHNFBZlKJopf3QLZPQd6v58wYx06ilgVYyD1OOTTD +w596ZC0GOowcEcUyKMSSBOx45qVuPzpkHFwvpmgXUxthR3XJBQ8Vqae8ssrvnjHA +/wBo96qXS7L6QDHU1saZEI7FX6Z+Y/jVRV2QiC+jeWIRuRnlgOpWk8P3PkyS2MuA +JeUyP4h2/L+VWJcG5QFuqjGfXNZs7YEpXgswCkdunNU9HcC9bAzTzTnnex2n2HAq +/DJ5UgGcK3Un1qG0i2Qoo9MUS5Vxxw1QaI0i2Rkk89vSmBQyup53DFR20wkjKsfu +9/UVCb1s/uQOP426flSGUpxhTgDimwt82c469KW4755JPaoocmQAd+KBX1NCBDtO +QR/X9KKtYSJFyMkiigZ//9mIRgQQEQIABgUCPGYkMgAKCRDHRjY5std5XiUiAKCM +dEJf5uBn+GWXhUNTn/s6uuPfQwCghwc5iBLRO+NJLlJeRxjbwieEGzCIRgQQEQIA +BgUCPGYl7gAKCRBjy2kd+uvV/Ds8AKChxrTmXyNZ3ODRBs0S6K2M7hzdmACgupKG +J03YZbIhDicYmlMUxovlb+KIRgQQEQIABgUCPHnkFQAKCRDXjLzlZqdLMYBXAKDM +R673JGWz4uAFsRvLduKHgy4UpwCZAd27hUIbcfkVJXihLCQQ/pCC8960LVBoaWxp +cCBSLiBaaW1tZXJtYW5uIDxwcnpAcGhpbHppbW1lcm1hbm4uY29tPohMBBARAgAM +BQI+vs8aBQsJCAcDAAoJEMdGNjmy13leDOYAoJ3psyoxXKRuTKXhQk41YNuKbS4b +AJ9N6zteM8H3cSkvWUrhi3gRvnf3lLkDDQQ6VOgnEAwAzB13VyQ4SuLE8OiOE2eX +TpITYfbb6yUOF/32mPfIfHmwch04dfv2wXPEgxEmK0Ngw+Po1gr9oSgmC66prrNl +D6IAUwGgfNaroxIe+g8qzh90hE/K8xfzpEDp19J3tkItAjbBJstoXp18mAkKjX4t +7eRdefXUkk+bGI78KqdLfDL2Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoB +p1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnh +V5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr +5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4 +XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zaf +q9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpTDJvAAICDACNUV4K2PS6h574 +Z3NaBsIQe5jkVO48MSohjC6s29CjPhlU79cQIYWmBpuNfwroZ6zltyz6Y2Fm65V0 +IfvVicR7zvFFCOhahMuk1cr+Qp936OMEq9sLZGxTjClgwrHGS7YpMSZrEC7bpOmE +Rjo4F/n5YmCHJCH8QzCOc9+80gjVEsHiJVABrC8yykjKL5x1V/PSArE4QtMLbkBP +GmQYOw8bx6jCHoO43QjUzbqRfBMHZqWVJyoIIZCp+n13XM4+NO/cDVsZ8bjch0LI +OyMrT85n24yfXRlP0s7BFjLm59Jjhf4djuJWikJawWETlypAy86OYRRuwCbIyNau +BeTKy+avZvF2oLvpwH4UnudpC06/O0jkj2lQpn9EEUw11RwO6sq9zYTwAUyKerN0 +0cbCfyiZl01CIo0btcTO6hQK3c67PaloJ9lVH8/mH7LuqkMLDH5ugkpzmed/8Sor +fqVkakne6b4mRySFCBXaVZoKmDHzcH2oSSMhM9exyh6dzi1bGu6IVAQYEQIADAUC +OlToJwUbDAAAAAASCRDHRjY5std5XgdlR1BHAAEB5W0AoPjfnyN286hffnwedCeb +BR1RzO4WAJ9PvQHw5eZ3J6+A+0XjA5WKCGcEUZkCCwQ8VMl5ARAAoIOr8TT4oIPR +UM9eApD7Uf3RKt7Aoyta+PtqMnqEZ6Pqameme2X6YYAP6ucKMHhQBjoNeyg9ll3o +KEOaV2xbz/sPY/c5t4OfV800Us2YEnHpU4mz5ysuoPK/BgwGOiEK2keqcXuNve/z +c56r0byqU7eYNVz+S8o1QbBL/RwGCRNb8stdKkkEbRM90Lp1M3xCzQuJImDTGTp5 +oGhXluADyCIVg7a68altzn46dSuAwIanJ2sq372GzraodLMSduOpL1XNwXPaR+sA +8P8rm9nXrj6ugWQSwScK7bv9tKg9J7GfYrP+Y9Gi9TGblZq+8SmKnnocsydVnaSS +udqp4PZ2rWHnUvhnnygyMNSau6aUDVn1XbkzSExUxdCbMIII0Lj6ik/E3eRgssEF +jf5Bh26ehHcm4lF2fvX6eHnpNFAeTPrK0sG5BeIUNJga6pbGqI4uArl43NHPmcdQ +9KRn6qgQprxFdbS7pd1PIdE80eKKVAPJiynoEKeXI4f3R8+80zw8VYEq925SfRcS +NWevbYf/oyY96uo6KN7lv+cvKkAq83Ugs7PkwxFsLnGbSSLiIU3LfADD2PwMrfj3 +/Y13yPsUkIM96+xLuaPqxLtNv3LYWjnOG9ymA7TZIyyrM4InsbdQWDqtOkfmModq +oLIPWs85H7nb76cIQqSexDsXHWj928cABim0JURhdmlkIE0uIFNoYXcgPGRzaGF3 +QGphYmJlcndvY2t5LmNvbT6IRgQQEQIABgUCPJfc9wAKCRAHlNKuLBMRcSkdAKCK +G/h17odvnPFMdJD2/MofAmLt/wCePQBItnFwcWsaoECtHVhAXkor806IRgQQEQIA +BgUCPF4i7wAKCRAIBXUxEzAHMTr/AJ44sNlp+qn9bVY56sXE3/iTZ+bTIgCeM16g +9RACeNezFD2z+1EzCg852OqJAhwEEwECAAYFAjzgIZIACgkQFBEjal5zZyqPKg// +aFqqmjW8vfSHDvn/1uhpuTO77oAByerBfM3kLxo9Qj0wUgTdFdPxBZ/7I+gG+4/0 +2Sf8s4YJHoQEjmbkY03dpFwJ+mlWNAzQwTbsIsuMp2Nprz9KBDWWkD/oSPe+Gm/Q +pwutvIS+UrP6gwczZhSCqL4LLxEXArvv8AaDrtTvmJasgtOSQzjkJM9piwp7tpUv +GVHfQ2iGWHmcR7ttkJ97a5NdXC8+lIQu80Y4NYldQbjb9myCgCQO9O2uUFiKOTYY +HEl1LighTq4Vk5DZg5QGW2c3r2Tih7jqwtMsvghGnDurRrEj7qCPrbF2utpoG1pL +KiTIva/EOM84XIAfTqzByRFhq7P9Iq139Wm69P0PL5kaqJlhwBxnIp0fy7G9ms2g +wqt/WClY5ZH0a9fKM2cJWxJfKzK0eN6f/wMn3mC6MhBmY2uk5FixkKsGNdGgGIO/ +4+Nw3yZKKLtWyL97AcccXUwcJrqVIrIOVpFd7sG1Km59UwkOdNxVRAcKYmRIwt7j +HIusxyFh+22o7ovN9OvDZPQFAqZTTAzA/M+WLAvLNGoo9NReMVd7evc7d0+uLX0c +RI5q0zzKDcOY2FUSIULAXou+REFtH+2ydIybEMOcTfHgrveon0RmP41m3DsYktqg +R/T8Drt3EAXkdBLZ8lY1mknn9Grqo+KKvV3oqCEDx3GIRgQQEQIABgUCPL9PngAK +CRBEslvUW9U99zyHAJ45DoDcb7HPXjgOAv00OHNIvDheMwCgsd3fo9m9BHyyxWz8 +QrCT0aLAcv2IRgQQEQIABgUCPM8S3QAKCRBPmlZ0/xSCmZYAAJ95aPCH6tZew8c6 +N2tS/SCQtOZIJwCdEV8/1FSy3xqUs6Yfk3B5p6YYokqJAhwEEwECAAYFAjziyTYA +CgkQZtISKO8Tm6v2Ow//dqxZpJujiTXfaOB2qjPGezqXkfjNBgOIMoNTWxFUjmHQ +hPM6BQj5lLQk4n65o2U+zqyzJp4oft0UThEFMni5U9u9Kffs7jqqEazDW1vP+6kD +TTGR1jbqPLKTkxsPYxFIUYLloDDW3fOa8X1fJcExUSa4iIQHmBosMfEV5EuUl10h +38UwPyO+eVvY0WBZNHij8FhrUE2Po4d5W7cWKCr4VqYVvTyKtJ0UT1Tsv119bsGC +XXtAjzo54LsV4QEM8lC+eD5Y2p7iWVlfra+PFKxmu+/QRt4BEdpj3fxc5gm1jSrn +P9VEP4xtA5uHl6IgbrNkt1A92T5gu1e/TQ1kmgI9lHN7Zk+7py3RSawAvq0tmAle +fYegATXK1C4GdbrNfQ4bxkd7E2Dn9ynpm/lPjvr3Sqdox4JXy+PitU/ELzl3CdKF +1vkKWjFfnbLmHHAjnPz8dgZtqnfnVQIAAQCCi9kXspexGiT249xZEdubjFJvkjZL +NPP6WLPMuBDgWICntHxIt4wJy6NXxv30eT2ye+BrL5a26wwsePflaD1x5HFW2E9g +kv3dkVEWvnLQ632Kwenj1YrKCnosNGmuoM0eZHbw7Ve2xIqleUO7wkFF7shWfzMS +ILR3Z+a6fesjRUS6atNFSQV6BnXncX2PTSpRH2wS4Yt0+iJWrcSNCk5tdfetJnSI +RgQQEQIABgUCPTWUIgAKCRB1QAEdEMB5GNvjAJ9ZeUVI1kvSWAuJGjPXVXEtRhJ4 +ZQCbBe/+ER6376Ad0EEItv/bTj1lZPeIRgQQEQIABgUCPJ9y1AAKCRCDaLtZZvvB +jN43AKCazWmPGOA8Q0oUrjF4QvOUFM/bDACdHDw6m42VYtjIGqZGudhZiam3PBuI +RgQQEQIABgUCPQQVqAAKCRCM8SRiTmc48XeGAJ0Z1Iz+W2SJyd26j/n/hEZTZJid +BQCfZjDrnexp9hi/ibzHBsPQQ9BZKD2IRgQQEQIABgUCPF7gdAAKCRCc69apC10n +aM32AKCypWJPQ+Y7y8odeJfaMsjZgrN+XgCff6aipzB501CUUc/PlaKhL3KanVWI +RgQQEQIABgUCPF2uXwAKCRC98g3l6mjvU3yBAJ92Uc/XTOt69hteH6JTCvcFJE3N +EACdG1gNdn1xkCU4cIjx4NZJty4vFF+IRgQQEQIABgUCPFoQqwAKCRDNz4aFoMk/ +ezmKAJ0RR7vc3BTGjcaI4Vn2UpXN9hfD9wCeMKfbsk0pyaQg1u2+JXMlBF/nzImI +RgQQEQIABgUCPH0qxgAKCRDWFJDobGH8qhA3AJ9QBuhppkcU1dO+qUDEFDmeKGlJ +eQCeNIHejRJbsqRlsJjWKhU0xDW6TKaIRgQQEQIABgUCPGBsXgAKCRDa2nnNeIo/ +TL/wAJ9fXFgw4gF89C0G22XZBFgddadIJACeP8RBT6kShayJrX1TK6SGo3aw3GaJ +AjQEEwECAB4FAjxUyXkCGwMGCwcKAwQCAxUDAgMWAgECHgECF4AACgkQ22mNcZkk +JWB+2g/8DKvZLG7wH/Xa41T9ruK42YS5B8nNcwqe6zF3OQnTYAzVcoZe/nKP6jHk +AcJPEmBFXna2WeUO6o8oI5Clqd6qy5cOT0sncAh2n+ZpVYORPuYLfkU5DouhV3RP ++XNCKyAfjDSN47dyHjqhISE1nJ4w5OICMZuM+N7b173/32N96Ia0JJwKTfbmCEqB +Jc2BoJxGal+j96f/BQdvtuwN7fxLIa+pS71TRDIDpQWPLXvUxbzCUzHkiVyEFab2 +8/yzBfLhG6Flc0Qu+8u0XA/KfiT/Vfe6mRrIjmAftjDxhLwIRDx8UGQG2gRfngRS +83r/sZiN+nx5RZwBYlopKdLWFS0ToAYVRiVDiZQyvqJX6cVKhfjfDH43ktNWhy8v +mOq5MwtugAv/Y/gHZGvZgVxIogNb0HAXzuFOOUIYAwJdNMlFtYFeKDRmfWKrJToU +v1RwetQo1sI51dycJIbHMbsd644+kwMJ+UJqDvZK9wqh9a80F8U1a7gibsMriOmj +XssCDaLm4A4aoTgj36ss4HcX6eVAIcueIHvXao34ByNkN1scYQ95gnWIDfPRmTab +h9pSZCWa0ZewYpo6g3k5SmLHGdWp60YEaUqBQ3VHDJ3Mks1unAdVkiJo9WjVqauf +BcaCVnE8upTXrCDXkY2f69XiQXjeeT/PuwyhiLBpKX7bKoFwKlWJAhwEEwECAAYF +AjzgI70ACgkQ5ac6VTM5BfVcdw//UKRdzwLXEle5NFPdG55ruswFiE6TVfGopa6U +U1UpoDt1216xETj0tqfab1prOO0bXTKVMNneRsmC4vnz+7WdXH5wbaPQSM8eGeVA +HtR5PprCKAC3QUQn8HI/VqTaUxlan7YM9PDXFNIQsD4gqh6pO/tzeq1Rh2pTqP0i +g1z7Hi0uCFfJuQP5aUigd5fPhxzV3M0/CS6qA1ZvzKLhqYxxa05MwUs/egOLwqEl +oHidVv4MHxCEuyLRZXi70p6XdEPWRY/uv3xbxyxmq/kk8QeG6+a0K21dTXwGkTc4 +tS76y1qCZm9JImmzKd3zwWneTsOJRy4KQoycnQILcLgc+Q0xkpJ7WfLjFeHgW29K +X7oYFznf5sWBf1V6gUguZH9kWlKqDJ4uMZLdhEK8ASjOEXzsRfiSJ/i6mYrBek28 +3StwhkM24CHKasEHUnmuVeFUg6U8ANpiebz45pZRKhYR8ruOSqOW/ZWF8qV9+kZQ +K1O2M0+BsmpO1Tj87fallem87ZazoauN2KnJynItYEVPKzZgwkKsFvcl61zRkRCc +t+BI/aekW5l3k2Mo6paTxTV1iTWvLdSV2QtiF80Jr146DeNS1bPSML9/gVvi44Zn +QK/PFp7RONURE1uQc7veEGIJUBjKIMl+KDWnaP0NiVCe/w3DQXyU+cuM8xTOgv+c +EWQ2PEyIRgQQEQIABgUCPFyBgwAKCRDqvxOyCxdw2+H+AJ4/oSxuFQVqj1SS3Z6n +ufW+4UKpxgCfUFd5h+48RyHC4prnHd2XwTwDFYaJARUDBRA8WjH+/+68qeVTobcB +ATLDB/9TtKzjqeZxYorwevfiGz0nNJcXi4z35m/8EAKyV1l2bFg2wbm8t8i+fsMM +DBciywxlf5D4guqjx3wttaCO7Lov04AXuV25UpMdfcAFIMrh6wMP2CU4KoVypmmR +YJHFSoRXHPNR1NcOx4hrzKFgPuFTBR3aiphrKmJHoL366GFrMWw8W0NTkOBh1cCf +KR2FXX1l+cSk0Y7ikwtRh3rHwOJaK67P8wv3JULiRzFf06xPTsrz9/b6ucwWxuYj +nq1P1TuMPessYh6ANieGA0kphGWgk6o5Xh9buibf2Ky+NUWkQWsjTqMhfwDOq65m +ou2oE5brWOZIzI1smeGDac2txOEPiQEcBBMBAQAGBQI8WH76AAoJEBgoyDTUbczF +W7AIAKJNEkdj1soBSTP9dVRNF+sMLbBE01uzqUUwzRbDny8CdVx2hfk20xwjhR42 +zdB9/3usYYy0cij7J/MOeAFzGFr1e2LpIWF3q/amiTVhIhhIe3BdRWPuT4wu0aAz +AEVryEN/CLG6RWVyvxD2fTS9IHfiBCU9saXBZFlY76ZwjPdhBf5fJ+05uhWz2rcM +GVvO7WwtJCgMusnJkT6uYc/N3VI5U2rSGbGKXDuDr4DZ4kjcHl8gyQereVAKpb+J +m0/VQxrcPd7cIk2dxd0AIFb8vRL8gC103EJDuyTnBg8DGoEx0ocC1RhmPWkykQeO +OgRofLnKJXJ7CamrVdVF3K9g6KuInAQTAQIABgUCPYpGygAKCRAeLnaN1500UYKc +A/9U2yxmDHZpngyOWH6DYzddMznYKRnezFy5gne4kr6VyaibFMbRXvUQopE3adIP +RmMWZRyyKKMHg0HW25t20dhXNsWL5uPd/Syqy0GPwFacDqX+ST5LOuOxXZT+6L2O +I1bqXG4dzGEiVPmXFO5tmXAwA7V4YzbaaDG44xwTYp9KY4hGBBARAgAGBQI9pjlP +AAoJECBMYRUOYGaZT1YAoOQ1clmOb585yn598d5v5LVA4utJAJ9gt+4q7O4tgRT4 +SA1Q/Rmui1BTG4h8BBIRAgA8BQI9aTxjNRpodHRwOi8vYW5pemUub3JnL2RmYy9n +cGctcG9saWN5L0RCNjk4RDcxOTkyNDI1NjAuYXNjAAoJEEGiJScHL6yJM0UAnRjN +T7/VQfzI+FJk0AbB1WC02LrmAJ4zmfUdjQ16NHpzhtDDFqPUDad9MYhGBBARAgAG +BQI9wVLyAAoJEEQ0VrKnu+CcBfYAnj29XMX1dGHBPVtqLMYCRCkexhA6AKCEohTG +sHpCtKJzxTs2wAhiXN5LqohGBBMRAgAGBQI9zZcJAAoJEEh3T0K+bv3FC+QAoJvn +R9GqNGaf98EtYsX77lFCKYAVAJ4m319nRjiMTsmIQJiFMTTsGd/tzYhGBBARAgAG +BQI9vy49AAoJEHoTX1ea1+PbJC8AoM6hw7g7332jtmGfKzJqDBao58InAKCowJHU +oYP2vFrT0zUazPVWFNVPQYhGBBARAgAGBQI9ph7KAAoJEHpiBmro19PuusQAniHo +oaJkjmpLwtwmmAuqfINu7PkxAKC+pqFQB4CWSzD55SoxnHf6BFrQpYhGBBMRAgAG +BQI92EzFAAoJEIPkKKKtNQOcPawAmwarUIUqVj5SZElSAo6CUwbqUWkHAKCFbqtd +r7clHlm5Ikf+hGU29ul8BIkBHAQTAQIABgUCPYpG2wAKCRCHHMKrPLO0FYJGB/4i +7emjklP0pl0lgQyUJpehHwsn+RyRHg/3/X6g8FnCBtsFDs3FktSwXw6T7oHVnsAA +MX8xs3qpINeJ9b3XG9L9STSvQXHAGibmye6DoLQcJt//Tg++LYvuugLaBAln50sf +LQwvnJQe23L6AT23SEozG/B4ZgiDT8vuVakM/nrGfJ0gZsM/92fo7vZa+iLpiBzR +LSYFXONNjKomO5/pL914wYEoRdA1yO13UYhc3hsqhUcg3ZyaXuThhFAA5eInWvZt +gT07cLf2Ju7GIn+eLl6cqafwfCZt5Cx1ndVEMU3Bg0weIi6+YtlgTYNLDBfxELHq +/qb6FDuGKRMvTfbqiqT1iEYEEBECAAYFAj1tEx8ACgkQstGlwdAgQaf6DQCg4Rpx +AHExs2/bn+UK7+FbHpHPKm4AoJ9CjPgTi4pxxyHTyi6M3dNRn/BYiHwEEhECADwF +Aj1pPB41Gmh0dHA6Ly9hbml6ZS5vcmcvZGZjL2dwZy1wb2xpY3kvREI2OThENzE5 +OTI0MjU2MC5hc2MACgkQt5YHPclUH7L3UwCaA8pAoIu+bZaPtfCMf2+oYEvXD7EA +niUJKT80LnRlWFghdZTgnauO4c3BiEYEExECAAYFAj3TKcsACgkQv+EgZWshSJoM +QgCgrojpi3gp2yszVKJGkmAikwAKzPQAn0mEPAFp859ougX295iZYXaGFb1SiQEc +BBMBAgAGBQI92EzlAAoJEMz612DH0Oj1nZQIALS4TD4+9VypmxF9PRjatxJr8X8Q +VFkljByObC96aFXMDiX1/n/pQZGJz0HKPaDsgClA37scIZMrmlPyBQ917HoNEYPf +PwipKv4oshDAF5Qdk8DOTSUyaaJ19aDwJiNTgIVrtY28/lbj3wv/vrniYleU83uT +9fg07IY0s7wIBn0t43XG4Kt+eDK5gPWIcjc0Dpb0Epm8zYKmMorwKyApUkcIeueP +mIC7bK9090S6+nrkwPWLu+bvg58Qz4Y4jCaLj9dFn3OpDbXR7kgmUB9kkPGgSS5r +ZupYe+xg0gJxX1Gjy1jpRtqqnkdXjSL8kaQYCkaGptKOYt8cqhbC52zMxnmJARwE +EwEBAAYFAjzQBRIACgkQ301Pgd/yDnnFLgf/R+g4wNdfc8Wv91OnVz3On7nSEE1U +LQVeUv7uADgnO48rjqepJWo6f1q8GOn7Hmq6TYG/tsK4UdArlt6OG+cbeGF8zBgO +1Pb+7i6bp4CKRIMr197dNavZByOF7SaXJnazRjKkcdRB+XXGbh/j0v8tKINA6sQM +vPoQv09Z1Px1a0zA3mKivD5xMcykOVmdxH+zAK/mJuiu1+EiE0jsrrjksJLmA7uN +Xo7hgdXXrLWoXvoGWCOnYD5XWOsKQt1ExBGE3U++CWAvxHaEsbcMMd2Od5qjuGZw +cIqxj94e9+3d9BNOja8VYeI95K6Q48YpAFH+QQuezrpdUMnqAhP5jKL4i4icBBMB +AgAGBQI90/E1AAoJEOHJS0bfHdRxicYEALF41XjiWS2Q6mHA5XE4WZ0I99Qf+jOD +nypmJ3suwWotdnJouK2QzlYK3YQCMJF1kbPhjAoV6sSzGq/Fa3OCEq+oDLWm0hCz +BDu1JTPGmtPcvisWI2VWb/g1ZRO2tttlgHfGJVknqzrFOXs0nimE62G5XStQodnG +qu8xgf+2ZZmBiEYEExECAAYFAj1mUioACgkQ5rgdHFfDQwurUACdE3kkQOzISsia +krHga+YfODk0RSIAoICjGv8Fcq9WBkgwm7cKfkbz+Hv1iEYEExECAAYFAj2m4SYA +CgkQ53XjJNtBs4f2pwCgtM/mkm9bHcw0KOH1BEJVPC+uoFsAnijcHioGNzXY4Enw +9gLWKi7/6UvJiEYEExECAAYFAj1ZW/sACgkQ+Tjeu9iy0gzCXwCdHInd56cq5YvY +vQRPuXyPnGnwPCcAoKQ7H6QvG18nxl0+d53w2g9FGyvqiEYEEBECAAYFAj4DWdgA +CgkQyhC034BnXmWnKwCg2/Ds6szWqXp/4TLyLbmfOSC825sAoNMmG+RJP+/Vf6tz +TICh7i2MvJswiEYEExECAAYFAj4J2NQACgkQFr+MTA0drktYGQCfSY/6YHM0upjy +w23+nAg87yL+3qEAn0IXNTFGL+W1czkM3XiOAVtbQ84BiEYEExECAAYFAj4KkrwA +CgkQmrQe9lqlvN8gaACgoxkwX4Vfne0nmt6PrjhAW/i5cfsAnj4d1hFW8k0Kz+yF +UT+Ti2Sp4R0GiEYEEBECAAYFAj4LcmUACgkQ6QPtAqft/S+AhgCcDPMZSpLkjSh8 +U4LdGiVCPH4AcLgAoIVY+53OyYvy1FXwpN4+lzPbvjP7iJwEEwEBAAYFAj4jGi0A +CgkQxS1HbQ2/kG0DUAP/bZzY6WrywK5BS0dIOOv5ZesEMYo+e1pR5hebI/51GIhk +1l3vnLV3nhbZxS+ati0zvagX00tQgmGnTyYiaQCuekoBRHwl1RB9XNpHg1NiJB9b +2STwKP2xrcjxF8I5RojgR2NrivQdyFNNNIqDVxlOYOoGOXOzo00rJTHTLzjcIq+I +RgQTEQIABgUCPiMajwAKCRDwIHNX9BSVKzpVAKCetMZ2qnsrnUW3kdNIYfJuuQCC +wQCg7U1+/2+bHSzypswG9tEh9SEpnhuIRgQTEQIABgUCPia2YgAKCRBzz9YVLP4Y +o3YBAJ46CObblNgDTfJEygjfL+XLu7+8DwCfbd1Y/AfkoTdeX3uXKywnGld2y0GI +RgQTEQIABgUCPia27gAKCRDwNtr0voCUGAJrAJwIHxo8aOORFfMo1bde6YXfF8I7 ++gCfdNDM67jRdinZs0cUISa07GyjYR6ImQQTEQIAWQUCPibpbFIaaHR0cDovL3d3 +dy52b2x0YS5keW5kbnMub3JnL35td2wvcGdwL3BvbGljeS9DRkIwQTA0QzIwMjBF +RUQ1LURCNjk4RDcxOTkyNDI1NjAuYXNjAAoJEM+woEwgIO7VlRwAn3HibJmyRmOR +XvMjBUOR5oPkNwxQAKC5T2Sit1VkLK99GuRuWDPCHUkGKohGBBMRAgAGBQI+KCUn +AAoJENl6NwsfjC9vJoIAnRAfzn7cm051gPUq/Zl3wm3SEMFYAJ4jhy2f4ZOZdmDa +ncNedOf69yGeUohFBBMRAgAGBQI+KCVNAAoJEEaMBQvr3uIT1isAnAtVjrw4GC6W +Imc6tTeyUOI4MlRLAJUXWhVyQmJHH7vfcbtiq/wQlApdiJUEExECAFUFAj4oIrFO +Gmh0dHA6Ly93d3cucG9ib3guY29tL35wa2FobGUvcGdwL3BvbGljeS9ENjg1RDM5 +NzY5QTM4QURFLURCNjk4RDcxOTkyNDI1NjAuYXNjAAoJENaF05dpo4re3b0Aniz9 +SbeMvfPqbKPoTYZoINqN81LNAJ9YKRBP9a1aWMYfED455KAHS5fMO4hGBBIRAgAG +BQI+Kk4iAAoJEPnKAdXiam8otlcAnjmn6y81ExweviD92w0zCh0/RLH1AJ48f5Xq +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 +ISIwQTE0OTs+Pj4lLkRJQzxINz0+O//bAEMBCgsLDg0OHBAQHDsoIig7Ozs7Ozs7 +Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEI +AJAAeAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/ +xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHB +FVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2Rl +ZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6 +wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEB +AQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQID +EQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkq +NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqS +k5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl +5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqKrX99BptnJd3L7YoxkmuGvvi +zZRkrZWbykdGbgVpClOp8KJlOMdz0KivILj4p6xM2IYYoV/Op7PxX4mv18xJSVBz +leP61v8AVKiV5WRHtovY9YorzD/hMdat/vygsOoIqeD4l3URAubVJB3K8Gk8JVWy +uHtYnpFFc5oXjXTtcnFsivFORna3+NdEDmueUXF2kjRNPVC0UUVIwooooAKKKKAC +iiigDmPiG5XwjdYPXAP614dX0D4l0+HVNKNncFxHK3JQgEYBPGQfSuCfwBpCnia9 +/GVP/iK9DC4iFKDUjnq05Sd0eeL94V6X4N1HTRpqxzzLE6DnPfiq0HgXQHdkku75 +GHT51/8AiKst4H0aE4W/vRj/AGkP/slXWr0asbNsmFOcHcx9euLee/le1x5WTgjo +ea5+Z+TXayeFNMQbf7QvMdeqf/EUz/hCtLkUN9qvSD38xP8A4irhiqUUkmJ0pt3O +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 +p0UURWXHtg5lWUiPEvjst0HXN0nW2CA1QA+6 +=wXhq -----END PGP PUBLIC KEY BLOCK----- From cvs at cvs.gnupg.org Tue Dec 14 08:45:32 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:56:25 2004 Subject: gnupg (43 files) Message-ID: Date: Tuesday, December 14, 2004 @ 08:49:27 Author: wk Path: /cvs/gnupg/gnupg Modified: AUTHORS ChangeLog INSTALL Makefile.am NEWS README configure.ac g10/ChangeLog g10/card-util.c g10/keyedit.c g10/keyserver.c keyserver/ChangeLog keyserver/Makefile.am po/be.po po/ca.po po/cs.po po/da.po po/de.po po/el.po po/eo.po po/es.po po/et.po po/fi.po po/fr.po po/gl.po po/hu.po po/id.po po/it.po po/ja.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sv.po po/tr.po po/zh_CN.po po/zh_TW.po scripts/depcomp scripts/install-sh scripts/missing scripts/mkinstalldirs Prepared for last 1.4 release candidate -----------------------+ AUTHORS | 26 + ChangeLog | 14 INSTALL | 52 +- Makefile.am | 2 NEWS | 9 README | 4 configure.ac | 4 g10/ChangeLog | 26 - g10/card-util.c | 41 - g10/keyedit.c | 95 ++-- g10/keyserver.c | 15 keyserver/ChangeLog | 5 keyserver/Makefile.am | 8 po/be.po | 832 ++++++++++++++-------------------------- po/ca.po | 986 +++++++++++++++++++++-------------------------- po/cs.po | 986 ++++++++++++++++++++++------------------------- po/da.po | 975 +++++++++++++++++++++-------------------------- po/de.po | 982 +++++++++++++++++++++-------------------------- po/el.po | 984 +++++++++++++++++++++-------------------------- po/eo.po | 988 ++++++++++++++++++++++------------------------- po/es.po | 984 +++++++++++++++++++++-------------------------- po/et.po | 984 +++++++++++++++++++++-------------------------- po/fi.po | 984 +++++++++++++++++++++-------------------------- po/fr.po | 992 ++++++++++++++++++++++------------------------- po/gl.po | 984 +++++++++++++++++++++-------------------------- po/hu.po | 984 +++++++++++++++++++++-------------------------- po/id.po | 984 +++++++++++++++++++++-------------------------- po/it.po | 984 +++++++++++++++++++++-------------------------- po/ja.po | 986 ++++++++++++++++++++++------------------------- po/pl.po | 989 ++++++++++++++++++++++------------------------- po/pt.po | 984 +++++++++++++++++++++-------------------------- po/pt_BR.po | 988 +++++++++++++++++++++-------------------------- po/ro.po | 984 +++++++++++++++++++++-------------------------- po/ru.po | 984 +++++++++++++++++++++-------------------------- po/sk.po | 984 +++++++++++++++++++++-------------------------- po/sv.po | 994 ++++++++++++++++++++++-------------------------- po/tr.po | 984 +++++++++++++++++++++-------------------------- po/zh_CN.po | 986 ++++++++++++++++++++++------------------------- po/zh_TW.po | 984 +++++++++++++++++++++-------------------------- scripts/depcomp | 75 ++- scripts/install-sh | 471 ++++++++++++---------- scripts/missing | 127 +++--- scripts/mkinstalldirs | 69 ++- 43 files changed, 12299 insertions(+), 14204 deletions(-) Index: gnupg/AUTHORS diff -u gnupg/AUTHORS:1.37 gnupg/AUTHORS:1.38 --- gnupg/AUTHORS:1.37 Wed Nov 17 17:04:21 2004 +++ gnupg/AUTHORS Tue Dec 14 08:49:26 2004 @@ -7,11 +7,14 @@ Authors ======= +Ales Nyakhaychyk Translations [be] + Birger Langkjer Translations [da] Maxim Britov Translations [ru] Daniel Resare Translations [sv] +Per Tunedal Translations [sv] David Shaw Assigns past and future changes. (all in keyserver/, @@ -25,12 +28,12 @@ Florian Weimer Assigns past and future changes (changed:g10/parse-packet.c, include/iobuf.h, util/iobuf.c) -Gaël Quéri Translations [fr] +Gaël Quéri Translations [fr] (fixed a lot of typos) Gregory Steuck Translations [ru] -Nagy Ferenc László Translations [hu] +Nagy Ferenc László Translations [hu] Ivo Timmermans Translations [nl] @@ -38,11 +41,20 @@ Janusz Aleksander Urbanowicz Translations [po] +Jedi Lin Translations [zh-tw] + +Jouni Hiltunen Translations [fi] +Tommi Vainikainen Translations [fi] + +Laurentiu Buzdugan Translations [ro] + Magda Procha'zkova' Translations [cs] Michael Roth Assigns changes. (wrote cipher/des.c., changes and bug fixes all over the place) +Michal Majer Translations [sk] + Marco d'Itri Translations [it] Matthew Skala Disclaimer @@ -65,7 +77,7 @@ Pedro Morais Translations [pt_PT] -Rémi Guyomarch Assigns past and future changes. +Rémi Guyomarch Assigns past and future changes. (g10/compress.c, g10/encr-data.c, g10/free-packet.c, g10/mdfilter.c, g10/plaintext.c, util/iobuf.c) @@ -93,8 +105,8 @@ -Other legal information -======================= +Other authors +============= This program uses the zlib compression library written by Jean-loup Gailly and Mark Adler. @@ -113,6 +125,10 @@ The RPM specs file scripts/gnupg.spec has been contributed by several people. +The files below scripts/conf-w32brg/ is a contribution to GnuPG by +Brian Gladman and not to be considered a proper part of GnuPG. + + Copyright 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.221 gnupg/ChangeLog:1.222 --- gnupg/ChangeLog:1.221 Wed Nov 17 17:04:21 2004 +++ gnupg/ChangeLog Tue Dec 14 08:49:26 2004 @@ -1,3 +1,9 @@ +2004-12-14 Werner Koch + + Released 1.3.93. + + * Makefile.am (AUTOMAKE_OPTIONS): Add filename-length-max=99. + 2004-11-06 David Shaw * configure.ac: Autodetect wldap32 on Windoze. @@ -1093,8 +1099,8 @@ Wed Jun 7 19:19:09 CEST 2000 Werner Koch - * acinclude.m4 (MKDIR_TAKES_ONE_ARG): Check some headers. By Gaël Quéri. - * configure.in (AM_INIT_AUTOMAKE): Use this now. By Gaël. + * acinclude.m4 (MKDIR_TAKES_ONE_ARG): Check some headers. By Gaël Quéri. + * configure.in (AM_INIT_AUTOMAKE): Use this now. By Gaël. Mon Jun 5 12:37:43 CEST 2000 Werner Koch @@ -1166,7 +1172,7 @@ Thu Feb 10 17:39:44 CET 2000 Werner Koch * configure.in: Use /usr/local for CFLAGS and LDFLAGS when - target is freebsd. By Rémi. + target is freebsd. By Rémi. Thu Jan 13 19:31:58 CET 2000 Werner Koch @@ -1433,7 +1439,7 @@ * config.links (m68k-atari-mint): New -Tue Jan 12 09:17:19 CET 1999 Gaël Quéri +Tue Jan 12 09:17:19 CET 1999 Gaël Quéri * all: Fixed typos all over the place Index: gnupg/INSTALL diff -u gnupg/INSTALL:1.27 gnupg/INSTALL:1.28 --- gnupg/INSTALL:1.27 Tue Dec 9 10:12:43 2003 +++ gnupg/INSTALL Tue Dec 14 08:49:26 2004 @@ -1,13 +1,16 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,9 +70,9 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -82,7 +85,7 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -99,19 +102,19 @@ Installation Names ================== - By default, `make install' will install the package's files in +By default, `make install' will install the package's files in `/usr/local/bin', `/usr/local/man', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +140,11 @@ Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -167,9 +170,9 @@ Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +181,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -192,8 +195,7 @@ `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' Index: gnupg/Makefile.am diff -u gnupg/Makefile.am:1.51 gnupg/Makefile.am:1.52 --- gnupg/Makefile.am:1.51 Fri Oct 15 11:55:39 2004 +++ gnupg/Makefile.am Tue Dec 14 08:49:26 2004 @@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4 DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support -AUTOMAKE_OPTIONS = dist-bzip2 +AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99 if CROSS_COMPILING checks = Index: gnupg/NEWS diff -u gnupg/NEWS:1.222 gnupg/NEWS:1.223 --- gnupg/NEWS:1.222 Thu Oct 28 11:50:24 2004 +++ gnupg/NEWS Tue Dec 14 08:49:26 2004 @@ -1,6 +1,10 @@ -Noteworthy changes in version 1.3.93 +Noteworthy changes in version 1.3.93 (2004-12-14) ------------------------------------------------- + * Ask the user to repeat a changed PIN. + + * Switched to automake 1.9. Minor big fixes. + Noteworthy changes in version 1.3.92 (2004-10-28) ------------------------------------------------- @@ -1675,7 +1679,8 @@ is generated on a system without a good random number generator. -Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +Copyright 1998, 1999, 2000, 2001, 2002, 2003, + 2004 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without Index: gnupg/README diff -u gnupg/README:1.90 gnupg/README:1.91 --- gnupg/README:1.90 Wed Nov 17 17:04:21 2004 +++ gnupg/README Tue Dec 14 08:49:26 2004 @@ -1,7 +1,7 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 1.3.92 + Version 1.4.0 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -761,4 +761,4 @@ and we try to answer questions when time allows us to do so. Commercial grade support for GnuPG is available; please see - the GNU service directory or search other resources. + the GNU service directory or check out http://g10code.com. Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.112 gnupg/configure.ac:1.113 --- gnupg/configure.ac:1.112 Sat Nov 6 14:18:13 2004 +++ gnupg/configure.ac Tue Dec 14 08:49:26 2004 @@ -19,14 +19,14 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.112 $)dnl +dnlAC_REVISION($Revision: 1.113 $)dnl AC_PREREQ(2.59) min_automake_version="1.7.9" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.3.93-cvs, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.3.93, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.654 gnupg/g10/ChangeLog:1.655 --- gnupg/g10/ChangeLog:1.654 Mon Dec 13 09:04:52 2004 +++ gnupg/g10/ChangeLog Tue Dec 14 08:49:26 2004 @@ -1,3 +1,11 @@ +2004-12-14 Werner Koch + + * keyserver.c (keyserver_work, keyserver_spawn): Map ldaps to ldap. + + * keyedit.c (keyedit_menu): Removed the N_() markers from the + command names. + * card-util.c (card_edit): Ditto. + 2004-12-13 Werner Koch * passphrase.c (read_passphrase_from_fd): Fixed memory leak. @@ -2999,7 +3007,7 @@ 2003-04-10 Werner Koch * passphrase.c (read_passphrase_from_fd): Do a dummy read if the - agent is to be used. Noted by Ingo Klöcker. + agent is to be used. Noted by Ingo Klöcker. (agent_get_passphrase): Inhibit caching when we have no fingerprint. This is required for key generation as well as for symmetric only encryption. @@ -3942,7 +3950,7 @@ warning. * passphrase.c (agent_get_passphrase): Fixed signed/unsigned char - problem in %-escaping. Noted by Ingo Klöcker. + problem in %-escaping. Noted by Ingo Klöcker. 2002-10-03 David Shaw @@ -8270,12 +8278,12 @@ Thu Feb 10 17:39:44 CET 2000 Werner Koch * keyedit.c (menu_expire): Fixed segv due to unitialized sub_pk. - By Rémi. + By Rémi. Thu Feb 10 11:39:41 CET 2000 Werner Koch * keylist.c (list_keyblock): Don't print warnings in the middle of - regulat output lines. By Rémi. + regulat output lines. By Rémi. * sig-check.c: Include options.h @@ -8865,7 +8873,7 @@ * g10.c (main): Fix for SHM init (Michael). * compress.c, encr-data.c, mdfilter.c, - plaintext.c, free-packet.c: Speed patches (Rémi). + plaintext.c, free-packet.c: Speed patches (Rémi). Thu May 27 09:40:55 CEST 1999 Werner Koch @@ -8890,7 +8898,7 @@ Tue May 25 19:50:32 CEST 1999 Werner Koch * sign.c (sign_file): Always use compression algo 1 for signed - onyl file becuase we can´ be sure the the verifier supports other + onyl file becuase we can´ be sure the the verifier supports other algorithms. * build-packet.c (build_sig_subpkt): Support for notation data. @@ -9080,7 +9088,7 @@ (protect_secret_key). Ditto. * misc.c (print_cipher_algo_note): Twofish is now a standard algo. - * keygen.c (do_create): Fixed spelling (Gaël Quéri) + * keygen.c (do_create): Fixed spelling (Gaël Quéri) (ask_keysize): Only allow keysizes up to 4096 * ringedit.c (add_keyblock_resource): chmod newly created secrings. @@ -9123,7 +9131,7 @@ * trustdb.c (insert_trust_record): Always use the primary key. - * encode.c (encode_simple): Added text_mode filter (Rémi Guyomarch) + * encode.c (encode_simple): Added text_mode filter (Rémi Guyomarch) (encode_crypt): Ditto. * mainproc.c (proc_pubkey_enc): Added status ENC_TO. @@ -10504,7 +10512,7 @@ Wed Apr 8 09:47:21 1998 Werner Koch (wk@isil.d.shuttle.de) - * sig-check.c (do_check): Applied small fix from Ulf Möller. + * sig-check.c (do_check): Applied small fix from Ulf Möller. Tue Apr 7 19:28:07 1998 Werner Koch (wk@isil.d.shuttle.de) Index: gnupg/g10/card-util.c diff -u gnupg/g10/card-util.c:1.23 gnupg/g10/card-util.c:1.24 --- gnupg/g10/card-util.c:1.23 Fri Dec 10 11:49:14 2004 +++ gnupg/g10/card-util.c Tue Dec 14 08:49:26 2004 @@ -1247,29 +1247,26 @@ int admin_only; const char *desc; } cmds[] = { - { N_("quit") , cmdQUIT , 0, N_("quit this menu") }, - { N_("q") , cmdQUIT , 0, NULL }, - { N_("admin") , cmdADMIN , 0, N_("show admin commands") }, - { N_("help") , cmdHELP , 0, N_("show this help") }, - { "?" , cmdHELP , 0, NULL }, - { N_("list") , cmdLIST , 0, N_("list all available data") }, - { N_("l") , cmdLIST , 0, NULL }, - { N_("debug") , cmdDEBUG , 0, NULL }, - { N_("name") , cmdNAME , 1, N_("change card holder's name") }, - { N_("url") , cmdURL , 1, N_("change URL to retrieve key") }, - { N_("fetch") , cmdFETCH , 0, - N_("fetch the key specified in the card URL") }, - { N_("login") , cmdLOGIN , 1, N_("change the login name") }, - { N_("lang") , cmdLANG , 1, N_("change the language preferences") }, - { N_("sex") , cmdSEX , 1, N_("change card holder's sex") }, - { N_("cafpr"), cmdCAFPR, 1, N_("change a CA fingerprint") }, - { N_("forcesig"), - cmdFORCESIG, 1, N_("toggle the signature force PIN flag") }, - { N_("generate"), - cmdGENERATE, 1, N_("generate new keys") }, - { N_("passwd"), cmdPASSWD, 0, N_("menu to change or unblock the PIN") }, + { "quit" , cmdQUIT , 0, N_("quit this menu")}, + { "q" , cmdQUIT , 0, NULL }, + { "admin" , cmdADMIN , 0, N_("show admin commands")}, + { "help" , cmdHELP , 0, N_("show this help")}, + { "?" , cmdHELP , 0, NULL }, + { "list" , cmdLIST , 0, N_("list all available data")}, + { "l" , cmdLIST , 0, NULL }, + { "debug" , cmdDEBUG , 0, NULL }, + { "name" , cmdNAME , 1, N_("change card holder's name")}, + { "url" , cmdURL , 1, N_("change URL to retrieve key")}, + { "fetch" , cmdFETCH , 0, N_("fetch the key specified in the card URL")}, + { "login" , cmdLOGIN , 1, N_("change the login name")}, + { "lang" , cmdLANG , 1, N_("change the language preferences")}, + { "sex" , cmdSEX , 1, N_("change card holder's sex")}, + { "cafpr" , cmdCAFPR , 1, N_("change a CA fingerprint")}, + { "forcesig", cmdFORCESIG, 1, N_("toggle the signature force PIN flag")}, + { "generate", cmdGENERATE, 1, N_("generate new keys")}, + { "passwd" , cmdPASSWD, 0, N_("menu to change or unblock the PIN")}, /* Note, that we do not announce this command yet. */ - { N_("privatedo"), cmdPRIVATEDO, 0, NULL }, + { "privatedo", cmdPRIVATEDO, 0, NULL }, { NULL, cmdINVCMD, 0, NULL } }; Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.157 gnupg/g10/keyedit.c:1.158 --- gnupg/g10/keyedit.c:1.157 Wed Nov 24 06:25:03 2004 +++ gnupg/g10/keyedit.c Tue Dec 14 08:49:26 2004 @@ -1242,56 +1242,57 @@ int not_with_sk; /* but 2 == must use SK */ const char *desc; } cmds[] = { - { N_("quit") , cmdQUIT , 0,0, N_("quit this menu") }, - { N_("q") , cmdQUIT , 0,0, NULL }, - { N_("save") , cmdSAVE , 0,0, N_("save and quit") }, - { N_("help") , cmdHELP , 0,0, N_("show this help") }, - { "?" , cmdHELP , 0,0, NULL }, - { N_("fpr") , cmdFPR , 0,0, N_("show fingerprint") }, - { N_("list") , cmdLIST , 0,0, N_("list key and user IDs") }, - { N_("l") , cmdLIST , 0,0, NULL }, - { N_("uid") , cmdSELUID , 0,0, N_("select user ID N") }, - { N_("key") , cmdSELKEY , 0,0, N_("select secondary key N") }, - { N_("check") , cmdCHECK , 0,0, N_("list signatures") }, - { N_("c") , cmdCHECK , 0,0, NULL }, - { N_("sign") , cmdSIGN , 0,1, N_("sign the key") }, - { N_("s") , cmdSIGN , 0,1, NULL }, - { N_("tsign") , cmdTSIGN , 0,1, N_("make a trust signature")}, - { N_("lsign") , cmdLSIGN , 0,1, N_("sign the key locally") }, - { N_("nrsign") , cmdNRSIGN , 0,1, N_("sign the key non-revocably") }, - { N_("nrlsign") , cmdNRLSIGN , 0,1, N_("sign the key locally and non-revocably") }, - { N_("debug") , cmdDEBUG , 0,0, NULL }, - { N_("adduid") , cmdADDUID , 1,1, N_("add a user ID") }, - { N_("addphoto"), cmdADDPHOTO , 1,1, N_("add a photo ID") }, - { N_("deluid") , cmdDELUID , 0,1, N_("delete user ID") }, + { "quit" , cmdQUIT , 0,0, N_("quit this menu") }, + { "q" , cmdQUIT , 0,0, NULL }, + { "save" , cmdSAVE , 0,0, N_("save and quit") }, + { "help" , cmdHELP , 0,0, N_("show this help") }, + { "?" , cmdHELP , 0,0, NULL }, + { "fpr" , cmdFPR , 0,0, N_("show fingerprint") }, + { "list" , cmdLIST , 0,0, N_("list key and user IDs") }, + { "l" , cmdLIST , 0,0, NULL }, + { "uid" , cmdSELUID , 0,0, N_("select user ID N") }, + { "key" , cmdSELKEY , 0,0, N_("select secondary key N") }, + { "check" , cmdCHECK , 0,0, N_("list signatures") }, + { "c" , cmdCHECK , 0,0, NULL }, + { "sign" , cmdSIGN , 0,1, N_("sign the key") }, + { "s" , cmdSIGN , 0,1, NULL }, + { "tsign" , cmdTSIGN , 0,1, N_("make a trust signature")}, + { "lsign" , cmdLSIGN , 0,1, N_("sign the key locally") }, + { "nrsign" , cmdNRSIGN , 0,1, N_("sign the key non-revocably") }, + { "nrlsign" , cmdNRLSIGN , 0,1, N_("sign the key locally " + "and non-revocably") }, + { "debug" , cmdDEBUG , 0,0, NULL }, + { "adduid" , cmdADDUID , 1,1, N_("add a user ID") }, + { "addphoto" , cmdADDPHOTO , 1,1, N_("add a photo ID") }, + { "deluid" , cmdDELUID , 0,1, N_("delete user ID") }, /* delphoto is really deluid in disguise */ - { N_("delphoto"), cmdDELUID , 0,1, NULL }, - { N_("addkey") , cmdADDKEY , 1,1, N_("add a secondary key") }, + { "delphoto" , cmdDELUID , 0,1, NULL }, + { "addkey" , cmdADDKEY , 1,1, N_("add a secondary key") }, #ifdef ENABLE_CARD_SUPPORT - { N_("addcardkey"), cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") }, - { N_("keytocard"), cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")}, + { "addcardkey", cmdADDCARDKEY , 1,1, N_("add a key to a smartcard") }, + { "keytocard", cmdKEYTOCARD , 1,2, N_("move a key to a smartcard")}, #endif /*ENABLE_CARD_SUPPORT*/ - { N_("delkey") , cmdDELKEY , 0,1, N_("delete a secondary key") }, - { N_("addrevoker"),cmdADDREVOKER,1,1, N_("add a revocation key") }, - { N_("delsig") , cmdDELSIG , 0,1, N_("delete signatures") }, - { N_("expire") , cmdEXPIRE , 1,1, N_("change the expire date") }, - { N_("primary") , cmdPRIMARY , 1,1, N_("flag user ID as primary")}, - { N_("toggle") , cmdTOGGLE , 1,0, N_("toggle between secret " - "and public key listing") }, - { N_("t" ) , cmdTOGGLE , 1,0, NULL }, - { N_("pref") , cmdPREF , 0,1, N_("list preferences (expert)")}, - { N_("showpref"), cmdSHOWPREF , 0,1, N_("list preferences (verbose)") }, - { N_("setpref") , cmdSETPREF , 1,1, N_("set preference list") }, - { N_("updpref") , cmdUPDPREF , 1,1, N_("updated preferences") }, - { N_("keyserver"),cmdPREFKS , 1,1, N_("set preferred keyserver URL")}, - { N_("passwd") , cmdPASSWD , 1,1, N_("change the passphrase") }, - { N_("trust") , cmdTRUST , 0,1, N_("change the ownertrust") }, - { N_("revsig") , cmdREVSIG , 0,1, N_("revoke signatures") }, - { N_("revuid") , cmdREVUID , 1,1, N_("revoke a user ID") }, - { N_("revkey") , cmdREVKEY , 1,1, N_("revoke a secondary key") }, - { N_("disable") , cmdDISABLEKEY, 0,1, N_("disable a key") }, - { N_("enable") , cmdENABLEKEY , 0,1, N_("enable a key") }, - { N_("showphoto"),cmdSHOWPHOTO , 0,0, N_("show photo ID") }, + { "delkey" , cmdDELKEY , 0,1, N_("delete a secondary key") }, + { "addrevoker",cmdADDREVOKER,1,1, N_("add a revocation key") }, + { "delsig" , cmdDELSIG , 0,1, N_("delete signatures") }, + { "expire" , cmdEXPIRE , 1,1, N_("change the expire date") }, + { "primary" , cmdPRIMARY , 1,1, N_("flag user ID as primary")}, + { "toggle" , cmdTOGGLE , 1,0, N_("toggle between secret " + "and public key listing") }, + { "t" , cmdTOGGLE , 1,0, NULL }, + { "pref" , cmdPREF , 0,1, N_("list preferences (expert)")}, + { "showpref" , cmdSHOWPREF , 0,1, N_("list preferences (verbose)") }, + { "setpref" , cmdSETPREF , 1,1, N_("set preference list") }, + { "updpref" , cmdUPDPREF , 1,1, N_("updated preferences") }, + { "keyserver",cmdPREFKS , 1,1, N_("set preferred keyserver URL")}, + { "passwd" , cmdPASSWD , 1,1, N_("change the passphrase") }, + { "trust" , cmdTRUST , 0,1, N_("change the ownertrust") }, + { "revsig" , cmdREVSIG , 0,1, N_("revoke signatures") }, + { "revuid" , cmdREVUID , 1,1, N_("revoke a user ID") }, + { "revkey" , cmdREVKEY , 1,1, N_("revoke a secondary key") }, + { "disable" , cmdDISABLEKEY, 0,1, N_("disable a key") }, + { "enable" , cmdENABLEKEY , 0,1, N_("enable a key") }, + { "showphoto",cmdSHOWPHOTO , 0,0, N_("show photo ID") }, { NULL, cmdNONE, 0, 0, NULL } }; enum cmdids cmd = 0; int rc = 0; Index: gnupg/g10/keyserver.c diff -u gnupg/g10/keyserver.c:1.72 gnupg/g10/keyserver.c:1.73 --- gnupg/g10/keyserver.c:1.72 Sun Dec 12 06:10:22 2004 +++ gnupg/g10/keyserver.c Tue Dec 14 08:49:26 2004 @@ -789,10 +789,15 @@ #endif /* Build the filename for the helper to execute */ + /* Note that we don't use a symlink for "ldaps" anymore because this + won't work under MS Windows. */ command=m_alloc(strlen("gpgkeys_")+strlen(keyserver->scheme)+1); - strcpy(command,"gpgkeys_"); - strcat(command,keyserver->scheme); - + strcpy(command,"gpgkeys_"); + if (!strcmp (keyserver->scheme, "ldaps")) + strcat(command, "ldap"); + else + strcat(command,keyserver->scheme); + if(opt.keyserver_options.options&KEYSERVER_USE_TEMP_FILES) { if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES) @@ -1247,7 +1252,9 @@ case KEYSERVER_VERSION_ERROR: log_error(_("gpgkeys_%s does not support handler version %d\n"), - keyserver->scheme,KEYSERVER_PROTO_VERSION); + !strcmp (keyserver->scheme,"ldaps")? + "ldap": keyserver->scheme, + KEYSERVER_PROTO_VERSION); break; case KEYSERVER_TIMEOUT: Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.92 gnupg/keyserver/ChangeLog:1.93 --- gnupg/keyserver/ChangeLog:1.92 Fri Dec 3 20:12:38 2004 +++ gnupg/keyserver/ChangeLog Tue Dec 14 08:49:26 2004 @@ -1,3 +1,8 @@ +2004-12-14 Werner Koch + + * Makefile.am (install-exec-hook, uninstall-hook): Removed. For + Windows reasons we can't use the symlink trick. + 2004-12-03 David Shaw * Makefile.am: The harmless "ignored error" on gpgkeys_ldap Index: gnupg/keyserver/Makefile.am diff -u gnupg/keyserver/Makefile.am:1.20 gnupg/keyserver/Makefile.am:1.21 --- gnupg/keyserver/Makefile.am:1.20 Fri Dec 3 20:12:38 2004 +++ gnupg/keyserver/Makefile.am Tue Dec 14 08:49:26 2004 @@ -39,12 +39,4 @@ gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ -install-exec-hook: -if GPGKEYS_LDAP - (cd $(libexecdir) && $(LN_S) -f gpgkeys_ldap$(EXEEXT) gpgkeys_ldaps$(EXEEXT)) -endif -uninstall-hook: -if GPGKEYS_LDAP - rm -f $(libexecdir)/gpgkeys_ldaps$(EXEEXT) -endif Index: gnupg/po/be.po diff -u gnupg/po/be.po:1.8 gnupg/po/be.po:1.9 --- gnupg/po/be.po:1.8 Fri Dec 10 23:21:02 2004 +++ gnupg/po/be.po Tue Dec 14 08:49:26 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -31,7 +31,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -338,7 +338,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "" @@ -541,160 +541,87 @@ msgid "secret key already stored on a card\n" msgstr "" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quit [выйÑьці]" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "даведка (help)" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "паказаць гÑтую даведку" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Даведка адÑутнічае" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "" - -#: g10/card-util.c:1258 -msgid "name" -msgstr "" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -msgid "login" -msgstr "" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 msgid "change the login name" msgstr "" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "за шмат пераваг Ð´Ð»Ñ \"%c\"\n" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -msgid "cafpr" -msgstr "" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "паказаць ключы й адбіткі пальцаў" -#: g10/card-util.c:1266 -msgid "forcesig" -msgstr "" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "Ð°Ð³ÑƒÐ»ÑŒÐ½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "Ñтварыць новую пару ключоў" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Загад> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "ÐерÑчаіÑны загад (паÑпрабуйце \"help\")\n" @@ -738,7 +665,7 @@ msgid "PIN not correctly repeated; try again" msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -748,13 +675,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1201,7 +1128,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "" @@ -1209,7 +1136,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "" @@ -1313,7 +1240,7 @@ msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" @@ -1323,352 +1250,352 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 msgid "could not parse keyserver URL\n" msgstr "" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s не дазвалÑецца разам з %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2717 +#: g10/g10.c:2715 msgid "selected compression algorithm is invalid\n" msgstr "" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2742 +#: g10/g10.c:2740 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [назва_файла]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [назва_файла]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [назва_файла]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [назва_файла]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [назва_файла]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [назва_файла]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [назва_файла]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [загады]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[назва_файла]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "" -#: g10/g10.c:3944 +#: g10/g10.c:3942 msgid "the given preferred keyserver URL is invalid\n" msgstr "" @@ -2426,12 +2353,12 @@ msgstr "" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr "" @@ -2594,7 +2521,7 @@ msgid "Really sign? (y/N) " msgstr "" -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2644,18 +2571,10 @@ msgstr "" #: g10/keyedit.c:1247 -msgid "save" -msgstr "" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "" @@ -2664,708 +2583,564 @@ msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "" #: g10/keyedit.c:1254 -msgid "key" -msgstr "" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "" #: g10/keyedit.c:1255 -msgid "check" -msgstr "" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "" - -#: g10/keyedit.c:1259 -msgid "tsign" -msgstr "" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "зрабіць адчÑплены подпіÑ" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "" - -#: g10/keyedit.c:1264 -msgid "add a user ID" -msgstr "" - -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "" - #: g10/keyedit.c:1265 -msgid "add a photo ID" +msgid "add a user ID" msgstr "" #: g10/keyedit.c:1266 -msgid "deluid" +msgid "add a photo ID" msgstr "" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "" -#: g10/keyedit.c:1271 -msgid "addcardkey" -msgstr "" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "" - -#: g10/keyedit.c:1274 -msgid "delete a secondary key" -msgstr "" - -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "" - #: g10/keyedit.c:1275 -msgid "add a revocation key" -msgstr "" - -#: g10/keyedit.c:1276 -msgid "delsig" +msgid "delete a secondary key" msgstr "" #: g10/keyedit.c:1276 -msgid "delete signatures" -msgstr "" - -#: g10/keyedit.c:1277 -msgid "expire" +msgid "add a revocation key" msgstr "" #: g10/keyedit.c:1277 -msgid "change the expire date" -msgstr "" - -#: g10/keyedit.c:1278 -msgid "primary" +msgid "delete signatures" msgstr "" #: g10/keyedit.c:1278 -msgid "flag user ID as primary" +msgid "change the expire date" msgstr "" #: g10/keyedit.c:1279 -msgid "toggle" +msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "" - -#: g10/keyedit.c:1282 -msgid "list preferences (expert)" -msgstr "" - -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "" - #: g10/keyedit.c:1283 -msgid "list preferences (verbose)" -msgstr "" - -#: g10/keyedit.c:1284 -msgid "setpref" +msgid "list preferences (expert)" msgstr "" #: g10/keyedit.c:1284 -msgid "set preference list" -msgstr "" - -#: g10/keyedit.c:1285 -msgid "updpref" +msgid "list preferences (verbose)" msgstr "" #: g10/keyedit.c:1285 -msgid "updated preferences" -msgstr "" - -#: g10/keyedit.c:1286 -msgid "keyserver" +msgid "set preference list" msgstr "" #: g10/keyedit.c:1286 -msgid "set preferred keyserver URL" +msgid "updated preferences" msgstr "" #: g10/keyedit.c:1287 -msgid "change the passphrase" -msgstr "" - -#: g10/keyedit.c:1288 -msgid "trust" +msgid "set preferred keyserver URL" msgstr "" #: g10/keyedit.c:1288 -msgid "change the ownertrust" -msgstr "" - -#: g10/keyedit.c:1289 -msgid "revsig" +msgid "change the passphrase" msgstr "" #: g10/keyedit.c:1289 -msgid "revoke signatures" +msgid "change the ownertrust" msgstr "" #: g10/keyedit.c:1290 -msgid "revuid" +msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 #, fuzzy msgid "revoke a user ID" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "" - -#: g10/keyedit.c:1291 -msgid "revoke a secondary key" -msgstr "" - #: g10/keyedit.c:1292 -msgid "disable" -msgstr "" - -#: g10/keyedit.c:1292 -msgid "disable a key" -msgstr "" - -#: g10/keyedit.c:1293 -msgid "enable" +msgid "revoke a secondary key" msgstr "" #: g10/keyedit.c:1293 -msgid "enable a key" +msgid "disable a key" msgstr "" #: g10/keyedit.c:1294 -msgid "showphoto" +msgid "enable a key" msgstr "" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "ДаÑтупны ÑакрÑтны ключ.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 msgid "Really sign all user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 msgid "Really remove all selected user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 msgid "Really remove this user ID? (y/N) " msgstr "" -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 msgid "Really move the primary key? (y/N) " msgstr "" -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 msgid "You must select exactly one key.\n" msgstr "" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 msgid "Do you really want to delete this key? (y/N) " msgstr "" -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 msgid "Really revoke all selected user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "" -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 msgid "Do you really want to revoke this key? (y/N) " msgstr "" -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 msgid "Set preference list to:\n" msgstr "" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 msgid "Really update the preferences? (y/N) " msgstr "" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Захаваць зьмены? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "ВыйÑьці не захаваўшы зьмены? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "" -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, c-format msgid "This key may be revoked by %s key %s" msgstr "" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, c-format msgid "trust: %s" msgstr "" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 msgid "revoked" msgstr "" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 msgid "expired" msgstr "" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "" -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "" -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 msgid "this key has already been designated as a revoker\n" msgstr "" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 msgid "Are you sure you want to replace it? (y/N) " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 msgid "Are you sure you want to delete it? (y/N) " msgstr "" -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 msgid " (non-revocable)" msgstr "" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, c-format msgid "revoked by your key %s on %s\n" msgstr "" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3665,7 +3440,7 @@ "\n" msgstr "" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "" @@ -3911,7 +3686,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" @@ -3926,104 +3701,104 @@ msgid "key not found on keyserver\n" msgstr "ÑкÑпартаваць ключы на паÑлужнік ключоў" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "імпартаваць ключы з паÑлужніка ключоў" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, c-format msgid "requesting key %s from %s\n" msgstr "" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "Ð°Ð³ÑƒÐ»ÑŒÐ½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, c-format msgid "refreshing 1 key from %s\n" msgstr "" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, c-format msgid "refreshing %d keys from %s\n" msgstr "" @@ -4202,7 +3977,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 #, fuzzy msgid "unknown" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" @@ -4373,50 +4148,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, c-format msgid " (main key ID %s)" msgstr "" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4427,40 +4202,40 @@ "\"%.*s\"\n" "%u-бітавы %s ключ, ID %08lX, Ñтвораны %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Паўтарыце пароль\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "УвÑдзіце пароль\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "пароль занадта доўгі\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "ÑкаÑавана карыÑтальнікам\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 msgid "can't query passphrase in batch mode\n" msgstr "" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "УвÑдзіце пароль: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4470,17 +4245,17 @@ "Вам неабходна ўвеÑьці пароль, каб адчыніць ÑакрÑтны ключ длÑ\n" "карыÑтальніка: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-бітавы %s ключ, ID %08lX, Ñтвораны %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Паўтарыце пароль: " @@ -5298,12 +5073,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "" @@ -5362,7 +5137,7 @@ msgid "[ revoked]" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "збой падпіÑаньнÑ: %s\n" @@ -5372,100 +5147,100 @@ msgid "[ unknown]" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5734,6 +5509,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quit [выйÑьці]" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -5771,6 +5550,13 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "" +#~ msgid "help" +#~ msgstr "даведка (help)" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "Ð°Ð³ÑƒÐ»ÑŒÐ½Ð°Ñ Ð¿Ð°Ð¼Ñ‹Ð»ÐºÐ°" + #, fuzzy #~ msgid "writing to file `%s'\n" #~ msgstr "Ð·Ð°Ð¿Ñ–Ñ Ñƒ stdout\n" Index: gnupg/po/ca.po diff -u gnupg/po/ca.po:1.10 gnupg/po/ca.po:1.11 --- gnupg/po/ca.po:1.10 Fri Dec 10 23:21:01 2004 +++ gnupg/po/ca.po Tue Dec 14 08:49:26 2004 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.4rc\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2003-12-05 19:15+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -51,7 +51,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -383,7 +383,7 @@ # Dest�s? ivb # Desat�s, s�. jm -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -599,167 +599,90 @@ msgid "secret key already stored on a card\n" msgstr "es descarta: la clau secreta ja �s present\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "ix" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ix del men�" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "les ordres entren en conflicte\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "ajuda" - # �pantalla� o �ajuda�? ivb # �ajuda�, evidentment. jm #: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra aquesta ajuda" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "llista" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "La clau �s disponible en: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "depura" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "canvia la data de caducitat" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "canvia la confian�a" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra empremta" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "error general" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "genera un nou parell de claus" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Ordre> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "les ordres entren en conflicte\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "les ordres entren en conflicte\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "s'est� escrivint la clau secreta a �%s�\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "L'ordre no �s v�lida (proveu �help�)\n" @@ -807,7 +730,7 @@ msgid "PIN not correctly repeated; try again" msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -817,13 +740,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona per a aquesta ordre\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "no s'ha trobat la clau �%s�: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1306,7 +1229,7 @@ msgid "Pubkey: " msgstr "Clau p�blica: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Xifratge: " @@ -1314,7 +1237,7 @@ msgid "Hash: " msgstr "Dispersi�: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Compressi�: " @@ -1427,7 +1350,7 @@ msgid "reading options from `%s'\n" msgstr "s'estan llegint opcions de �%s�\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s no �s per a �s normal!\n" @@ -1439,343 +1362,343 @@ "la extensi� de xifrat �%s� no s'ha carregat per tindre permissos " "insegurs\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s no �s un joc de car�cters v�lid\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "" "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcions d'importanci� no v�lides\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "opcions d'importaci� no v�lides\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcions d'importanci� no v�lides\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "opcions d'importaci� no v�lides\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "no s'ha pogut fixar l'exec-path a %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "AV�S: el programa podria crear un fitxer core!\n" # FIXME: prefer�ncia? jm # Ho discut�rem en la llista, segur. Deu ser als arxius. ivb -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AV�S: %s t� prefer�ncia sobre %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s no �s perm�s amb %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s no t� sentit amb %s!\n" # clares -> en clar? ivb -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 " "habilitat.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no �s v�lid\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "l'algorisme de resum seleccionat no �s v�lid\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no �s v�lid\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ha de ser major que 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ha de ser major que 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "les prefer�ncies per defecte s�n inv�lides\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "les prefer�ncies personals de digest s�n inv�lides\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s encara no funciona amb %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [nom_del_fitxer]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [nom_del_fitxer]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "ha fallat el desxifratge: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [nom_del_fitxer]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [nom_del_fitxer]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom_del_fitxer]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [nom_del_fitxer]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [nom_del_fitxer]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [ordres]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [anell]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'enviament al servidor de claus ha fallat: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la recepci� des del servidor de claus ha fallat: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "l'exportaci� de la clau ha fallat: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "ha fallat la cerca al servidor de claus: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "ha fallat el refresc des del servidor de claus: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "no s'ha pogut llevar l'armadura: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "no s'ha pogut crear l'armadura: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nom_del_fitxer]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Endavant, escriviu el missatge...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1783,23 +1706,23 @@ "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i " "acabar amb el signe �=�\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" @@ -2706,14 +2629,14 @@ msgstr "L'ID d'usuari �%s� est� revocat." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Segur que encara voleu signarla? (s/N) " # O no s'ha pogut? ivb # FIXME: comprovar context. jm #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " No es pot signar.\n" @@ -2916,7 +2839,7 @@ msgid "Really sign? (y/N) " msgstr "Signar realment? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2970,18 +2893,10 @@ msgstr "s'est� posant la signatura al lloc correcte\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "desa" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "desa i ix" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "mostra empremta" @@ -2989,10 +2904,6 @@ msgid "list key and user IDs" msgstr "llista claus i ID" -#: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb # Yeah, els vaig corregir abans de que enviares la teua correcci�. jm #: g10/keyedit.c:1253 @@ -3000,507 +2911,363 @@ msgstr "tria l'ID d'usuari N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "clau" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "tria la clau secund�ria N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "comprova" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "llista les signatures" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "signa la clau" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "crea una signatura separada" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "signa la clau localment" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "signa la clau irrevocablement" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "signa la clau localment i irrevocablement" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "afegeix un ID d'usuari" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - # Com estava escrit abans. ivb # Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot # el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids # i no hem unificat en catal�. Potser li ho dir� a Werner. jm. -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "afegeix un photo ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "esborra un ID d'usuari" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "afegeix una clau secund�ria" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "esborra una clau secund�ria" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "afegeix una clau de revocaci�" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "esborra signatures" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "canvia la data de caducitat" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primari" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "marca l'ID d'usuari com a primari" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "canvia entre el llistat de claus secretes i p�bliques" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "llista les prefer�ncies (expert)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "llista les prefer�ncies (detallat)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "estableix la llista de prefer�ncies" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "prefer�ncies actualitzades" -# �del servidor�, �en el servidor�? ivb -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "error de servidor de claus" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "" "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "canvia la contrasenya" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "canvia la confian�a" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revoca signatures" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "revoca un ID d'usuari" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revoca una clau secund�ria" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "desactiva una clau" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "activa una clau" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - # Igual que dalt. ivb # Idem :) jm -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "mostra el photo ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "error en llegir el bloc de claus secretes �%s�: %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "La clau secreta est� disponible.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Cal la clau secreta per a fer a��.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Useu l'ordre �toggle� abans.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "La clau est� revocada." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Realment voleu signar tots els ID d'usuari? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Pista: Trieu els ID d'usuari que voleu signar\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Heu de seleccionar al menys un ID d'usuari.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "No podeu esborrar l'�ltim ID d'usuari!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Heu de seleccionar, si m�s no, una clau.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Heu de seleccionar, si m�s no, una clau.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Realment voleu eliminar les claus seleccionades? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Realment voleu eliminar aquesta clau? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Realment voleu revocar les claus seleccionades? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Realment voleu revocar aquesta clau? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "estableix la llista de prefer�ncies" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?" -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Realment voleu actualitzar les prefer�ncies? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Voleu desar els canvis? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Voleu eixir sense desar? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "ha fallat l'actualitzaci�: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Resum: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Funcionalitats: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" # Potser %s haja d'anar darrere de �clau�. ivb # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Aquesta clau pot ser revocada per la clau %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "no s'ha pogut creat %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " confian�a: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " confian�a: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Aquesta clau ha estat desactivada" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3509,19 +3276,19 @@ "necess�riament\n" "correcta a no ser que torneu a executar el programa.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[revocada]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3531,7 +3298,7 @@ "assumida.\n" # Photo ID com abans. ivb -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3540,49 +3307,49 @@ "AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que " "algunes versions de PGP rebutgen aquesta clau.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Esteu segur que encara voleu afegir-lo? (s/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n" # Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)? ivb # Hmm. S�... (s/N/x) jm -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "S'ha esborrat %d signatura.\n" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "S'han esborrat %d signatures.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "No s'hi ha eliminat res.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3592,168 +3359,168 @@ "pot\n" "fer que algunes versions de PGP rebutjen aquesta clau.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Introdu�u l'ID d'usuari del revocador designat: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no podeu nominar una clau com el seu propi revocador designat\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AV�S: no es pot desfer la nominaci� d'una clau com a revocador " "designat!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Per favor, elimineu les seleccions de les claus secretes.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "No podeu canviar la data de caducitat de les claus v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "No hi ha cap signatura corresponent en l'anell secret\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Heu de seleccionar exactament un ID.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "No hi ha cap ID amb l'�ndex %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID d'usuari: �" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " signat per %08lX el %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (no-exportable)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Aquesta signatura va caducar el %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Esteu segur de que encara voleu revocarla? (s/N) " # (s/N) ivb # S! jm -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" "Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Heu signat els seg�ents ID d'usuari:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (no-exportable)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocat per %08lX el %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Esteu a punt de revocar aquestes signatures:\n" # (s/N)? ivb -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Realment voleu crear els certificats de revocaci�? (s/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "ho hi ha clau secreta\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'ID d'usuari �%s� ja est� revocat\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -4087,7 +3854,7 @@ "Cal una contrasenya per a protegir la clau secreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4361,7 +4128,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opcions d'exportaci� no v�lides\n" @@ -4376,108 +4143,108 @@ msgid "key not found on keyserver\n" msgstr "no s'ha trobat la clau �%s�: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "s'est� sol�licitant la clau %08lX de %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "s'est� sol�licitant la clau %08lX de %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "s'est� cercant �%s� al servidor HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "�\n" "signat amb la vostra clau %08lX el %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "s'est� cercant �%s� al servidor HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "s'est� cercant �%s� al servidor HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "no es coneix cap servidor de claus (useu l'opci� \"--keyserver\")\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" # �del servidor�, �en el servidor�? ivb -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "error de servidor de claus" # �del servidor�, �en el servidor�? ivb -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "error de servidor de claus" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "la recepci� des del servidor de claus ha fallat: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: no �s un ID v�lid\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) �%s�: %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "s'est� sol�licitant la clau %08lX de %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "s'est� sol�licitant la clau %08lX de %s\n" @@ -4663,7 +4430,7 @@ msgid "textmode" msgstr "mode text" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "desconeguda" @@ -4851,46 +4618,46 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent no est� disponible en aquesta sessi�\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "no es pot establir el pid del client per l'agent\n" # llija/llegisca/llegesca. ivb -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versi� %d del protocol de gpg-agent no est� suportada\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no s'ha pogut connectar amb �%s�: %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID de la clau principal %08lX)" @@ -4906,7 +4673,7 @@ # Se't passava l'argument �*�. printf(3), hieroglyph(7). ivb # Ah! Prova-ho, no casque alguna cosa :P ivb # Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4917,41 +4684,41 @@ "�%2$.*1$s�\n" "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Repetiu la contrasenya\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Introdu�u la contrasenya\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "la contrasenya �s massa llarga\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "la resposta de l'agent �s inv�lida\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "s'ha cancel�lat per l'usuari\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "no es pot demanar la contrasenya en mode desat�s\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Introdu�u la contrasenya: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4961,17 +4728,17 @@ "Necessiteu la contrasenya per desblocar la clau secreta de\n" "l'usuari: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Repetiu la contrasenya: " @@ -5886,12 +5653,12 @@ "la base de dades de confian�a est� corrompuda; per favor, executeu " "�gpg --fix-trustdb�.\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "no es poden tractar l�nies m�s llargues de %d car�cters\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "la l�nia d'entrada �s superior a %d car�cters\n" @@ -5952,7 +5719,7 @@ msgid "[ revoked]" msgstr "[revocada]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[caducada]" @@ -5962,109 +5729,109 @@ msgid "[ unknown]" msgstr "desconeguda" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "" "la pr?xima comprovaci� de la base de dades de confian�a ser� el %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "no s'ha trobat la clau p�blica %08lX: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "si us plau, feu un --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "s'est� comprovant la base de dades de confian�a\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "no s'han trobat claus amb confian�a absoluta\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n" @@ -6356,6 +6123,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "ix" + # �xX�? ivb #: util/miscutil.c:351 msgid "qQ" @@ -6397,6 +6168,159 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "ajuda" + +#~ msgid "list" +#~ msgstr "llista" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "depura" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "error general" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "desa" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "clau" + +#~ msgid "check" +#~ msgstr "comprova" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primari" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +# �del servidor�, �en el servidor�? ivb +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "error de servidor de claus" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "" #~ "l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n" Index: gnupg/po/cs.po diff -u gnupg/po/cs.po:1.13 gnupg/po/cs.po:1.14 --- gnupg/po/cs.po:1.13 Fri Dec 10 23:21:01 2004 +++ gnupg/po/cs.po Tue Dec 14 08:49:27 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -29,7 +29,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "Nalezena OpenPGP karta èíslo %s\n" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "nelze provést v dávkovém módu\n" @@ -545,151 +545,79 @@ msgid "secret key already stored on a card\n" msgstr "tajný klíè je na kartì ulo¾en\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "ukonèit" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ukonèit toto menu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "u" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "admin" - #: g10/card-util.c:1252 msgid "show admin commands" msgstr "zobraz administrátorské pøíkazy" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "ukázat tuto pomoc" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 msgid "list all available data" msgstr "vypi¹ v¹echna dostupná data" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -msgid "name" -msgstr "jméno" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "zmìní jméno majitele karty" #: g10/card-util.c:1259 -msgid "url" -msgstr "url" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "zmìní URL pro záskání klíèe" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "fetch" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "získá klíè specifikovaný v URL karty" -#: g10/card-util.c:1262 -msgid "login" -msgstr "login" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 msgid "change the login name" msgstr "zmìnit login name" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "lang" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 msgid "change the language preferences" msgstr "zmìnit jazykové pøedvolby" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "sex" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "zmìní pohlaví dr¾itele karty" -#: g10/card-util.c:1265 -msgid "cafpr" -msgstr "cafpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 msgid "change a CA fingerprint" msgstr "vypsat fingerprint certifikaèní autority" -#: g10/card-util.c:1266 -msgid "forcesig" -msgstr "forcesig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "zapnout/vypnout po¾adování PINu pøi ka¾dé self-sign operaci" -#: g10/card-util.c:1268 -msgid "generate" -msgstr "generate" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 msgid "generate new keys" msgstr "vytvoøit nový pár klíèù" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "nabídka pro zmìnu anebo odblokování PINu" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Pøíkaz> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 msgid "Admin-only command\n" msgstr "pouze administrátorské pøíkazy\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 msgid "Admin commands are allowed\n" msgstr "administrátorské pøíkazy jsou povoleny\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 msgid "Admin commands are not allowed\n" msgstr "administrátorské pøíkazy nejsou povoleny\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný pøíkaz (zkuste \"help\")\n" @@ -740,7 +668,7 @@ msgid "PIN not correctly repeated; try again" msgstr "heslo není zopakováno správnì; zkuste to znovu" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -750,13 +678,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output pro tento pøíkaz není platný\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "klíè \"%s\" nenalezen: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1213,7 +1141,7 @@ msgid "Pubkey: " msgstr "Veøejný klíè: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "©ifra: " @@ -1221,7 +1149,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Komprese: " @@ -1344,7 +1272,7 @@ msgid "reading options from `%s'\n" msgstr "ètu mo¾nosti z `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s není pro normální pou¾ití!\n" @@ -1356,332 +1284,332 @@ "¹ifra `%s' nebyla nahrána, proto¾e pøístupová práva nejsou nastavena " "bezpeènì\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' není platná znaková sada\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 msgid "could not parse keyserver URL\n" msgstr "nelze zpracovat URL serveru klíèù\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: neplatný parametr pro server klíèù\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 msgid "invalid keyserver options\n" msgstr "neplatný parametr pro server klíèù\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parametr pro import\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "neplatný parametr pro import\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parametr pro export\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "neplatný parametr pro export\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: neplatný parametr pro výpis\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 msgid "invalid list options\n" msgstr "neplatný parametr pro výpis\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: neplatný parametr pro ovìøení\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 msgid "invalid verify options\n" msgstr "neplatný parametr pro ovìøení\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nelze nastavit exec-path na %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVÁNÍ: %s pøepí¹e %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "Není dovoleno pou¾ívat %s s %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedává s %s smysl!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v módu --pgp2 mù¾ete vytváøet pouze oddìlené podpisy nebo podpisy èitelné " "jako text\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v módu --pgp2 nelze souèasnì ¹ifrovat a podepisovat\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v módu --pgp2 musíte pou¾ít soubor (ne rouru).\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrování zpráv v módu --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 msgid "selected compression algorithm is invalid\n" msgstr "vybraný komprimovací algoritmus je neplatný\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "polo¾ka max-cert-depth musí být v rozmezí od 1 do 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "neplatná implicitní úroveò certifikace (default-cert-level); musí být 0, 1, " "2 nebo 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "neplatná minimální úroveò certifikace (min-cert-level); musí být 0, 1, 2 " "nebo 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dùraznì nedoporuèován\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "neplatné defaultní pøedvolby\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro ¹ifrování\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro hashování\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro komprimaci\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s dosud není funkèní s %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "pou¾ití ¹ifrovacího algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "pou¾ití hashovacího algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pou¾ití komprimaèního algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemohu inicializovat databázi dùvìry: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVÁNÍ: specifikován adresát (-r) bez pou¾ití ¹ifrování s veøejným klíèem\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [jméno souboru]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [jméno souboru]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symetrické ¹ifrování `%s' se nepovedlo: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [jméno souboru]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [jméno souboru]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "nelze pou¾ít --symmetric --encrypt s pøíkazem --s2k-mode 0\n" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "nelze pou¾ít --symmetric --encrypt v módu %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [jméno souboru]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [jméno souboru]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [jméno souboru]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "nelze pou¾ít --symmetric --sign --encrypt s pøíkazem --s2k-mode 0\n" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "nelze pou¾ít --symmetric --sign --encrypt v módu %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [jméno souboru]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [jméno souboru]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [jméno souboru]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id u¾ivatele" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ivatele" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u¾ivatele" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u¾ivatele" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ivatele [pøíkazy]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ivatele] [soubor s klíèi (keyring)]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "odeslání na keyserver se nezdaøilo: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "získání dat z keyserveru se nezdaøilo: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "export klíèe se nepodaøil: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "hledání na keyserveru se nezdaøilo: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "refresh dat na keyserveru se nezdaøil: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódování z ASCII formátu selhalo: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódování do ASCII formátu selhalo: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[jméno souboru]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Zaènìte psát svou zprávu ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1689,23 +1617,23 @@ "symbolické jméno smí obsahovat pouze písmena, èíslice, teèky nebo podtr¾ítka " "a musí konèit znakem '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "jméno u¾ivatele musí obsahovat znakt '@' \n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "hodnota nemù¾e obsahovat ¾ádné kontrolní znaky\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pro certifikaèní politiku je neplatné\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pro podepisovací politiku je neplatné\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 msgid "the given preferred keyserver URL is invalid\n" msgstr "zadané URL preferovaného serveru klíèù je neplaté\n" @@ -2578,12 +2506,12 @@ msgstr "U¾ivatelské ID \"%s\" je revokováno." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Jste si jistý(á), ¾e stále chcete podepsat tento klíè? (a/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Nelze podepsat.\n" @@ -2763,7 +2691,7 @@ msgid "Really sign? (y/N) " msgstr "Skuteènì podepsat? (a/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2815,18 +2743,10 @@ msgstr "pøesunuji podpis klíèe na správné místo\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "ulo¾it" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "ulo¾it a ukonèit" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "vypsat fingerprint" @@ -2835,485 +2755,341 @@ msgstr "vypsat seznam klíèù a id u¾ivatelù" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "vyberte identifikátor u¾ivatele N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "vyberte sekundární klíè N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "vypsat seznam podpisù" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "podepsat klíè" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -msgid "tsign" -msgstr "tsign" - #: g10/keyedit.c:1259 msgid "make a trust signature" msgstr "vytvoøit trust signature" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "podepsat klíè lokálnì" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "podepsat klíè bez mo¾nosti odvolat podpis (non-revocably)" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "podepsat klíè lokálnì a bez mo¾nosti odvolat podpis (non-revocably)" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "pøidat identifikátor u¾ivatele" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "pøidat fotografický ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "smazat identifikátor u¾ivatele" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "pøidat sekundární klíè" -#: g10/keyedit.c:1271 -msgid "addcardkey" -msgstr "addcardkey" - -#: g10/keyedit.c:1271 +#: g10/keyedit.c:1272 msgid "add a key to a smartcard" msgstr "pøidat klíè na kartu" -#: g10/keyedit.c:1272 -msgid "keytocard" -msgstr "keytocard" - -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "pøesunout klíè na kartu" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "smazat sekundární klíè" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "pøidat revokaèní klíè" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "smazat podpisy" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "zmìnit dobu platnosti" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "oznaèit u¾ivatelské ID jako primární" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "pøepnout mezi vypsáním seznamu tajných a veøejných klíèù" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "vypsat seznam pøedvoleb (pro experty)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "vypsat seznam pøedvoleb (podrobnì)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "nastavit seznam pøedvoleb" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "aktualizovat pøedvolby" -#: g10/keyedit.c:1286 -msgid "keyserver" -msgstr "keyserver" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 msgid "set preferred keyserver URL" msgstr "nastavit URL pro preferovaný server klíèù" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "zmìnit heslo" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "zmìnit dùvìryhodnost vlastníka klíèe" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revokovat podpisy" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "odvolat platnost id u¾ivatele" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revokovat sekundární klíè" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "nastavit klíè jako neplatný (disable)" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "nastavit klíè jako platný (enable)" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "ukázat fotografický ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "chyba pøi ètení bloku tajného klíèe \"%s\": %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Tajný klíè je dostupný.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Pro provedení této operace je potøeba tajný klíè.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Prosím, nejdøíve pou¾ijte pøíkaz \"toggle\" (pøepnout).\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Klíè revokován." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 msgid "Really sign all user IDs? (y/N) " msgstr "Opravdu podepsat v¹echny id u¾ivatele? (a/N) " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Nápovìda: Vyberte id u¾ivatele k podepsání\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tento pøíkaz není v módù %s dovolený.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Musíte vybrat alespoò jeden id u¾ivatele.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Nemù¾ete smazat poslední id u¾ivatele!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 msgid "Really remove all selected user IDs? (y/N) " msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? (a/N) " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 msgid "Really remove this user ID? (y/N) " msgstr "Opravdu odstranit tento id u¾ivatele? (a/N) " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 msgid "Really move the primary key? (y/N) " msgstr "Opravdu pøesunout primární klíè? (a/N) " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 msgid "You must select exactly one key.\n" msgstr "Musíte vybrat právì jeden klíè.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Musíte vybrat alespoò jeden klíè.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Opravdu chcete smazat vybrané klíèe? (a/N) " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 msgid "Do you really want to delete this key? (y/N) " msgstr "Opravdu chcete smazat tento klíè? (a/N) " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 msgid "Really revoke all selected user IDs? (y/N) " msgstr "Opravdu revokovat v¹echny vybrané id u¾ivatele? (a/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 msgid "Really revoke this user ID? (y/N) " msgstr "Opravdu revokovat tento id u¾ivatele? (a/N) " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Opravdu chcete revokovat vybrané klíèe? (a/N) " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 msgid "Do you really want to revoke this key? (y/N) " msgstr "Opravdu chcete revokovat tento klíè? (a/N) " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" "Dùvìryhodnost vlastníka nelze mìnit je-li pou¾ívána databáze dùvìry " "poskytnutá u¾ivatelem\n" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 msgid "Set preference list to:\n" msgstr "Nastavit seznam pøedvoleb:\n" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Opravdu aktualizovat pøedvolby pro vybraný id u¾ivatele? (a/N) " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 msgid "Really update the preferences? (y/N) " msgstr "Opravdu aktualizovat pøedvolby? (a/N) " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 msgid "Save changes? (y/N) " msgstr "Ulo¾it zmìny? (a/N) " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 msgid "Quit without saving? (y/N) " msgstr "Ukonèit bez ulo¾ení? (a/N) " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "aktualizace selhala: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizace tajného klíèe selhala: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Klíè nebyl zmìnìn, tak¾e není potøeba jej aktualizovat.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Hash: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Vlastnosti: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "Keyserver bez modifikace" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "Preferovaný keyserver: " -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Tento klíè mù¾e být revokován klíèem %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr "(citlivá informace)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "vytvoøen: %s" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "revokován: %s" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "platnost skonèila: %s" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "platnost skonèí: %s" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, c-format msgid "usage: %s" msgstr "pou¾ití: %s" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, c-format msgid "trust: %s" msgstr "dùvìra: %s" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "platnost: %s" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Tento klíè byl oznaèen za neplatný (disabled)" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "èíslo karty: " -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "U¾ivatelský ID formátu PGP 2.x nemá ¾ádné pøedvolby\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3321,17 +3097,17 @@ "Prosím nezapomeòte, ¾e zobrazované údaje o platnosti klíèù nemusí\n" "být nutnì správné, dokud znova nespustíte program.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 msgid "revoked" msgstr "revokován" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 msgid "expired" msgstr "platnost skonèila" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3339,7 +3115,7 @@ "VAROVÁNÍ: ¾ádné u¾ivatelské ID nebylo oznaèeno jako primární. Tento pøíkaz\n" " mù¾e zpùsobit, ¾e za primární bude pova¾ováno jiné user ID.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3348,45 +3124,45 @@ "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání fotografického ID mù¾e v nìkterých\n" " verzích PGP vést k odmítnutí tohoto klíèe.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Jste si jistý, ¾e jej chcete stále pøidat? (a/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nemìli by jste pøidávat fotografický ID k PGP2 klíèi.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Smazat tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Smazat tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Smazat tento neznámý podpis? (a/N/u)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Smazán %d podpis.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Smazáno %d podpisù.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nic nebylo smazáno.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3395,155 +3171,155 @@ "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání 'povìøení revokace' mù¾e v nìkterých\n" " verzích PGP vést k odmítnutí tohoto klíèe.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nemìli by jste pøidávat 'povìøení revokace' k PGP2 klíèi.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ivatele povìøeného revokací: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "klíè formátu PGP 2.x nelze povìøit revokací\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "klíè nelze povìøit revokací jím samým\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 msgid "this key has already been designated as a revoker\n" msgstr "tento klíè ji¾ bykl povìøen revokací\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "VAROVÁNÍ: ustanovení klíèe 'povøeným revokátorem' je nevratná operace!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Jste si jistí, ¾e tento klíè chcete povìøit revokací? (a/N) " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Prosím, odstraòte výbìr z tajných klíèù.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte nejvý¹e jeden sekundární klíè.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Mìním dobu platnosti sekundárního klíèe.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Mìním dobu platnosti primárního klíèe.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nemù¾ete zmìnit dobu platnosti klíèe verze 3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "V souboru tajných klíèù chybí odpovídající podpis\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte právì jeden id u¾ivatele .\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "pøeskoèen v3 podpis klíèe jím samým u u¾ivatelského id \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "Vlo¾te URL preferovaného keyserveru: " -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 msgid "Are you sure you want to replace it? (y/N) " msgstr "Jste si jistý(á), ¾e jej chcete pøepsat? (a/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 msgid "Are you sure you want to delete it? (y/N) " msgstr "Jste si jistý(á), ¾e jej chcete smazat? (a/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundární klíè s indexem %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, c-format msgid "user ID: \"%s\"\n" msgstr "id u¾ivatele:\"%s\"\n" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "podepsáno va¹ím klíèem %s v %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (neexportovatelné)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnost podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Jste si jistý, ¾e jej chcete stále revokovat? (a/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvoøit pro tento podpis revokaèní certifikát? (a/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Podepsal(a) jste následující identifikátory u¾ivatele: %s:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 msgid " (non-revocable)" msgstr " (nerevokovatelné)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, c-format msgid "revoked by your key %s on %s\n" msgstr "revokováno va¹ím klíèem %s v %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte se revokovat tyto podpisy:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "neexistuje tajný klíè\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "U¾ivatelské ID \"%s\" je ji¾ revokováno.\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "VAROVÁNÍ: podpis ID u¾ivatele je datován %d sekund v budoucnosti\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíè %s (uid %d)\n" @@ -3866,7 +3642,7 @@ "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4126,7 +3902,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Vlo¾te èíslo (èísla), 'N' pro dal¹í nebo 'Q' pro konec> " -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "neplatný protokol serveru klíèù (us %d!=handler %d)\n" @@ -4140,101 +3916,101 @@ msgid "key not found on keyserver\n" msgstr "klíè nebyl na serveru klíèù nalezen\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "po¾aduji klíè %s ze %s server %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, c-format msgid "requesting key %s from %s\n" msgstr "po¾aduji klíè %s z %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, c-format msgid "sending key %s to %s server %s\n" msgstr "posílám klíè %s na %s server %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, c-format msgid "sending key %s to %s\n" msgstr "posílám klíè %s na %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "vyhledávám \"%s\" na %s serveru %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "vyhledávám \"%s\" na serveru %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 msgid "no keyserver action!\n" msgstr "¾ádná operace se serverem klíèù!\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "VAROVÁNÍ: keyserver handler z jiné verze GnuPG (%s)\n" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "server klíèù neposlal VERSION\n" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "¾adný server klíèù není znám (pou¾íjte volbu --keyserver)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "volání externího keyserver není v této verzi podporováno\n" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "protokol serveru klíèù `%s' není podporován\n" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "akce `%s' není podporována v protokolu `%s' serveru klíèù\n" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "gpgkeys_%s nepodporuje protokol verze %d\n" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 msgid "keyserver timed out\n" msgstr "èasový limit pro server klíèù vypr¹el\n" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 msgid "keyserver internal error\n" msgstr "interní chyba serveru klíèù\n" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, c-format msgid "keyserver communications error: %s\n" msgstr "chyba komunikace se serverem klíèù: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "\"%s\" není ID klíèe: pøeskoèeno\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "VAROVÁNÍ: nelze aktualizovat klíè %s prostøednictvím %s: %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, c-format msgid "refreshing 1 key from %s\n" msgstr "aktualizuji 1 klíè z %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, c-format msgid "refreshing %d keys from %s\n" msgstr "aktualizuji %d klíèù z %s\n" @@ -4418,7 +4194,7 @@ msgid "textmode" msgstr "textový formát" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "neznámý formát" @@ -4590,50 +4366,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent není v tomto sezení dostupný\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "nemohu nastavit PID klienta pro gpg-agenta\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "nelze získat server read file descriptor pro agenta r\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "nezle získat server write file descriptor pro agenta\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "¹patný formát promìnné prostøedí GPG_AGENT_INFO\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verze %d není podporován\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemohu se pøipojit k `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problém v komunikaci s gpg-agentem\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentem - pou¾ívání agenta vypnuto\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, c-format msgid " (main key ID %s)" msgstr "(hlavní ID klíèe %s)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4644,41 +4420,41 @@ "\"%.*s\"\n" "Klíè o délce %u bitù, typ %s, ID %s, vytvoøený %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Opakovat heslo\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Vlo¾it heslo\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "heslo je pøíli¹ dlouhé\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "neplatná reakce od agenta\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "zru¹eno u¾ivatelem\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentem: agent vrací 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "v dávkovém re¾imu se nemohu ptát na heslo\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4687,17 +4463,17 @@ "Musíte znát heslo, abyste odemknul(a) tajný klíè pro\n" "u¾ivatele: \"%s\"\n" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "délka %u bitù, typ %s, klíè %s, vytvoøený %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr " (podklíè na hlavním klíèi ID %s)" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -5566,12 +5342,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "databáze dùvìry je po¹kozena; prosím spus»te \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nemohu pracovat s øádky del¹ími ne¾ %d znakù\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "vstupní øádek je del¹í ne¾ %d znakù\n" @@ -5631,7 +5407,7 @@ msgid "[ revoked]" msgstr "revokován" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "platnost skonèila" @@ -5641,96 +5417,96 @@ msgid "[ unknown]" msgstr "neznámý formát" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 #, fuzzy msgid "[marginal]" msgstr "èásteèná" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 #, fuzzy msgid "[ultimate]" msgstr "absolutní" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "nedefinován" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "¾ádná" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "èásteèná" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "plná" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "absolutní" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "není nutné kontrolovat databázi dùvìry\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹í kontrola databáze dùvìry v %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "není nutné kontrolovat databázi dùvìry s modelem `%s'\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "není nutné aktualizovat databázi dùvìry s modelem `%s'\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, c-format msgid "public key %s not found: %s\n" msgstr "veøejný klíè %s nebyl nalezen: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "prosím proveïte --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "kontroluji databázi dùvìry\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "zpracováno %d klíèù (%d validit vymazáno)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "¾ádný absolutnì dùvìryhodný klíè nebyl nalezen\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "veøejný klíè k absolutnì dùvìryhodnému klíèi %s nebyl nalezen\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "po¾adováno %d èásteèné dùvìry a %d úplné dùvìry, model %s\n" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5738,7 +5514,7 @@ "hloubka: %d platných: %3d podepsaných: %3d dùvìra: %d-, %dq, %dn, %dm, %" "df, %du\n" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "nelze aktualizovat záznam v databázi dùvìry: chyba pøi zápisu: %s\n" @@ -6008,6 +5784,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "ukonèit" + #: util/miscutil.c:351 msgid "qQ" msgstr "uUqQ" @@ -6044,6 +5824,168 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(pravdìpodobnì jste pro tento úkol pou¾ili nesprávný program)\n" +#~ msgid "q" +#~ msgstr "u" + +#~ msgid "admin" +#~ msgstr "admin" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#~ msgid "name" +#~ msgstr "jméno" + +#~ msgid "url" +#~ msgstr "url" + +#~ msgid "fetch" +#~ msgstr "fetch" + +#~ msgid "login" +#~ msgstr "login" + +#~ msgid "lang" +#~ msgstr "lang" + +#~ msgid "sex" +#~ msgstr "sex" + +#~ msgid "cafpr" +#~ msgstr "cafpr" + +#~ msgid "forcesig" +#~ msgstr "forcesig" + +#~ msgid "generate" +#~ msgstr "generate" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "ulo¾it" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#~ msgid "tsign" +#~ msgstr "tsign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#~ msgid "addcardkey" +#~ msgstr "addcardkey" + +#~ msgid "keytocard" +#~ msgstr "keytocard" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#~ msgid "keyserver" +#~ msgstr "keyserver" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "hashovací algoritmus `%s' je v tomto release read-only\n" Index: gnupg/po/da.po diff -u gnupg/po/da.po:1.18 gnupg/po/da.po:1.19 --- gnupg/po/da.po:1.18 Fri Dec 10 23:21:01 2004 +++ gnupg/po/da.po Tue Dec 14 08:49:27 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -32,7 +32,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -352,7 +352,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "" @@ -563,164 +563,88 @@ msgid "secret key already stored on a card\n" msgstr "udelod: hemmelig nøgle er allerede tilstede\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "afslut" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "afslut denne menu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "a" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "konfliktende kommandoer\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "hjælp" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "vis denne hjælp" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "vis" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Ingen hjælp tilgængelig" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "aflus" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "slåtil" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsignér" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "ændr udløbsdatoen" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "vis præferencer" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "vis fingeraftryk" -#: g10/card-util.c:1266 -msgid "forcesig" -msgstr "" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "generel fejl" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "generér et nyt nøglepar" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "kodeord" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "" -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "" @@ -768,7 +692,7 @@ msgid "PIN not correctly repeated; try again" msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -778,13 +702,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, fuzzy, c-format msgid "error reading keyblock: %s\n" @@ -1234,7 +1158,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "" @@ -1242,7 +1166,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 #, fuzzy msgid "Compression: " msgstr "Kommentar: " @@ -1347,7 +1271,7 @@ msgid "reading options from `%s'\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTITS: %s er ikke til normal brug!\n" @@ -1357,370 +1281,370 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 #, fuzzy msgid "invalid import options\n" msgstr "ugyldig rustning" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 #, fuzzy msgid "invalid export options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "ugyldig rustning" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ikke tilladt med %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2742 +#: g10/g10.c:2740 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/g10.c:2744 +#: g10/g10.c:2742 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 #, fuzzy msgid "invalid default preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2769 +#: g10/g10.c:2767 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2773 +#: g10/g10.c:2771 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2777 +#: g10/g10.c:2775 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "valgte cifferalgoritme er ugyldig\n" # er det klogt at oversætte TrustDB? -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [filnavn (som gemmes)]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn (som krypteres)]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [filnavn (som signeres)]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3093 +#: g10/g10.c:3091 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn (som dekrypteres)]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key bruger-id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key bruger-id [kommandoer]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [bruger-id] [nøglering]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "signering fejlede: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hash-algoritme `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[filnavn]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Gå til sagen og skriv meddelelsen ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3865 +#: g10/g10.c:3863 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" @@ -2483,13 +2407,13 @@ msgstr "Nøglen er beskyttet.\n" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr "" @@ -2657,7 +2581,7 @@ msgid "Really sign? (y/N) " msgstr "Vil du gerne signere? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2708,18 +2632,10 @@ msgstr "" #: g10/keyedit.c:1247 -msgid "save" -msgstr "gem" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "gem og afslut" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "vis fingeraftryk" @@ -2728,752 +2644,598 @@ msgstr "vis nøgler og bruger-id'er" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "" #: g10/keyedit.c:1254 -msgid "key" -msgstr "nøgle" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "vælg sekundær nøgle N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "tjek" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "vis signaturer" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "signér" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "signér nøglen" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "signér" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "opret en separat signatur" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsignér" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "signér nøglen lokalt" #: g10/keyedit.c:1261 #, fuzzy -msgid "nrsign" -msgstr "signér" - -#: g10/keyedit.c:1261 -#, fuzzy msgid "sign the key non-revocably" msgstr "signér nøglen lokalt" #: g10/keyedit.c:1262 #, fuzzy -msgid "nrlsign" -msgstr "signér" - -#: g10/keyedit.c:1262 -#, fuzzy msgid "sign the key locally and non-revocably" msgstr "signér nøglen lokalt" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "tilføj-bid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 #, fuzzy msgid "add a photo ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "sletbid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "slet bruger id" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "tilføj nøgle" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "tilføj sekundær nøgle" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "tilføj nøgle" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "sletnøgle" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "slet sekundær nøgle" -#: g10/keyedit.c:1275 -#, fuzzy -msgid "addrevoker" -msgstr "tilføj nøgle" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 #, fuzzy msgid "add a revocation key" msgstr "tilføj sekundær nøgle" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "sletsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "slet signaturer" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "udløb" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "ændr udløbsdatoen" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "skift" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "skift imellem hemmelig og offentlig nøgle visning" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "s" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "præf" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 #, fuzzy msgid "list preferences (expert)" msgstr "vis præferencer" -#: g10/keyedit.c:1283 -#, fuzzy -msgid "showpref" -msgstr "vispræf" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 #, fuzzy msgid "list preferences (verbose)" msgstr "vis præferencer" -#: g10/keyedit.c:1284 -#, fuzzy -msgid "setpref" -msgstr "præf" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 #, fuzzy msgid "set preference list" msgstr "vis præferencer" -#: g10/keyedit.c:1285 -#, fuzzy -msgid "updpref" -msgstr "præf" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 #, fuzzy msgid "updated preferences" msgstr "vis præferencer" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "generel fejl" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 msgid "set preferred keyserver URL" msgstr "" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "ændr kodesætningen" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "betro" - -#: g10/keyedit.c:1288 -msgid "change the ownertrust" -msgstr "" - #: g10/keyedit.c:1289 -msgid "revsig" +msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:1290 -#, fuzzy -msgid "revuid" -msgstr "sletbid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 #, fuzzy msgid "revoke a user ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "slåfra" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "slå nøgle fra" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "slåtil" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "slå nøgle til" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 #, fuzzy msgid "Key is revoked." msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Vil du gerne signere? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 msgid "Really move the primary key? (y/N) " msgstr "" -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Vil du virkelig gerne gøre dette?" -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Vil du virkelig gerne gøre dette?" -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "vis præferencer" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Gem ændringer? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Afslut uden at gemme? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "" -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "kan ikke oprette %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "tilføj nøgle" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr "betro" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr "betro" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "tilføj nøgle" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "udløb" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Slettede %d signatur.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Indtast nøglens størrelse" -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen bruger-id med indeks %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen sekundær nøgle med indeks %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "bruger-id: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr "signér en nøgle lokalt" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3784,7 +3546,7 @@ "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "" @@ -4038,7 +3800,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "ugyldig nøglering" @@ -4053,104 +3815,104 @@ msgid "key not found on keyserver\n" msgstr "%s: bruger ikke fundet: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "eksportér nøgler til en nøgletjener" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "ugyldig nøglering" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "generel fejl" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "generel fejl" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" @@ -4331,7 +4093,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 #, fuzzy msgid "unknown" msgstr "ukendt version" @@ -4505,50 +4267,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "valgte cifferalgoritme %d er ugyldig\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (hovednøgle-ID %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4556,42 +4318,42 @@ "%u-bit %s key, ID %s, created %s%s\n" msgstr "" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 #, fuzzy msgid "Repeat passphrase\n" msgstr "Gentag kodesætning: " -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 #, fuzzy msgid "Enter passphrase\n" msgstr "Indtast kodesætning: " -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 msgid "can't query passphrase in batch mode\n" msgstr "" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Indtast kodesætning: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4600,17 +4362,17 @@ "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Gentag kodesætning: " @@ -5459,12 +5221,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "" @@ -5523,7 +5285,7 @@ msgid "[ revoked]" msgstr "tilføj nøgle" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "udløb" @@ -5533,101 +5295,101 @@ msgid "[ unknown]" msgstr "ukendt version" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "offentlig nøgle ikke fundet" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 #, fuzzy msgid "checking the trustdb\n" msgstr "|[NAMES]|tjek tillidsdatabasen" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5898,6 +5660,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "afslut" + #: util/miscutil.c:351 msgid "qQ" msgstr "aA" @@ -5936,6 +5702,143 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan have brugt et forkert program til denne opgave)\n" +#~ msgid "q" +#~ msgstr "a" + +#~ msgid "help" +#~ msgstr "hjælp" + +#~ msgid "list" +#~ msgstr "vis" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "aflus" + +#, fuzzy +#~ msgid "name" +#~ msgstr "slåtil" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsignér" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "generel fejl" + +#~ msgid "passwd" +#~ msgstr "kodeord" + +#~ msgid "save" +#~ msgstr "gem" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "nøgle" + +#~ msgid "check" +#~ msgstr "tjek" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "signér" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "signér" + +#~ msgid "lsign" +#~ msgstr "lsignér" + +#, fuzzy +#~ msgid "nrsign" +#~ msgstr "signér" + +#, fuzzy +#~ msgid "nrlsign" +#~ msgstr "signér" + +#~ msgid "adduid" +#~ msgstr "tilføj-bid" + +#~ msgid "deluid" +#~ msgstr "sletbid" + +#~ msgid "addkey" +#~ msgstr "tilføj nøgle" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "tilføj nøgle" + +#~ msgid "delkey" +#~ msgstr "sletnøgle" + +#, fuzzy +#~ msgid "addrevoker" +#~ msgstr "tilføj nøgle" + +#~ msgid "delsig" +#~ msgstr "sletsig" + +#~ msgid "expire" +#~ msgstr "udløb" + +#~ msgid "toggle" +#~ msgstr "skift" + +#~ msgid "t" +#~ msgstr "s" + +#~ msgid "pref" +#~ msgstr "præf" + +#, fuzzy +#~ msgid "showpref" +#~ msgstr "vispræf" + +#, fuzzy +#~ msgid "setpref" +#~ msgstr "præf" + +#, fuzzy +#~ msgid "updpref" +#~ msgstr "præf" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "generel fejl" + +#~ msgid "trust" +#~ msgstr "betro" + +#, fuzzy +#~ msgid "revuid" +#~ msgstr "sletbid" + +#~ msgid "disable" +#~ msgstr "slåfra" + +#~ msgid "enable" +#~ msgstr "slåtil" + #~ msgid "DSA only allows keysizes from 512 to 1024\n" #~ msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n" Index: gnupg/po/de.po diff -u gnupg/po/de.po:1.98 gnupg/po/de.po:1.99 --- gnupg/po/de.po:1.98 Fri Dec 10 23:20:54 2004 +++ gnupg/po/de.po Tue Dec 14 08:49:27 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-10-05 10:11+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -29,7 +29,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -354,7 +354,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -567,165 +567,88 @@ msgid "secret key already stored on a card\n" msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quit" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "Menü verlassen" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "Widersprüchliche Befehle\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "Diese Hilfe zeigen" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "Liste der Schlüssel" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Schlüssel erhältlich bei: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "Ändern des Verfallsdatums" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "Den \"Owner trust\" ändern" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "\"Fingerabdruck\" anzeigen" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "Allgemeiner Fehler" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "Ein neues Schlüsselpaar erzeugen" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Befehl> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "Widersprüchliche Befehle\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "Widersprüchliche Befehle\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n" @@ -773,7 +696,7 @@ msgid "PIN not correctly repeated; try again" msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -783,13 +706,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output funktioniert nicht bei diesem Kommando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "Schlüssel `%s' nicht gefunden: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1264,7 +1187,7 @@ msgid "Pubkey: " msgstr "Öff.Schlüssel: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Verschlü.: " @@ -1272,7 +1195,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Komprimierung: " @@ -1384,7 +1307,7 @@ msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n" @@ -1396,344 +1319,344 @@ "Verschlüsselungserweiterung \"%s\" wurde wegen falscher Rechte nicht " "geladen\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ungültige Import Option.\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "Ungültige Import Option\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ungültige Import Option.\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "Ungültige Import Option\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNUNG: %s ersetzt %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften " "machen\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und " "verschlüsseln\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes " "verwenden.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-" "Verschlüsselung\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 msgid "selected compression algorithm is invalid\n" msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen gröÂßer als 0 sein\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen gröÂßer als 1 sein\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "ungültige Standard Voreinstellungen\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "ungültige private Verschlüsselungsvoreinstellungen\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "ungültige private Hashvoreinstellungen\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "ungültige private Komprimierungsvoreinstellungen\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s arbeitet noch nicht mit %s zusammen\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht " "erlaubt.\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Entschlüsselung fehlgeschlagen: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [Dateiname]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key User-ID" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key User-ID" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "Schlüsselexport fehlgeschlagen: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1741,23 +1664,23 @@ "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muß mit einem '=' enden\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n" @@ -2661,12 +2584,12 @@ msgstr "User-ID \"%s\" ist widerrufen." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Beglaubigen ist nicht möglich.\n" @@ -2872,7 +2795,7 @@ msgid "Really sign? (y/N) " msgstr "Wirklich unterschreiben? (j/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2925,18 +2848,10 @@ msgstr "schiebe eine Beglaubigung an die richtige Stelle\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "speichern und Menü verlassen" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "\"Fingerabdruck\" anzeigen" @@ -2945,503 +2860,357 @@ msgstr "Schlüssel und User-IDs auflisten" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "User-ID N auswählen" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "Zweitschlüssel N auswählen" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "Liste der Signaturen" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "Den Schlüssel signieren" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -msgid "tsign" -msgstr "tsign" - #: g10/keyedit.c:1259 msgid "make a trust signature" msgstr "Eine Trust-Unterschrift erzeugen" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "Den Schlüssel nur für diesen Rechner beglaubigen" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "Den Schlüssel nicht-widerrufbar beglaubigen" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "Den Schlüssel nicht-widerrufbar und nur für diesen Rechner signieren" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "Eine User-ID hinzufügen" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "Eine Foto-ID hinzufügen" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "User-ID entfernen" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "Einen Zweitschlüssel hinzufügen" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "Einen Zweitschlüssel entfernen" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "Einen Widerrufschlüssel hinzufügen" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "Signatur entfernen" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "Ändern des Verfallsdatums" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "User-ID als Haupt-User-ID kennzeichnen" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "Liste der Voreinstellungen (für Experten)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "Liste der Voreinstellungen (ausführlich)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "Liste der Voreinstellungen einstellen" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "geänderte Voreinstellungen" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "Schlüsselserverfehler" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "Die Passphrase ändern" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "Den \"Owner trust\" ändern" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "Signaturen widerrufen" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "Eine User-ID widerrufen" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "Einen Zweitschlüssel widerrufen" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "Schlüssel abschalten" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "Schlüssel anschalten" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "Foto-ID anzeigen" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "Fehler beim Lesen des geheimen Schlüsselblocks `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Geheimer Schlüssel ist vorhanden.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Hierzu wird der geheime Schlüssel benötigt.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Schlüssel wurde widerrufen." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Wirklich alle User-IDs beglaubigen? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Die letzte User-ID kann nicht gelöscht werden!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Diese User-ID wirklich widerrufen? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "Liste der Voreinstellungen einstellen" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Die Voreinstellungen wirklich ändern? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Änderungen speichern? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Beenden ohne zu speichern? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "Änderung fehlgeschlagen: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Eigenschaften: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "Keyserver no-modify" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Dieser Schlüssel könnte widerrufen worden sein von %s Schlüssel " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr "(empfindlich)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s kann nicht erzeugt werden: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[widerrufen]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [verfällt: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [verfällt: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "Gültigkeit: %s" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3449,20 +3218,20 @@ "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n" "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[widerrufen]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" # translated by wk -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3470,7 +3239,7 @@ "WARNUNG: Keine User-ID ist als primär markiert. Dieses Kommando kann\n" "dazu führen, daß eine andere User-ID as primär angesehen wird.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3480,45 +3249,45 @@ "könnte\n" " bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nichts entfernt.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3528,37 +3297,37 @@ " Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n" " des Schlüssels führen.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer " "hinzufügen.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Geben sie die User-ID des designierten Widerrufers ein: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer " "eingetragen werden\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 msgid "this key has already been designated as a revoker\n" msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann " "nicht rückgangig gemacht werden!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3566,129 +3335,129 @@ "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer " "deklarieren? (j/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Bitte genau eine User-ID auswählen.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Wollen Sie es wirklich benutzen? (j/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Wollen Sie es wirklich benutzen? (j/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein Zweitschlüssel mit Index %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "User-ID: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " beglaubigt durch %08lX um %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Sie haben folgende User-IDs beglaubigt:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " widerrufen durch %08lX um %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Es werden nun folgende Beglaubigungen entfernt:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "Kein geheimer Schlüssel\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User-ID \"%s\" ist bereits widerrufen\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -4017,7 +3786,7 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4281,7 +4050,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "Ungültige export Option\n" @@ -4296,107 +4065,107 @@ msgid "key not found on keyserver\n" msgstr "Schlüssel `%s' nicht gefunden: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "Schlüssel %08lX wird von %s angefordert\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "Schlüssel %08lX wird von %s angefordert\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "unterschrieben mit Ihrem Schlüssel %08lX um %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "Ungültige export Option\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "Schlüsselserverfehler" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "Schlüsselserverfehler" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: Dies ist keine gültige Schlüssel-ID\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" "WARNUNG: die temporäre Datei (%s) `%s' konnte nicht entfernt werden: %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "Schlüssel %08lX wird von %s angefordert\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "Schlüssel %08lX wird von %s angefordert\n" @@ -4579,7 +4348,7 @@ msgid "textmode" msgstr "Textmodus" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "unbekannt" @@ -4755,51 +4524,51 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "Client-PID für den Agent kann nicht gesetzt werden\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "Server-Lese-Handle für den Agent nicht verfügbar\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "Server-Schreib-Handle für den Agent nicht verfügbar\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit GPG-Agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "" "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (Hauptschlüssel-ID %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4810,41 +4579,41 @@ "Benutzer: \"%.*s\"\n" "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Geben Sie die Passphrase nochmal ein\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Geben Sie die Passphrase ein\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "Passphrase ist zu lang\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "Falsche Antwort des Agenten\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "Abbruch durch Benutzer\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Geben Sie die Passphrase ein: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4854,17 +4623,17 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Geben Sie die Passphrase nochmal ein: " @@ -5786,12 +5555,12 @@ "Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpg --fix-trustdb" "\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "Textzeilen länger als %d Zeichen können nicht benutzt werden\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "Eingabezeile ist länger als %d Zeichen\n" @@ -5852,7 +5621,7 @@ msgid "[ revoked]" msgstr "[widerrufen]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[verfallen]" @@ -5862,106 +5631,106 @@ msgid "[ unknown]" msgstr "unbekannt" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 #, fuzzy msgid "[marginal]" msgstr "marginal" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 #, fuzzy msgid "[ultimate]" msgstr "uneingeschränkt" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "unbestimmt" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "niemals " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "vollständig" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "uneingeschränkt" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "\"Trust-DB\"-Überprüfung ist beim \"%s\"-Vertrauensmodell nicht nötig\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "\"Trust-DB\"-Änderung ist beim \"%s\"-Vertrauensmodell nicht nötig\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "Öffentlicher Schlüssel %08lX nicht gefunden: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "Bitte ein --check-trustdb durchführen\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "\"Trust-DB\" wird überprüft\n" # translated by wk -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "kein uneingeschränkt vertrauenswürdiger Schlüssel %08lX gefunden\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %08lX nicht gefunden\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6235,6 +6004,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quit" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6275,6 +6048,157 @@ msgstr "" "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "Liste der Schlüssel" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "Allgemeiner Fehler" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#~ msgid "tsign" +#~ msgstr "tsign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "Schlüsselserverfehler" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "Hashmethode `%s' ist in diesem Release read-only\n" Index: gnupg/po/el.po diff -u gnupg/po/el.po:1.14 gnupg/po/el.po:1.15 --- gnupg/po/el.po:1.14 Fri Dec 10 23:20:54 2004 +++ gnupg/po/el.po Tue Dec 14 08:49:27 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -354,7 +354,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -565,165 +565,88 @@ msgid "secret key already stored on a card\n" msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "ôåñìáôéóìüò" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Êëåéäß äéáèÝóéìï óôï: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "áðåéêüíéóç ôïõ fingerprint" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "ãåíéêü óöÜëìá" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "äçìéïõñãßá åíüò íÝïõ æåýãïõò êëåéäéþí" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "ÅíôïëÞ> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Ìç Ýãêõñç åíôïëÞ (äïêéìÜóôå \"help\")\n" @@ -768,7 +691,7 @@ msgid "PIN not correctly repeated; try again" msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -778,13 +701,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1250,7 +1173,7 @@ msgid "Pubkey: " msgstr "ÄçìïóÊëåéäß:" -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Êñõðôáëãüñéèìïò: " @@ -1258,7 +1181,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Óõìðßåóç: " @@ -1365,7 +1288,7 @@ msgid "reading options from `%s'\n" msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\n" @@ -1377,343 +1300,343 @@ "ç åðÝêôáóç ôïõ êñõðôáëãüñéèìïõ \"%s\" äåí öïñôþèçêå åðåéäÞ õðÜñ÷ïõí\n" "áíáóöáëåßò Üäåéåò\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --pgp2 êáôÜóôáóç\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --pgp2 " "êáôÜóôáóç\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "" "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò ãéá ðéóôïðïßçóç\n" "äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ìç Ýãêõñï default-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ìç Ýãêõñï min-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý êñõðôáëãüñéèìïõ\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ ðåñßëçøçò\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ óõìðßåóçò\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "ôï %s áêüìá äå ëåéôïõñãåß ìáæß ìå ôï %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ êñõðôáëãüñéèìïõ \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ óõìðßåóçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äþèçêáí ðáñáëÞðôåò (-r) ÷þñéò ÷ñÞóç êñõðôïãñÜöçóçò\n" "äçìïóßïõ êëåéäéïý\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [åíôïëÝò]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [êëåéäïèÞêç]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver áðïóôïëÞ áðÝôõ÷å: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "åîáãùãÞ êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver áíáæÞôçóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver áíáíÝùóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "èùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ìç Ýãêõñïò áëãüñéèìïò hash `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[üíïìá áñ÷åßïõ]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Ìðïñåßôå ôþñá íá åéóáãÜãåôå ôï ìÞíõìá óáò ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1721,23 +1644,23 @@ "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï åêôõðþóéìïõò ÷áñáêôÞñåò êáé êåíÜ " "êáé íá ëÞãåé ìå Ýíá '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "ôï üíïìá óçìåßùóçò ÷ñÞóôç ðñÝðåé íá ðåñéÝ÷åé ôï '@' ÷áñáêôÞñá\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "ç ôéìÞ óçìåßùóçò ðñÝðåé íá ìç ÷ñçóéìïðïéåß ÷áñáêôÞñåò control\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" @@ -2611,12 +2534,12 @@ msgstr "Ôï user ID \"%s\" áíáêáëåßôå." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï õðïãñÜøåôå; (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Áäõíáìßá õðïãñáöÞò.\n" @@ -2821,7 +2744,7 @@ msgid "Really sign? (y/N) " msgstr "Óßãïõñá íá õðïãñáöåß; " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2872,18 +2795,10 @@ msgstr "ìåôáêßíçóç õðïãñáöÞò êëåéäéïý óôç óùóôÞ èÝóç\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "áðïèÞêåõóç êáé Ýîïäïò" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "áðåéêüíéóç ôïõ fingerprint" @@ -2892,505 +2807,358 @@ msgstr "áðåéêüíéóç ôùí êëåéäéþí êáé ôùí user ID" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "åðéëïãÞ user ID N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "åðéëïãÞ äåõôåñåýïíôïò êëåéäéïý N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "áðåéêüíéóç õðïãñáöþí" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "õðïãñáöÞ ôïõ êëåéäéïý" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "õðïãñáöÞ ôïõ êëåéäéïý ìç-áíáêáëÝóéìá" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "ðñïóèÞêç åíüò user ID" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "ðñïóèÞêç åíüò photo ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "äéáãñáöÞ åíüò user ID" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "äéáãñáöÞ åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "ðñïóèÞêç åíüò êëåéäéïý áíÜêëçóçò" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "äéáãñáöÞ õðïãñáöþí" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "ðñùôåýùí" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "óçìåßùóç ôïõ user ID óáí ðñùôåýùí" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "áëëáãÞ ìåôáîý ôçò áðåéêüíéóçò ìõóôéêïý êáé äçìüóéïõ êëåéäéïý" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "áðåéêüíéóç ðñïåðéëïãþí (åéäéêÝò)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "áðåéêüíéóç åðéëïãþí (áíáëõôéêÜ)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "áíáùåùìÝíåò åðéëïãÝò" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "áíÜêëçóç õðïãñáöþí" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "áíÜêëçóç åíüò user ID" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "áíÜêëçóç åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "áðåíåñãïðïéåß Ýíá êëåéäß" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "åíåñãïðïéåß Ýíá êëåéäß" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "áðåéêüíéóç photo ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Ôï ìõóôéêü êëåéäß åßíáé äéáèÝóéìï.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Áðáéôåßôáé ôï ìõóôéêü êëåéäß ãéá íá ãßíåé áõôü.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôçí åíôïëÞ \"toggle\" ðñþôá.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Ôï êëåéäß áíáêëÞèçêå." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "ÓõìâïõëÞ: ÅðéëÝîôå ôï user ID ãéá õðïãñáöÞ\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "ÁõôÞ ç åíôïëÞ áðáãïñåýåôå óå áõôÞ ôçí êáôÜóôáóç %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôï ëéãüôåñï Ýíá user ID.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôï ôåëåõôáßï user ID!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí üëá ôá åðéëåãìÝíá user ID; " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí ôá åðéëåãìÝíá êëåéäéÜ; " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí üëá ôá åðéëåãìÝíá user ID; " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï user ID; " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí ôá åðéëåãìÝíá êëåéäéÜ; " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Óßãïõñá èÝëåôå íá áíáíåùèïýí ïé ðñïåðéëïãÝò ãéá ôï åðéëåãìÝíï user ID; " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Óßãïõñá íá áíáíåùèïýí ïé ðñïåðéëïãÝò;" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "ÁðïèÞêåõóç ôùí áëëáãþí; " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Ôåñìáôéóìüò ÷ùñßò áðïèÞêåõóç; " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Ðåñßëçøç: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Äõíáôüôçôå: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (åõáßóèçôï)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[áíáêëçìÝíï]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Äåí õðÜñ÷ïõí ðñïåðéëïãÝò óå Ýíá user ID ôýðïõ PGP 2.x.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3398,19 +3166,19 @@ "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\n" "åêôüò êáé åÜí åðáíáêêéíÞóåôå ôï ðñüãñáììá.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[áíáêëçìÝíï]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3418,7 +3186,7 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ý÷åé óçìåéùèåß ID ÷ñÞóôç óáí ðñùôåýùí. ÁõôÞ ç åíôïëÞ\n" " ìðïñåß íá êÜíåé Ýíá Üëëï ID ÷ñÞóôç íá ãßíåé ôï ðñùôåýùí.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3427,45 +3195,45 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n" " ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3475,38 +3243,38 @@ " êáèïñéóìÝíïõ áíáêëçôÞ ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP\n" " íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Äåí ìðïñåßôå íá ðñïóèÝóåôå Ýíá êáèïñéóìÝíï áíáêëçôÞ óå êëåéäß ôýðïõ PGP2.x.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "ÐëçêôñïëïãÞóôå ôï user ID ôïõ äéïñéóìÝíïõ áíáêëçôÞ: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí ïñéóìÝíï áíáêëçôÞ!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: åÜí ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ äåí ìðïñåß íá " "åðáíÝëèåé!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3514,129 +3282,129 @@ "Åßóôå óßãïõñïé üôé èÝëåôå íá ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ; (y/" "N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "ðáñáëåßöèçêå ç v3 éäéï-õðïãñáöÞ óôï user id \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Äåí õðÜñ÷åé äåõôåñåýïí êëåéäß ìå äåßêôç %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " áíáêëÞèçêå áðü %08lX óôéò %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)" -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "êáíÝíá ìõóôéêü êëåéäß\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìéá õðïãñáöÞ user ID Ý÷åé çìåñïìçíßá %d äåýôåñá óôï ìÝëëïí\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Áðåéêüíéóç %s photo ID ìåãÝèïõò %ld ãéá ôï êëåéäß 0x%08lX (uid %d)\n" @@ -3964,7 +3732,7 @@ "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4231,7 +3999,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" @@ -4246,106 +4014,106 @@ msgid "key not found on keyserver\n" msgstr "ôï êëåéäß '%s' äå âñÝèçêå: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "õðïãñÜöèçêå ìå ôï êëåéäß óáò %08lX óôéò %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: áäõíáìßá äéáãñáöÞò tempfile (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" @@ -4524,7 +4292,7 @@ msgid "textmode" msgstr "êáôÜóôáóç-êåéìÝíïõ" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "Üãíùóôï" @@ -4701,50 +4469,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "õðïðáêÝôï ôýðïõ %d Ý÷åé ïñéóìÝíï ôï êñéôéêü bit\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "ï gpg-agent äåí åßíáé äéáèÝóéìïò óå áõôÞ ôç óõíåäñßá\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "áäõíáìßá ïñéóìïý ôïõ pid ôïõ ðåëÜôç óéá ôï agent\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "áäõíáìßá áíÜãíùóçò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "áäõíáìßá åããñáöÞò ôïõ FD áðü ôï äéáêïìéóôÞ ãéá ôïí agent\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "êáêïäéáôõðïìÝíç ìåôáâëçôÞ ðåñéâÜëëïíôïò GPG_AGENT_INFO\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "ðñüâëçìá åðéêïéíùíßáò ìå ôï gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "ðñüâëçìá ìå ôïí agent - áðåíåñãïðïéÞóç ôçò ÷ñÞóçò ôïõ agent\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (êýñéï êëåéäß, ID %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4756,41 +4524,41 @@ "\"%.*s\"\n" "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "ÅðáíáëÜâåôå ôç öñÜóç\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "ç öñÜóç êëåéäß åßíáé ðïëý ìåãÜëç\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "ìç Ýãêõñç áðÜíôçóç áðü ôïí agent\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "áêõñþèçêå áðü ôï ÷ñÞóôç\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "ðñüâëçìá ìå ôïí agent: agent åðéóôñÝöåé 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "áäõíáìßá åñþôçóçò ôçò ëÝîçò êëåéäß óå êáôÜóôáóç äÝóìçò\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4800,17 +4568,17 @@ "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\n" "ãéá ôï ÷ñÞóôç: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " @@ -5707,12 +5475,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "ç trustdb åßíáé öèáñìÝíç - ÷ñçóéìïðïéåßóôå ôï \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "áäõíáìßá ÷åéñéóìïý ãñáììþí êåéìÝíïõ ìåãáëýôåñåò áðü %d ÷áñáêôÞñåò\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "ãñáììÞ åéóüäïõ ìåãáëýôåñç áðü %d ÷áñáêôÞñåò\n" @@ -5773,7 +5541,7 @@ msgid "[ revoked]" msgstr "[áíáêëçìÝíï]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[ëçãìÝíï]" @@ -5783,102 +5551,102 @@ msgid "[ unknown]" msgstr "Üãíùóôï" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "ðïôÝ " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "åðüìåíïò Ýëåã÷ïò ôçò trustdb èá ãßíåé óôéò %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ôï äçìüóéï êëåéäß %08lX äåí âñÝèçêå: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "ðáñáêáëþ êÜíôå Ýíá --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "Ýëåã÷ïò ôçò trustdb\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d êëåéäéÜ åðåîåñãÜóôçêáí (%d ìåôñÞóåéò åããõñüôçôáò ðÝñáóáí)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "äå âñÝèçêáí áðüëõôá åìðéóôåýóéìá êëåéäéÜ\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "äå âñÝèçêå ôï äçìüóéï êëåéäß ôïõ áðüëõôá åìðéóôåýóéìïõ êëåéäéïý %08lX\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "åããñáöÞ trust %lu, ôýðïò %d: write áðÝôõ÷å: %s\n" @@ -6150,6 +5918,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "ôåñìáôéóìüò" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6187,6 +5959,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(ßóùò ÷ñçóéìïðïéÞóáôå ëÜèïò ðñüãñáììá ãéá áõôÞ ôçí åñãáóßá)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "ãåíéêü óöÜëìá" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "ðñùôåýùí" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "óöÜëìá äéáêïìéóôÞ êëåéäéþí" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "" #~ "ï áëãüñéèìïò ðåñßëçøçò `%s' åßíáé óå áõôÞ ôçí Ýêäïóç ãéá áíÜãíùóç ìüíï\n" Index: gnupg/po/eo.po diff -u gnupg/po/eo.po:1.17 gnupg/po/eo.po:1.18 --- gnupg/po/eo.po:1.17 Fri Dec 10 23:20:54 2004 +++ gnupg/po/eo.po Tue Dec 14 08:49:27 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -562,165 +562,88 @@ msgid "secret key already stored on a card\n" msgstr "ignorita: sekreta þlosilo jam æeestas\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "fini" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "forlasi æi tiun menuon" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "f" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "malkongruaj komandoj\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "helpo" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "montri æi tiun helpon" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "listo" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nenia helpo disponata" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "spuri" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "en" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsub" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "þanøi la daton de eksvalidiøo" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "þanøi la posedantofidon" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fsp" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "montri fingrospuron" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "øenerala eraro" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "krei novan þlosilparon" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "pasf" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Komando> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Nevalida komando (provu per \"helpo\")\n" @@ -768,7 +691,7 @@ msgid "PIN not correctly repeated; try again" msgstr "la pasfrazo ne estis øuste ripetita; provu denove" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -778,13 +701,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ne funkcias por æi tiu komando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1235,7 +1158,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "" @@ -1243,7 +1166,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 #, fuzzy msgid "Compression: " msgstr "Komento: " @@ -1348,7 +1271,7 @@ msgid "reading options from `%s'\n" msgstr "legas opciojn el '%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTO: %s ne estas por normala uzado!\n" @@ -1358,342 +1281,342 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ne estas valida signaro\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ne povis analizi URI de þlosilservilo\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 #, fuzzy msgid "invalid import options\n" msgstr "nevalida kiraso" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 #, fuzzy msgid "invalid export options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "nevalida kiraso" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "AVERTO: programo povas krei core-dosieron!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTO: %s nuligas %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ne eblas kun %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "ne eblas samtempe subskribi kaj æifri kun --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "æifri mesaøon kun --pgp2 postulas la æifron IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed devas esti pli granda ol 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed devas esti pli granda ol 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth devas esti inter 1 kaj 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "nevalida S2K-reøimo; devas esti 0, 1 aý 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 #, fuzzy msgid "invalid default preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [dosiero]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [dosiero]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "malæifrado malsukcesis: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [dosiero]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [dosiero]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [dosiero]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [dosiero]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [dosiero]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key uzantidentigilo" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key uzantidentigilo" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key uzantidentigilo" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key uzantidentigilo" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key uzantidentigilo [komandoj]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record malsukcesis: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "elkirasigo malsukcesis: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "enkirasigo malsukcesis: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "nevalida kompendi-metodo '%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[dosiero]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Ektajpu vian mesaøon ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1702,24 +1625,24 @@ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn " "kaj fini per '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "la donita gvidlinia URL por atestado ne validas\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" @@ -2573,13 +2496,13 @@ msgstr "Uzantidentigilo \"%s\" estas revokita.\n" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr "" @@ -2796,7 +2719,7 @@ msgid "Really sign? (y/N) " msgstr "Æu vere subskribi? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2849,18 +2772,10 @@ msgstr "movas þlosilsubskribon al la øusta loko\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "skribi" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "skribi kaj fini" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fsp" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "montri fingrospuron" @@ -2869,533 +2784,384 @@ msgstr "listigi þlosilojn kaj uzantidentigilojn" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "elekti uzantidentigilon N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "þlosilo" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "elekti flankan þlosilon N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "kontroli" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "listigi subskribojn" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "k" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "subskribi" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "subskribi la þlosilon" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "subskribi" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "fari apartan subskribon" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsub" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "subskribi la þlosilon loke" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsub" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "subskribi la þlosilon nerevokeble" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsub" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "subskribi la þlosilon loke kaj nerevokeble" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "aluid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "aldoni uzantidentigilon" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "alfoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "aldoni foto-identigilon" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "foruid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "forviþi uzantidentigilon" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "forfoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "al" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "aldoni flankan þlosilon" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "al" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "for" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "forviþi flankan þlosilon" -#: g10/keyedit.c:1275 -#, fuzzy -msgid "addrevoker" -msgstr "revokita" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 #, fuzzy msgid "add a revocation key" msgstr "aldoni flankan þlosilon" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "forsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "forviþi subskribojn" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "eksval" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "þanøi la daton de eksvalidiøo" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "æefa" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "marku uzantidentigilon kiel æefan" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "alia" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "de sekreta aý publika listo iri al la alia" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "a" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "listigi preferojn (spertula)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "monpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "listigi preferojn (detale)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "agpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "agordi liston de preferoj" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "aktpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "aktualigitaj preferoj" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "þlosilservila eraro" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "ne povis analizi URI de þlosilservilo\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "þanøi la pasfrazon" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "fido" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "þanøi la posedantofidon" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revoki subskribojn" -#: g10/keyedit.c:1290 -#, fuzzy -msgid "revuid" -msgstr "revsig" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 #, fuzzy msgid "revoke a user ID" msgstr "aldoni uzantidentigilon" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "rev" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revoki flankan þlosilon" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "el" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "malþalti þlosilon" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "en" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "þalti þlosilon" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "monfoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "montri foto-identigilon" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Sekreta þlosilo estas havebla.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Bezonas la sekretan þlosilon por fari tion.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 #, fuzzy msgid "Key is revoked." msgstr "Þlosilo estas revokita.\n" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Æu vere subskribi æiujn uzantidentigilojn? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Vi devas elekti almenaý unu uzantidentigilon.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Vi ne povas forviþi la lastan uzantidentigilon!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Vi devas elekti almenaý unu þlosilon.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Vi devas elekti almenaý unu þlosilon.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Æu vi vere volas forviþi la elektitajn þlosilojn? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Æu vi vere volas forviþi æi tiun þlosilon? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Æu vi vere volas revoki la elektitajn þlosilojn? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Æu vi vere volas revoki æi tiun þlosilon? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "agordi liston de preferoj" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Æu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Æu vere aktualigi la preferojn? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Æu skribi þanøojn? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Æu fini sen skribi þanøojn? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "aktualigo malsukcesis: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "aktualigo de sekreto malsukcesis: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "" -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Æi tiu þlosilo estas revokebla per %s þlosilo %s%s\n" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (sentema)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "ne povas krei %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "rev" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Æi tiu þlosilo estas malþaltita" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "rev" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "eksval" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3404,46 +3170,46 @@ "AVERTO: Æi tiu estas PGP2-stila þlosilo. Aldono de foto-identigilo eble\n" " kaýzos, ke iuj versioj de PGP malakceptos la þlosilon.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila þlosilo.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Forviþis %d subskribon.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Forviþis %d subskribojn.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nenio estis forviþita.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 #, fuzzy msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " @@ -3453,164 +3219,164 @@ "AVERTO: Æi tiu estas PGP2-stila þlosilo. Aldono de foto-identigilo eble\n" " kaýzos, ke iuj versioj de PGP malakceptos la þlosilon.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 #, fuzzy msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila þlosilo.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Donu la þlosilgrandon" -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Þanøas la daton de eksvalidiøo de la æefa þlosilo.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vi ne povas þanøi la daton de eksvalidiøo de v3-þlosilo\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Mankas responda subskribo en sekreta þlosilaro\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Bonvolu elekti precize unu uzantidentigilon.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "þlosilo %08lX: nevalida mem-subskribo\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Mankas uzantidentigilo kun indekso %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Mankas flanka þlosilo kun indekso %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "uzantidentigilo: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " subskribita per %08lX je %s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr "subskribi þlosilon nerevokeble" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokita de %08lX je %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Vi revokos la sekvajn subskribojn:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Æu vere krei la revokatestilojn? (j/N)" -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "mankas sekreta þlosilo\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3938,7 +3704,7 @@ "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4206,7 +3972,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "nevalida þlosilaro" @@ -4221,106 +3987,106 @@ msgid "key not found on keyserver\n" msgstr "þlosilo '%s' ne trovita: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "subskribita per via þlosilo %08lX je %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "nevalida þlosilaro" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "neniu þlosilservilo konata (uzu la opcion --keyserver)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "þlosilservila eraro" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "þlosilservila eraro" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: ne valida þlosilidentigilo\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "Averto: malsekura posedeco sur %s \"%s\"\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" @@ -4501,7 +4267,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 #, fuzzy msgid "unknown" msgstr "nekonata versio" @@ -4675,50 +4441,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ne estas disponata en æi tiu sesio\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "ne povas agordi kliento-PID por la agento\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "ne povas akiri lego-FD de servilo por la agento\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "ne povas akiri skribo-FD de servilo por la agento\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokolversio %d de gpg-agent ne estas uzebla\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ne povas konektiøi al '%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "komunikproblemo kun gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problemo kun agento - malþaltas uzadon de agento\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (æefþlosilo %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4729,41 +4495,41 @@ "\"%.*s\"\n" "%u-bita %s þlosilo, ID %08lX, kreita je %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Ripetu pasfrazon\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Donu pasfrazon\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "pasfrazo estas tro longa\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "nevalida respondo de agento\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "nuligita de uzanto\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemo kun agento: agento redonas 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Donu pasfrazon: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4773,17 +4539,17 @@ "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n" "por la uzanto: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " @@ -5657,12 +5423,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "la fido-datenaro estas fuþita; bonvolu ruli \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "enigata linio pli longa ol %d signojn\n" @@ -5721,7 +5487,7 @@ msgid "[ revoked]" msgstr "rev" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "eksval" @@ -5731,101 +5497,101 @@ msgid "[ unknown]" msgstr "nekonata versio" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "sekva kontrolo de fido-datenaro je %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "publika þlosilo %08lX ne trovita: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "kontrolas la fido-datenaron\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n" @@ -6098,6 +5864,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "fini" + #: util/miscutil.c:351 msgid "qQ" msgstr "fF" @@ -6136,6 +5906,160 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n" +#~ msgid "q" +#~ msgstr "f" + +#~ msgid "help" +#~ msgstr "helpo" + +#~ msgid "list" +#~ msgstr "listo" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "spuri" + +#, fuzzy +#~ msgid "name" +#~ msgstr "en" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsub" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fsp" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "øenerala eraro" + +#~ msgid "passwd" +#~ msgstr "pasf" + +#~ msgid "save" +#~ msgstr "skribi" + +#~ msgid "fpr" +#~ msgstr "fsp" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "þlosilo" + +#~ msgid "check" +#~ msgstr "kontroli" + +#~ msgid "c" +#~ msgstr "k" + +#~ msgid "sign" +#~ msgstr "subskribi" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "subskribi" + +#~ msgid "lsign" +#~ msgstr "lsub" + +#~ msgid "nrsign" +#~ msgstr "nrsub" + +#~ msgid "nrlsign" +#~ msgstr "nrlsub" + +#~ msgid "adduid" +#~ msgstr "aluid" + +#~ msgid "addphoto" +#~ msgstr "alfoto" + +#~ msgid "deluid" +#~ msgstr "foruid" + +#~ msgid "delphoto" +#~ msgstr "forfoto" + +#~ msgid "addkey" +#~ msgstr "al" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "al" + +#~ msgid "delkey" +#~ msgstr "for" + +#, fuzzy +#~ msgid "addrevoker" +#~ msgstr "revokita" + +#~ msgid "delsig" +#~ msgstr "forsig" + +#~ msgid "expire" +#~ msgstr "eksval" + +#~ msgid "primary" +#~ msgstr "æefa" + +#~ msgid "toggle" +#~ msgstr "alia" + +#~ msgid "t" +#~ msgstr "a" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "monpref" + +#~ msgid "setpref" +#~ msgstr "agpref" + +#~ msgid "updpref" +#~ msgstr "aktpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "þlosilservila eraro" + +#~ msgid "trust" +#~ msgstr "fido" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "revuid" +#~ msgstr "revsig" + +#~ msgid "revkey" +#~ msgstr "rev" + +#~ msgid "disable" +#~ msgstr "el" + +#~ msgid "enable" +#~ msgstr "en" + +#~ msgid "showphoto" +#~ msgstr "monfoto" + #~ msgid "" #~ "About to generate a new %s keypair.\n" #~ " minimum keysize is 768 bits\n" Index: gnupg/po/es.po diff -u gnupg/po/es.po:1.13 gnupg/po/es.po:1.14 --- gnupg/po/es.po:1.13 Fri Dec 10 23:20:53 2004 +++ gnupg/po/es.po Tue Dec 14 08:49:27 2004 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-10-12 19:27+0200\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" @@ -34,7 +34,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -364,7 +364,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -577,165 +577,88 @@ msgid "secret key already stored on a card\n" msgstr "omitido: clave secreta ya presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "salir|fin|acabar" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "sale de este menú" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "s" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "órdenes incompatibles\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "ayuda" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "muestra esta ayuda" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "lista" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Clave disponible en: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "depura" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "habcla" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "firmal" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "cambia fecha de caducidad" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "cambia valores de confianza" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "hdac" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "muestra huella dactilar" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revfir" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "Error general" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "genera un nuevo par de claves" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "contr" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Orden> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "órdenes incompatibles\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "órdenes incompatibles\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Orden inválida (pruebe \"help\")\n" @@ -783,7 +706,7 @@ msgid "PIN not correctly repeated; try again" msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -793,13 +716,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona con esta orden\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "clave '%s' no encontrada: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1270,7 +1193,7 @@ msgid "Pubkey: " msgstr "Clave pública: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Cifrado: " @@ -1278,7 +1201,7 @@ msgid "Hash: " msgstr "Resumen: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Compresión: " @@ -1382,7 +1305,7 @@ msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s no es para uso normal!\n" @@ -1392,325 +1315,325 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "no se carga el cifrado de ampliación \"%s\" por permisos inseguros\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s no es un juego de caracteres válido\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "no se puede interpretar la URI del servidor de claves\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "opciones de importación inválidas\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "opciones de importación inválidas\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "imposible establecer camino de ejecutables %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sustituye a %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s no permitido con %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s no tiene sentido con %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "sólo puede hacer firmas separadas o en claro en modo --pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "debe usar ficheros (no tuberías) si trabaja con --pgp2 activo.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no inválido\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "el algoritmo de certificación por resumen elegido es inválido\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level inválido; debe ser 0, 1, 2, ó 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level inválido; debe ser 0, 1, 2, ó 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "preferencias por defecto inválidas\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "preferencias personales de cifrado inválidas\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "preferencias personales de algoritmo de resumen inválidas\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "preferencias personales de compresión inválidas\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s aún no funciona con %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "no puede usar el cifrado \"%s\" en modo %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "no puede usar el resumen \"%s\" en modo %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "no puede usar la compresión \"%s\" en modo %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "descifrado fallido: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "no puede usar %s en modo %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "no puede usar %s en modo %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nombre_fichero]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id-usuario" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuario" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-usuario" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-usuario" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuario [órdenes]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuario] [anillo]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "envío al servidor de claves fallido: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepción del servidor de claves fallida: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "exportación de clave fallida: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "búsqueda del servidor de claves fallida: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "renovación al servidor de claves fallida: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución inválido `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nombre_fichero]" @@ -1718,11 +1641,11 @@ # En español no se deja espacio antes de los puntos suspensivos # (Real Academia dixit) :) # Tomo nota :-). Este comentario déjalo siempre. -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1730,23 +1653,23 @@ "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y " "acabar con un '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "un nombre de notación de usuario debe contener el caracter '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación no debe usar ningún caracter de control\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "URL de política de certificado inválida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "URL de política inválida\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL de política inválida\n" @@ -2615,12 +2538,12 @@ msgstr "ID de usuario \"%s\" revocado." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¿Seguro que todavía quiere firmarlo? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Imposible firmar.\n" @@ -2822,7 +2745,7 @@ msgid "Really sign? (y/N) " msgstr "¿Firmar de verdad? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2875,18 +2798,10 @@ msgstr "moviendo la firma de la clave al lugar correcto\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "graba" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "graba y sale" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "hdac" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "muestra huella dactilar" @@ -2895,505 +2810,358 @@ msgstr "lista clave e identificadores de usuario" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "idu" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "selecciona identificador de usuario N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "clave" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "selecciona clave secundaria N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "comprueba" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "lista firmas" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "firma" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "firma la clave" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "firma" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "crea una firma separada" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "firmal" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "firma la clave localmente" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "firmanr" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "firma la clave irrevocablemente" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "firmanrl" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "firma la clave local e irrevocablemente" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "añaidu" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "añade un identificador de usuario" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "añadirfoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "añade un ID fotográfico" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "borridu" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "borra un identificador de usuario" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "borfoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "añacla" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "añade una clave secundaria" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "añacla" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "borrcla" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "borra una clave secundaria" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "añarevoc" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "añade una clave de revocación" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "borrfir" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "borra firmas" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expira" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "cambia fecha de caducidad" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primaria" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "marca ID de usuario como primario" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "cambia" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "cambia entre lista de claves secretas y públicas" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "muestra preferencias (experto)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "verpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "muestra preferencias (prolijo)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "estpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "establece preferencias" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "actpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "preferencias actualizadas" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "error del servidor de claves" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "no se puede interpretar la URI del servidor de claves\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "cambia la frase contraseña" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "conf" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "cambia valores de confianza" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revfir" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revoca firmas" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revidu" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "revocar un identificador de usuario" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revcla" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revoca una clave secundaria" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "descla" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "deshabilita una clave" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "habcla" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "habilita una clave" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "verfoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "mostrar ID fotográfico" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "error leyendo bloque de clave secreta `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Clave secreta disponible.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Se necesita la clave secreta para hacer esto.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor use la orden \"cambia\" primero.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "La clave está revocada." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "¿Firmar realmente todos los identificadores de usuario? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Esta orden no se permite en modo %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Debe seleccionar por lo menos un identificador de usuario.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "¡No puede borrar el último identificador de usuario!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "¿Borrar realmente todos los identificadores seleccionados? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "¿Borrar realmente este identificador de usuario? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "¿Borrar realmente este identificador de usuario? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Debe seleccionar por lo menos una clave.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Debe seleccionar por lo menos una clave.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "¿De verdad quiere borrar las claves seleccionadas? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "¿De verdad quiere borrar esta clave? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "¿Revocar realmente todos los identificadores seleccionados? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "¿Revocar realmente este identificador de usuario? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "¿De verdad quiere revocar las claves seleccionadas? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "¿De verdad quiere revocar esta clave? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "establece preferencias" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "¿Actualizar realmente las preferencias para todos los ID seleccionados? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "¿Actualizar realmente las preferencias? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "¿Grabar cambios? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "¿Salir sin grabar? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "actualización fallida: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "actualización de la clave secreta fallida: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Clave sin cambios, no se necesita actualización.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Resumen: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Esta clave puede ser revocada por la clave %s" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (confidencial)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "no se puede crear %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Esta clave está deshabilitada" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3401,19 +3169,19 @@ "Por favor, advierta que la validez de clave mostrada no es necesariamente\n" "correcta a menos de que reinicie el programa.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[revocada]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expira" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3421,7 +3189,7 @@ "AVISO: ningún ID de usuario está marcado como principal. Esta orden puede\n" " causar que se tome como principal por defecto otro ID de usuario.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3430,45 +3198,45 @@ "AVISO: esta es una clave de tipo PGP2. Añadir un ID fotográfico puede\n" "hacer que algunas versiones de PGP rechacen esta clave.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de querer añadirla? (s/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta firma correcta? (s/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta firma inválida? (s/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta firma desconocida? (s/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "¿Borrar realmente esta autofirma? (s/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d firmas borradas.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d firmas borradas\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "No se borró nada\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3477,163 +3245,163 @@ "AVISO: esta es una clave tipo PGP2. Añadir un revocador designado puede\n" " hacer que algunas versiones de PGP rechacen esta clave.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Introduzca el ID de usuario del revocador designado: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no puede elegir una clave como su propio revocador designado\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ATENCIÓN: ¡Esta clave ha sido revocada por la persona designada\n" "como revocador!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "¿Está seguro de querer elegir esta clave como revocador designado? (s/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite las selecciones de las claves secretas.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo una clave secundaria.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando caducidad de clave secundaria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "No puede cambiar la fecha de caducidad de una clave v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "No existe la firma correspondiente en el anillo secreto\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Por favor seleccione exactamente un identificador de usuario.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "omitiendo autofirma V3 para el id \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Seguro que quiere usarlo? (s/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Seguro que quiere usarlo? (s/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "No hay ningún identificador de usuario con el índice %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el índice %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " firmada por %08lX el %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (no exportable)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta firma caducó el %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿De verdad quiere revocarla? (s/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta clave? (s/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ha firmado los siguientes IDs de usuario:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (no exportable)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocada por %08lX el %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Va a revocar las siguientes firmas:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Crear los certificados de revocación realmente? (s/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "no hay clave secreta\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3964,7 +3732,7 @@ "Necesita una frase contraseña para proteger su clave secreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4227,7 +3995,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opciones de exportación inválidas\n" @@ -4242,106 +4010,106 @@ msgid "key not found on keyserver\n" msgstr "clave '%s' no encontrada: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "solicitando clave %08lX a %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "solicitando clave %08lX a %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "buscando \"%s\" en el servidor HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "firmada con su clave %08lX el %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "buscando \"%s\" en el servidor HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "buscando \"%s\" en el servidor HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "opciones de exportación inválidas\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "no hay servidores de claves conocidos (use opción --keyserver)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "error del servidor de claves" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "error del servidor de claves" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "recepción del servidor de claves fallida: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "'%s' no es un identificador de clave válido\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "solicitando clave %08lX a %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "solicitando clave %08lX a %s\n" @@ -4519,7 +4287,7 @@ msgid "textmode" msgstr "modotexto" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "desconocido" @@ -4694,50 +4462,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "el agente gpg no esta disponible en esta sesión\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "no puedo establecer pid para el agente\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "no puedo conseguir el FD de lectura para el agente\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "no puedo conseguir el FD de escritura para el agente\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variable de entorno GPG_AGENT_INFO malformada\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "el programa no permite usar el protocolo agente gpg versión %d\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no se puede conectar con `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con el agente gpg\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problema con el agente - inhabilitando el uso del agente\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr "(ID clave primaria %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4748,41 +4516,41 @@ "del usuario: \"%.*s\"\n" "%u bits, clave %s, ID %08lX, creada el %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Repita frase contraseña\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Introduzca frase contraseña\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "frase contraseña demasiado larga\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "respuesta del agente inválida\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "cancelado por el usuario\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con el agente: el agente devuelve 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "imposible pedir contraseña en modo de proceso por lotes\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Introduzca frase contraseña: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4792,17 +4560,17 @@ "Necesita una frase contraseña para desbloquear la clave secreta\n" "del usuario: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Repita frase contraseña: " @@ -5687,12 +5455,12 @@ "La base de datos de confianza está dañada. Por favor, ejecute\n" "\"gpg --fix-trust-db\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "no se pueden manejar líneas de texto de más de %d caracteres\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "línea de longitud superior a %d caracteres\n" @@ -5751,7 +5519,7 @@ msgid "[ revoked]" msgstr "[revocada]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[caducada]" @@ -5761,101 +5529,101 @@ msgid "[ unknown]" msgstr "desconocido" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "nunca " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "siguiente comprobación de base de datos de confianza el: %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "clave pública %08lX no encontrada: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "por favor haga un --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "comprobando base de datos de confianza\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d claves procesadas (%d validaciones superadas)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "no se encuentran claves totalmente fiables\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "clave pública de la clave totalmente fiable %08lX no encontrada\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n" @@ -6153,6 +5921,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "salir|fin|acabar" + #: util/miscutil.c:351 msgid "qQ" msgstr "sS" @@ -6190,6 +5962,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n" +#~ msgid "q" +#~ msgstr "s" + +#~ msgid "help" +#~ msgstr "ayuda" + +#~ msgid "list" +#~ msgstr "lista" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "depura" + +#, fuzzy +#~ msgid "name" +#~ msgstr "habcla" + +#, fuzzy +#~ msgid "login" +#~ msgstr "firmal" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "hdac" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revfir" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "Error general" + +#~ msgid "passwd" +#~ msgstr "contr" + +#~ msgid "save" +#~ msgstr "graba" + +#~ msgid "fpr" +#~ msgstr "hdac" + +#~ msgid "uid" +#~ msgstr "idu" + +#~ msgid "key" +#~ msgstr "clave" + +#~ msgid "check" +#~ msgstr "comprueba" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "firma" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "firma" + +#~ msgid "lsign" +#~ msgstr "firmal" + +#~ msgid "nrsign" +#~ msgstr "firmanr" + +#~ msgid "nrlsign" +#~ msgstr "firmanrl" + +#~ msgid "adduid" +#~ msgstr "añaidu" + +#~ msgid "addphoto" +#~ msgstr "añadirfoto" + +#~ msgid "deluid" +#~ msgstr "borridu" + +#~ msgid "delphoto" +#~ msgstr "borfoto" + +#~ msgid "addkey" +#~ msgstr "añacla" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "añacla" + +#~ msgid "delkey" +#~ msgstr "borrcla" + +#~ msgid "addrevoker" +#~ msgstr "añarevoc" + +#~ msgid "delsig" +#~ msgstr "borrfir" + +#~ msgid "expire" +#~ msgstr "expira" + +#~ msgid "primary" +#~ msgstr "primaria" + +#~ msgid "toggle" +#~ msgstr "cambia" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "verpref" + +#~ msgid "setpref" +#~ msgstr "estpref" + +#~ msgid "updpref" +#~ msgstr "actpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "error del servidor de claves" + +#~ msgid "trust" +#~ msgstr "conf" + +#~ msgid "revsig" +#~ msgstr "revfir" + +#~ msgid "revuid" +#~ msgstr "revidu" + +#~ msgid "revkey" +#~ msgstr "revcla" + +#~ msgid "disable" +#~ msgstr "descla" + +#~ msgid "enable" +#~ msgstr "habcla" + +#~ msgid "showphoto" +#~ msgstr "verfoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "el algoritmo de resumen `%s' es de sólo lectura en esta versión\n" Index: gnupg/po/et.po diff -u gnupg/po/et.po:1.13 gnupg/po/et.po:1.14 --- gnupg/po/et.po:1.13 Fri Dec 10 23:20:53 2004 +++ gnupg/po/et.po Tue Dec 14 08:49:27 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -562,165 +562,88 @@ msgid "secret key already stored on a card\n" msgstr "jätsin vahele: avalik võti on juba olemas\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "välju" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "välju sellest menüüst" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "v" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "vastuolulised käsud\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "näita seda abiinfot" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Võtme leiate: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "muuda aegumise kuupäeva" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "muuda omaniku usaldust" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "näita sõrmejälge" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "üldine viga" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "genereeri uus võtmepaar" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Käsklus> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Vigane käsklus (proovige \"help\")\n" @@ -765,7 +688,7 @@ msgid "PIN not correctly repeated; try again" msgstr "parooli ei korratud õieti; proovige uuesti" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -775,13 +698,13 @@ msgid "--output doesn't work for this command\n" msgstr "võti --output ei tööta selle käsuga\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "võtit '%s' ei leitud: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1239,7 +1162,7 @@ msgid "Pubkey: " msgstr "Avalik võti: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "¦iffer: " @@ -1247,7 +1170,7 @@ msgid "Hash: " msgstr "Räsi: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Pakkimine: " @@ -1351,7 +1274,7 @@ msgid "reading options from `%s'\n" msgstr "loen võtmeid failist `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n" @@ -1361,335 +1284,335 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ebaturvaliste õiguste tõttu ei laetud ¨ifri laiendust \"%s\"\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ei saa parsida võtmeserveri URI\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "vigased impordi võtmed\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "vigased impordi võtmed\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path väärtuseks ei õnnestu seada %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "HOIATUS: %s määrab üle %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s ei ole koos lubatud!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s ei oma koos mõtet!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "--pgp2 moodis saate luua ainult eraldiseisvaid või avateksti allkirju\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krüpteerida\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA ¨iffrit\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "valitud lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed peab olema suurem, kui 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed peab olema suurem, kui 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "vigane S2K mood; peab olema 0, 1 või 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "vigased vaikimisi eelistused\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "vigased isikliku ¨ifri eelistused\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "vigased isikliku lühendi eelistused\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "vigased isikliku pakkimise eelistused\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ei tööta veel koos %s-ga\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "¨ifri algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [failinimi]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [failinimi]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "lahtikrüpteerimine ebaõnnestus: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [failinimi]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [failinimi]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [failinimi]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [failinimi]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [failinimi]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key kasutaja-id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key kasutaja-id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key kasutaja-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key kasutaja-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key kasutaja-id [käsud]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "võtmeserverile saatmine ebaõnnestus: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "võtme eksport ebaõnnestus: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "võtmeserveri otsing ebaõnnestus: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "lahtipakendamine ebaõnnestus: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "pakendamine ebaõnnestus: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "vigane räsialgoritm `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[failinimi]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Kirjutage nüüd oma teade ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1697,23 +1620,23 @@ "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n" "ning lõpus peab olema '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "antud sertifikaadi poliisi URL on vigane\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" @@ -2570,12 +2493,12 @@ msgstr "Kasutaja ID \"%s\" on tühistatud." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Ei saa allkirjastada.\n" @@ -2776,7 +2699,7 @@ msgid "Really sign? (y/N) " msgstr "Allkirjastan tõesti? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2829,18 +2752,10 @@ msgstr "tõstan võtme allkirja õigesse kohta\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "salvesta ja välju" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "näita sõrmejälge" @@ -2849,504 +2764,357 @@ msgstr "näita võtit ja kasutaja IDd" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "vali kasutaja ID N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "vali sekundaarne võti N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "näita allkirju" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "allkirjasta võti" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "loo eraldiseisev allkiri" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "allkirjasta võti lokaalselt" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "lisa kasutaja ID" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "lisa foto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "lisa foto ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "kustuta kasutaja ID" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "lisa sekundaarne võti" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "kustuta sekundaarne võti" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "lisa tühistamise võti" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "kustuta allkirjad" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "muuda aegumise kuupäeva" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primaarne" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "märgi kasutaja ID primaarseks" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "lülita" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "lülita salajaste või avalike võtmete loendi vahel" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "näita eelistusi (ekspert)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "näita eelistusi (detailsena)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "sea eelistuste nimekiri" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "uuendatud eelistused" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "võtmeserveri viga" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "ei saa parsida võtmeserveri URI\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "muuda parooli" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "muuda omaniku usaldust" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "tühista allkirjad" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "tühista kasutaja ID" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "tühista sekundaarne võti" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "blokeeri võti" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "luba võti" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "näita foto ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Salajane võti on kasutatav.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Selle tegamiseks on vaja salajast võtit.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Võti on tühistatud." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Vihje: Valige allkirjastamiseks kasutaja\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "See käsklus ei ole %s moodis lubatud.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Te peate valima vähemalt ühe kasutaja ID.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Viimast kasutaja ID ei saa kustutada!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Kas kustutan tõesti kõik kasutaja IDd? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Kas eemaldan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Kas eemaldan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Te peata valima vähemalt ühe võtme.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Te peata valima vähemalt ühe võtme.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Kas te tõesti soovite valitud võtmeid kustutada? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Kas te tõesti soovite seda võtit kustutada? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Kas tühistan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Kas te tõesti soovite valitud võtmeid tühistada? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Kas te tõesti soovite seda võtit tühistada? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "sea eelistuste nimekiri" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Kas tõesti uuendan seaded? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvestan muutused? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Väljun salvestamata? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "salajase võtme uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Teatelühend: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Omadused: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Selle võtme võib olla tühistanud %s võti " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (tundlik)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s ei õnnestu luua: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[tühistatud] " -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "See võti on blokeeritud" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3354,19 +3122,19 @@ "Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n" "näidatud võtme kehtivus olla tingimata korrektne.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[tühistatud] " -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3374,7 +3142,7 @@ "HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks. See käsklus võib\n" " põhjustada muu kasutaja ID primaarseks määramist.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3383,45 +3151,45 @@ "HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n" " PGP versioone seda võtit tagasi lükkama.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Kustutan selle korrektse allkirja? (j/E/v)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Kustutan selle vigase allkirja? (j/E/v)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Kustutan selle tundmatu allkirja? (j/E/v)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Kustutatud %d allkiri.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Kustutatud %d allkirja.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Midagi ei kustutatud.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3430,160 +3198,160 @@ "HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n" " põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Sisestage määratud tühistaja kasutaja ID: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "palun valige ülimalt üks sekundaarne võti.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Muudan sekundaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Muudan primaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3 võtme aegumise aega ei saa muuta.\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Palun valige täpselt üks kasutaja ID.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Kasutaja ID numbriga %d puudub\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Sekundaarne võti numbriga %d puudub\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "kasutaja ID: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " allkirjastanud %08lX %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "See allkiri aegub %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " tühistanud %08lX %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Te asute tühistama järgmisi allkirju:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "salajast võtit pole\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n" @@ -3910,7 +3678,7 @@ "Te vajate oma salajase võtme kaitsmiseks parooli.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4169,7 +3937,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "vigased ekspordi võtmed\n" @@ -4184,106 +3952,106 @@ msgid "key not found on keyserver\n" msgstr "võtit '%s' ei leitud: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "allkirjastatud teie võtmega %08lX %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "vigased ekspordi võtmed\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "võtmeserveri viga" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "võtmeserveri viga" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" @@ -4460,7 +4228,7 @@ msgid "textmode" msgstr "tekstimood" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "tundmatu" @@ -4634,50 +4402,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "agendile ei õnnestu seada kliendi pid\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "agendiga suhtlemiseks ei õnnestu saada lugemise FD\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "agendiga suhtlemiseks ei õnnestu saada kirjutamise FD\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "probleem gpg-agent programmiga suhtlemisel\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "probleem agendiga - blokeerin agendi kasutamise\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (peamise võtme ID %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4688,41 +4456,41 @@ "\"%.*s\"\n" "%u-bitti %s võti, ID %08lX, loodud %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Korrake parooli\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Sisestage parool\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "liiga pikk parool\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "vigane vastus agendilt\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "katkestatud kasutaja poolt\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem agendiga: agent tagastas 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "pakettmoodis ei saa parooli küsida\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Sisestage parool: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4732,17 +4500,17 @@ "Te vajate kasutaja salajase võtme lahtilukustamiseks\n" "parooli: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bitine %s võti, ID %08lX, loodud %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Korrake parooli: " @@ -5616,12 +5384,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb on vigane; palun käivitage \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "ei suuda käsitleda tekstiridu mis on pikemad, kui %d sümbolit\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "sisendrida on pikem, kui %d sümbolit\n" @@ -5680,7 +5448,7 @@ msgid "[ revoked]" msgstr "[tühistatud] " -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[aegunud] " @@ -5690,101 +5458,101 @@ msgid "[ unknown]" msgstr "tundmatu" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "mitte kunagi" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "trustdb järgmine kontroll %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ei leia avalikku võtit %08lX: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "palun tehke --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "kontrollin trustdb faili\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d võtit töödeldud (%d kehtivust puhastatud)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "absoluutselt usaldatavaid võtmeid pole\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n" @@ -6056,6 +5824,10 @@ msgid "nN" msgstr "eE" +#: util/miscutil.c:348 +msgid "quit" +msgstr "välju" + #: util/miscutil.c:351 msgid "qQ" msgstr "vV" @@ -6093,6 +5865,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n" +#~ msgid "q" +#~ msgstr "v" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "üldine viga" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "lisa foto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primaarne" + +#~ msgid "toggle" +#~ msgstr "lülita" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "võtmeserveri viga" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "sõnumilühendi algoritm `%s' ei ole selles versioonis muudetav\n" Index: gnupg/po/fi.po diff -u gnupg/po/fi.po:1.8 gnupg/po/fi.po:1.9 --- gnupg/po/fi.po:1.8 Fri Dec 10 23:20:53 2004 +++ gnupg/po/fi.po Tue Dec 14 08:49:27 2004 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -46,7 +46,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -371,7 +371,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -582,165 +582,88 @@ msgid "secret key already stored on a card\n" msgstr "ohitetaan: salainen avain on jo paikalla\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "lopeta|sulje" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ulos tästä valikosta" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "ristiriitainen komento\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "apua" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "näytä tämä ohje" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Avain saatavilla kohteessa: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "muuta voimassoloaikaa" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "muuta luottamusastetta" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "näytä sormenjälki" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "yleinen virhe" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "luo uusi avainpari" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Komento> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Komento ei kelpaa (kirjoita \"help\")\n" @@ -785,7 +708,7 @@ msgid "PIN not correctly repeated; try again" msgstr "salasanaa ei toistettu oikein, yritä uudestaan." -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -795,13 +718,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ei toimi yhdessä tämän komennon kanssa\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "avainta \"%s\" ei löydy: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1260,7 +1183,7 @@ msgid "Pubkey: " msgstr "JulkAvain: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Salaus: " @@ -1268,7 +1191,7 @@ msgid "Hash: " msgstr "Tiiviste: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Pakkaus: " @@ -1372,7 +1295,7 @@ msgid "reading options from `%s'\n" msgstr "luetaan asetukset tiedostosta \"%s\"\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "HUOM: %s ei ole normaaliin käyttöön!\n" @@ -1382,336 +1305,336 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "avainpalvelimen URI:iä ei voi jäsentää\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-polkua kohteeseen %s ei voi asettaa\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROITUS: %s korvaa %s:n\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s eivät ole sallittuja yhdessä!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s yhdessä on järjetöntä!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "valittu tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed täytyy olla suurempi kuin 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed täytyy olla suurempi kuin 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth tulee olla välillä 1-255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "virheelliset oletusarvoiset valinnat\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "virheelliset henkilökohtaisen salaimen valinnat\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ja %s eivät vielä toimi yhdessä\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [tiedostonimi]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [tiedostonimi]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "avaus epäonnistui: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [tiedostonimi]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "valitsinta %s ei voi käyttää %s-tilassa\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--allekirjoita [tiedostonimi]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "valitsinta %s ei voi käyttää %s-tilassa\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [tiedostonimi]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [tiedostonimi]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [tiedostonimi]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key käyttäjätunnus" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key käyttäjätunnus" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrlsign-key käyttäjätunnus" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key käyttäjätunnus" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key käyttäjätunnus [komennot]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "avaimen vienti epäonnistui: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "avainpalvelimen päivitys epäonnistui: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "ascii-koodauksen purku epäonnistui: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "ascii-koodaaminen epäonnistui: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "virheellinen tiivistealgoritmi \"%s\"\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[tiedostonimi]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Kirjoita viestisi...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1719,23 +1642,23 @@ "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai " "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "notaatiosssa ei saa olla erikoismerkkejä\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "annettu varmennekäytännön URL on virheellinen\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" @@ -2606,12 +2529,12 @@ msgstr "Käyttäjätunnus \"%s\" on mitätöity." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Allekirjoittaminen ei onnistu.\n" @@ -2814,7 +2737,7 @@ msgid "Really sign? (y/N) " msgstr "Varmastiko allekirjoita? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2867,18 +2790,10 @@ msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "tallenna" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "tallenna ja lopeta" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "näytä sormenjälki" @@ -2887,504 +2802,357 @@ msgstr "näytä avaimet ja käyttäjätunnukset" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "valitse käyttäjätunnus N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "valitse toissijainen avain N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "näytä allekirjoitukset" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "allekirjoita avain" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "tee erillinen allekirjoitus" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "allekirjoita avain paikallisesti" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "allekirjoita avain mitätöimättömästi" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "allekirjoita avain paikallisesti ja mitätöimättömästi" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "lisää käyttäjätunnus" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "lisää valokuva" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "poista käyttäjätunnus" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "lisää toissijainen avain" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "poista toissijainen avain" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "lisää mitätöintiavain" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "poista allekirjoitus" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "muuta voimassoloaikaa" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "merkitse käyttäjätunnus ensisijaiseksi" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "vaihda salaisten ja julkisten avainten luettelon välillä" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "näytä valinnat (asiantuntija)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "näytä valinnat (monisanaisesti)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "näytä valinnat" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "päivitä valinnat" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "avainpalvelinvirhe" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "avainpalvelimen URI:iä ei voi jäsentää\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "muuta salasanaa" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "muuta luottamusastetta" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "mitätöi allekirjoitus" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "mitätöi käyttäjätunnus" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "mitätöi toissijainen avain" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "poista avain käytöstä" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "ota avain käyttöön" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "näytä valokuvatunniste" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Salainen avain on saatavilla.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Tähän tarvitaan salainen avain.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Käytä ensin komentoa \"toggle\".\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Avain on mitätöity." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?" -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tätä komentoa ei sallita %s-tilassa.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Varmastiko poista tämä käyttäjätunnus? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Varmastiko poista tämä käyttäjätunnus? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Sinun täytyy valita ainakin yksi avain.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Sinun täytyy valita ainakin yksi avain.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Haluatko varmasti poistaa valitut avaimet? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Haluatko varmasti poistaa tämän avaimen? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Varmastiko mitätöi tämä käyttäjätunnus? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Haluatko varmasti mitätöidä valitut avaimet? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Haluatko varmasti mitätöidä tämän avaimen? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "näytä valinnat" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Varmastiko päivitä valinnat? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Tallenna muutokset? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Lopeta tallentamatta muutoksia?" -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "päivitys epäonnistui: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "salaisen päivitys epäonnistui: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Tiiviste: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Ominaisuudet: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Tämä avain voidaan mitätöidä %s-avaimella " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (luottamuksellinen)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "ei voida luoda kohdetta %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[mitätöity] " -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Tämä avain on poistettu käytöstä" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3392,19 +3160,19 @@ "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n" "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[mitätöity] " -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3412,7 +3180,7 @@ "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi. Tämän \n" "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3421,45 +3189,45 @@ "VAROITUS: Tämä on PGP2-muodon avain. Valokuvan lisääminen voi\n" " saada jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Varmastiko poista oma-allekirjoitus? (k/E)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d allekirjoitus poistettu.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d allekirjoitusta poistettu.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Mitään ei poistettu.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3469,162 +3237,162 @@ "voi\n" " saada jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Poista salaisten avainten valinnat, kiitos.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Valitse tasan yksi käyttäjätunnus!\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Indeksillä %d ei löydy toissijaista avainta\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "käyttäjätunnus: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " %08lX allekirjoitti tämän %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Tämä allekirjoitus vanheni %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Haluatko varmasti mitätöidä sen? (k/E) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " %08lX mitätöi tämän %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "salainen avain ei ole saatavilla\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän " "tulevaisuuteen\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3955,7 +3723,7 @@ "Tarvitset salasanan suojaamaan salaista avaintasi.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4219,7 +3987,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "virheelliset vientivalitsimet\n" @@ -4234,106 +4002,106 @@ msgid "key not found on keyserver\n" msgstr "avainta \"%s\" ei löydy: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "allekirjoitettu avaimellasi %08lX %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "avainpalvelinvirhe" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "avainpalvelinvirhe" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" @@ -4514,7 +4282,7 @@ msgid "textmode" msgstr "teksti" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "tuntematon " @@ -4691,50 +4459,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "agentille ei voida asettaa pid:tä\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "palvelin ei lue agentin FD:tä\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "palvelin ei kirjoita agentille FD:tä\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "gpg-agentin kanssa yhteysongelma\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (pääavaimen tunnus %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4745,41 +4513,41 @@ "\"%.*s\"\n" "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Toista salasana\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Syötä salasana\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "salasana on liian pitkä\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "agentin lähettämä vastaus ei kelpaa\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "käyttäjän peruma\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "salasanan kysyminen ei onnistu eräajossa\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Syötä salasana: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4788,17 +4556,17 @@ "\n" "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Toista salasana: " @@ -5695,12 +5463,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb on turmeltunut; suorita \"gpg --fix-trustdb\"\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "yli %d merkkiä pitkiä tekstirivejä ei voi käsitellä\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "syöterivi on yli %d merkkiä pitkä\n" @@ -5760,7 +5528,7 @@ msgid "[ revoked]" msgstr "[mitätöity] " -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[vanhentunut] " @@ -5770,101 +5538,101 @@ msgid "[ unknown]" msgstr "tuntematon " -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "ei koskaan" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "seuraava trustdb tarkistus %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "julkista avainta %08lX ei löydy: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "tee --check-trustdb, kiitos\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "tarkistetaan trustdb:tä\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n" @@ -6136,6 +5904,10 @@ msgid "nN" msgstr "eE" +#: util/miscutil.c:348 +msgid "quit" +msgstr "lopeta|sulje" + #: util/miscutil.c:351 msgid "qQ" msgstr "lLsS" @@ -6173,6 +5945,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "apua" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "yleinen virhe" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "tallenna" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "avainpalvelinvirhe" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "" #~ "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n" Index: gnupg/po/fr.po diff -u gnupg/po/fr.po:1.67 gnupg/po/fr.po:1.68 --- gnupg/po/fr.po:1.67 Fri Dec 10 23:20:52 2004 +++ gnupg/po/fr.po Tue Dec 14 08:49:27 2004 @@ -5,13 +5,13 @@ # Thanks to Rémi Guyomarch and # for pointing me out some errors. # -# $Id: fr.po,v 1.67 2004/12/10 22:20:52 wk Exp $ +# $Id: fr.po,v 1.68 2004/12/14 07:49:27 wk Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.3.93-cvs\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-11-08 01:13+0100\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -35,7 +35,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -364,7 +364,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "carte OpenPGP n° %s détectée\n" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "impossible de faire cela en mode automatique\n" @@ -562,154 +562,81 @@ msgid "secret key already stored on a card\n" msgstr "la clé secrète est déjà stockée sur une carte\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quitter" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "quitter ce menu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "admin" - #: g10/card-util.c:1252 msgid "show admin commands" msgstr "indiquer les commandes d'administration" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "afficher cette aide" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "lister" - #: g10/card-util.c:1255 msgid "list all available data" msgstr "lister toutes les données disponibles" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "déboguer" - -#: g10/card-util.c:1258 -msgid "name" -msgstr "nom" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "changer le nom du propriétaire de la carte" #: g10/card-util.c:1259 -msgid "url" -msgstr "url" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "changer l'URL pour récupérer la clé" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "chercher" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "aller chercher la clé spécifiée dans l'URL de la carte" -#: g10/card-util.c:1262 -msgid "login" -msgstr "identification" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 msgid "change the login name" msgstr "changer le nom d'identification" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "langue" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 msgid "change the language preferences" msgstr "changer les préférences de langue" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "sexe" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "changer le sexe du propriétaire de la carte" -# g10/keyedit.c:556 ??? -#: g10/card-util.c:1265 -msgid "cafpr" -msgstr "emprac" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 msgid "change a CA fingerprint" msgstr "changer l'empreinte d'une autorité de certification" -#: g10/card-util.c:1266 -msgid "forcesig" -msgstr "forcersig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" "inverser le paramètre obligeant à rentrer le code PIN pour les\n" "signatures" -#: g10/card-util.c:1268 -msgid "generate" -msgstr "générer" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 msgid "generate new keys" msgstr "générer de nouvelles clés" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "mot.pas" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "menu pour changer ou déverrouiller le PIN" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Commande> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 msgid "Admin-only command\n" msgstr "La commande n'est utilisable qu'en mode administration\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 msgid "Admin commands are allowed\n" msgstr "Les commandes d'administration sont permises\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 msgid "Admin commands are not allowed\n" msgstr "Les commandes d'administration ne sont pas permises\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez «help»)\n" @@ -759,7 +686,7 @@ msgid "PIN not correctly repeated; try again" msgstr "le mot de passe n'a pas été correctement répété ; recommencez." -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -769,13 +696,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output n'est pas compatible avec cette commande\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "clé « %s » introuvable: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1244,7 +1171,7 @@ msgid "Pubkey: " msgstr "Clé publique: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Chiffrement: " @@ -1252,7 +1179,7 @@ msgid "Hash: " msgstr "Hachage: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Compression: " @@ -1380,7 +1307,7 @@ msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s n'est pas pour une utilisation normale !\n" @@ -1392,342 +1319,342 @@ "l'extension de chiffrement `%s' n'a pas été chargée car ses\n" "permissions sont peu sûres\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' n'est pas un jeu de caractères valide\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 msgid "could not parse keyserver URL\n" msgstr "impossible d'interpréter l'URL du serveur de clés\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: les options du serveur de clés sont invalides\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 msgid "invalid keyserver options\n" msgstr "les options du serveur de clés sont invalides\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: options d'import invalides\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "options d'import invalides\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: options d'export invalides\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "options d'export invalides\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: options de liste invalides\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 msgid "invalid list options\n" msgstr "options de liste invalides\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: options de vérification invalides\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 msgid "invalid verify options\n" msgstr "options de vérification invalides\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossible de mettre le chemin d'exécution à %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENTION: %s remplace %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n'est pas permis avec %s !\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n'a aucun sens avec %s !\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "il n'est possible de faire une signature détachée ou en texte clair\n" "qu'en mode --pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "vous ne pouvez pas signer et chiffrer en même temps en mode --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n" "est activé.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "chiffrer un message en mode --pgp2 nécessite l'algorithme de chiffrage IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 msgid "selected compression algorithm is invalid\n" msgstr "l'algorithme de compression sélectionné est invalide\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "la fonction de hachage de certification sélectionnée est invalide\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "«completes-needed» doit être supérieur à 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "«marginals-needed» doit être supérieur à 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth doit être compris entre 1 et 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalide; doit être 0, 1, 2 ou 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalide; doit être 0, 1, 2 ou 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide; ce doit être 0, 1 ou 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "préférences par défaut invalides\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "préférences de chiffrement personnelles invalides\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "préférences de hachage personnelles invalides\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "préférences de compression personnelles invalides\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne marche pas encore avec %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n" "en mode %s.\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n" "en mode %s.\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n" "en mode %s.\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "impossible d'initialiser la base de confiance: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISSEMENT: des destinataires (-r) ont été donnés alors que le\n" "chiffrement ne se fait pas par clé publique\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "le chiffrement symétrique de `%s' a échoué: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [nom du fichier]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [nom du fichier]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n" "--s2k-mode 0\n" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n" "en mode %s.\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom du fichier]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key utilisateur" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key utilisateur" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key utilisateur" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key utilisateur" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'envoi vers le serveur de clés a échoué: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la réception depuis le serveur de clés a échoué: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "l'export de la clé a échoué: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "la recherche au sein du serveur de clés a échoué: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "le rafraîchissement par le serveur de clés a échoué: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "la suppression d'une armure a échoué: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "la construction d'une armure a échoué: %s \n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Vous pouvez taper votre message...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1735,23 +1662,23 @@ "le nom d'une notation ne doit comporter que des caractères imprimables\n" "ou des espaces, et se terminer par un signe '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notation utilisateur doit contenir le caractère '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "l'URL de politique de certification donnée est invalide\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "l'URL de politique de signature donnée est invalide\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 msgid "the given preferred keyserver URL is invalid\n" msgstr "l'URL du serveur de clés favori qui a été donnée est invalide\n" @@ -2636,12 +2563,12 @@ msgstr "Le nom d'utilisateur \"%s\" est révoqué." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Etes-vous sûr de toujours vouloir le signer ? (o/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Impossible de signer.\n" @@ -2824,7 +2751,7 @@ msgid "Really sign? (y/N) " msgstr "Signer réellement ? (o/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2875,18 +2802,9 @@ msgstr "replacer la signature d'une clé à l'endroit correct\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "enregistrer" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "enregistrer et quitter" -# g10/keyedit.c:556 ??? -#: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - #: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "afficher l'empreinte" @@ -2896,488 +2814,344 @@ msgstr "lister la clé et les noms d'utilisateurs" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "sélectionner le nom d'utilisateur N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "clé" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "sélectionner la clé secondaire N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "vérifier" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "lister les signatures" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "signer" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "signer la clé" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -msgid "tsign" -msgstr "tsigner" - #: g10/keyedit.c:1259 msgid "make a trust signature" msgstr "faire une signature de confiance" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsigner" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "signer la clé localement" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsigner" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "signer la clé de façon non-révocable" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsigner" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "signer la clé de façon locale et non-révocable" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "aj.ut" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "ajouter un utilisateur" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "aj.photo" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "ajouter une photo d'identité" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "suppr.ut" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "enlever un utilisateur" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "suppr.photo" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "aj.clé" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "ajouter une clé secondaire" -#: g10/keyedit.c:1271 -msgid "addcardkey" -msgstr "ajclécarte" - -#: g10/keyedit.c:1271 +#: g10/keyedit.c:1272 msgid "add a key to a smartcard" msgstr "ajouter une clé à une carte à puce" -#: g10/keyedit.c:1272 -msgid "keytocard" -msgstr "cléverscarte" - -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "déplacer une clé vers une carte à puce" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "suppr.clé" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "enlever une clé secondaire" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "aj.rev" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "ajouter une clé de révocation" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "suppr.sign" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "supprimer les signatures" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "changer la date d'expiration" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "principale" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "marquer le nom d'utilisateur comme principal" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "changer" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "passer de la liste des clés secrètes aux clés privées et inversement" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "préf" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "lister les préférences (expert)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "montr.préf" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "lister les préférences (bavard)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "mettre.préf" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "donner la liste de préférences" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "préf.màj" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "préférences mises à jour" -#: g10/keyedit.c:1286 -msgid "keyserver" -msgstr "servclés" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 msgid "set preferred keyserver URL" msgstr "indiquer l'URL du serveur de clés préféré" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "changer le mot de passe" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "confi." - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "changer la confiance" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "révoquer les signatures" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "révoquer un nom d'utilisateur" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revclé" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "révoquer une clé secondaire" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "désactiver" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "désactiver une clé" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "activer" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "activer une clé" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "montr.photo" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "montrer la photo d'identité" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erreur pendant la lecture du bloc de clé secrète « %s »: %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "La clé secrète est disponible.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Il faut la clé secrète pour faire cela.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Utilisez la commande «toggle» d'abord.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "La clé est révoquée." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 msgid "Really sign all user IDs? (y/N) " msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Aide: Sélectionner les utilisateurs à signer\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Cette commande n'est pas admise en mode %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Vous devez sélectionner au moins un utilisateur.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 msgid "Really remove all selected user IDs? (y/N) " msgstr "Enlever réellement tous les noms d'utilisateurs sélectionnés ? (o/N) " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 msgid "Really remove this user ID? (y/N) " msgstr "Enlever réellement ce nom d'utilisateur ? (o/N) " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 msgid "Really move the primary key? (y/N) " msgstr "Enlever réellement la clé principale ? (o/N) " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 msgid "You must select exactly one key.\n" msgstr "Vous devez sélectionner exactement une clé.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Vous devez sélectionner au moins une clé.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? (o/N) " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 msgid "Do you really want to delete this key? (y/N) " msgstr "Voulez-vous vraiment supprimer cette clé ? (o/N) " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 msgid "Really revoke all selected user IDs? (y/N) " msgstr "Révoquer réellement tous les noms d'utilisateurs sélectionnés ? (o/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 msgid "Really revoke this user ID? (y/N) " msgstr "Révoquer réellement ce nom d'utilisateur ? (o/N) " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? (o/N) " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 msgid "Do you really want to revoke this key? (y/N) " msgstr "Voulez-vous vraiment révoquer cette clé ? (o/N) " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" "La confiance du propriétaire peut ne pas être positionnée en utilisant\n" "la base de confiance d'un tiers\n" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 msgid "Set preference list to:\n" msgstr "Changer la liste de préférences en :\n" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Mettre à jour réellement les préférences des noms d'utilisateurs\n" "sélectionnés ? (o/N) " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 msgid "Really update the preferences? (y/N) " msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 msgid "Save changes? (y/N) " msgstr "Enregistrer les changements? (o/N) " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 msgid "Quit without saving? (y/N) " msgstr "Quitter sans enregistrer ? (o/N) " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "la mise à jour a échoué: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "la mise à jour de la clé secrète a échoué: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "La clé n'a pas changé donc la mise à jour est inutile.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Hachage: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Fonctions: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "Serveur de clés: pas-de-modification" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "Serveur de clés préféré: " -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Cette clé peut être révoquée par la clé %s %s" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 msgid "(sensitive)" msgstr "(sensible)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "créé: %s" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "revoqué: %s" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "expiré: %s" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "expire: %s" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, c-format msgid "usage: %s" msgstr "utilisation: %s" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, c-format msgid "trust: %s" msgstr " confiance: %s" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "validité: %s" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Cette clé a été désactivée" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "n° de carte: " -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" "Il n'y a pas de préférences dans un nom d'utilisateur du style de\n" "PGP 2.x.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3385,17 +3159,17 @@ "Notez que la validité affichée pour la clé n'est pas nécessairement\n" "correcte tant que vous n'avez pas relancé le programme.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 msgid "revoked" msgstr "revoquée" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 msgid "expired" msgstr "expirée" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3404,7 +3178,7 @@ "Cette commande risque de rendre un autre nom d'utilisateur principal\n" "par défaut.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3414,46 +3188,46 @@ "d'identité peut empêcher certaines versions de PGP d'accepter\n" "cette clé\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Etes-vous sûr de vouloir l'ajouter ? (y/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Vous ne pouvez pas ajouter de photo d'identité à une clé du style PGP2.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Supprimer cette bonne signature ? (o/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Supprimer cette signature invalide ? (o/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Supprimer cette signature inconnue ? (o/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d signature supprimée.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d signatures supprimées\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Rien n'a été supprimé.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3463,165 +3237,165 @@ "désigné peut empêcher certaines versions de PGP d'accepter\n" "cette clé.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Vous ne pouvez pas ajouter de révocateur désigné à une clé de style PGP2.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Entrez le nom d'utilisateur du révocateur désigné: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "impossible d'utiliser une clé de style PGP 2.x comme révocateur\n" "désigné.\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "vous ne pouvez pas utiliser une clé comme son propre révocateur\n" "désigné\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 msgid "this key has already been designated as a revoker\n" msgstr "cette clé à déjà été désignée comme un révocateur\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVERTISSEMENT: l'établissement d'une clé comme révocateur désigné\n" "est irréversible !\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Etes-vous sûr de vouloir établir cette clé comme révocateur\n" "désigné ? (o/N) " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Enlevez les sélections des clés secrètes.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Vous devez sélectionner au plus une clé secondaire.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Changer la date d'expiration d'une clé secondaire.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Changer la date d'expiration de la clé principale.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vous ne pouvez pas changer la date d'expiration d'une clé v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-clés secret\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Vous devez sélectionner exactement un utilisateur.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "l'auto-signature v3 du nom d'utilisateur « %s » a été ignorée\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "Entrez l'URL de votre serveur de clés favori: " -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 msgid "Are you sure you want to replace it? (y/N) " msgstr "Etes-vous sûr de vouloir le remplacer ? (o/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 msgid "Are you sure you want to delete it? (y/N) " msgstr "Etes-vous sûr de vouloir le supprimer ? (o/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Pas de clé secondaire avec l'index %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, c-format msgid "user ID: \"%s\"\n" msgstr "nom d'utilisateur: « %s »\n" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "signé par votre clé %s à %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Cette signature a expiré le %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Etes-vous sûr de vouloir toujours le révoquer ? (y/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Générer un certificat de révocation pour cette signature ? (o/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Vous avez signé ces noms d'utilisateurs sur la clé %s:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 msgid " (non-revocable)" msgstr " (non-révocable)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, c-format msgid "revoked by your key %s on %s\n" msgstr "révoqué par votre clé %s à %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Vous êtes sur le point de révoquer ces signatures:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Créer réellement les certificats de révocation ? (o/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "pas de clé secrète\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Le nom d'utilisateur \"%s\" est déjà révoqué.\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n" "dans le futur\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3948,7 +3722,7 @@ "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4215,7 +3989,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > " -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "protocole serveur de clés invalide (nous %d!=gestionnaire %d)\n" @@ -4229,109 +4003,109 @@ msgid "key not found on keyserver\n" msgstr "clé non trouvée dans le serveur de clés\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "requête de la clé %s du serveur %s %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, c-format msgid "requesting key %s from %s\n" msgstr "requête de la clé %s de %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, c-format msgid "sending key %s to %s server %s\n" msgstr "envoi de la clé %s au serveur %s %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, c-format msgid "sending key %s to %s\n" msgstr "envoi de la clé %s à %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "recherche de « %s » du serveur %s %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "recherche de « %s » de %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 msgid "no keyserver action!\n" msgstr "pas d'action pour le serveur de clés !\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" "AVERTISSEMENT: le gestionnaire de serveurs de clés provient d'une\n" "version différente de GnuPG (%s)\n" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "le serveurs de clés n'a pas envoyé son numéro de VERSION\n" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "pas de serveur de clés connu (utilisez l'option --keyserver)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" "les appels externes à un serveur de clé ne sont pas supportés dans\n" "cette compilation\n" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "pas de gestionnaire pour le type de serveurs de clés `%s'\n" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" "l'action `%s' n'est pas supportée avec le type de serveurs\n" "de clés `%s'\n" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "gpgkeys_%s ne supporte pas le gestionnaire de version %d\n" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 msgid "keyserver timed out\n" msgstr "le délai d'attente du serveur de clés a expiré\n" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 msgid "keyserver internal error\n" msgstr "erreur interne du serveur de clés\n" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, c-format msgid "keyserver communications error: %s\n" msgstr "erreur de communication avec le serveur de clés: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "« %s » n'est pas une ID de clé: ignoré\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" "AVERTISSEMENT: impossible de rafraîchir la clé %s\n" "via %s: %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, c-format msgid "refreshing 1 key from %s\n" msgstr "rafraîchissement d'une clé depuis %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, c-format msgid "refreshing %d keys from %s\n" msgstr "rafraîchissement de %d clés depuis %s\n" @@ -4510,7 +4284,7 @@ msgid "textmode" msgstr "modetexte" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "inconnu" @@ -4688,53 +4462,53 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "un sous-paquet de type %d possède un bit critique\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent n'est pas disponible dans cette session\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "impossible d'obtenir le pid du client pour l'agent\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "" "impossible d'obtenir le descripteur de lecture du serveur\n" "pour l'agent\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "" "impossible d'obtenir le descripteur d'écriture du serveur pour l'agent\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "la variable d'environnement GPG_AGENT_INFO est mal définie\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "le protocole gpg-agent version %d n'est pas supporté\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossible de se connecter à `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problème de communication avec ssh-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problème avec l'agent - arrêt d'utilisation de l'agent\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, c-format msgid " (main key ID %s)" msgstr " (ID clé principale %s)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4746,40 +4520,40 @@ "\"%.*s\"\n" "clé %u bits %s, ID %s, créée %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Répétez le mot de passe\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Entrez le mot de passe\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "mot de passe trop long\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "réponse de l'agent invalide\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "annulé par l'utilisateur\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 msgid "can't query passphrase in batch mode\n" msgstr "impossible de demander la phrase de passe en mode automatique\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4788,17 +4562,17 @@ "Vous avez besoin d'une phrase de passe pour déverrouiller la\n" "clé secrète pour l'utilisateur: « %s »\n" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clé de %u bits %s, ID %s, créée le %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr " (sous-clé de la clé principale ID %s)" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Répétez le mot de passe: " @@ -5701,12 +5475,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "la base de confiance est corrompue; exécutez «gpg --fix-trustdb».\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossible de traiter les lignes plus longues que %d caractères\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "la ligne d'entrée est plus longue que %d caractères\n" @@ -5769,7 +5543,7 @@ msgid "[ revoked]" msgstr "revoquée" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "expirée" @@ -5779,102 +5553,102 @@ msgid "[ unknown]" msgstr "inconnu" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 #, fuzzy msgid "[marginal]" msgstr "marginale" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 #, fuzzy msgid "[ultimate]" msgstr "ultime" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "indéfini" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "jamais" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "marginale" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "pleine" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "ultime" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "vérification de la base de confiance inutile\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "vérification de la base de confiance inutile avec le modèle de\n" "confiance `%s'\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" "mise à jour de la base de confiance inutile avec le modèle de\n" "confiance `%s'\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, c-format msgid "public key %s not found: %s\n" msgstr "clé publique %s non trouvée : %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "faites un --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "vérifier la base de confiance\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d clés traitées (%d comptes de validité réinitialisés)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "aucune clé de confiance ultime n'a été trouvée\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "la clé publique de la clé de confiance ultime %s est introuvable\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" "%d marginale(s) nécessaires, %d complète(s) nécessaires, modèle\n" "de confiance %s\n" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5882,7 +5656,7 @@ "profondeur: %d valide: %3d signé: %3d\n" "confiance: %d-. %dg. %dn. %dm. %df. %du\n" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6156,6 +5930,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quitter" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6194,6 +5972,170 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "admin" +#~ msgstr "admin" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "lister" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "déboguer" + +#~ msgid "name" +#~ msgstr "nom" + +#~ msgid "url" +#~ msgstr "url" + +#~ msgid "fetch" +#~ msgstr "chercher" + +#~ msgid "login" +#~ msgstr "identification" + +#~ msgid "lang" +#~ msgstr "langue" + +#~ msgid "sex" +#~ msgstr "sexe" + +# g10/keyedit.c:556 ??? +#~ msgid "cafpr" +#~ msgstr "emprac" + +#~ msgid "forcesig" +#~ msgstr "forcersig" + +#~ msgid "generate" +#~ msgstr "générer" + +#~ msgid "passwd" +#~ msgstr "mot.pas" + +#~ msgid "save" +#~ msgstr "enregistrer" + +# g10/keyedit.c:556 ??? +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "clé" + +#~ msgid "check" +#~ msgstr "vérifier" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "signer" + +#~ msgid "s" +#~ msgstr "s" + +#~ msgid "tsign" +#~ msgstr "tsigner" + +#~ msgid "lsign" +#~ msgstr "lsigner" + +#~ msgid "nrsign" +#~ msgstr "nrsigner" + +#~ msgid "nrlsign" +#~ msgstr "nrlsigner" + +#~ msgid "adduid" +#~ msgstr "aj.ut" + +#~ msgid "addphoto" +#~ msgstr "aj.photo" + +#~ msgid "deluid" +#~ msgstr "suppr.ut" + +#~ msgid "delphoto" +#~ msgstr "suppr.photo" + +#~ msgid "addkey" +#~ msgstr "aj.clé" + +#~ msgid "addcardkey" +#~ msgstr "ajclécarte" + +#~ msgid "keytocard" +#~ msgstr "cléverscarte" + +#~ msgid "delkey" +#~ msgstr "suppr.clé" + +#~ msgid "addrevoker" +#~ msgstr "aj.rev" + +#~ msgid "delsig" +#~ msgstr "suppr.sign" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "principale" + +#~ msgid "toggle" +#~ msgstr "changer" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "préf" + +#~ msgid "showpref" +#~ msgstr "montr.préf" + +#~ msgid "setpref" +#~ msgstr "mettre.préf" + +#~ msgid "updpref" +#~ msgstr "préf.màj" + +#~ msgid "keyserver" +#~ msgstr "servclés" + +#~ msgid "trust" +#~ msgstr "confi." + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revclé" + +#~ msgid "disable" +#~ msgstr "désactiver" + +#~ msgid "enable" +#~ msgstr "activer" + +#~ msgid "showphoto" +#~ msgstr "montr.photo" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "" #~ "l'algorithme de hachage `%s' ne marche qu'en lecture seule dans cette\n" Index: gnupg/po/gl.po diff -u gnupg/po/gl.po:1.13 gnupg/po/gl.po:1.14 --- gnupg/po/gl.po:1.13 Fri Dec 10 23:20:52 2004 +++ gnupg/po/gl.po Tue Dec 14 08:49:27 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -566,165 +566,88 @@ msgid "secret key already stored on a card\n" msgstr "omítese: a chave secreta xa está presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "abandonar" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "saír deste menú" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "s" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandos conflictivos\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "axuda" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "amosar esta axuda" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "listar" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Chave dispoñible en: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "depurar" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "cambia-la fecha de expiración" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "cambia-la confianza sobre o dono" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "amosar fingerprint" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "erro xeral" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "xerar un novo par de chaves" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Comando incorrecto (tente \"help\")\n" @@ -772,7 +695,7 @@ msgid "PIN not correctly repeated; try again" msgstr "o contrasinal non se repetiu correctamente; ténteo de novo" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -782,13 +705,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output non traballa con este comando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "non se atopou a chave `%s': %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1252,7 +1175,7 @@ msgid "Pubkey: " msgstr "Pública: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Cifra: " @@ -1260,7 +1183,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Compresión: " @@ -1364,7 +1287,7 @@ msgid "reading options from `%s'\n" msgstr "lendo as opcións de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s non é para uso normal!\n" @@ -1375,338 +1298,338 @@ msgstr "" "non se cargou a extensión de cifrado \"%s\" debido a permisos inseguros\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "opcións de importación non válidas\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "opcións de importación non válidas\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "non se puido estabrecer exec-path a %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s fai que se ignore %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s non se admite con %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s non ten sentido empregándoo con %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode crear sinaturas separadas ou en claro no modo --pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "debe empregar ficheiros (e non canalizacións) ao traballar con --pgp2 " "activado.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "para cifrar unha mensaxe en modo --pgp2 precísase da cifra IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de resumo seleccionado non é válido\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser superior a 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser superior a 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth debe valer entre 1 e 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "preferencias por defecto non válidas\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "preferencias de cifrado personais non válidas\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "preferencias de resumo personais non válidas\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "preferencias de compresión personais non válidas\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "¡%s aínda non traballa con %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [ficheiro]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [ficheiro]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "o descifrado fallou: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [ficheiro]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [ficheiro]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ficheiro]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [ficheiro]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [ficheiro]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id-de-usuario" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id-de-usuario" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-de-usuario" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-de-usuario" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-de-usuario [comandos]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "o envío ao servidor de chaves fallou: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "a recepción do servidor de chaves fallou: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "a exportación da chave fallou: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "a busca no servidor de chaves fallou fallou: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "a actualización no servidor de chaves fallou: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "non se puido quita-la armadura: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "non se puido poñe-la armadura: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash non válido `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[ficheiro]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Escriba a súa mensaxe ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1714,23 +1637,23 @@ "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe " "rematar en '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación non pode empregar ningún carácter de control\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "o URL de normativa de certificación dado non é válido\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non é válido\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non é válido\n" @@ -2598,12 +2521,12 @@ msgstr "O ID de usuario \"%s\" está revocado." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¿Está seguro de que quere asinalo? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Non se puido asinar.\n" @@ -2803,7 +2726,7 @@ msgid "Really sign? (y/N) " msgstr "¿Asinar de verdade? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2856,18 +2779,10 @@ msgstr "movendo a sinatura dunha chave ó seu sitio\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "gardar" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "gardar e saír" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "amosar fingerprint" @@ -2876,506 +2791,359 @@ msgstr "listar chave e IDs de usuario" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "selecciona-lo ID de usuario N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "chave" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "selecciona-la chave secundaria N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "verificar" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "listar sinaturas" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "v" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "asina-la chave" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "f" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "facer unha sinatura separada" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "asina-la chave localmente" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "asina-la chave de xeito non revocable" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "asina-la chave localmente e de xeito non revocable" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "engadir un ID de usuario" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "engadir unha identificación fotográfica" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "borrar un ID de usuario" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "engadir unha chave secundaria" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "borrar unha chave secundaria" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "engadir unha chave de revocación" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "borrar sinaturas" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "cambia-la fecha de expiración" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "marcar un ID de usuario coma primario" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "cambiar entre o listado de chaves públicas e secretas" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "c" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "lista-las preferencias (expertos)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "lista-las preferencias (moitos datos)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "estabrece-la lista de preferencias" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "preferencias actualizadas" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "erro do servidor de chaves" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "cambia-lo contrasinal" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "cambia-la confianza sobre o dono" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revocar sinaturas" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "revocar un ID de usuario" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revocar unha chave secundaria" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "deshabilitar unha chave" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "habilitar unha chave" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "amosa-la identificación fotográfica" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "A chave secreta está disponible.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Cómpre a chave secreta para facer isto.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor, empregue o comando \"toggle\" antes.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "A chave está revocada." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Non se admite este comando no modo %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Debe seleccionar alomenos un ID de usuario.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "¡Non pode borra-lo último ID de usuario!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "¿Seguro de que quere borrar este ID de usuario? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "¿Seguro de que quere borrar este ID de usuario? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Debe seleccionar alomenos unha chave.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Debe seleccionar alomenos unha chave.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "¿Seguro de que quere borra-las chaves seleccionadas? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "¿Seguro de que quere borrar esta chave? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "¿Seguro de que quere revocar este ID de usuario? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "¿Realmente quere revoca-las chaves seleccionadas? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "¿Realmente quere revocar esta chave? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "estabrece-la lista de preferencias" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "¿Seguro que quere actualiza-las preferencias dos IDs de usuario " "seleccionados? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "¿Realmente desexa actualiza-las preferencias? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "¿Garda-los cambios? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "¿Saír sin gardar? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "a actualización fallou: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "o segredo da actualización fallou: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "A chave non cambiou, polo que non fai falla actualizar.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Resumo: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Esta chave pode estar revocada por %s chave " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "non foi posible crear %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada] " -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Esta chave está desactivada" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3383,19 +3151,19 @@ "Teña en conta que a validez da chave amosada non é necesariamente\n" "correcta a menos que reinicie o programa.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[revocada] " -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3403,7 +3171,7 @@ "AVISO: non se marcou ningún ID de usuario coma primario. Esta orde pode\n" " facer que un ID de usuario diferente se converta no primario.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3412,47 +3180,47 @@ "AVISO: Esta é unha chave de estilo PGP2. Se engade unha identificación\n" " fotográfica algunhas versións de PGP han rexeitar esta chave.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de que quere engadila? (s/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Non pode engadir unha identificación fotográfica a unha chave de estilo " "PGP2.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta sinatura correcta? (s/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Borrada %d sinatura.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Borradas %d sinaturas.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Non se borrou nada.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3462,165 +3230,165 @@ "designado\n" " pode facer que algunhas versións de PGP rexeiten esta chave.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Introduza o ID de usuario do revocador designado: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non " "se pode desfacer!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite as seleccións das chaves secretas.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo unha chave secundaria.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando a data de expiración para a chave secundaria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando a data de expiración da chave primaria.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Non pode cambia-la data de expiración dunha chave v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Escolla exactamente un ID de usuario.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Non hai ID de usuario con índice %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Non hai chave secundaria con índice %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " asinada por %08lX no %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (non exportable)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta sinatura caducou o %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿Está seguro de que quere revocala? (s/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Asinou estes IDs de usuario: \n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (non exportable)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocada por %08lX no %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Está a punto de revocar estas sinaturas:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "non hai chave secreta\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3950,7 +3718,7 @@ "Necesita un contrasinal para protexe-la súa chave secreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4213,7 +3981,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opcións de exportación non válidas\n" @@ -4228,107 +3996,107 @@ msgid "key not found on keyserver\n" msgstr "non se atopou a chave `%s': %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "asinado coa súa chave %08lX no %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "opcións de exportación non válidas\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" "non hai un servidor de chaves coñecido (empregue a opción --keyserver)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "a recepción do servidor de chaves fallou: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: non é un ID de chave válido\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "solicitando a chave %08lX de %s\n" @@ -4505,7 +4273,7 @@ msgid "textmode" msgstr "modo texto" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "descoñecido" @@ -4682,50 +4450,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "un subpaquete de tipo %d ten o bit crítico posto\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent non está dispoñible nesta sesión\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "non se pode estabrece-lo pid do cliente para o axente\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versión %d do protocolo de gpg-agent non está soportada\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "non se puido conectar a `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problema co axente - desactivando o emprego do axente\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4736,41 +4504,41 @@ "\"%.*s\"\n" "Chave de %u bits, %s, ID %08lX, creada o %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Repita o contrasinal\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Introduza o contrasinal\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "contrasinal demasiado longo\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "resposta do axente non válida\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "cancelado polo usuario\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Introduza o contrasinal: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4780,17 +4548,17 @@ "Necesita un contrasinal para desbloquea-la chave secreta para\n" "o usuario \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bits, chave %s, ID %08lX, creada %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Repita o contrasinal: " @@ -5686,12 +5454,12 @@ "a base de datos de confianza está corrompida; execute \"gpg --fix-trustdb" "\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "non é posible manexar liñas de texto maiores que %d caracteres\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "a liña de entrada contén máis de %d caracteres\n" @@ -5751,7 +5519,7 @@ msgid "[ revoked]" msgstr "[revocada] " -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[caducada ]" @@ -5761,101 +5529,101 @@ msgid "[ unknown]" msgstr "descoñecido" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "nunca " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "hase comproba-la base de datos de confianza o %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "non se atopou a chave pública %08lX: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "por favor, execute con --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "comprobando a base de datos de confianza\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "procesáronse %d chaves (marcáronse %d contas de validez)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "non se atoparon chaves de confianza absoluta\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n" @@ -6128,6 +5896,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "abandonar" + #: util/miscutil.c:351 msgid "qQ" msgstr "aA" @@ -6165,6 +5937,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(pode que usara o programa equivocado para esta tarefa)\n" +#~ msgid "q" +#~ msgstr "s" + +#~ msgid "help" +#~ msgstr "axuda" + +#~ msgid "list" +#~ msgstr "listar" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "depurar" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "erro xeral" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "gardar" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "chave" + +#~ msgid "check" +#~ msgstr "verificar" + +#~ msgid "c" +#~ msgstr "v" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "f" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "c" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "erro do servidor de chaves" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "o algoritmo de resumo `%s' é de só lectura nesta versión\n" Index: gnupg/po/hu.po diff -u gnupg/po/hu.po:1.8 gnupg/po/hu.po:1.9 --- gnupg/po/hu.po:1.8 Fri Dec 10 23:20:52 2004 +++ gnupg/po/hu.po Tue Dec 14 08:49:27 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Hungarian \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -353,7 +353,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -564,165 +564,88 @@ msgid "secret key already stored on a card\n" msgstr "Kihagytam: titkos kulcs már jelen van.\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "kilépés|kilepes" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "kilépés ebbõl a menübõl" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "Egymásnak ellentmondó parancsok!\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "megmutatja ezt a súgót" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Kulcs található: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "lejárat megváltoztatása" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "kulcstulajdonos megbízhatóságának beállítása" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "megmutatja az ujjlenyomatot" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "általános hiba" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "új kulcspár létrehozása" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Parancs> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n" @@ -767,7 +690,7 @@ msgid "PIN not correctly repeated; try again" msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -777,13 +700,13 @@ msgid "--output doesn't work for this command\n" msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "\"%s\" kulcs nem található: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1239,7 +1162,7 @@ msgid "Pubkey: " msgstr "Nyilvános kulcsú (pubkey): " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Rejtjelezõ (cipher): " @@ -1247,7 +1170,7 @@ msgid "Hash: " msgstr "Kivonatoló (hash): " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Tömörítõ (compression): " @@ -1351,7 +1274,7 @@ msgid "reading options from `%s'\n" msgstr "Az opciókat a \"%s\" állományból olvasom.\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n" @@ -1361,336 +1284,336 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "A \"%s\" rejtjelezõ bõvítést rossz engedélyek miatt töltöm be.\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "FIGYELEM: A program core állományt hozhat létre!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "FIGYELEM: %s hatástalanítja %s-t!\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s és %s nem használható együtt!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s értelmetlen %s mellett!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "Csak különálló és olvashatószöveg-aláírást készíthet --pgp2 módban!\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Nem írhat alá és titkosíthat egyszerre --pgp2 módban!\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Csak állományokat (pipe-ot nem) használhat --pgp2 módban!\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Üzenet titkosítása --pgp2 módban IDEA rejtjelezõt igényel!\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed nagyobb kell legyen 0-nál!\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed nagyobb kell legyen 1-nél!\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth 1 és 255 közé kell essen!\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "Érvénytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "Érvénytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MEGJEGYZÉS: Egyszerû S2K mód (0) erõsen ellenjavallt!\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "Érvénytelen alapértelmezett preferenciák!\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "Érvénytelen személyes rejtjelezõ-preferenciák!\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "Érvénytelen személyes kivonatolópreferenciák!\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "Érvénytelen személyes tömörítõpreferenciák!\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s és %s egyelõre nem használható együtt!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "Lehet, hogy nem használhatja \"%s\" rejtjelezõ algoritmust %s módban!\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Lehet, hogy nem használhatja \"%s\" tömörítõ algoritmust %s módban!\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [fájlnév]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [fájlnév]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Visszafejtés sikertelen: %s.\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [fájlnév]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [fájlnév]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [fájlnév]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [fájlnév]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [fájlnév]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key felh-azonosító" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key felh-azonosító" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key felh-azonosító" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key felh-azonosító" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key felh-azonosító [parancsok]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [felh-azonosító] [kulcskarika]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "Küldés a kulcsszerverre sikertelen: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "Kulcsexportálás sikertelen: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "Keresés a kulcsszerveren sikertelen: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Frissítés a kulcsszerverrõl sikertelen: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "Páncél eltávolítása nem sikerült: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "Páncélozás nem sikerült: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Érvénytelen kivonatoló algoritmus: %s\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[fájlnév]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Kezdheti gépelni az üzenetet...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1698,23 +1621,23 @@ "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = " "jellel kell befejezõdjön.\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "Egy jelölés értékében nem szerepelhet vezérlõkarakter!\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" @@ -2583,12 +2506,12 @@ msgstr "\"%s\" felhasználói azonosítót visszavonták." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Nem tudom aláírni.\n" @@ -2788,7 +2711,7 @@ msgid "Really sign? (y/N) " msgstr "Valóban aláírja? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2841,18 +2764,10 @@ msgstr "Átrakom a kulcsaláírást a megfelelõ helyre.\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "mentés és kilépés" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "megmutatja az ujjlenyomatot" @@ -2861,504 +2776,357 @@ msgstr "kilistázza a kulcs- és felhasználóazonosítókat" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "N. felhasználói azonosító kiválasztása" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "N. másodlagos kulcs kiválasztása" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "aláírások kilistázása" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "kulcs aláírása" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "különálló aláírás készítése" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "kulcs helyi aláírása" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "kulcs nem visszavonható aláírása" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "kulcs nem visszavonható helyi aláírása" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "felhasználói azonosító hozzáadása" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "fotóazonosító hozzáadása" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "felhasználói azonosító törlése" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "másodlagos kulcs (alkulcs) hozzáadása" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "másodlagos kulcs törlése" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "visszavonó kulcs hozzáadása" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "aláírások törlése" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "lejárat megváltoztatása" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "felhasználóazonosító megjelölése elsõdlegesként" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "váltás a titkos és a nyilvános kulcs listázása között" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "preferenciák listázása (szakértõ)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "preferenciák listázása (részletes)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "preferencialista beállítása" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "preferenciák frissítése" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "kulcsszerverhiba" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "jelszóváltoztatás" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "kulcstulajdonos megbízhatóságának beállítása" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "aláírások visszavonása" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "felhasználói azonosító visszavonása" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "másodlagos kulcs visszavonása" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "kulcs tiltása" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "kulcs engedélyezése" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "fotóazonosító megmutatása" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "Hiba \"%s\" titkoskulcs-blokk olvasásakor: %s.\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Titkos kulcs rendelkezésre áll.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Ehhez szükség van a titkos kulcsra.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Kérem, használja elõbb a \"toggle\" parancsot!\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "A kulcsot visszavonták." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Valóban aláírja az összes felhasználóazonosítót? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Ez a parancs %s módban nem engedélyezett.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Legalább egy felhasználóazonosítót ki kell választania!\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Valóban eltávolítja az összes kijelölt felhasználóazonosítót? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Legalább egy kulcsot ki kell választania!\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Legalább egy kulcsot ki kell választania!\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Valóban törli a kiválasztott kulcsokat? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Valóban törli ezt a kulcsot? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Valóban visszavonja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Valóban visszavonja a kijelölt kulcsokat? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Valóban visszavonja ezt a kulcsot? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "preferencialista beállítása" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Valóban frissítsem a preferenciákat? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Mentsem a változtatásokat? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Kilépjek mentés nélkül? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "Frissítés sikertelen: %s.\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "A kulcs nem változott, nincs szükség frissítésre.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Kivonat: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Jellemzõk: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Ezt a kulcsot a következõ %s kulcs visszavonhatja: " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (érzékeny)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s nem hozható létre: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[visszavont] " -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Ez a kulcs tiltott." -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3366,19 +3134,19 @@ "Kérem, vegye figyelembe, hogy az itt látható kulcs érvényessége nem\n" "feltétlenül helyes, amíg újra nem indítja a programot!\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[visszavont] " -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3386,7 +3154,7 @@ "FIGYELEM: Nincs kijelölt elsõdleges felhasználóazonosító. Ez a parancs\n" " azt okozhatja, hogy egy másik azonosító lesz elsõdlegesként használva.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3396,45 +3164,45 @@ "okozhatja,\n" " hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Továbbra is hozzá akarja adni? (i/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Törli ezt a jó aláírást? (i/N/k)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Valóban törli ezt az önaláírást? (i/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nem töröltem semmit.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3444,162 +3212,162 @@ " azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a " "kulcsot!\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Kérem, távolítsa el a kijelöléseket a titkos kulcsokról!\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Másodlagos kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Elsõdleges kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Kérem, válasszon ki pontosan egy felhasználóazonosítót!\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Nincs %d indexû felhasználóazonosító!\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Nincs %d indexû másodlagos kulcs!\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Felhasználóazonosító: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " aláírva %08lX által %s%s%s idõpontban.\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Ez az aláírás lejárt %s idõpontban.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Biztos benne, hogy mégis visszavonja? (i/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ön aláírta a következõ felhasználóazonosítókat:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " visszavonva %08lX által %s idõpontban.\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "A következõ aláírásokat fogja visszavonni:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "Nincs titkos kulcs.\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "FIGYELEM: A felhasználóazonosítót %d másodperccel a jövõben írták alá.\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n" @@ -3928,7 +3696,7 @@ "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4191,7 +3959,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "Érvénytelen export opciók!\n" @@ -4206,107 +3974,107 @@ msgid "key not found on keyserver\n" msgstr "\"%s\" kulcs nem található: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "Aláírva az Ön %08lX kulcsával %s idõpontban.\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "Érvénytelen export opciók!\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "kulcsszerverhiba" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "kulcsszerverhiba" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "" "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" @@ -4486,7 +4254,7 @@ msgid "textmode" msgstr "Szövegmódú" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "Ismeretlen módú" @@ -4662,52 +4430,52 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "A %d típusú alcsomag kritikus bitje beállított.\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "GPG ügynök nem elérhetõ ebben a munkafolyamatban.\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "Nem tudom beállítani a kliens pid-et az ügynöknek.\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "Nem tudom lekérni a szerver olvasási állományleíróját az ügynöknek.\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "Nem tudom lekérni a szerver írási állományleíróját az ügynöknek.\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "Nem megfelelõ formájú GPG_AGENT_INFO környezeti változó!\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "%d gpg-agent protokollverzió nem támogatott!\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "Kommunikációs probléma a gpg ügynökkel!\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "Probléma van az ügynökkel. Letiltom a használatát.\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr "" " \n" " (fõ kulcsazonosító: %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4719,41 +4487,41 @@ "\"%.*s\"\n" "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Ismételje meg a jelszót!\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Írja be a jelszót!\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "A jelszó túl hosszú!\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "Érvénytelen válasz az ügynöktõl!\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "A felhasználó megszakította a mûveletet.\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "Nem tudok jelszót bekérni kötegelt módban!\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Írja be a jelszót: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4764,17 +4532,17 @@ "használatához:\n" "\"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s." -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Ismételje meg a jelszót: " @@ -5658,12 +5426,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "Bizalmi adatbázis sérült. Kérem, futtassa: \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "Nem tudok %d karakternél hosszabb szövegsorokat kezelni!\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "A bemeneti sor hosszabb, mint %d karakter.\n" @@ -5723,7 +5491,7 @@ msgid "[ revoked]" msgstr "[visszavont] " -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[lejárt] " @@ -5733,101 +5501,101 @@ msgid "[ unknown]" msgstr "Ismeretlen módú" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "soha " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "A bizalmi adatbázis következõ ellenõrzése: %s.\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "Ellenõrzöm a bizalmi adatbázist.\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "Nem találtam alapvetõen megbízható kulcsot.\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "Nem találom az alapvetõen megbízható %08lX kulcs nyilvános kulcsát!\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n" @@ -6099,6 +5867,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "kilépés|kilepes" + #: util/miscutil.c:351 msgid "qQ" msgstr "kK" @@ -6136,6 +5908,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(Lehet, hogy nem a megfelelõ programot használja a feladatra.)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "általános hiba" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "kulcsszerverhiba" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "\"%s\" kivonatoló algoritmus csak olvasható ebben a kiadásban\n" Index: gnupg/po/id.po diff -u gnupg/po/id.po:1.18 gnupg/po/id.po:1.19 --- gnupg/po/id.po:1.18 Fri Dec 10 23:20:51 2004 +++ gnupg/po/id.po Tue Dec 14 08:49:27 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -32,7 +32,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -566,165 +566,88 @@ msgid "secret key already stored on a card\n" msgstr "dilewati: kunci pribadi telah ada\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "q|k|keluar" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "berhenti dari menu ini" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "perintah saling konflik\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "bantuan" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "tampilkan bantuan" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "tampilkan" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Kunci tersedia di:" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "ubah tanggal kadaluarsa" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "ubah ownertrust" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "tampilkan fingerprint" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "Kesalahan umum" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "buat sepasang kunci baru" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Perintah> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Perintah tidak valid (coba \"help\")\n" @@ -769,7 +692,7 @@ msgid "PIN not correctly repeated; try again" msgstr "passphrase tidak diulang dengan benar; coba lagi" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -779,13 +702,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output tidak berfungsi untuk perintah ini\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "kunci '%s' tidak ditemukan: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1243,7 +1166,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Cipher: " @@ -1251,7 +1174,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Kompresi: " @@ -1355,7 +1278,7 @@ msgid "reading options from `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "CATATAN: %s tidak untuk pemakaian normal!\n" @@ -1365,344 +1288,344 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "tidak dapat menset path exec ke %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "PERINGATAN: program mungkin membuat file core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "PERINGATAN: %s menimpa %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s tidak dibolehkan dengan %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s tidak masuk akal dengan %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "anda hanya dapat membuat signature detached atau clear saat dalam mode --" "pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --" "pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --" "pgpg2\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "algoritma digest yang dipilih tidak valid\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed harus lebih dari 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed harus lebih dari 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth harus di antara 1 hingga 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "preferensi baku tidak valid\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "preferensi cipher personal tidak valid\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "preferensi digest personal tidak valid\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "preferensi kompresi personal tidak valid\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s belum dapat dipakai dengan %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public " "key \n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [namafile]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [namafile]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "dekripsi gagal: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [namafile]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [namafile]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [namafile]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [namafile]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [namafile]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id-user" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id-user" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-user [perintah]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-user] [keyring]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "Pengiriman keyserver gagal: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Penerimaan keyserver gagal: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "Ekspor kunci gagal: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "Pencarian keyserver gagal: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh keyserver gagal: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "gagal dearmoring: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritma hash tidak valid `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[namafile]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Teruskan dan ketikkan pesan anda ....\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1710,23 +1633,23 @@ "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, " "dan diakhiri dengan sebuah '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" @@ -2595,12 +2518,12 @@ msgstr "User ID \"%s\" dibatalkan." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Apakah anda yakin masih ingin menandainya? (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr "..Tidak dapat menandai.\n" @@ -2804,7 +2727,7 @@ msgid "Really sign? (y/N) " msgstr "Ditandai? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2857,18 +2780,10 @@ msgstr "memindahkan signature kunci ke tempat yang tepat\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "simpan" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "simpan dan berhenti" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "tampilkan fingerprint" @@ -2877,504 +2792,357 @@ msgstr "tampilkan kunci dan ID user" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "pilih ID user N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "kunci" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "pilih kunci sekunder N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "periksa" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "tampilkan signature" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "tandai" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "tandai kunci" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "tandai" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "buat detached signature" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "tandai kunci secara lokal" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "tandai kunci sebagai tidak dapat dibatalkan" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "tambah sebuah ID user" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "tambah sebuah photo ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "hapus ID user" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "tambah kunci sekunder" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "hapus kunci sekunder" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "tambah kunci pembatalan" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "hapus signature" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "ubah tanggal kadaluarsa" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primer" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "tandai ID user sebagai primer" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "ubah tampilan kunci rahasia dan publik" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "tampilkan preferensi (ahli)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "tampilkan preferensi (verbose)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "set daftar preferensi" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "perbarui preferensi" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "kesalahan keyserver" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "ubah passphrase" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "ubah ownertrust" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "batalkan signature" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "batalkan sebuah ID user" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "batalkan kunci sekunder" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "tiadakan kunci" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "aktifkan kunci" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "tampilkan photo ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "kesalahan membaca keyblock rahasia `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Kunci rahasia tersedia.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Silakan gunakan dulu perintah \"toogle\".\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Kunci dibatalkan" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Tandai ID seluruh user? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Petunjuk: Pilih ID user untuk ditandai\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Anda tidak dapat menghapus ID user terakhir!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Hapus seluruh ID user terpilih? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Hapus ID user ini? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Hapus ID user ini? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Anda harus memilih minimum satu kunci.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Anda harus memilih minimum satu kunci.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Anda ingin menghapus kunci terpilih ini? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Anda ingin menghapus kunci ini? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Benar-benar hapus seluruh ID user terpilih? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Benar-benar hapus ID user ini? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Anda ingin membatalkan kunci terpilih ini? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Anda ingin membatalkan kunci ini? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "set daftar preferensi" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Perbarui preferensi untuk user ID terpilih?" -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Update preferensi?" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Simpan perubahan? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Berhenti tanpa menyimpan? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "gagal memperbarui: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "gagal perbarui rahasia: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Fitur: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Kunci ini dapat dibatalkan oleh kunci %s" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "tidak dapat membuat %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revoked] " -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Kunci ini telah ditiadakan" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3382,19 +3150,19 @@ "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n" "kecuali anda memulai kembali program.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[revoked] " -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3402,7 +3170,7 @@ "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3412,45 +3180,45 @@ "dapat menyebabkan beberapa versi\n" " PGP menolak kunci ini.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Anda tetap ingin menambahkannya? (y/n) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Hapus signature baik ini? (y/T/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Hapus signature tidak valid ini? (y/T/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Hapus signature tidak dikenal ini? (y/T/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Yakin ingin menghapus self-signature ini? (y/T)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Tidak ada yang dihapus.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3460,165 +3228,165 @@ "designated dapat\n" "............menyebabkan beberapa versi PGP menolak kunci ini.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Masukkan user ID pihak yang ingin dibatalkan: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan " "sendiri\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat " "dilakukan\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):" -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Silakan hapus pilihan dari kunci rahasia.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Silakan pilih maksimum satu kunci sekunder.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Merubah batas waktu untuk kunci sekunder.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Merubah batas waktu untuk kunci primer.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Anda tidak dapat merubah batas waktu kunci v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Tidak ada signature koresponden di ring rahasia\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "melewati self-signature v3 pada user id \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Tidak ada ID user dengan index %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Tidak ada kunci sekunder dengan index %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID user: " -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " ditandai oleh %08lX pada %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Anda tetap ingin membatalkannya? (y/n) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Anda telah menandai ID user ini:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " dibatalkan oleh %08lX pada %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Anda akan membatalkan signature ini:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Ingin membuat sertifikat pembatalan? (y/T)" -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "tidak ada kunci rahasia\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n" @@ -3944,7 +3712,7 @@ "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4206,7 +3974,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opsi ekspor tidak valid\n" @@ -4221,106 +3989,106 @@ msgid "key not found on keyserver\n" msgstr "kunci '%s' tidak ditemukan: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "ditandai dengan kunci anda %08lX pada %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "opsi ekspor tidak valid\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "kesalahan keyserver" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "kesalahan keyserver" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "Penerimaan keyserver gagal: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "meminta kunci %08lX dari %s\n" @@ -4497,7 +4265,7 @@ msgid "textmode" msgstr "modeteks" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "tidak dikenal" @@ -4671,50 +4439,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpaket tipe %d memiliki bit kritis terset\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent tidak tersedia untuk sesi ini\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "tidak dapat menset pid client untuk agen\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "tidak dapat membuat server membaca FD untuk agen\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "tidak dapat membuat server menulis FD untuk agen\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokol gpg-agent versi %d tidak didukung\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "tidak dapat terkoneksi ke `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "masalah komunikasi dengan gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "masalah dengan agen - tiadakan penggunaan agen\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID kunci utama %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4725,41 +4493,41 @@ "\"%.*s\"\n" "%u-bit %s key, ID %08lX, tercipta %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Ulangi passphrase\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Masukkan passphrase\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "passphrase terlalu panjang\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "respon tidak valid dari agen\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "dibatalkan oleh user\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "tidak dapat meminta password dalam mode batch\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Masukkan passphrase: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4769,17 +4537,17 @@ "Anda perlu passphrase untuk membuka kunci rahasia untuk\n" "pemakai: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bit kunci %s, ID %08lX, tercipta %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " @@ -5664,12 +5432,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "baris input lebih dari %d karakter\n" @@ -5728,7 +5496,7 @@ msgid "[ revoked]" msgstr "[revoked] " -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[expired] " @@ -5738,101 +5506,101 @@ msgid "[ unknown]" msgstr "tidak dikenal" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "tidak pernah..." -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "pemeriksaan trustdb berikutnya pada %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "kunci publik %08lX tidak ditemukan: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "lakukanlah --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "memeriksa trustdb\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "trust record %lu, tipe %d: gagal menulis: %s\n" @@ -6104,6 +5872,10 @@ msgid "nN" msgstr "tT" +#: util/miscutil.c:348 +msgid "quit" +msgstr "q|k|keluar" + #: util/miscutil.c:351 msgid "qQ" msgstr "kK" @@ -6142,6 +5914,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "bantuan" + +#~ msgid "list" +#~ msgstr "tampilkan" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "Kesalahan umum" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "simpan" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "kunci" + +#~ msgid "check" +#~ msgstr "periksa" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "tandai" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "tandai" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primer" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "kesalahan keyserver" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n" Index: gnupg/po/it.po diff -u gnupg/po/it.po:1.71 gnupg/po/it.po:1.72 --- gnupg/po/it.po:1.71 Fri Dec 10 23:20:50 2004 +++ gnupg/po/it.po Tue Dec 14 08:49:27 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -356,7 +356,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -568,165 +568,88 @@ msgid "secret key already stored on a card\n" msgstr "saltata: chiave pubblica già presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quit" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "abbandona questo menù" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandi in conflitto\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra questo aiuto" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Chiave disponibile presso: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "abilita" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "cambia la data di scadenza" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "cambia il valore di fiducia" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra le impronte digitali" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "errore generale" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "genera una nuova coppia di chiavi" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" @@ -771,7 +694,7 @@ msgid "PIN not correctly repeated; try again" msgstr "passphrase non ripetuta correttamente; prova ancora" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -781,13 +704,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output non funziona con questo comando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "chiave `%s' non trovata: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1254,7 +1177,7 @@ msgid "Pubkey: " msgstr "A chiave pubblica: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Cifrari: " @@ -1262,7 +1185,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Compressione: " @@ -1367,7 +1290,7 @@ msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s normalmente non deve essere usato!\n" @@ -1379,338 +1302,338 @@ "l'estensione crittografica \"%s\" non è stata caricata a causa dei\n" "permessi insicuri.\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossibile impostare exec-path a %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENZIONE: %s ha la precedenza su %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "Non è permesso usare %s con %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "Non ha senso usare %s con %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nella modalità --pgp2 puoi fare solo firme in chiaro o separate\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "nella modalità --pgp2 non puoi firmare e cifrare contemporaneamente\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "nella modalità --pgp2 è richiesto il cifrario IDEA per cifrare un messaggio\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "preferenze predefinite non valide\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "preferenze personali del cifrario non valide\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "preferenze personali del digest non valide\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "preferenze personali di compressione non valide\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s non funziona ancora con %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "non è possibile usare l'algoritmo di cifratura \"%s\" in modalità %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "non è possibile usare l'algoritmo di digest \"%s\" in modalità %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "non è possibile usare l'algoritmo di compressione \"%s\" in modalità %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n" "crittografia a chiave pubblica\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifratura fallita: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nomefile]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [portachiavi]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "invio al keyserver fallito: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "ricezione dal keyserver fallita: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "esportazione della chiave fallita: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "ricerca nel keyserver fallita: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aggiornamento del keyserver fallito: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1718,23 +1641,23 @@ "il nome di una nota deve essere formato solo da caratteri stampabili o\n" "spazi e terminare con un '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "l'URL della politica di certificazione indicato non è valido\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "l'URL della politica di firma indicato non è valido\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "l'URL della politica di firma indicato non è valido\n" @@ -2608,12 +2531,12 @@ msgstr "L'user ID \"%s\" è stato revocato." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Sei ancora sicuro di volerla firmare? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Impossibile firmarla.\n" @@ -2815,7 +2738,7 @@ msgid "Really sign? (y/N) " msgstr "Firmo davvero? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2868,18 +2791,10 @@ msgstr "spostamento della firma di una chiave nel posto corretto\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "salva ed esci" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "mostra le impronte digitali" @@ -2888,504 +2803,357 @@ msgstr "elenca le chiavi e gli user ID" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "scegli l'user ID N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "scegli la chiave secondaria N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "elenca le firme" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "firma la chiave" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "fai una firma separata" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "firma la chiave localmente" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "firma la chiave irrevocabilmente" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "firma la chiave localmente e irrevocabilmente" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "aggiungi un user ID" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "aggiungi un ID fotografico" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "cancella un user ID" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "aggiungi una chiave secondaria" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "cancella una chiave secondaria" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "aggiungi una chiave di revoca" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsign" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "cancella le firme" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "cambia la data di scadenza" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "imposta l'user ID come primario" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "elenca le preferenze (per esperti)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "elenca le preferenze (prolisso)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "imposta la lista di preferenze" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "preferenze aggiornate" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "errore del keyserver" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "cambia la passphrase" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "cambia il valore di fiducia" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revoca firme" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "revoca un user ID" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revoca una chiave secondaria" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "disabilita una chiave" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "abilita" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "abilita una chiave" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "mostra l'ID fotografico" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "errore leggendo il keyblock segreto `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "È disponibile una chiave segreta.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Per fare questo serve la chiave segreta.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Per favore usa prima il comando \"toggle\".\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "La chiave è stata revocata." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Firmo davvero tutti gli user ID? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Suggerimento: seleziona gli user ID da firmare\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Questo comando non è permesso in modalità %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Devi selezionare almeno un user ID.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Tolgo davvero tutti gli user ID selezionati? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Tolgo davvero questo user ID? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Tolgo davvero questo user ID? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Vuoi davvero cancellare le chiavi selezionate? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Vuoi davvero cancellare questa chiave? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Revoco davvero tutti gli user ID selezionati? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Revoco davvero questo user ID? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Vuoi davvero revocare le chiavi selezionate? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Vuoi davvero revocare questa chiave? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "imposta la lista di preferenze" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Aggiorno davvero le preferenze? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvo i cambiamenti? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Esco senza salvare? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Caratteristiche: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Questa chiave può essere revocata dalla chiave %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (sensibile)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossibile creare %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocata]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Questa chiave è stata disabilitata" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3394,19 +3162,19 @@ "corretta\n" "finchè non eseguirai di nuovo il programma.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[revocata]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3415,7 +3183,7 @@ " potrebbe fare diventare un altro user ID il primario " "predefinito.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3424,46 +3192,46 @@ "ATTENZIONE: Questa è una chiave in stile PGP2. Aggiungere un ID fotografico\n" " può causarne il rifiuto da parte di alcune versioni di PGP.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Cancellare questa firma corretta? (s/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Cancellare questa firma non valida? (s/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Cancellare questa firma sconosciuta? (s/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Cancellare davvero questa autofirma? (s/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Cancellata %d firma.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Cancellate %d firme.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Non è stato cancellato nulla.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3473,168 +3241,168 @@ " designato può causarne il rifiuto da parte di alcune versioni\n" " di PGP.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Non è possibile aggiungere un revocatore designato a una chiave in stile\n" "PGP 2.x.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Inserisci l'user ID del revocatore designato: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "impossibile nominare una chiave come revocatore designato di sè stessa\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n" "annullata.\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):" -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Togli le selezioni dalle chiavi segrete.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Seleziona al massimo una chiave secondaria.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambio la data di scadenza per una chiave secondaria.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Cambio la data di scadenza per la chiave primaria.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Devi selezionare esattamente un user ID.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "salto una autofirma v3 sull'user ID \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Nessun user ID con l'indice %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " firmata da %08lX il %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (non esportabile)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Questa chiave è scaduta il %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creare un certificato di revoca per questa firma? (s/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (non esportabile)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocata da %08lX il %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Stai per revocare queste firme:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Creare davvero i certificati di revoca? (s/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "manca la chiave segreta\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3963,7 +3731,7 @@ "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4228,7 +3996,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opzioni di esportazione non valide\n" @@ -4243,22 +4011,22 @@ msgid "key not found on keyserver\n" msgstr "chiave `%s' non trovata: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" @@ -4266,84 +4034,84 @@ "firmata con la tua chiave %08lX il %s\n" "\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "opzioni di esportazione non valide\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "errore del keyserver" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "errore del keyserver" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "ricezione dal keyserver fallita: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "richiedo la chiave %08lX a %s\n" @@ -4520,7 +4288,7 @@ msgid "textmode" msgstr "modo testo" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "sconosciuto" @@ -4698,50 +4466,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent non è disponibile in questa sessione\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "impossibile impostare il pid del client dell'agent\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "impossibile ottenere il FD di lettura dell'agent\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "impossibile ottenere il FD di scrittura dell'agent\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versione %d del protocollo di gpg-agent non è gestita\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossibile connettersi a `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problema di comunicazione con gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problema con l'agent - uso dell'agent disattivato\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (key ID principale %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4752,41 +4520,41 @@ "\"%.*s\"\n" "%u-bit %s key, ID %08lX, created %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Ripeti la passphrase\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Inserisci la passphrase\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "passphrase troppo lunga\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "risposta non valida dall'agent\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "interrotto dall'utente\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con l'agent: ha restituito 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "impossibile chiedere la password in modo batch\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4796,17 +4564,17 @@ "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " @@ -5712,12 +5480,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "Il trustdb è danneggiato; eseguire \"gpg --fix-trust-db\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossibile gestire linee di testo più lunghe di %d caratteri\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "linea di input più lunga di %d caratteri\n" @@ -5777,7 +5545,7 @@ msgid "[ revoked]" msgstr "[revocata]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[scaduta]" @@ -5787,101 +5555,101 @@ msgid "[ unknown]" msgstr "sconosciuto" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "il prossimoi controllo del trustdb sarà fatto il %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chiave pubblica %08lX non trovata: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "per favore usa --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "controllo il trustdb\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d chiavi processate (%d conteggi di validità azzerati)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "trust record %lu, req type %d: write fallita: %s\n" @@ -6154,6 +5922,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quit" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6191,6 +5963,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "abilita" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "errore generale" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsign" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "errore del keyserver" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "abilita" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "in questa versione l'algoritmo digest `%s' è in sola lettura\n" Index: gnupg/po/ja.po diff -u gnupg/po/ja.po:1.18 gnupg/po/ja.po:1.19 --- gnupg/po/ja.po:1.18 Fri Dec 10 23:20:45 2004 +++ gnupg/po/ja.po Tue Dec 14 08:49:27 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -33,7 +33,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -349,7 +349,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP¥«¡¼¥Éno. %s¤ò¸¡½Ð\n" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" @@ -543,151 +543,79 @@ msgid "secret key already stored on a card\n" msgstr "ÈëÌ©¸°¤Ï¤â¤¦¥«¡¼¥É¤ËÊݴɤ·¤Æ¤¢¤ê¤Þ¤¹\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quit" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "admin" - #: g10/card-util.c:1252 msgid "show admin commands" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤òɽ¼¨" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "¤³¤Î¥Ø¥ë¥×¤òɽ¼¨" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 msgid "list all available data" msgstr "Á´Í­¸ú¥Ç¡¼¥¿¤òɽ¼¨" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -msgid "name" -msgstr "name" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "¥«¡¼¥É½êÍ­¼Ô¤Î̾Á°¤ÎÊѹ¹" #: g10/card-util.c:1259 -msgid "url" -msgstr "url" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "¸°¤òõº÷¤¹¤ëURL¤ÎÊѹ¹" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "fetch" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "¥«¡¼¥ÉURL¤Ç»ØÄꤵ¤ì¤¿¸°¤Î°ú¤­½Ð¤·" -#: g10/card-util.c:1262 -msgid "login" -msgstr "login" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 msgid "change the login name" msgstr "¥í¥°¥¤¥ó̾¤ÎÊѹ¹" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "lang" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 msgid "change the language preferences" msgstr "¸À¸ìÁª¹¥¤ÎÊѹ¹" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "sex" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "¥«¡¼¥É½êÍ­¼Ô¤ÎÀ­Ê̤ÎÊѹ¹" -#: g10/card-util.c:1265 -msgid "cafpr" -msgstr "cafpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 msgid "change a CA fingerprint" msgstr "CA»ØÌæ¤ÎÊѹ¹" -#: g10/card-util.c:1266 -msgid "forcesig" -msgstr "forcesig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "½ð̾¶¯À©PIN¥Õ¥é¥°¤òȿž" -#: g10/card-util.c:1268 -msgid "generate" -msgstr "generate" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 msgid "generate new keys" msgstr "¿·¤·¤¤¸°·²¤òÀ¸À®" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "PIN¥Ö¥í¥Ã¥¯¤Î²ò½ü¤äÊѹ¹¤Î¥á¥Ë¥å¡¼" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "¥³¥Þ¥ó¥É> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 msgid "Admin-only command\n" msgstr "´ÉÍýÀìÍÑ¥³¥Þ¥ó¥É\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 msgid "Admin commands are allowed\n" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 msgid "Admin commands are not allowed\n" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Èhelp¡É¤ò»²¾È)\n" @@ -734,7 +662,7 @@ msgid "PIN not correctly repeated; try again" msgstr "PIN¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -744,13 +672,13 @@ msgid "--output doesn't work for this command\n" msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "¸°¡È%s¡É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1202,7 +1130,7 @@ msgid "Pubkey: " msgstr "¸ø³«¸°: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "°Å¹æË¡: " @@ -1210,7 +1138,7 @@ msgid "Hash: " msgstr "¥Ï¥Ã¥·¥å: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "°µ½Ì: " @@ -1314,7 +1242,7 @@ msgid "reading options from `%s'\n" msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Ãí°Õ: ÉáÄÌ%s¤Ï»È¤¤¤Þ¤»¤ó!\n" @@ -1324,348 +1252,348 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "°ÂÁ´¤Ç¤Ê¤¤µö²Ä¤Î¤¿¤á¡¢°Å¹æË¡³ÈÄ¥¡Ö%s¡×¤ò¥í¡¼¥É¤·¤Þ¤»¤ó\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, c-format msgid "`%s' is not a valid character set\n" msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 msgid "could not parse keyserver URL\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURL¤ò²òÀÏÉÔǽ\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 msgid "invalid keyserver options\n" msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 msgid "invalid list options\n" msgstr "̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 msgid "invalid verify options\n" msgstr "̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤Ã¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ²½¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æË¡¤¬É¬ÍפǤ¹\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 msgid "selected compression algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿¾ÚÌÀ½ñÍ×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "̵¸ú¤Êdefault-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "̵¸ú¤Êmin-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "̵¸ú¤Ê´ûÄê¤ÎÁª¹¥\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍѰŹæË¡¤ÎÁª¹¥\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑÍ×Ìó¤ÎÁª¹¥\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑ°µ½Ì¤ÎÁª¹¥\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s¤Ï%s¤Çµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "·Ù¹ð: ¸ø³«¸°°Å¹æ¤ò»È¤ï¤º¤Ë¡¢¼õ¼è¿Í (-r) ¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "¡Ö%s¡×¤ÎÂоΰŹæ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "--symmetric --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "--symmetric --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "--symmetric --sign --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "--symmetric --sign --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¤Î¼õ¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "¸°¤Î½ñ½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î²óÉü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤Ç¤¹\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤òÂǤäƤ¯¤À¤µ¤¤ ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" "Ãí¼á̾¤Ë¤Ï°õ»ú²Äǽ¤Êʸ»ú¤«¶õÇò¤Î¤ß¤ò»È¤¤¡¢'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "¥æ¡¼¥¶¡¼Ãí¼á̾¤Ï¡¢'@'ʸ»ú¤ò´Þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤ò»È¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 msgid "the given preferred keyserver URL is invalid\n" msgstr "»ØÄꤵ¤ì¤¿Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤Ï̵¸ú¤Ç¤¹\n" @@ -2521,12 +2449,12 @@ msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " ½ð̾ÉÔǽ¡£\n" @@ -2700,7 +2628,7 @@ msgid "Really sign? (y/N) " msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2753,18 +2681,10 @@ msgstr "¸°¤Î½ð̾¤òÀµ¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤Þ¤¹\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "Êݸ¤·¤Æ½ªÎ»" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "»ØÌæ¤òɽ¼¨" @@ -2773,484 +2693,340 @@ msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "Éû¸°N¤ÎÁªÂò" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "½ð̾¤Î°ìÍ÷" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "¸°¤Ø½ð̾" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -msgid "tsign" -msgstr "tsign" - #: g10/keyedit.c:1259 msgid "make a trust signature" msgstr "¿®Íѽð̾¤òºîÀ®" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "¥Õ¥©¥ÈID¤ÎÄɲÃ" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "Éû¸°¤ÎÄɲÃ" -#: g10/keyedit.c:1271 -msgid "addcardkey" -msgstr "addcardkey" - -#: g10/keyedit.c:1271 +#: g10/keyedit.c:1272 msgid "add a key to a smartcard" msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Ø¸°¤ÎÄɲÃ" -#: g10/keyedit.c:1272 -msgid "keytocard" -msgstr "keytocard" - -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Î¸°¤Ø¤Î°ÜÆ°" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "Éû¸°¤Îºï½ü" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "¼º¸ú¸°¤ÎÄɲÃ" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "½ð̾¤Îºï½ü" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "ËþλÆü¤ÎÊѹ¹" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "¥æ¡¼¥¶¡¼ID¤ò¼ç¤Ë¤¹¤ë" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤Îȿž" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "Áª¹¥¤Î°ìÍ÷ (¥¨¥­¥¹¥Ñ¡¼¥È)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "Áª¹¥¤Î°ìÍ÷ (¾éĹ)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·" -#: g10/keyedit.c:1286 -msgid "keyserver" -msgstr "keyserver" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 msgid "set preferred keyserver URL" msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼¤ÎURI¤òÀßÄê" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "½ð̾¤Î¼º¸ú" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "¥æ¡¼¥¶¡¼ID¤Î¼º¸ú" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "Éû¸°¤Î¼º¸ú" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "¥Õ¥©¥ÈID¤òɽ¼¨" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯¡È%s¡É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "¤Þ¤º¡Ètoggle¡É¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "¸°¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 msgid "Really sign all user IDs? (y/N) " msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤Ç¤¹¡£\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 msgid "Really remove all selected user IDs? (y/N) " msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 msgid "Really remove this user ID? (y/N) " msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 msgid "Really move the primary key? (y/N) " msgstr "¤³¤Î¼ç¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 msgid "You must select exactly one key.\n" msgstr "¸°¤ò¤­¤Ã¤«¤ê1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 msgid "Do you really want to delete this key? (y/N) " msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 msgid "Really revoke all selected user IDs? (y/N) " msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 msgid "Really revoke this user ID? (y/N) " msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 msgid "Do you really want to revoke this key? (y/N) " msgstr "¤³¤Î¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" "ÍøÍѼԻØÄê¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ÎÍøÍÑÃæ¡¢½êÍ­¼Ô¿®ÍѤÏÀßÄꤵ¤ì¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ" "¤¹¡£\n" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 msgid "Set preference list to:\n" msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê:\n" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 msgid "Really update the preferences? (y/N) " msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 msgid "Save changes? (y/N) " msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 msgid "Quit without saving? (y/N) " msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "ÈëÌ©¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤ÏÉÔÍפǤ¹¡£\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Í×Ìó: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "µ¡Ç½: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "̵½¤Àµ¸°¥µ¡¼¥Ð¡¼" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼: " -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, c-format msgid "This key may be revoked by %s key %s" msgstr "¤³¤Î¸°¤Ï¡¢%s¸°%s¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 msgid "(sensitive)" msgstr "(¥Ç¥ê¥±¡¼¥È)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "ºîÀ®: %s" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "¼º¸ú: %s" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "Ëþλ: %s" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "Ëþλ: %s" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, c-format msgid "usage: %s" msgstr "ÍøÍÑË¡: %s" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, c-format msgid "trust: %s" msgstr "¿®ÍÑ: %s" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "Í­¸úÀ­: %s" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "¥«¡¼¥ÉÈÖ¹æ: " -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x·Á¼°¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤¬¡¢¤¢¤ê¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3258,17 +3034,17 @@ "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n" "¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 msgid "revoked" msgstr "¼º¸ú" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 msgid "expired" msgstr "Ëþλ" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3276,7 +3052,7 @@ "·Ù¹ð: ¼ç¤¿¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ê̤Ê\n" " ¥æ¡¼¥¶¡¼ID¤¬¼ç¤Ë¤Ê¤ë¤È²¾Äꤹ¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3285,45 +3061,45 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3332,154 +3108,154 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¤¹¡£»Ø̾¼º¸ú¼Ô¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾¼º¸ú¼Ô¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "»Ø̾¼º¸ú¼Ô¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾¼º¸ú¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "»Ø̾¼º¸ú¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 msgid "this key has already been designated as a revoker\n" msgstr "¤³¤Î¸°¤Ï¼º¸ú¼Ô¤È¤·¤Æ¤â¤¦»Ø̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "·Ù¹ð: ¤¢¤ë¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤹ¤ë¤È¡¢¸µ¤ËÌ᤻¤Þ¤»¤ó!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "ËÜÅö¤Ë¤³¤Î¸°¤ò»Ø̾¼º¸ú¼Ô¤ËǤ̿¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Îv3¼«¸Ê½ð̾¤ò¤È¤Ð¤·¤Þ¤¹\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 msgid "Are you sure you want to replace it? (y/N) " msgstr "ËÜÅö¤Ë¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 msgid "Are you sure you want to delete it? (y/N) " msgstr "ËÜÅö¤Ëºï½ü¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, c-format msgid "user ID: \"%s\"\n" msgstr "¥æ¡¼¥¶¡¼ID:¡È%s¡É\n" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "%s¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (½ñ½Ð¤·ÉÔ²Ä)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹¡£\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë¼º¸ú¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë¸°%s¤Ç½ð̾¤·¤Þ¤·¤¿:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 msgid " (non-revocable)" msgstr " (¼º¸úÉÔ²Ä)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, c-format msgid "revoked by your key %s on %s\n" msgstr "¤¢¤Ê¤¿¤Î¸°%s¤Ç%s¤Ë¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "¤³¤ì¤é¤Î½ð̾¤ò¼º¸ú¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "¼º¸ú¾ÚÌÀ½ñ¤òËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "·Ù¹ð: ¥æ¡¼¥¶¡¼ID½ð̾¤¬¡¢%dÉÃ̤Íè¤Ç¤¹\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "%s (Â礭¤µ%ld) ¤Î¸°%s (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n" @@ -3800,7 +3576,7 @@ "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4055,7 +3831,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "ÈÖ¹æ(s)¡¢N)¼¡¡¢¤Þ¤¿¤ÏQ)Ãæ»ß¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ >" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥×¥í¥È¥³¥ë¤Ç¤¹ (us %d!=handler %d)\n" @@ -4069,101 +3845,101 @@ msgid "key not found on keyserver\n" msgstr "¸°¤¬¸°¥µ¡¼¥Ð¡¼¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "¸°%s¤ò%s¤«¤é¥µ¡¼¥Ð¡¼%s¤ËÍ×µá\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, c-format msgid "requesting key %s from %s\n" msgstr "¸°%s¤ò%s¤ËÍ×µá\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, c-format msgid "sending key %s to %s server %s\n" msgstr "¸°%s¤ò%s¥µ¡¼¥Ð¡¼%s¤ØÁ÷¿®\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, c-format msgid "sending key %s to %s\n" msgstr "¸°%s¤ò%s¤ØÁ÷¿®\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "¡È%s¡É¤ò%s¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "¡È%s¡É¤ò¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 msgid "no keyserver action!\n" msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¢¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤»¤ó!\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "·Ù¹ð: ÊÌÈÇ (%s) ¤ÎGnuPG¤Î¸°¥µ¡¼¥Ð¡¼¡¦¥Ï¥ó¥É¥é\n" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÏVERSION¤òÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "´ûÃΤθ°¥µ¡¼¥Ð¡¼¤¬¤¢¤ê¤Þ¤»¤ó (¥ª¥×¥·¥ç¥ó--keyserver¤ò»È¤¤¤Þ¤·¤ç¤¦)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "¤³¤Î¹½ÃۤǤϡ¢³°Éô¸°¥µ¡¼¥Ð¡¼¤Î¸Æ½Ð¤·¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×ÍѤΥϥó¥É¥é¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "Áàºî¡Ö%s¡×¤Ï¡¢¸°¥µ¡¼¥Ð¡¼¡¦¥¹¥­¡¼¥à¡Ö%s¡×¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "gpgkeys_%s¤Ï¡¢¥Ï¥ó¥É¥é%dÈǤò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó\n" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 msgid "keyserver timed out\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¥¿¥¤¥à¥¢¥¦¥È\n" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 msgid "keyserver internal error\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎÆâÉô¥¨¥é¡¼\n" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, c-format msgid "keyserver communications error: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼ÄÌ¿®¥¨¥é¡¼: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "¡È%s¡É¸°ID¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: ¤È¤Ð¤·¤Þ¤¹\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "·Ù¹ð: ¸°%s¤ò%s·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1Ëܤθ°¤ò%s¤«¤é²óÉü\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%dËܤθ°¤ò%s¤«¤é²óÉü\n" @@ -4340,7 +4116,7 @@ msgid "textmode" msgstr "¥Æ¥­¥¹¥È¥â¡¼¥É" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "̤ÃΤÎ" @@ -4509,50 +4285,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "·¿%d¤Î²¼°Ì¥Ñ¥±¥Ã¥È¤Ë¥¯¥ê¥Æ¥£¥«¥ë¡¦¥Ó¥Ã¥È¤òȯ¸«\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Çgpg-agent¤Ï̵¸ú¤Ç¤¹\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Î¥¯¥é¥¤¥¢¥ó¥Èpid¤òÀßÄê¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼ÆɽФ·FD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥ÈÍѤΥµ¡¼¥Ð¡¼½ñ¹þ¤ßFD¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO´Ä¶­ÊÑ¿ô¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "¡Ö%s¡×¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent¤È¤ÎÄÌ¿®¾ã³²\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, c-format msgid " (main key ID %s)" msgstr " (¼ç¸°ID %s)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4563,40 +4339,40 @@ "\"%.*s\"\n" "%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹¤¹¤®¤Þ¤¹\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤«¤é¤Î̵¸ú¤Ê±þÅú\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "¥æ¡¼¥¶¡¼¤Ë¤è¤ë¼è¾Ã¤·\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥È¤¬0x%lx¤òÊÖµÑ\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 msgid "can't query passphrase in batch mode\n" msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÌä¹ç¤»¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4605,17 +4381,17 @@ "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹:¡È%s¡É\n" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr " (¼ç¸°ID %s ¤ÎÉû¸°)" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: " @@ -5452,12 +5228,12 @@ msgstr "" "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬²õ¤ì¤Æ¤¤¤Þ¤¹¡£¡Ègpg --fix-trustdb¡É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "%dʸ»ú°Ê¾å¤ÎŤµ¤Î¥Æ¥­¥¹¥È¹Ô¤Ï¡¢¼è¤ê°·¤¨¤Þ¤»¤ó\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "ÆþÎϹԤÎŤµ¤¬%dʸ»ú¤òĶ¤¨¤Æ¤¤¤Þ¤¹\n" @@ -5516,7 +5292,7 @@ msgid "[ revoked]" msgstr "¼º¸ú" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "Ëþλ" @@ -5526,102 +5302,102 @@ msgid "[ unknown]" msgstr "̤ÃΤÎ" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 #, fuzzy msgid "[marginal]" msgstr "¤¢¤ëÄøÅÙ" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 #, fuzzy msgid "[ultimate]" msgstr "ÀäÂÐŪ" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "̤ÄêµÁ" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "̵´ü¸Â" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "¤¢¤ëÄøÅÙ" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "´°Á´" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "ÀäÂÐŪ" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "¼¡²ó¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¸¡ºº¤Ï¡¢%s¤Ç¤¹\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, c-format msgid "public key %s not found: %s\n" msgstr "¸ø³«¸°%s¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "--check-trustdb¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%dËܤθ°¤ò½èÍý (¤¦¤Á%dËܤÎÍ­¸úÀ­¿ô¤ò¥¯¥ê¥¢)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%s¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "ºÇ¾®¤Î¡Ö¤¢¤ëÄøÅ٤ο®ÍÑ¡×%d¡¢ºÇ¾®¤Î¡ÖÁ´ÌÌŪ¿®ÍÑ¡×%d¡¢%s¿®ÍÑ¥â¥Ç¥ë\n" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "¿¼¤µ: %d Í­¸úÀ­: %3d ½ð̾: %3d ¿®ÍÑ: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5893,6 +5669,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quit" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -5929,6 +5709,168 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "admin" +#~ msgstr "admin" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#~ msgid "name" +#~ msgstr "name" + +#~ msgid "url" +#~ msgstr "url" + +#~ msgid "fetch" +#~ msgstr "fetch" + +#~ msgid "login" +#~ msgstr "login" + +#~ msgid "lang" +#~ msgstr "lang" + +#~ msgid "sex" +#~ msgstr "sex" + +#~ msgid "cafpr" +#~ msgstr "cafpr" + +#~ msgid "forcesig" +#~ msgstr "forcesig" + +#~ msgid "generate" +#~ msgstr "generate" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#~ msgid "tsign" +#~ msgstr "tsign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#~ msgid "addcardkey" +#~ msgstr "addcardkey" + +#~ msgid "keytocard" +#~ msgstr "keytocard" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#~ msgid "keyserver" +#~ msgstr "keyserver" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤Ï¡¢¤³¤ÎÈǤÀ¤ÈÆɽФ·¤À¤±¤Ç¤¹\n" Index: gnupg/po/pl.po diff -u gnupg/po/pl.po:1.48 gnupg/po/pl.po:1.49 --- gnupg/po/pl.po:1.48 Fri Dec 10 23:20:43 2004 +++ gnupg/po/pl.po Tue Dec 14 08:49:27 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -40,7 +40,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -370,7 +370,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -583,165 +583,88 @@ msgid "secret key already stored on a card\n" msgstr "pominiêty: klucz prywatny jest ju¿ wpisany\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "wyj¶cie" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "wyj¶cie z tego menu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "w" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "sprzeczne polecenia\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "pomoc" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "ten tekst pomocy" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "lista" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Klucz dostêpny w: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "¶ledzenia" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "w³kl" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lpodpis" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "zmiana daty wa¿no¶ci klucza" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "zmiana zaufania w³a¶ciciela" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "odc" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "okazanie odcisku klucza" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "unpod" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "b³±d ogólny" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "generacja nowej pary kluczy" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "has³o" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Polecenie> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "sprzeczne polecenia\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "sprzeczne polecenia\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (spróbuj \"help\")\n" @@ -789,7 +712,7 @@ msgid "PIN not correctly repeated; try again" msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -799,13 +722,13 @@ msgid "--output doesn't work for this command\n" msgstr "opcja --output nie dzia³a z tym poleceniem\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1263,7 +1186,7 @@ msgid "Pubkey: " msgstr "Asymetryczne: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Symetryczne: " @@ -1271,7 +1194,7 @@ msgid "Hash: " msgstr "Skrótów: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Kompresji: " @@ -1387,7 +1310,7 @@ msgid "reading options from `%s'\n" msgstr "odczyt opcji z ,,%s''\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n" @@ -1399,337 +1322,337 @@ "modu³ szyfru ,,%s'' nie zosta³ za³adowany z powodu niebezpiecznych praw " "dostêpu\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nie jest poprawn± nazw± zestawu znaków\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "niezrozuma³y URI serwera kluczy\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie wolno u¿ywaæ %s z %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nie ma sensu w po³±czeniu z %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "w trybie --pgp2 mo¿na sk³adaæ tylko podpisy oddzielne lub do³±czone do " "tekstu\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "w trybie --pgp2 nie mo¿na jednocze¶nie szyfrowaæ i podpisywaæ\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "w trybie --pgp2 trzeba u¿ywaæ plików a nie potoków.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "szyfrowanie wiadomo¶ci w trybie --pgp2 wymaga modu³u szyfru IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów po¶wiadczeñ jest niepoprawny\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "niew³a¶ciwy domy¶lny poziom sprawdzania; musi mieæ warto¶æ 0, 1, 2 lub 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "niew³a¶ciwy minimalny poziom sprawdzania; musi mieæ warto¶æ 0, 1, 2 lub 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "niew³a¶ciwe domy¶lne ustawienia\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "niew³a¶ciwe ustawienia szyfrów\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "niew³a¶ciwe ustawienia skrótów\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "niew³a¶ciwe ustawienia algorytmów kompresji\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s jeszcze nie dzia³a z %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "szyfr ,,%s'' nie jest dostêpny w trybie %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "skrót ,,%s'' nie jest dostêpny w trybie %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "kompresja ,,%s'' nie jest dostêpna w trybie %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "OSTRZE¯ENIE: podano adresatów (-r) w dzia³aniu które ich nie dotyczy\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "b³±d odszyfrowywania: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [plik]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key nazwa u¿ytkownika" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key nazwa u¿ytkownika" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key nazwa u¿ytkownika" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrsign-key nazwa u¿ytkownika" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u¿ytkownika [polecenia]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "wysy³ka do serwera kluczy nie powiod³a siê: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "eksport kluczy nie powiód³ siê: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "szukanie w serwerze kluczy nie powiod³o siê: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "od¶wie¿enie kluczy z serwera nie powiod³o siê: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1737,23 +1660,23 @@ "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki i podkre¶lenia, \n" "i musi koñczyæ siê ,,=''\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "adnotacja u¿ytkownika musi zawieraæ znak '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "tre¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "podany URL regulaminu po¶wiadczania jest niepoprawny\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "podany URL regulaminu podpisów jest niepoprawny\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "podany URL regulaminu podpisów jest niepoprawny\n" @@ -2617,12 +2540,12 @@ msgstr "Identyfikator u¿ytkownika ,,%s'' zosta³ uniewa¿niony." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Czy na pewno chcesz podpisaæ? (t/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Nie da siê z³o¿yæ podpisu.\n" @@ -2823,7 +2746,7 @@ msgid "Really sign? (y/N) " msgstr "Czy na pewno podpisaæ? (t/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2876,18 +2799,10 @@ msgstr "przenoszê podpis klucza na w³a¶ciwe miejsce\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "zapis" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "zapis zmian i wyj¶cie" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "odc" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "okazanie odcisku klucza" @@ -2896,506 +2811,358 @@ msgstr "lista kluczy i identyfikatorów u¿ytkowników" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "id" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "wybór identyfikatora u¿ytkownika N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "klucz" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "wybór podklucza N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "lista" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "lista podpisów" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "l" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "podpis" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "z³o¿enie podpisu na kluczu" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "p" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "podpis" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "z³o¿enie podpisu oddzielonego od dokumentu" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lpodpis" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "z³o¿enie prywatnego (lokalnego) podpisu na kluczu" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nupodpis" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "z³o¿enie na kluczu podpisu nie podlegaj±cego uniewa¿nieniu" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nulpodpis" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "z³o¿enie na kluczu prywatnego podpisu nie podlegaj±cego uniewa¿nieniu" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "dodid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "dodfoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "dodanie zdjêcia u¿ytkownika do klucza" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "usid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "usuniêcie identyfikatora u¿ytkownika z klucza" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "usfoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "dodkl" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "dodanie podklucza" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "dodkl" - -#: g10/keyedit.c:1271 +#: g10/keyedit.c:1272 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 -#, fuzzy -msgid "keytocard" -msgstr "Podaj \"help\" aby zobaczyæ listê poleceñ." - -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "uskl" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "usuniêcie podklucza" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "dodun" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "wyznaczenie klucza uniewa¿niaj±cego" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "uspod" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "usuniêcie podpisów" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "data" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "zmiana daty wa¿no¶ci klucza" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "g³ówny" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "oznaczenie identyfikatora u¿ytkownika jako g³ównego" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "prze³" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i prywatnych" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "p" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "opcje" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "ustawienia (zaawansowane)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "opcje" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "rozbudowana lista ustawieñ" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "ustaw" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "ustawienie opcji klucza" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "aktopc" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "aktualizacja ustawieñ klucza" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "b³±d serwera kluczy" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "niezrozuma³y URI serwera kluczy\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "zmiana has³a klucza" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "zaufanie" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "zmiana zaufania w³a¶ciciela" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "unpod" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "uniewa¿nienie podpisu" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "unpod" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "uniewa¿nienie identyfikatora u¿ytkownika" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "unpkl" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "uniewa¿nienie podklucza" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "wy³kl" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "wy³±czyæ klucz z u¿ycia" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "w³kl" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "w³±czyæ klucz do u¿ycia" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "foto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "okazanie identyfikatora - zdjêcia" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "b³±d odczytu bloku klucza tajnego '%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Dostêpny jest klucz tajny.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Najpierw trzeba u¿yæ polecenia \"prze³\".\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Klucz uniewa¿niony." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "To polecenie nie jest dostêpne w trybie %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Musisz wybraæ co najmniej jeden klucz.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Musisz wybraæ co najmniej jeden klucz.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Czy na pewno chcesz usun±æ wybrane klucze? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Czy na pewno chcesz usun±æ ten klucz? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Czy na pewno uniewa¿niæ wszystkie wybrane identyfikatory u¿ytkownika? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Czy na pewno uniewa¿niæ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "ustawienie opcji klucza" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Czy na pewno zaktualizowaæ ustawienia klucza dla wybranych identyfikatorów? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Czy na pewno usaktualniæ ustawienia? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Zapisaæ zmiany? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Wyj¶æ bez zapisania zmian? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "zapis zmian nie powiód³ siê: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "zapis zmian na kluczu prywatnym nie powiód³ siê: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Klucz nie zosta³ zmieniony wiêc zapis zmian nie jest konieczny.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Skrót: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Ustawienia: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Klucz mo¿e zostaæ uniewa¿niony przez klucz %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (poufne)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "nie mo¿na utworzyæ %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[uniewa¿niony]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [wygasa :%s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [wygasa :%s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " zaufanie: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " zaufanie: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Ten klucz zosta³ wy³±czony z u¿ytku" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Klucze PGP 2.x nie zawieraj± opisu ustawieñ.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3403,19 +3170,19 @@ "Pokazana warto¶æ wiarygodno¶ci klucza mo¿e byæ niepoprawna,\n" "dopóki program nie zostanie uruchomiony ponownie.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[uniewa¿niony]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "data" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3424,7 +3191,7 @@ " jako g³ówny. Wykonanie tego polecenie mo¿e wiêc spowodowaæ\n" " wy¶wietlanie innego identyfikatora jako domy¶lnego g³ównego.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3433,45 +3200,45 @@ "OSTRZE¯ENIE: To jest klucz PGP wersji 2. Dodanie zdjêcia spowoduje, ¿e\n" " niektóre wersje przestan± go rozumieæ.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Czy dalej chcesz je dodaæ? (t/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Do klucza dla PGP 2.x nie mo¿na dodaæ zdjêcia.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Usun±æ ten poprawny podpis? (t/N/w) " -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) " -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Usun±æ ten nieznany podpis? (t/N/w) " -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) " -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d podpis usuniêty.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d podpisów usuniêtych.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nic nie zosta³o usuniête.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3481,162 +3248,162 @@ " uniewa¿niaj±cego, spowoduje, ¿e niektóre wersje PGP przestan±\n" " go rozumieæ.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Do klucza dla PGP 2.x nie mo¿na wyznaczyæ klucza uniewa¿niaj±cego.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Podaj identyfikator klucza uniewa¿niaj±cego: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "klucza PGP 2.x nie mo¿na wyznaczyæ jako uniewa¿niaj±cego\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nie mo¿na wyznaczuæ klucza do uniewa¿niania jego samego\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony kluczem uniewa¿niaj±cym!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "OSTRZE¯ENIE: nie mo¿na cofn±æ wyznaczenia klucza jako uniewa¿niaj±cego!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Czy na pewno chcesz wyznaczyæ ten klucz jako uniewa¿niaj±cy? (t/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Proszê usun±æ znacznik wyboru z kluczy prywatnych.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Proszê wybraæ tylko jeden podklucz.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Zmiana daty wa¿no¶ci podklucza.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nie mo¿na zmieniæ daty wa¿no¶ci klucza w wersji 3.\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy prywatnych\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominiêty\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Czy na pewno chcesz tego u¿yæ? (t/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Czy na pewno chcesz tego u¿yæ? (t/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Brak podklucza o numerze %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Identyfikator u¿ytkownika: " -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "podpisany przez %08lX w %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Te identyfikatory s± podpisane przez Ciebie:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr "uniewa¿niony przez %08lX w %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "brak klucza tajnego\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "identyfikator u¿ytkownika ,,%s'' zosta³ ju¿ uniewa¿niony\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "OSTRZE¯ENIE: identyfikator u¿ytkownika podpisany za %d sekund (w " "przysz³o¶ci)\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Zdjêcie w formacie %s, rozmiar %ld bajtów, klucz 0x%08lX (id %d).\n" @@ -3967,7 +3734,7 @@ msgstr "" "Musisz podaæ d³ugie, skomplikowane has³o aby ochroniæ swój klucz tajny.\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4234,7 +4001,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "niepoprawne opcje eksportu kluczy\n" @@ -4249,106 +4016,106 @@ msgid "key not found on keyserver\n" msgstr "klucz ,,%s'' nie zosta³ odnaleziony: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "zapytanie o klucz %08lX w %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "zapytanie o klucz %08lX w %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "podpisano Twoim kluczem %08lX w %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "brak znanyk serwerów kluczy (u¿yj opcji --keyserver)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "b³±d serwera kluczy" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "b³±d serwera kluczy" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s: nie jest poprawnym identyfikatorem klucza\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "OSTRZE¯ENIE: nie mo¿na skasowaæ pliku tymczasowego (%s) ,,%s'': %s.\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "zapytanie o klucz %08lX w %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "zapytanie o klucz %08lX w %s\n" @@ -4526,7 +4293,7 @@ msgid "textmode" msgstr "tekstowy" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "nieznany" @@ -4700,50 +4467,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nie jest dostêpny w tej sesji\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "nie mo¿na ustawiæ numeru procesu klienckiego agenta\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "serwer nie chce czytaæ deskryptora dla agenta\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "serwer nie chce pisaæ deskryptora dla agenta\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "z³y format zmiennej ¶rodowiskowej GPG_AGENT_INFO\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "wersja %d protoko³u agenta nie jest obs³ugiwana\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nie mo¿na siê po³±czyæ z ,,%s'': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problem z porozumiewaniem siê z agentem\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problem z agentem - zostaje wy³±czony\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (podklucz %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4754,41 +4521,41 @@ "\"%.*s\".\n" "Klucz o d³ugo¶ci %u bitów, typ %s, numer %08lX, stworzony %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Powtórzone has³o\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Has³o\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "has³o zbyt d³ugie\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "b³êdna odpowied¼ agenta\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "anulowano przez u¿ytkownika\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem agenta: zwróci³ 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Podaj has³o: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4798,17 +4565,17 @@ "Musisz podaæ has³o aby odbezpieczyæ klucz prywatny u¿ytkownika:\n" "\"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "d³ugo¶æ %u bitów, typ %s, numer %08lX, stworzony %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Powtórz has³o: " @@ -5702,12 +5469,12 @@ msgstr "" "Baza zaufania jest uszkodzona; proszê uruchomiæ ,,gpg --fix-trustdb''.\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nie mo¿na obs³u¿yæ linii tekstu d³u¿szej ni¿ %d znaków\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "linia d³u¿sza ni¿ %d znaków\n" @@ -5767,7 +5534,7 @@ msgid "[ revoked]" msgstr "[uniewa¿niony]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[przeterminowany]" @@ -5777,101 +5544,101 @@ msgid "[ unknown]" msgstr "nieznany" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "nigdy " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "nastêpne sprawdzanie bazy odbêdzie siê %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "klucz publiczny %08lX nie odnaleziony: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "nale¿y uruchomiæ gpg z opcj± ,,--check-trustdb''\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "sprawdzanie bazy zaufania\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "przetworzono %d kluczy (rozwi±zano %d przeliczeñ zaufania)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "brak absolutnie zaufanych kluczy\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powiód³ siê: %s\n" @@ -6143,6 +5910,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "wyj¶cie" + #: util/miscutil.c:351 msgid "qQ" msgstr "wW" @@ -6180,6 +5951,162 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dlatego zadania)\n" +#~ msgid "q" +#~ msgstr "w" + +#~ msgid "help" +#~ msgstr "pomoc" + +#~ msgid "list" +#~ msgstr "lista" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "¶ledzenia" + +#, fuzzy +#~ msgid "name" +#~ msgstr "w³kl" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lpodpis" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "odc" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "unpod" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "b³±d ogólny" + +#~ msgid "passwd" +#~ msgstr "has³o" + +#~ msgid "save" +#~ msgstr "zapis" + +#~ msgid "fpr" +#~ msgstr "odc" + +#~ msgid "uid" +#~ msgstr "id" + +#~ msgid "key" +#~ msgstr "klucz" + +#~ msgid "check" +#~ msgstr "lista" + +#~ msgid "c" +#~ msgstr "l" + +#~ msgid "sign" +#~ msgstr "podpis" + +#~ msgid "s" +#~ msgstr "p" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "podpis" + +#~ msgid "lsign" +#~ msgstr "lpodpis" + +#~ msgid "nrsign" +#~ msgstr "nupodpis" + +#~ msgid "nrlsign" +#~ msgstr "nulpodpis" + +#~ msgid "adduid" +#~ msgstr "dodid" + +#~ msgid "addphoto" +#~ msgstr "dodfoto" + +#~ msgid "deluid" +#~ msgstr "usid" + +#~ msgid "delphoto" +#~ msgstr "usfoto" + +#~ msgid "addkey" +#~ msgstr "dodkl" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "dodkl" + +#, fuzzy +#~ msgid "keytocard" +#~ msgstr "Podaj \"help\" aby zobaczyæ listê poleceñ." + +#~ msgid "delkey" +#~ msgstr "uskl" + +#~ msgid "addrevoker" +#~ msgstr "dodun" + +#~ msgid "delsig" +#~ msgstr "uspod" + +#~ msgid "expire" +#~ msgstr "data" + +#~ msgid "primary" +#~ msgstr "g³ówny" + +#~ msgid "toggle" +#~ msgstr "prze³" + +#~ msgid "t" +#~ msgstr "p" + +#~ msgid "pref" +#~ msgstr "opcje" + +#~ msgid "showpref" +#~ msgstr "opcje" + +#~ msgid "setpref" +#~ msgstr "ustaw" + +#~ msgid "updpref" +#~ msgstr "aktopc" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "b³±d serwera kluczy" + +#~ msgid "trust" +#~ msgstr "zaufanie" + +#~ msgid "revsig" +#~ msgstr "unpod" + +#~ msgid "revuid" +#~ msgstr "unpod" + +#~ msgid "revkey" +#~ msgstr "unpkl" + +#~ msgid "disable" +#~ msgstr "wy³kl" + +#~ msgid "enable" +#~ msgstr "w³kl" + +#~ msgid "showphoto" +#~ msgstr "foto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "w tej wersji algorytm skrótu ,,%s'' jest tylko do odczytu\n" Index: gnupg/po/pt.po diff -u gnupg/po/pt.po:1.13 gnupg/po/pt.po:1.14 --- gnupg/po/pt.po:1.13 Fri Dec 10 23:20:43 2004 +++ gnupg/po/pt.po Tue Dec 14 08:49:27 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -33,7 +33,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -354,7 +354,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -565,165 +565,88 @@ msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "sair" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "sair deste menu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandos em conflito\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nenhuma ajuda disponível" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "muda a data de validade" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "muda os valores de confiança" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra impressão digital" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "erro geral" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "gerar um novo par de chaves" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "comandos em conflito\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos em conflito\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" @@ -768,7 +691,7 @@ msgid "PIN not correctly repeated; try again" msgstr "a frase secreta não foi repetida corretamente; tente outra vez" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -778,13 +701,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output não funciona para este comando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "chave `%s' não encontrada: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1246,7 +1169,7 @@ msgid "Pubkey: " msgstr "Chave pública: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Cifra: " @@ -1254,7 +1177,7 @@ msgid "Hash: " msgstr "Dispersão: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Compressão: " @@ -1358,7 +1281,7 @@ msgid "reading options from `%s'\n" msgstr "a ler opções de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" @@ -1370,337 +1293,337 @@ "a extensão de cifra \"%s\" não foi carregada devido às suas permissões " "inseguras\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "não consegui processar a URI do servidor de chaves\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "opções de importação inválidas\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "opções de importação inválidas\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "não foi possível alterar o exec-path para %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um ficheiro core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sobrepõe %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "não pode assinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "deve utilizar ficheiros (e não um 'pipe') quando trabalho no modo --pgp2.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado é inválido\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "preferências por omissão inválidas\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "preferências pessoais de cifra inválidas\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "preferências pessoais de 'digest' inválidas\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "preferências pessoais de compressão inválidas\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [nome_do_ficheiro]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_ficheiro]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifragem falhou: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_ficheiro]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [nome_do_ficheiro]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nome_do_ficheiro]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_ficheiro]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_ficheiro]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id-utilizador" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizador" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-utilizador" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-utilizador" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizador [comandos]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de dispersão inválido `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nome_do_ficheiro]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Digite a sua mensagem ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1708,23 +1631,23 @@ "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e " "terminar com um '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "a URL de política de certificação dada é inválida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "a URL de política de assinatura dada é inválida\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "a URL de política de assinatura dada é inválida\n" @@ -2592,12 +2515,12 @@ msgstr "Utilizador \"%s\" está revocado." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Não foi possível assinar.\n" @@ -2799,7 +2722,7 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2852,18 +2775,10 @@ msgstr "a mover a assinatura da chave para o local correcto\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "gravar e sair" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "mostra impressão digital" @@ -2872,505 +2787,358 @@ msgstr "lista chave e identificadores de utilizadores" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "seleciona ID de utilizador N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "seleciona chave secundária N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "assina a chave" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "fazer uma assinatura separada" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "assina a chave localmente" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "assina a chave de forma não-revogável" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "assinar a chave localmente e de forma não revogável" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "adiciona um novo ID de utilizador" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "adiciona um identificador fotográfico" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "remove ID de utilizador" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "remove uma chave secundária" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "adiciona uma chave de revocação" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "remove assinaturas" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "muda a data de validade" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "seleccionar o identificador do utilizador como primário" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "alterna entre listagem de chave secreta e pública" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "lista preferências (perito)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "lista preferências (detalhadamente)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "configurar lista de preferências" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "preferências actualizadas" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "erro do servidor de chaves" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "não consegui processar a URI do servidor de chaves\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "muda os valores de confiança" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revoga assinaturas" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "revocar um ID de utilizador" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revoga uma chave secundária" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "desactiva uma chave" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "activa uma chave" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "mostrar identificador fotográfico" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erro na leitura do bloco de chave secreto `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Chave secreta disponível.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "A chave secreta é necessária para fazer isto.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor utilize o comando \"toggle\" primeiro.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "A chave está revogada." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Realmente assinar todos os IDs de utilizador? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Este comando não é permitido no modo %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Você não pode remover o último ID de utilizador!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de utilizador seleccionados? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Realmente remover este ID de utilizador? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Realmente remover este ID de utilizador? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Você quer realmente remover as chaves selecionadas? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Você quer realmente remover esta chave? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Realmente revocar todos os IDs de utilizador seleccionados? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Realmente revocar este ID de utilizador? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Você quer realmente revogar as chaves selecionadas? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Você quer realmente revogar esta chave? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "configurar lista de preferências" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Realmente actualizar as preferências para os utilizadores seleccionados?" -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Realmente actualizar as preferências?" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Gravar alterações? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Sair sem gravar? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "actualização falhou: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma actualização é necessária.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "'Digest': " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Esta chave pode ser revogada pela chave %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (sensível)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Esta chave foi desactivada" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3378,25 +3146,25 @@ "Não se esqueça que a validade de chave mostrada não é necessáriamente a\n" "correcta a não ser que reinicie o programa.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "revkey" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3405,46 +3173,46 @@ "AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n" " algumas versão do PGP podem rejeitá-la.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Apagar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Apagar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Apagar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3453,161 +3221,161 @@ "AVISO: Esta chave é do tipo PGP 2.x. Se adicionar um revogador designado\n" " algumas versão do PGP podem rejeitá-la.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Insira o ID de utilizador do revogador escolhido: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as selecções das chaves secretas.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Por favor seleccione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "A modificar a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Modificar a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Você não pode modificar a data de validade de uma chave v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Seleccione exactamente um identificador de utilizador.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de utilizador com índice %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de utilizador: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " assinado por %08lX em %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (não-exportável)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Tem a certeza de que quer revogá-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Assinou estes identificadores de utilizadores:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (não-exportável)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente criar os certificados de revogação? (s/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3939,7 +3707,7 @@ "Você precisa de uma frase secreta para proteger a sua chave.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4201,7 +3969,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opções de exportação inválidas\n" @@ -4216,106 +3984,106 @@ msgid "key not found on keyserver\n" msgstr "chave `%s' não encontrada: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "assinado com a sua chave %08lX em %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "opções de exportação inválidas\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "erro do servidor de chaves" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "AVISO: dono pouco seguro em %s \"%s\"\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "a pedir a chave %08lX de %s\n" @@ -4495,7 +4263,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 #, fuzzy msgid "unknown" msgstr "versão desconhecida" @@ -4671,50 +4439,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "o gpg-agent não está disponível nesta sessão\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "não consegui colocar o pid do cliente no agente\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "não consigo obter FD de leitura no servidor para o agente\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "não consigo obter FD de escrita no servidor para o agente\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variável de ambiente GPG_AGENT_INFO inválida\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versão %d do protocolo gpg-agent não é suportada\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível ligar a `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problemas na comunicação com o gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problema com o agente - a desactivar a utilização deste\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4727,41 +4495,41 @@ "\"%.*s\"\n" "chave %u bits %s, ID %08lx, criada %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Repita a frase secreta\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Insira a frase secreta\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "frase secreta demasiado longa\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "resposta do agente inválida\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "cancelado pelo utilizador\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema com o agente: o agente returnou 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "impossível pedir senha em modo não-interactivo\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4771,17 +4539,17 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "utilizador: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -5662,12 +5430,12 @@ "A base de dados de confiança está danificada; por favor execute\n" "\"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossível manipular linhas de texto maiores que %d caracteres\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "linha de entrada maior que %d caracteres\n" @@ -5728,7 +5496,7 @@ msgid "[ revoked]" msgstr "revkey" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "expire" @@ -5738,103 +5506,103 @@ msgid "[ unknown]" msgstr "versão desconhecida" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "proxima verificação da base de dados de confiança a %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública %08lX não encontrada: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "a verificar a base de dados de confiança\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "" "chave pública da chave absolutamente de confiança %08lX não encontrada\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "chave pública da chave absolutamente de confiança %08lX não encontrada\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n" @@ -6107,6 +5875,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "sair" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6144,6 +5916,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "erro geral" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "erro do servidor de chaves" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "" #~ "About to generate a new %s keypair.\n" #~ " minimum keysize is 768 bits\n" Index: gnupg/po/pt_BR.po diff -u gnupg/po/pt_BR.po:1.50 gnupg/po/pt_BR.po:1.51 --- gnupg/po/pt_BR.po:1.50 Fri Dec 10 23:20:43 2004 +++ gnupg/po/pt_BR.po Tue Dec 14 08:49:27 2004 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -37,7 +37,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -359,7 +359,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -571,167 +571,89 @@ msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" -# INICIO MENU -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "sair" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "sair deste menu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comandos conflitantes\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "mostra esta ajuda" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nenhuma ajuda disponível" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "muda a data de validade" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "muda os valores de confiança" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "mostra impressão digital" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "erro geral" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "gerar um novo par de chaves" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Comando> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "escrevendo certificado privado para `%s'\n" # help ou ajuda ??? -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" @@ -779,7 +701,7 @@ msgid "PIN not correctly repeated; try again" msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -789,13 +711,13 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "usuário `%s' não encontrado: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, fuzzy, c-format msgid "error reading keyblock: %s\n" @@ -1257,7 +1179,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "" @@ -1265,7 +1187,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 #, fuzzy msgid "Compression: " msgstr "Comentário: " @@ -1370,7 +1292,7 @@ msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" @@ -1380,346 +1302,346 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 #, fuzzy msgid "invalid import options\n" msgstr "armadura inválida" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 #, fuzzy msgid "invalid export options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "armadura inválida" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 #, fuzzy msgid "invalid default preferences\n" msgstr "lista preferências" -#: g10/g10.c:2769 +#: g10/g10.c:2767 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "lista preferências" -#: g10/g10.c:2773 +#: g10/g10.c:2771 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "lista preferências" -#: g10/g10.c:2777 +#: g10/g10.c:2775 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "lista preferências" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "descriptografia falhou: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3093 +#: g10/g10.c:3091 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuário" -#: g10/g10.c:3143 +#: g10/g10.c:3141 #, fuzzy msgid "--nrsign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:3147 +#: g10/g10.c:3145 #, fuzzy msgid "--nrlsign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuário [comandos]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record falhou: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas não fica claro -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1728,26 +1650,26 @@ "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e " "terminar com '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "a URL de política dada é inválida\n" @@ -2561,13 +2483,13 @@ msgstr "A chave é protegida.\n" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr "" @@ -2748,7 +2670,7 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2803,18 +2725,10 @@ msgstr "movendo a assinatura da chave para o local correto\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "gravar e sair" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "mostra impressão digital" @@ -2823,753 +2737,599 @@ msgstr "lista chave e identificadores de usuários" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "seleciona ID de usuário N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "seleciona chave secundária N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "assina a chave" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "fazer uma assinatura separada" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "assina a chave localmente" #: g10/keyedit.c:1261 #, fuzzy -msgid "nrsign" -msgstr "sign" - -#: g10/keyedit.c:1261 -#, fuzzy msgid "sign the key non-revocably" msgstr "assina a chave localmente" #: g10/keyedit.c:1262 #, fuzzy -msgid "nrlsign" -msgstr "sign" - -#: g10/keyedit.c:1262 -#, fuzzy msgid "sign the key locally and non-revocably" msgstr "assina a chave localmente" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 #, fuzzy msgid "add a photo ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "remove ID de usuário" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "remove uma chave secundária" -#: g10/keyedit.c:1275 -#, fuzzy -msgid "addrevoker" -msgstr "revkey" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 #, fuzzy msgid "add a revocation key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "remove assinaturas" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "muda a data de validade" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "alterna entre listagem de chave secreta e pública" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 #, fuzzy msgid "list preferences (expert)" msgstr "lista preferências" -#: g10/keyedit.c:1283 -#, fuzzy -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 #, fuzzy msgid "list preferences (verbose)" msgstr "lista preferências" -#: g10/keyedit.c:1284 -#, fuzzy -msgid "setpref" -msgstr "pref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 #, fuzzy msgid "set preference list" msgstr "lista preferências" -#: g10/keyedit.c:1285 -#, fuzzy -msgid "updpref" -msgstr "pref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 #, fuzzy msgid "updated preferences" msgstr "lista preferências" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "erro geral" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 msgid "set preferred keyserver URL" msgstr "" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "muda os valores de confiança" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revoga assinaturas" -#: g10/keyedit.c:1290 -#, fuzzy -msgid "revuid" -msgstr "revsig" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 #, fuzzy msgid "revoke a user ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revoga uma chave secundária" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "desativa uma chave" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "ativa uma chave" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Chave secreta disponível.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "A chave secreta é necessária para fazer isto.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 #, fuzzy msgid "Key is revoked." msgstr "A chave é protegida.\n" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Realmente assinar todos os IDs de usuário? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestão: Selecione os IDs de usuário para assinar\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Você não pode remover o último ID de usuário!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Você realmente quer remover as chaves selecionadas? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Você realmente quer remover esta chave? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Você realmente quer revogar as chaves selecionadas? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Você realmente quer revogar esta chave? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "lista preferências" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvar alterações? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Sair sem salvar? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "atualização falhou: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "atualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma atualização é necessária.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "" -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr "trust" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr "trust" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Esta chave foi desativada" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "revkey" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Deletar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Deletar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Deletar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Digite o tamanho da chave" -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as seleções das chaves secretas.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Por favor selecione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Modificando a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Modificando a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Você não pode modificar a data de validade de uma chave v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de usuário com índice %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuário: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " assinado por %08lX em %s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Você assinou estes IDs de usuário:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr "assinar uma chave localmente" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Você está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3905,7 +3665,7 @@ "Você precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "" @@ -4175,7 +3935,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "chaveiro inválido" @@ -4190,106 +3950,106 @@ msgid "key not found on keyserver\n" msgstr "usuário `%s' não encontrado: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "assinado com sua chave %08lX em %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "exportar chaves para um servidor" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "lendo opções de `%s'\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "chaveiro inválido" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "erro geral" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "erro geral" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, fuzzy, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "%s não é um mapa de caracteres válido\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "impossível escrever para o chaveiro: %s\n" @@ -4470,7 +4230,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 #, fuzzy msgid "unknown" msgstr "versão desconhecida" @@ -4644,50 +4404,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpacote do tipo %d tem bit crítico ligado\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, fuzzy, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "algoritmo de proteção %d não é suportado\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível abrir `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4699,44 +4459,44 @@ "usuário: \"%.*s\"\n" "%u-bit %s chave, ID %08lX, criada %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 #, fuzzy msgid "Repeat passphrase\n" msgstr "Repita a frase secreta: " -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 #, fuzzy msgid "Enter passphrase\n" msgstr "Digite a frase secreta: " -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 #, fuzzy msgid "passphrase too long\n" msgstr "linha muito longa\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "impossível pedir senha em modo não-interativo\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4746,17 +4506,17 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "usuário: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -5632,12 +5392,12 @@ "O banco de dados de confiabilidade está danificado; por favor rode\n" "\"gpg --fix-trust-db\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "impossível manipular linhas de texto maiores que %d caracteres\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "linha de entrada maior que %d caracteres\n" @@ -5697,7 +5457,7 @@ msgid "[ revoked]" msgstr "revkey" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "expire" @@ -5707,103 +5467,103 @@ msgid "[ unknown]" msgstr "versão desconhecida" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 #, fuzzy msgid "no need for a trustdb check\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, fuzzy, c-format msgid "next trustdb check due at %s\n" msgstr "inserção de registro de confiança falhou: %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública não encontrada" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 #, fuzzy msgid "checking the trustdb\n" msgstr "muda os valores de confiança" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registro de confiança %lu, tipo %d: escrita falhou: %s\n" @@ -6079,6 +5839,11 @@ msgid "nN" msgstr "nN" +# INICIO MENU +#: util/miscutil.c:348 +msgid "quit" +msgstr "sair" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6117,6 +5882,153 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "erro geral" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "nrsign" +#~ msgstr "sign" + +#, fuzzy +#~ msgid "nrlsign" +#~ msgstr "sign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#, fuzzy +#~ msgid "addrevoker" +#~ msgstr "revkey" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#, fuzzy +#~ msgid "showpref" +#~ msgstr "showpref" + +#, fuzzy +#~ msgid "setpref" +#~ msgstr "pref" + +#, fuzzy +#~ msgid "updpref" +#~ msgstr "pref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "erro geral" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "revuid" +#~ msgstr "revsig" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + #~ msgid "" #~ "About to generate a new %s keypair.\n" #~ " minimum keysize is 768 bits\n" Index: gnupg/po/ro.po diff -u gnupg/po/ro.po:1.8 gnupg/po/ro.po:1.9 --- gnupg/po/ro.po:1.8 Fri Dec 10 23:20:42 2004 +++ gnupg/po/ro.po Tue Dec 14 08:49:27 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-06-17 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -34,7 +34,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -361,7 +361,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -572,165 +572,88 @@ msgid "secret key already stored on a card\n" msgstr "sãritã: cheia secretã deja prezentã\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "terminã" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ieºi din acest meniu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "t" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "comenzi în conflict\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "ajutor" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "afiºeazã acest mesaj" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "enumerã" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Cheie disponibilã la: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "depanare" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "activ" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "semloc" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "schimbã data de expirare" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "schimbã încrederea pentru proprietar" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "ampr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "afiºeazã amprenta" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsem" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "eroare generalã" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "genereazã o nouã perechi de chei" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "parola" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Comandã> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "comenzi în conflict\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "comenzi în conflict\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Comandã invalidã (încercaþi \"ajutor\")\n" @@ -775,7 +698,7 @@ msgid "PIN not correctly repeated; try again" msgstr "fraza-parolã nu a fost repetatã corect; mai încercaþi o datã" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -785,13 +708,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output nu merge pentru aceastã comandã\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "cheia `%s' nu a fost gãsitã: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1251,7 +1174,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Cifru: " @@ -1259,7 +1182,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Compresie: " @@ -1375,7 +1298,7 @@ msgid "reading options from `%s'\n" msgstr "citesc opþiuni din `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTÃ: %s nu este pentru o folosire normalã!\n" @@ -1387,341 +1310,341 @@ "extensie cifru \"%s\" nu a fost încãrcat din cauza permisiunilor nesigure " "(unsafe)\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nu este un set de carectere valid\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "nu am putut interpreta URI pentru serverul de chei\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opþiuni import invalide\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "opþiuni import invalide\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opþiuni import invalide\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "opþiuni import invalide\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nu pot seta cale-execuþie ca %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "AVERTISMENT: programul ar putea crea un fiºier core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTISMENT: %s înlocuieºte %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s nu este permis cu %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nu are sens cu %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "puteþi crea doar semnãturi detaºate sau în clar câtã vreme sunteþi în modul " "--pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "nu puteþi semna ºi cifra în acelaºi timp câtã vreme sunteþi în modul --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "trebuie sã folosiþi fiºiere (ºi nu un pipe) când lucraþi cu modul --pgp2 " "activat.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrarea unui mesaj în modul --pgp2 necesitã un cifru IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "algoritm rezumat selectat este invalid\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritm rezumat certificare selectat este invalid\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed trebuie sã fie mai mare decât 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed trebuie sã fie mai mare decât 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth trebuie sã fie în intervalul 1..255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTÃ: modul S2K simplu (0) este contraindicat cu insistenþã\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mod S2K invalid; trebuie sã fie 0, 1 sau 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "preferinþe implicite invalide\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "preferinþe cifrare personale invalide\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "preferinþe rezumat personale invalide\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "preferinþe compresie personale invalide\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s nu merge încã cu %s!\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "nu puteþi folosi algoritmul de cifrare \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "nu puteþi folosi algorimul de rezumat \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "nu puteþi folosi algoritmul de compresie \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "am eºuat sã iniþializez TrustDB:%s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISMENT: destinatari (-r) furnizaþi fãrã a folosi cifrare cu cheie " "publicã\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [nume_fiºier]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [nume_fiºier]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decriptarea a eºuat: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [nume_fiºier]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [nume_fiºier]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nume_fiºier]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [nume_fiºier]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [nume_fiºier]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id-utilizator" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizator" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key id-utilizator" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id-utilizator" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizator [comenzi]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "trimitere server de chei eºuatã: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepþie server de chei eºuatã: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "export cheie eºuat: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "cãutare server de chei eºuatã: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualizare server de chei eºuatã: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminarea armurii a eºuat: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "punerea armurii a eºuat: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritm hash invalid `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[nume_fiºier]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Daþi-i drumul ºi scrieþi mesajul ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1729,24 +1652,24 @@ "un nume de notaþie trebuie sã conþinã numai caractere imprimabile sau spaþii " "ºi sã se termine cu un '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "un nume de notaþie utilizator trebuie sã conþinã caracterul '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "" "o valoare de notaþie trebuie sã nu foloseascã nici un caracter de control\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "URL-ul politicii de certificare furnizat este invalid\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "URL-ul politicii de semnãturi furnizat este invalid\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL-ul politicii de semnãturi furnizat este invalid\n" @@ -2615,12 +2538,12 @@ msgstr "ID utilizator \"%s\" a fost revocat." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã ºtergeþi permanent \"%s\"? (d/N)" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Nu pot semna.\n" @@ -2824,7 +2747,7 @@ msgid "Really sign? (y/N) " msgstr "Doriþi cu adevãrat sã semnaþi?" -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2877,18 +2800,10 @@ msgstr "mut o semnãturã de cheie în locul corect\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "salveazã" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "salveazã ºi terminã" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "ampr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "afiºeazã amprenta" @@ -2897,506 +2812,359 @@ msgstr "enumerã chei ºi ID-uri utilizator" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "selecteazã ID utilizator N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "cheie" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "selecteazã cheie secundarã N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "verificã" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "enumerã semnãturi" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "semneazã" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "semneazã cheia" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "semneazã" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "creazã o semnãturã detaºatã" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "semloc" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "semneazã cheia local" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "semirev" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "semneazã cheia irevocabil" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "semlirev" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "semneazã cheia local ºi irevocabil" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adauid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "adaugã un ID utilizator" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "adapoza" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "adaugã o pozã ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "steuid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "ºterge ID utilizator" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "stepoza" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "adacheie" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "adaugã o cheie secundarã" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "adacheie" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "stecheie" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "ºterge o cheie secundarã" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "adarev" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "adaugã o cheie de revocare" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "stesem" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "ºterge semnãturi" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expira" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "schimbã data de expirare" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primar" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "marcheazã ID-ul utilizator ca primar" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "comuta" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "comutã între listele de chei secrete ºi publice" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "enumerã preferinþele (expert)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "afispref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "afiºeazã preferinþele (detaliat)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "seteazã lista de preferinþe" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "actpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "preferinþe actualizate" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "eroare server de chei" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "nu am putut interpreta URI pentru serverul de chei\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "schimbã fraza-parolã" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "incred" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "schimbã încrederea pentru proprietar" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsem" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revocã semnãturi" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "revocã un ID utilizator" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revcheie" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revocã o cheie secundarã" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "deact" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "deactiveazã o cheie" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "activ" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "activeazã o cheie" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "afispoza" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "aratã o pozã ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "eroare la citire keyblock secret `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Cheia secretã este disponibilã.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Aveþi nevoie de cheia secretã pentru a face aceasta.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Vã rugãm folosiþi mai întâi comanda \"toggle\".\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Cheia este revocatã." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Semnaþi într-adevãr toate ID-urile utilizator? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestie: Selectaþi ID-ul utilizator de semnat\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Aceastã comandã nu este permisã în modul %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Trebuie mai întâi sã selectaþi cel puþin un ID utilizator.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Nu puteþi ºterge ultimul ID utilizator!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "ªtergeþi într-adevãr toate ID-urile utilizator selectate? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "ªtergeþi într-adevãr acest ID utilizator? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "ªtergeþi într-adevãr acest ID utilizator? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Trebuie sã selectaþi cel puþin o cheie.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Trebuie sã selectaþi cel puþin o cheie.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Doriþi într-adevãr sã ºtergeþi cheile selectate? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Doriþi într-adevãr sã ºtergeþi aceastã cheie? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi toate ID-urile utilizator selectate? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi acest ID utilizator? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi cheile selectate? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi aceastã cheie? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "seteazã lista de preferinþe" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Doriþi într-adevãr sã actualizaþi preferinþele pentru ID-urile utilizator " "selectate? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Doriþi într-adevãr sã actualizaþi preferinþele? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvaþi schimbãrile? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Terminaþi fãrã a salva? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "actualizarea a eºuat: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "actualizarea secretului a eºuat: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Cheia nu a fost schimbatã aºa cã nici o actualizare a fost necesarã.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Rezumat: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Capabilitãþi: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Aceastã cheie poate fi revocatã de cheia %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (senzitiv)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "nu pot crea %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocatã] " -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [expirã: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [expirã: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " încredere: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " încredere: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Aceastã cheie a fost deactivatã" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Nu existã nici o preferinþã pentru un ID utilizator stil PGP 2.x.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3404,19 +3172,19 @@ "Vã rugãm observaþi cã validitatea cheii arãtate nu este în mod necesar\n" "corectã dacã nu reporniþi programul.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[revocatã] " -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expira" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3425,7 +3193,7 @@ " Aceastã comandã poate cauza ca un alt ID utilizator\n" " sã devinã ID-ul utilizator primar presupus.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3434,45 +3202,45 @@ "AVERTISMENT: Aceasta este o cheie stil PGP2. Adãugarea unei poze ID poate\n" " cauza unele versiuni de PGP sã respingã aceastã cheie.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sunteþi încã sigur(ã) cã doriþi sã o adãugaþi? (d/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nu puteþi adãuga o pozã ID la o cheie stil PGP2.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã bunã? (d/N/t)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã invalidã? (d/N/t)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã necunoscutã? (d/N/t)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "ªtergeþi într-adevãr aceastã auto-semnãturã? (d/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Am ºters %d semnãturã.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Am ºters %d semnãturi.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Nu am ºters nimic.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3482,34 +3250,34 @@ "revocator desemnat poate face ca unele versiuni de PGP sã respingã " "cheia.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nu puteþi adãuga un revocator desemnat la o cheie stil PGP 2.x.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Introduceþi ID-ul utilizator al revocatorului desemnat: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nu puteþi desemna o cheie ca propriul sãu revocator desemnat\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVERTISMENT: Aceastã cheie a fost revocatã revocatorul desemnat!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi " "anulatã!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3517,129 +3285,129 @@ "Sunteþi sigur(ã) cã doriþi sã desemnaþi aceastã cheie ca ºi revocator " "desemnat? (d/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Vã rugãm ºtergeþi selecþiile din cheile secrete.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Vã rugãm selectaþi cel mult o cheie secundarã.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Schimbarea timpului de expirare pentru o cheie secundarã.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Schimbarea timpului de expirare pentru o cheie primarã.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nu puteþi schimba data de expirare a unei chei v3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Vã rugãm selectaþi exact un ID utilizator.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "auto-semnãturi v3 sãrite pentru ID-ul utilizator \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã o folosiþi (d/N)? " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã o folosiþi (d/N)? " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Nici un ID utilizator cu indicele %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Nici o cheie secundarã cu indicele %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID utilizator: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " semnatã de %08lX la %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (non-exportabilã)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Aceastã semnãturã a expirat pe %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sunteþi încã sigur(ã) cã doriþi sã o revocaþi? (d/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creaþi un certificat de revocare pentru aceastã semnãturã? (d/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Aþi semnat aceste ID-uri utilizator:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (non-exportabilã)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocat de %08lX la %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Sunteþi pe cale sã revocaþi aceste semnãturi:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Doriþi într-adevãr sã creaþi certificatele de revocare? (d/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "nici o cheie secretã\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID-ul utilizator \"%s\" este deja revocat\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVERTISMENT: o semnãturã ID utilizator este datatã %d secunde în viitor\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Afiºez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n" @@ -3968,7 +3736,7 @@ "Aveþi nevoie de o frazã-parolã pentru a vã proteja cheia secretã.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4232,7 +4000,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "opþiuni export invalide\n" @@ -4247,106 +4015,106 @@ msgid "key not found on keyserver\n" msgstr "cheia `%s' nu a fost gãsitã: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "cer cheia %08lX de la %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "cer cheia %08lX de la %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "caut pentru \"%s\" de pe serverul HKP %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "semnatã cu cheie d-voastrã %08lX la %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "caut pentru \"%s\" de pe serverul HKP %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "caut pentru \"%s\" de pe serverul HKP %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "opþiuni export invalide\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "eroare server de chei" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "eroare server de chei" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "recepþie server de chei eºuatã: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "AVERTISMENT: nu pot ºterge fiºierul temporar (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "cer cheia %08lX de la %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "cer cheia %08lX de la %s\n" @@ -4523,7 +4291,7 @@ msgid "textmode" msgstr "modtext" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "necunoscut" @@ -4701,50 +4469,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "subpachetul de tip %d are bitul critic setat\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nu este disponibil în aceastã sesiune\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "nu pot seta pid-ul client pentru agent\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "nu pot convinge serverul sã citeascã FD pentru agent\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "nu pot convinge serverul sã scrie FD pentru agent\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "variabila de mediu GPG_AGENT_INFO anormalã\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent versiune protocol %d nu este suportat\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nu mã pot conecta la `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "probleme de comunicare cu gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problemã cu agentul - deactivez folosirea agentului\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID cheie principalã %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4756,41 +4524,41 @@ "\"%.*s\"\n" "%u-bit cheia %s, ID %08lX, creatã %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Repetaþi fraza-parolã\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Introduceþi fraza-parolã\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "frazã-parolã prea lungã\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "rãspuns invalid de la agent\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "anulatã de utilizator\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemã cu agentul: agentul returneazã 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "nu pot cere parola în modul batch\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Introduceþi fraza-parolã: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4800,17 +4568,17 @@ "Aveþi nevoie de o frazã-parolã pentru a descuia cheia\n" "secretã pentru utilizator: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "cheia %2$s de %1$u-biþi, ID %3$08lX, creatã %4$s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Repetaþi fraza-parolã: " @@ -5696,12 +5464,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "trustdb este coruptã; rulaþi \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nu pot mânui linii de text mai lungi de %d caractere\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "linii de intrare mai lungi de %d caractere\n" @@ -5760,7 +5528,7 @@ msgid "[ revoked]" msgstr "[revocatã] " -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[expiratã] " @@ -5770,101 +5538,101 @@ msgid "[ unknown]" msgstr "necunoscut" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "niciodatã " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "urmãtoarea verificare pentru trustdb programatã pe %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "cheia publicã %08lX nu a fost gãsitã: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "vã rugãm faceþi un --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "verific trustdb\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d chei procesate (%d numãrãtori valide anulate)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "nu am gãsit nici o cheie cu încredere supremã\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "cheia publicã a cheii cu încredere supremã %08lX nu a fost gãsitã\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "înregistrare încredere %lu, tip %d: scrierea a eºuat: %s\n" @@ -6136,6 +5904,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "terminã" + #: util/miscutil.c:351 msgid "qQ" msgstr "tT" @@ -6174,6 +5946,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(aþi folosit probabil un program nepotrivit pentru aceastã sarcinã)\n" +#~ msgid "q" +#~ msgstr "t" + +#~ msgid "help" +#~ msgstr "ajutor" + +#~ msgid "list" +#~ msgstr "enumerã" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "depanare" + +#, fuzzy +#~ msgid "name" +#~ msgstr "activ" + +#, fuzzy +#~ msgid "login" +#~ msgstr "semloc" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "ampr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsem" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "eroare generalã" + +#~ msgid "passwd" +#~ msgstr "parola" + +#~ msgid "save" +#~ msgstr "salveazã" + +#~ msgid "fpr" +#~ msgstr "ampr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "cheie" + +#~ msgid "check" +#~ msgstr "verificã" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "semneazã" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "semneazã" + +#~ msgid "lsign" +#~ msgstr "semloc" + +#~ msgid "nrsign" +#~ msgstr "semirev" + +#~ msgid "nrlsign" +#~ msgstr "semlirev" + +#~ msgid "adduid" +#~ msgstr "adauid" + +#~ msgid "addphoto" +#~ msgstr "adapoza" + +#~ msgid "deluid" +#~ msgstr "steuid" + +#~ msgid "delphoto" +#~ msgstr "stepoza" + +#~ msgid "addkey" +#~ msgstr "adacheie" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "adacheie" + +#~ msgid "delkey" +#~ msgstr "stecheie" + +#~ msgid "addrevoker" +#~ msgstr "adarev" + +#~ msgid "delsig" +#~ msgstr "stesem" + +#~ msgid "expire" +#~ msgstr "expira" + +#~ msgid "primary" +#~ msgstr "primar" + +#~ msgid "toggle" +#~ msgstr "comuta" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "afispref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "actpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "eroare server de chei" + +#~ msgid "trust" +#~ msgstr "incred" + +#~ msgid "revsig" +#~ msgstr "revsem" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revcheie" + +#~ msgid "disable" +#~ msgstr "deact" + +#~ msgid "enable" +#~ msgstr "activ" + +#~ msgid "showphoto" +#~ msgstr "afispoza" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "algoritm rezumat `%s' este numai-citire în acestã ediþie\n" Index: gnupg/po/ru.po diff -u gnupg/po/ru.po:1.51 gnupg/po/ru.po:1.52 --- gnupg/po/ru.po:1.51 Fri Dec 10 23:20:42 2004 +++ gnupg/po/ru.po Tue Dec 14 08:49:27 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GnuPG 1.2.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2003-12-23 19:24+0100\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -31,7 +31,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -566,165 +566,88 @@ msgid "secret key already stored on a card\n" msgstr "пропущено: Ñекретный ключ уже имеетÑÑ\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "Выход" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "выйти из Ñтого меню" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "неÑовмеÑтимые команды\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "показать Ñту Ñправку" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Ключ доÑтупен: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "Ñменить Ñрок дейÑтвиÑ" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "изменить уровень Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "показать отпечаток" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "Ð¾Ð±Ñ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "Ñоздать новую пару ключей" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Команда> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "неÑовмеÑтимые команды\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "неÑовмеÑтимые команды\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (ÑпиÑок команд: \"help\")\n" @@ -769,7 +692,7 @@ msgid "PIN not correctly repeated; try again" msgstr "повторный ввод Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚ÐµÐ½; попробуйте еще раз" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -779,13 +702,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output не работает Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ команды\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "ключ `%s' не найден: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1241,7 +1164,7 @@ msgid "Pubkey: " msgstr "С открытым ключом: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Симметричные шифры: " @@ -1249,7 +1172,7 @@ msgid "Hash: " msgstr "Ð¥Ñш-функции: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Ðлгоритмы ÑжатиÑ: " @@ -1353,7 +1276,7 @@ msgid "reading options from `%s'\n" msgstr "наÑтройки взÑÑ‚Ñ‹ из файла `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ЗÐМЕЧÐÐИЕ: %s не предназначен Ð´Ð»Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ð³Ð¾ иÑпользованиÑ!\n" @@ -1364,336 +1287,336 @@ msgstr "" "раÑширение шифра \"%s\" не загружено вÑледÑтвие небезопаÑных прав доÑтупа\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° Ñимволов\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "не могу проанализировать URI Ñервера ключей\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: недопуÑтимые параметры импорта\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "недопуÑтимые параметры импорта\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: недопуÑтимые параметры импорта\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "недопуÑтимые параметры импорта\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "не могу определить путь запуÑка Ð´Ð»Ñ %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "Ð’ÐИМÐÐИЕ: возможно Ñоздание файла дампа памÑти!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "Ð’ÐИМÐÐИЕ: %s заменит %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s недопуÑтимо иÑпользовать Ñ %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s не имеет ÑмыÑла ÑовмеÑтно Ñ %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Можно Ñделать только отделенную или прозрачную подпиÑÑŒ в режиме --pgp2\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Ð’Ñ‹ не можете одновременно подпиÑать и зашифровать в режиме --pgp2\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Ð’Ñ‹ должны иÑпользовать файлы (а не каналы (pipe)) в режиме --pgp2.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Ð´Ð»Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²ÐºÐ¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² режиме --pgp2 требуетÑÑ ÑˆÐ¸Ñ„Ñ€ IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "выбран неверный алгоритм шифрованиÑ\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-функциÑ\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "выбран неверный алгоритм шифрованиÑ\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð´Ð»Ñ Ñертификации\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "недопуÑтимый default-cert-level; должен быть 0, 1, 2 или 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "недопуÑтимый min-cert-level; должен быть 1, 2 или 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ЗÐМЕЧÐÐИЕ: проÑтой (0) режим S2K Ñтрого не рекомендуетÑÑ\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопуÑтимый режим S2K; должно быть 0, 1 или 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "недопуÑтимые Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð°\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ…Ñш-функции\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð°Ð»Ð³Ð¾Ñ€Ð¸Ñ‚Ð¼Ð¾Ð² ÑжатиÑ\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s не работает пока Ñ %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать шифрование \"%s\" в режиме %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñ…Ñш-функцию \"%s\" в режиме %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñжатие \"%s\" в режиме %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ñбой инициализации таблицы доверий: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Ð’ÐИМÐÐИЕ: получатели (-r) заданы без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ " "ключом\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Ñбой раÑшифрованиÑ: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать %s в режиме %s\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать %s в режиме %s\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "неудача при отправке на Ñервер ключей: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "неудача при получении Ñ Ñервера ключей: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "не удалоÑÑŒ ÑкÑпортировать ключ: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "неудача при поиÑке на Ñервере ключей: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "неудача при обновлении на Ñервере ключей: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· ASCII формата: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² ASCII формат: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[filename]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Ðабирайте Ваше Ñообщение ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1701,23 +1624,23 @@ "Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать только печатные Ñимволы или пробелы,и " "заканчиватьÑÑ Ð·Ð½Ð°ÐºÐ¾Ð¼ '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать '@' Ñимвол\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "значение Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð½Ðµ должно Ñодержать управлÑющие Ñимволы\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "заданный URL правил Ñертификации неверен\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "заданный URL правил подпиÑи неверен\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "заданный URL правил подпиÑи неверен\n" @@ -2574,12 +2497,12 @@ msgstr "User ID \"%s\" отозван." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите Ñто подпиÑать? (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Ðе могу подпиÑать.\n" @@ -2781,7 +2704,7 @@ msgid "Really sign? (y/N) " msgstr "ДейÑтвительно подпиÑать? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2834,18 +2757,10 @@ msgstr "перемещение подпиÑи ключа в правильное меÑто\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "Ñохранить и выйти" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "показать отпечаток" @@ -2854,504 +2769,357 @@ msgstr "вывеÑти ÑпиÑок ключей и User ID" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "выбрать User ID N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "выбрать вторичный ключ N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "вывеÑти ÑпиÑок подпиÑей" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "подпиÑать ключ" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "Ñоздать отделенную (detached) подпиÑÑŒ" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "локально подпиÑать ключ" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "подпиÑать ключ без возможноÑти отзыва" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "подпиÑать ключ локально и без возможноÑти отзыва" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "добавить User ID" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "добавить фото ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "удалить User ID" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "добавить вторичный ключ" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "удалить вторичный ключ" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "добавить ключ отзыва" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "удалить подпиÑÑŒ" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "Ñменить Ñрок дейÑтвиÑ" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "пометить User ID как главный" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "переключение между открытым и закрытым ключами" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "ÑпиÑок предпочтений (ÑкÑпертам)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "ÑпиÑок предпочтений (подробный)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "уÑтановить предпочтениÑ" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "обновить предпочтениÑ" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "ошибка Ñервера ключей" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "не могу проанализировать URI Ñервера ключей\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "Ñменить пароль" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "изменить уровень Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "отзыв подпиÑей" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "отзыв User ID" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "отзыв подключей" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "отключить ключ" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "включить ключ" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "показать фото ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñекретного блока ключа `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Секретный ключ доÑтупен.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Ð”Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ дейÑÑ‚Ð²Ð¸Ñ Ð½ÑƒÐ¶ÐµÐ½ Ñекретный ключ.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Сначала воÑпользуйтеÑÑŒ командой \"toggle\".\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Ключ отозван." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите подпиÑать ВСЕ User ID? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "ПодÑказка: Выберите User IDs Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Ð”Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° не допуÑтима в режиме %s.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Ð’Ñ‹ должны выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один User ID.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Ð’Ñ‹ не можете удалить поÑледний User ID!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить ВСЕ выбранные User IDs? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить данный User ID? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить данный User ID? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Ð’Ñ‹ должны выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один ключ.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Ð’Ñ‹ должны выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один ключ.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить выбранные ключи? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить данный ключ? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "ДейÑтвительно отозвать ВСЕ выбранные User ID? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "ДейÑтвительно отозвать данный User ID? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите отозвать выбранные ключи? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите отозвать данный ключ? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "уÑтановить предпочтениÑ" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "ДейÑтвительно обновить Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… User ID? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "ДейÑтвительно обновить предпочтениÑ? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Сохранить изменениÑ? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Выйти без ÑохранениÑ? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "Ñбой при обновлении: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "Ñбой при обновлений Ñекретного ключа: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "ключ не изменÑлÑÑ - обновление не нужно.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Ð¥Ñш-функции: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Опции: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Данный ключ может быть отозван ключом %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "не могу Ñоздать %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[отозван]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [годен до: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [годен до: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " доверие: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " доверие: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Данный ключ отключен" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Ðе может быть предпочтений в PGP 2.x-Ñтиле User ID.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3359,19 +3127,19 @@ "Заметьте, что показанные Ñтепени доÑтоверноÑти могут быть неверными,\n" "пока Ð’Ñ‹ не перезапуÑтите программу.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[отозван]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3379,7 +3147,7 @@ "Ð’ÐИМÐÐИЕ: нет User ID отмеченного как главный. Ð”Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° может\n" " иÑпользовать другой User ID в качеÑтве главного.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3388,45 +3156,45 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP2. Добавление фото ID может в некоторых верÑиÑÑ…\n" " PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите добавить Ñто? (y/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Ð’Ñ‹ можете не добавлÑÑ‚ÑŒ фото ID в ключ PGP2-типа.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Удалить данную дейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Удалить данную недейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Удалить данную неизвеÑтную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "ДейÑтвительно удалить данную ÑамоподпиÑÑŒ? (y/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Удалена %d подпиÑÑŒ.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Удалено %d подпиÑи.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Ðичего не удалено.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3435,159 +3203,159 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n" " может в некоторых верÑиÑÑ… PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Ð’Ñ‹ не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Укажите User ID ключа, назначенного отзывающим: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÑŒ PGP 2.x ключ, как назначенный отзывающим\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "ключ не может быть назначен отзывающим Ñам ÑебÑ\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "Ð’ÐИМÐÐИЕ: Данный ключ отозван отзывающим ключом!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "Ð’ÐИМÐÐИЕ: назначение ключа отзывающим не возможно будет отменить!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите назначить данный ключ отзывающим? (y/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Снимите выделение Ñ Ñекретного ключа.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Выделите не более одного вторичного ключа.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Смена Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ ключа.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Смена Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ ключа\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Ð’Ñ‹ не можете изменить Ñрок дейÑÑ‚Ð²Ð¸Ñ v3 ключа\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Ðет ÑоответÑтвующей подпиÑи в ÑвÑзке Ñекретных\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Выберите только один User ID.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "пропуÑк v3 ÑамоподпиÑи на User ID \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите иÑпользовать его? (y/N)" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите иÑпользовать его? (y/N)" -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Ðет User ID Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Ðет вторичного ключа Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "User ID: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " подпиÑан %08lX %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (не ÑкÑпортируемаÑ)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Срок подпиÑи закончилÑÑ %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите отозвать? (y/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Создать Ñертификат отзыва Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ подпиÑи? (y/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ð’Ñ‹ подпиÑали данные User ID:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (не ÑкÑпортируемаÑ)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " отозван %08lX %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Ð’Ñ‹ отзываете Ñледующие подпиÑи:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "ДейÑтвительно Ñоздать Ñертификат отзыва? (y/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "нет Ñекретного ключа\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" уже отозван\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "Ð’ÐИМÐÐИЕ: User ID подпиÑÑŒ датирована %d Ñекундами в будущем\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Показ %s фото ID размера %ld Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° 0x%08lX (uid %d)\n" @@ -3915,7 +3683,7 @@ "Ð”Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ Ñекретного ключа необходим пароль.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4177,7 +3945,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" @@ -4192,106 +3960,106 @@ msgid "key not found on keyserver\n" msgstr "ключ `%s' не найден: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ñ ÐºÐ»ÑŽÑ‡Ð° %08lX Ñ %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ñ ÐºÐ»ÑŽÑ‡Ð° %08lX Ñ %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "поиÑк \"%s\" на HKP Ñервере %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "подпиÑанный Вашим ключом %08lX %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "поиÑк \"%s\" на HKP Ñервере %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "поиÑк \"%s\" на HKP Ñервере %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "ошибка Ñервера ключей" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "ошибка Ñервера ключей" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "неудача при получении Ñ Ñервера ключей: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "Ð’ÐИМÐÐИЕ: не могу удалить временный файл (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ñ ÐºÐ»ÑŽÑ‡Ð° %08lX Ñ %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ñ ÐºÐ»ÑŽÑ‡Ð° %08lX Ñ %s\n" @@ -4468,7 +4236,7 @@ msgid "textmode" msgstr "текÑтовый" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "неизвеÑтен" @@ -4641,50 +4409,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "подпакет типа %d имеет выÑтавленный критичеÑкий бит\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent недоÑтупен в данной ÑеÑÑии\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "не могу уÑтановить pid Ð´Ð»Ñ Ð°Ð³ÐµÐ½Ñ‚Ð°\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "не могу получить деÑкриптор Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð°Ð³ÐµÐ½Ñ‚Ð°\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "не могу получить деÑкриптор запиÑи Ð´Ð»Ñ Ð°Ð³ÐµÐ½Ñ‚Ð°\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ GPG_AGENT_INFO\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "протокол gpg-agent верÑии %d не поддерживаетÑÑ\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "не могу подключитьÑÑ Ðº `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "коммуникационный проблемы Ñ gpg-agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼ - иÑпользование агента отключено\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (главный идентификатор ключа %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4695,41 +4463,41 @@ "\"%.*s\"\n" "%u-бит %s ключ, ID %08lX, Ñоздан %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Повторите пароль\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Введите пароль\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "пароль Ñлишком длинный\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "неверный ответ от агента\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "прервано пользователем\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼: агент вернул 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "не могу получить пароль в пакетном режиме\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Введите пароль: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4739,17 +4507,17 @@ "Ðеобходим пароль Ð´Ð»Ñ Ð´Ð¾Ñтупа к Ñекретному ключу пользователÑ:\n" "\"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-бит %s ключ, ID %08lX, Ñоздан %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Повторите пароль: " @@ -5616,12 +5384,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "таблица доверий повреждена; запуÑтите \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "не могу обработать Ñтроки текÑта длиннее %d Ñимволов\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "Ñтрока ввода длиннее %d Ñимволов\n" @@ -5680,7 +5448,7 @@ msgid "[ revoked]" msgstr "[отозван]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[проÑрочен]" @@ -5690,101 +5458,101 @@ msgid "[ unknown]" msgstr "неизвеÑтен" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "никогда " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "Ñрок Ñледующей проверки таблицы доверий %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "открытый ключ %08lX не найден: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "выполните --check-trustdb, пожалуйÑта\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "проверка таблицы доверий\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d ключей обработано (%d дейÑвующих запиÑей очищено)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "не найдено абÑолютно доверÑемых ключей\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "открытый ключ Ð´Ð»Ñ Ð°Ð±Ñолютно доверÑемого ключа %08lX не найден\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "запиÑÑŒ о доверии %lu, тип %d: ошибка запиÑи: %s\n" @@ -6056,6 +5824,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "Выход" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6095,6 +5867,158 @@ "(возможно, Ð’Ñ‹ иÑпользуете неподходÑщее программное обеÑпечение\n" "Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ задачи)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "Ð¾Ð±Ñ‰Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "ошибка Ñервера ключей" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ `%s' в данной верÑии только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ\n" Index: gnupg/po/sk.po diff -u gnupg/po/sk.po:1.8 gnupg/po/sk.po:1.9 --- gnupg/po/sk.po:1.8 Fri Dec 10 23:20:42 2004 +++ gnupg/po/sk.po Tue Dec 14 08:49:27 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -29,7 +29,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -562,165 +562,88 @@ msgid "secret key already stored on a card\n" msgstr "preskoèené: tajný kµúè je u¾ v databáze\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "ukonèi»" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "ukonèi» toto menu" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "u" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "konfliktné príkazy\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "ukáza» túto pomoc" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Kµúè k dispozícii na: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "zmeni» dobu platnosti" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "zmeni» dôveryhodnos» vlastníka kµúèa" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "vypísa» fingerprint" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "v¹eobecná chyba" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "vytvori» nový pár kµúèov" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Príkaz> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný príkaz (skúste \"help\")\n" @@ -765,7 +688,7 @@ msgid "PIN not correctly repeated; try again" msgstr "heslo nie je zopakované správne; skúste to znovu" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -775,13 +698,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output pre tento príkaz nefunguje\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "kµúè `%s' nebol nájdený: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1246,7 +1169,7 @@ msgid "Pubkey: " msgstr "Verejné kµúèe: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "©ifry: " @@ -1254,7 +1177,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Kompresia: " @@ -1361,7 +1284,7 @@ msgid "reading options from `%s'\n" msgstr "èítam mo¾nosti z `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s nie je pre normálne pou¾itie!\n" @@ -1373,340 +1296,340 @@ "¹ifra \"%s\" nebola nahraná, preto¾e prístupové práva nie sú nastavené " "bezpeène\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nie je platná znaková sada\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "neplatný parameter pre import\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "neplatný parameter pre import\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nemo¾no nastavi» exec-path na %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "VAROVANIE: program mô¾e vytvori» súbor core!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVANIE: %s prepí¹e %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie je dovolené pou¾íva» %s s %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedáva s %s zmysel!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v móde --pgp2 mô¾ete vytvára» len oddelené podpisy alebo podpisy èitateµné " "ako text\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v móde --pgp2 nemo¾no súèasne ¹ifrova» a podpisova»\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v móde --pgp2 musíte pou¾i» súbor (nie rúru).\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrovanie správ v móde --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí by» väè¹ia ako 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí by» väè¹ia ako 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "polo¾ka max-cert-depth musí by» v rozmedzí od 1 do 255\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "neplatná implicitná úroveò certifikácie; musí by» 0, 1, 2 alebo 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "neplatná minimálna úroveò certifikácie; musí by» 0, 1, 2 alebo 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dôrazne nedoporuèovaný\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí by» 0, 1 alebo 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "neplatné defaultné predvoµby\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre ¹ifrovanie\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre hashovanie\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre kompresiu\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s e¹te nepracuje s %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» ¹ifrovací algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» hashovací algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» kompresný algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemô¾em inicializova» databázu dôvery: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVANIE: daný adresát (-r) bez pou¾itia ¹ifrovania s verejným kµúèom\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [meno súboru]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [meno súboru]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "de¹ifrovanie zlyhalo: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [meno súboru]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" "pou¾itie %s nie je v móde %s dovolené\n" "\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [meno súboru]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" "pou¾itie %s nie je v móde %s dovolené\n" "\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [meno súboru]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [meno súboru]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [meno súboru]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key id u¾ívateµa" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ívateµa" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key id u¾ívateµa" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key id u¾ívateµa" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ívateµa [príkazy]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ívateµa] [súbor s kµúèmi (keyring)]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "nepodarilo posla» kµúè na server: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "nepodarilo sa prija» kµúè zo servera: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "nepodaril sa export kµúèa: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "nepodarilo sa nájs» server: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aktualizácia servera zlyhala: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódovanie do ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[meno súboru]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Zaènite písa» svoju správu ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1714,23 +1637,23 @@ "meno mô¾e obsahova» len písmená, èíslice, bodky, podèiarníky alebo medzery a " "konèi» s '='\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "hodnota musí obsahova» znak '@'\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "hodnota nesmie obsahova» ¾iadne kontrolné znaky\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pre certifikaènú politiku je neplatné\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pre podpisovú politiku je neplatné\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "zadané URL pre podpisovú politiku je neplatné\n" @@ -2600,12 +2523,12 @@ msgstr "U¾ívateµské ID \"%s\" je revokované." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Ste si istý, ¾e stále chcete podpísa» tento kµúè? (a/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Nemo¾no podpísa».\n" @@ -2809,7 +2732,7 @@ msgid "Really sign? (y/N) " msgstr "Skutoène podpísa»? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2862,18 +2785,10 @@ msgstr "presúvam podpis kµúèa na správne miesto\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "ulo¾i»" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "ulo¾i» a ukonèi»" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "vypísa» fingerprint" @@ -2882,504 +2797,357 @@ msgstr "vypísa» zoznam kµúèov a id u¾ívateµov" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "vyberte identifikátor u¾ívateµa N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "vyberte sekundárny kµúè N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "vypísa» zoznam podpisov" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "podpísa» kµúè" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "vytvori» podpis oddelený od dokumentu" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "podpísa» kµúè lokálne" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "podpísa» kµúè bez mo¾nosti odvola» podpis (non-revocably)" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "podpísa» kµúè lokálne a bez mo¾nosti odvola» podpis (non-revocably)" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "prida» identifikátor u¾ívateµa" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "prida» fotografické ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "zmaza» identifikátor u¾ívateµa" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "prida» sekundárny kµúè" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "zmaza» sekundárny kµúè" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "prida» revokaèný kµúè" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "zmaza» podpisy" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "zmeni» dobu platnosti" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "oznaèi» u¾ívateµské ID ako primárne" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "prepnú» medzi vypísaním zoznamu tajných a verejných kµúèov" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "vypísa» zoznam predvolieb (pre expertov)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "vypísa» zoznam predvolieb (podrobne)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "nastavi» zoznam predvolieb" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "aktualizova» predvoµby" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "chyba servera kµúèov" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "zmeni» heslo" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "zmeni» dôveryhodnos» vlastníka kµúèa" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "revokova» podpisy" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revsig" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "revokova» identifikátor u¾ívateµa" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "revokova» sekundárny kµúè" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "nastavi» kµúè ako neplatný (disable)" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "nastavi» kµúè ako platný (enable)" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "ukáza» fotografické ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "chyba pri èítaní bloku tajného kµúèa `%s': %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Tajný kµúè je dostupný.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Na vykonanie tejto operácie je potrebný tajný kµúè.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Prosím, najskôr pou¾ite príkaz \"toggle\" (prepnú»).\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Kµúè revokovaný." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Skutoène podpísa» v¹etky id u¾ívateµa? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Nápoveda: Vyberte id u¾ívateµa na podpísanie\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tento príkaz nie je v módoch %s dovolený.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Musíte vybra» aspoò jedno id u¾ívateµa.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Nemô¾ete zmaza» posledné id u¾ívateµa!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Skutoène odstráni» v¹etky vybrané id u¾ívateµa? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Skutoène odstráni» toto id u¾ívateµa? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Skutoène odstráni» toto id u¾ívateµa? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Musíte vybra» aspoò jeden kµúè.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Musíte vybra» aspoò jeden kµúè.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Skutoène chcete zmaza» vybrané kµúèe? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Skutoène chcete zmaza» tento kµúè? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Skutoène revokova» v¹etky vybrané id u¾ívateµa? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Skutoène revokova» toto id u¾ívateµa? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Skutoène chcete revokova» vybrané kµúèe? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Skutoène chcete revokova» tento kµúè? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "nastavi» zoznam predvolieb" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Skutoène aktualizova» predvoµby pre vybrané id u¾ívateµa? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Skutoène aktualizova» predvoµby? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Ulo¾i» zmeny? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Ukonèi» bez ulo¾enia? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "aktualizácia zlyhala: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizácia tajného kµúèa zlyhala: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "kµúè nebol zmenený, tak¾e nie je potrebné ho aktualizova».\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Charakteristiky: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Tento kµúè mô¾e by» revokovaný kµúèom %s " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr "(citlivá informácia)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s: nemô¾em vytvori»: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revokované]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Tento kµúè bol oznaèený za neplatný (disabled)" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "U¾ívateµské ID vo formáte PGP 2.x nemá ¾iadne predvoµby\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3387,19 +3155,19 @@ "Prosím nezabúdajte, ¾e zobrazované údaje o platnosti kµúèov nemusia\n" "by» správne, pokiaµ znovu nespustíte program.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[revokované]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3407,7 +3175,7 @@ "VAROVANIE: ¾iadne ID u¾ívateµa nebolo oznaèené ako primárne. Tento príkaz\n" "spôsobí, ¾e iné ID u¾ívateµa sa bude pova¾ova» primárne.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3416,45 +3184,45 @@ "VAROVANIE: Toto je PGP2 kµúè. Pridanie fotografického ID mô¾e v niektorých\n" " verziách PGP vies» k odmietnutiu tohto kµúèa.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Ste si istý, ¾e ho chcete stále prida»? (a/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nemali by ste pridáva» fotografické ID k PGP2 kµúèu.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Zmaza» tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Zmaza» tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Zmaza» tento neznámy podpis? (a/N/u)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Skutoène zmaza» tento podpis podpísaný sebou samým? (a/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Zmazaný %d podpis.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Zmazaných %d podpisov.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Niè nebolo zmaznané.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3463,159 +3231,159 @@ "VAROVANIE: Toto je PGP2 kµúè. Pridanie fotografického ID mô¾e v niektorých\n" " verziách PGP vies» k odmietnutiu tohoto kµúèa.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nemali by ste pridáva» fotografické ID k PGP2 kµúèu.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ívateµa povereného revokáciou: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "kµúè vo formáte PGP 2.x nemo¾no poveri» revokáciou\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "kµúè nemo¾no poveri» revokáciou ním samým\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VAROVANIE: Tento kµúè bol revokovaný jeho urèeným revokátorom/!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VAROVANIE: oznaèenie kµúèa ako revokovací u¾ nemô¾e by» zru¹ené!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Ste si istý, ¾e chcete oznaèi» tento kµúè ako revokovací? (a/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Prosím, odstráòte výber z tajných kµúèov.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Mením dobu platnosti sekundárneho kµúèa.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Mením dobu platnosti primárneho kµúèa.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nemô¾ete zmeni» dobu platnosti kµúèa verzie 3\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "V súbore tajných kµúèov chýba zodpovedajúci podpis\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte práve jedno id u¾ívateµa.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "preskoèený v3 podpis kµúèa ním samým u u¾ívateµského id \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Ste si istý, ¾e ho chcete pou¾i»? (a/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Ste si istý, ¾e ho chcete pou¾i»? (a/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundárny kµúè s indexom %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "id u¾ívateµa: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " podpísané %08lX v %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnos» podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Ste si istý, ¾e ho chcete stále revokova»? (a/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvori» pre tento podpis revokaèný certifikát? (a/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Podpísali ste nasledujúce identifikátory u¾ívateµa:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokované %08lX v %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte sa revokova» tieto podpisy:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Skutoène vytvori» revokaèné certifikáty? (a/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "neexistuje tajný kµúè\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "VAROVANIE: podpis pou¾ivateµkého ID vznikol %d sekund v budúcnosti\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3944,7 +3712,7 @@ "Na ochranu Vá¹ho tajného kµúèa musíte zada» heslo.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4206,7 +3974,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "neplatný parameter pre export\n" @@ -4221,106 +3989,106 @@ msgid "key not found on keyserver\n" msgstr "kµúè `%s' nebol nájdený: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "podpísané Va¹ím kµúèom %08lX v %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "neplatný parameter pre export\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "chyba servera kµúèov" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "chyba servera kµúèov" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "nepodarilo sa prija» kµúè zo servera: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "VAROVANIE: nemô¾em vymaza» doèasný súbor (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" @@ -4504,7 +4272,7 @@ msgid "textmode" msgstr "textový mód" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "neznáme" @@ -4678,50 +4446,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "podpaket typu %d má nastavený kritický bit\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent nie je v tomto sedení dostupný\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "nemô¾em nastavi» PID klienta pre gpg-agenta\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "nemo¾no získa» server read file descriptor pre agenta\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "nemo¾no získa» server write file descriptor pre agenta\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "zlý formát premennej prostredia GPG_AGENT_INFO\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verzie %d nie je podporovaný\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemô¾em sa pripoji» k `%s': %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problém v komunikácii s gpg-agentom\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentom - pou¾ívanie agenta vypnuté\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (hlavné ID kµúèa %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4732,41 +4500,41 @@ "\"%.*s\"\n" "kµúè s då¾kou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Opakova» heslo\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Vlo¾i» heslo\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "heslo je príli¹ dlhé\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "neplatná reakcia od agenta\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "zru¹ené u¾ívateµom\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentom: agent vracia 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "v dávkovom re¾ime sa nemô¾em pýta» na heslo\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4776,17 +4544,17 @@ "Musíte pozna» heslo, aby ste odomkli tajný kµúè pre\n" "u¾ívateµa: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "då¾ka %u bitov, typ %s, ID %08lX, vytvorený %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -5671,12 +5439,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "databáza dôvery je po¹kodená; prosím spustite \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "nemô¾em pracova» s riadkami dlh¹ími ako %d znakov\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "vstupný riadok je dlh¹í ako %d znakov\n" @@ -5736,7 +5504,7 @@ msgid "[ revoked]" msgstr "[revokované]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[expirované]" @@ -5746,101 +5514,101 @@ msgid "[ unknown]" msgstr "neznáme" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "nikdy " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹ia kontrola databázy dôvery %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "verejný kµúè %08lX nebol nájdený: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "prosím vykonajte --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "kontrolujem databázu dôvery\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kµúèov spracovaných (%d poètov platnosti vymazaných)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "neboli nájdené ¾iadne absolútne dôveryhodné kµúèe\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "verejný kµúè k absolútne dôveryhodnému kµúèu %08lX nebol nájdený\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n" @@ -6112,6 +5880,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "ukonèi»" + #: util/miscutil.c:351 msgid "qQ" msgstr "uUqQ" @@ -6149,6 +5921,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(pravdepodobne ste na túto úlohu pou¾ili nesprávny program)\n" +#~ msgid "q" +#~ msgstr "u" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "v¹eobecná chyba" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "ulo¾i»" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "chyba servera kµúèov" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revsig" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "hashovací algoritmus `%s' je len na èítanie v tejto verzii\n" Index: gnupg/po/sv.po diff -u gnupg/po/sv.po:1.18 gnupg/po/sv.po:1.19 --- gnupg/po/sv.po:1.18 Fri Dec 10 23:20:41 2004 +++ gnupg/po/sv.po Tue Dec 14 08:49:27 2004 @@ -17,13 +17,13 @@ # who sends his thanks to André Dahlqvist # and to his wife Olivia . # -# $Id: sv.po,v 1.18 2004/12/10 22:20:41 wk Exp $ +# $Id: sv.po,v 1.19 2004/12/14 07:49:27 wk Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.6\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-12-01 17:49+0100\n" "Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" @@ -47,7 +47,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -376,7 +376,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -586,166 +586,87 @@ msgid "secret key already stored on a card\n" msgstr "hoppade över: hemlig nyckel finns redan\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "avsluta" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "avsluta denna meny" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "motstridiga kommandon\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "visa denna hjälp" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "visa en lista" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Nyckeln tillgänglig hos: " -# ??? -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "avlusa" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "ändra utgÃ¥ngsdatum" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - # originalet borde ha ett value -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "ändra ägartillitsvärdet" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -# skall dessa översättas? -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "visa fingeravtryck" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "allmänt fel" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "generera ett nytt nyckelpar" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Kommando> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "motstridiga kommandon\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 msgid "Admin commands are allowed\n" msgstr "" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 msgid "Admin commands are not allowed\n" msgstr "" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Felaktigt kommando (försök med \"help\")\n" @@ -791,7 +712,7 @@ msgstr "lösenmeningen upprepades inte korrekt; försök igen." # se förra kommentaren -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -801,13 +722,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output kan inte användas för detta kommando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "hittade inte nyckeln `%s': %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1278,7 +1199,7 @@ msgid "Pubkey: " msgstr "öppen nyckel: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Chiffer: " @@ -1286,7 +1207,7 @@ msgid "Hash: " msgstr "Kontrollsumma: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Komprimering: " @@ -1391,7 +1312,7 @@ msgid "reading options from `%s'\n" msgstr "läser inställningar frÃ¥n \"%s\"\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "OBS: %s är inte för normal användning!\n" @@ -1401,349 +1322,349 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s är ingen giltig teckentabell\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "kunde inte tolka nyckelserver-URI\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s: felaktiga importinställningar %d\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "felaktiga importinställningar\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s: felaktiga importinställningar %d\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "felaktiga importinställningar\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunde inte sätta exec-sökvägen till %s\n" # Programmet skapar en avbildning (image) av minnet för att lättare kunna spÃ¥ra fel. -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VARNING: %s gäller istället för %s\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s är inte tillÃ¥ten tillsammans med %s!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "det är ingen poäng att använda %s tillsammans med %s!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n" "i --pgp2-läge\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "du mÃ¥ste använda filer (och inte rör) i --pgp2-läge\n" # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard. -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "den valda krypteringsalgoritmen är felaktig\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen är felaktig\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "den valda krypteringsalgoritmen är felaktig\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen är felaktig\n" # antalet betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "variabeln \"completes-needed\" mÃ¥ste ha ett värde som är större än 0\n" # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "variabeln \"marginals-needed\" mÃ¥ste vara större än 1\n" # Hur djupt GnuPG ska leta i Web-of-trust. -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "variabeln \"max-cert-depth\" mÃ¥ste ha ett värde mellan 1 och 255\n" # Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "felaktigt standardvärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" # Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "felaktigt minimivärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" # S2K har med krypteringen av hemliga nyckeln att göra -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "felaktigt S2K-läge; mÃ¥ste vara 0, 1 eller 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "felaktiga standardinställningar\n" # Du kan ange de algoritmer du föredrar i prioritetsordning. DÃ¥ avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel). -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s fungerar ännu inte med %s\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [filnamn]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [filnamn]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "dekrypteringen misslyckades: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [filnamn]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "du kan inte använda %s när du är i %s läge\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [filnamn]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "du kan inte använda %s när du är i %s läge\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnamn]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [filnamn]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [filnamn]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key användaridentitet" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key användaridentitet" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key användaridentitet" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key användaridentitet" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key användaridentitet [kommandon]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "Sändning till nyckelservern misslyckades: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Hämtning frÃ¥n nyckelservern misslyckades: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "Export av nyckeln misslyckades: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "Sökning pÃ¥ nyckelservern misslyckades: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Uppdatering av nyckeln frÃ¥n en nyckelserver misslyckades: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "misslyckades med att ta bort ASCII-skalet: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "misslyckades med att skapa ASCII-skal: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "felaktig kontrollsummealgoritm `%s'\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[filnamn]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Skriv ditt meddelande här ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1754,23 +1675,23 @@ # user notation name?? # Werner: # That is an OpenPGP notation name not registered with IANA. -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "ett användarnoteringsnamn mÃ¥ste innehÃ¥lla '@'-tecknet\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "ett notationsvärde fÃ¥r inte inehÃ¥lla nÃ¥gra kontrolltecken\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n" @@ -2667,12 +2588,12 @@ msgstr "Användar-ID \"%s\" är spärrat." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Vill du verkligen fortfarande signera den? (j/N)" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Kan inte signera.\n" @@ -2881,7 +2802,7 @@ msgid "Really sign? (y/N) " msgstr "Vill du verkligen signera? " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2934,18 +2855,9 @@ msgstr "flyttar en nyckelsignatur till den rätta platsen\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "spara och avsluta" -# skall dessa översättas? -#: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - #: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "visa fingeravtryck" @@ -2955,508 +2867,360 @@ msgstr "visa en lista pÃ¥ nycklar och användaridentiteter" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "välj användaridentitet N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "välj undernyckel N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "visa en lista pÃ¥ signaturer" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "signera nyckeln" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "skapa signatur i en separat fil" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "signera nyckeln lokalt" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "signera nyckeln utan möjlighet att Ã¥terkalla signaturen" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "signera en nyckel lokalt utan möjlighet till Ã¥terkallelse" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "lägg till en användaridentitet" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "lägg till ett foto som användaridentitet" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "ta bort en användaridentitet" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "lägg till en undernyckel" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "ta bort en undernyckel" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "lägg till en spärrnyckel" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "ta bort signaturer" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "ändra utgÃ¥ngsdatum" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "markera användaridentiteten som huvudidentitet" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "hoppa mellan att visa en lista pÃ¥ hemliga eller öppna nycklar" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "visa en lista pÃ¥ inställningar (expertläge)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "visa en lista pÃ¥ inställningar (utförligt)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "ange inställningslista" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "uppdaterat inställningar" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "nyckelserverfel" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "kunde inte tolka nyckelserver-URI\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "ändra lösenmening" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - # originalet borde ha ett value -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "ändra ägartillitsvärdet" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "Ã¥terkalla signaturer" -# ska detta översättas? Verkar vara ett kommando. -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "spärra en användaridentitet" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "spärra en undernyckel" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "stäng av en nyckel" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "aktivera en nyckel" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "visa foto-ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Den hemliga nyckeln finns tillgänglig.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Den hemliga nyckeln behövs för att göra detta.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "Använd kommandot \"toggle\" först.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Nyckeln är spärrad." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Vill du verkligen signera alla användaridentiteter? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Tips: Välj de användarID:n du vill signera\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Detta kommando är inte tillÃ¥tet när du är i %s-läge.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en användaridentitet.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Du kan inte ta bort den sista användaridentiteten!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Vill du verkligen ta bort alla valda användaridentiteter? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Vill du verkligen ta bort denna användaridentitet? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Vill du verkligen radera denna egensignatur? (j/N)" -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en nyckel.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en nyckel.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Vill du verkligen ta bort valda nycklar? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Vill du verkligen ta bort denna nyckel? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Vill du verkligen spärra alla valda användaridentiteter? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Vill du verkligen spärra denna användaridentitet? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Vill du verkligen spärra de valda nycklarna? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Vill du verkligen spärra denna nyckel? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "ange inställningslista" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Vill du verkligen ändra inställningarna?" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "Spara ändringarna? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Avsluta utan att spara? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "uppdateringen misslyckades: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "misslyckades med att uppdatera hemligheten: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Nyckeln är oförändrad sÃ¥ det behövs ingen uppdatering.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Sammandrag: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Funktioner: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Denna nyckel kan spärras av nyckeln %s" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (känsligt)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "kan inte skapa %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[spärrad]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[gÃ¥r ut: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[gÃ¥r ut: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, c-format msgid "usage: %s" msgstr "" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " tillit: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Denna nyckel har stängts av" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" "Du kan inte ange nÃ¥gra inställningar för ett användar-ID av PGP 2.x-typ.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3464,19 +3228,19 @@ "Obs! Den visade nyckelgiltigheten kan vara felaktig\n" "om du inte startar om programmet.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[spärrad]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3485,7 +3249,7 @@ "Detta kommando kan göra att ett annat användar-ID antas\n" "vara huvudidentitet.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3495,46 +3259,46 @@ "vissa versioner\n" " av PGP avvisa denna nyckel.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Vill du verkligen fortfarande lägga till den? (j/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Vill du radera denna korrekta signatur? (j/N/a)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Vill du radera denna okända signatur? (j/N/a)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Vill du verkligen radera denna egensignatur? (j/N)" # skulle lika gärna kunna heta 1 signatur va? -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "Raderade %d signatur.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "Raderade %d signaturer.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Ingenting raderat.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3543,33 +3307,33 @@ "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna " "nyckel inte användas i vissa versioner av PGP.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Du fÃ¥r inte ange en spärrnyckel för en PGP 2-nyckel.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "Ange användar-ID för spärrnyckeln: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "det gÃ¥r inte att använda en PGP 2-nyckel som spärrnyckel\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VARNING: det gÃ¥r aldrig att ändra om du utser en spärrnyckel!\n" # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad) -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3577,135 +3341,135 @@ "Är du verkligen säker pÃ¥ att du vill utse denna nyckel till spärrnyckel? (j/" "N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Tag bort markeringar frÃ¥n de hemliga nycklarna.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Välj som högst en undernyckel.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändrar giltighetstid för en undernyckel.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Ändrar giltighetstid för huvudnyckeln.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Du mÃ¥ste välja bara en användaridentitet.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "hoppar över v3 egensignatur pÃ¥ användar-id \"%s\"\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" # Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Vill du verkligen använda det (j/N)?" # Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Vill du verkligen använda det (j/N)?" -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen användaridentitet med index %d\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen undernyckel med index %d\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "användaridentitet: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" "\"\n" "signerad med din nyckel %08lX %s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Denna signatur gick ut den %s.\n" # nyckel? signatur? -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Vill du verkligen spärra denna nyckel? (j/N)" -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Du har signerat följande användaridentiteter:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " spärrad av %08lX %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Du stÃ¥r i begrepp att Ã¥terkalla dessa signaturer:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "ingen hemlig nyckel\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Användar-ID \"%s\" är redan spärrad\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "VARNING: en signatur pÃ¥ ett användar-ID är daterad %d sekunder in i " "framtiden\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n" @@ -4037,7 +3801,7 @@ "Du behöver en lösenmening för att skydda din hemliga nyckel\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4302,7 +4066,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "" @@ -4317,104 +4081,104 @@ msgid "key not found on keyserver\n" msgstr "hittade inte nyckeln `%s': %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "begär nyckel %08lX frÃ¥n %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "begär nyckel %08lX frÃ¥n %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "söker \"%s\" frÃ¥n HKP-server %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "begär nyckel %08lX frÃ¥n %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "söker \"%s\" frÃ¥n HKP-server %s\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "söker \"%s\" frÃ¥n HKP-server %s\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "nyckelserverfel" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "nyckelserverfel" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "nyckelserverfel" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "Hämtning frÃ¥n nyckelservern misslyckades: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "begär nyckel %08lX frÃ¥n %s\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "begär nyckel %08lX frÃ¥n %s\n" @@ -4601,7 +4365,7 @@ msgid "textmode" msgstr "textläge" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "okänd" @@ -4775,52 +4539,52 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "kunde inte fÃ¥ tillgÃ¥ng till GPG-Agent i denna session\n" # vad är detta? -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "kan inte ange pid för GPG-Agent\n" # FD? -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "kan inte fÃ¥ server-läs FD för GPG-Agent\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "kan inte fÃ¥ server-skriv FD för GPG-Agent\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent protokoll version %d stöds inte\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan inte ansluta till \"%s\": %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "problem vid kommunikation med GPG-Agent\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "problem med GPG-Agent, stänger av den\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (huvudnyckelns identitet %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4831,41 +4595,41 @@ "användaren: \"%.*s\"\n" "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Repetera lösenmeningen\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Ange lösenmening\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "lösenmeningen är för lÃ¥ng\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "felaktigt svar frÃ¥n GPG-Agent\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "avbruten av användaren\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "kan inte frÃ¥ga efter lösenmening i batch-läge\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Ange lösenmening: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4875,17 +4639,17 @@ "Du behöver en lösenmening för att lÃ¥sa upp den hemliga nyckeln för\n" "användaren: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Repetera lösenmeningen: " @@ -5806,12 +5570,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "tillitsdatabasen är trasig, kör \"gpg --fix-trustdb\".\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "kan inte hantera text med rader längre än %d tecken\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "indataraden är längre än %d tecken\n" @@ -5874,7 +5638,7 @@ msgid "[ revoked]" msgstr "[spärrad]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[Giltighetstiden har gÃ¥tt ut]" @@ -5884,105 +5648,105 @@ msgid "[ unknown]" msgstr "okänd" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "aldrig" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "hittade inte den öppna nyckeln %08lX :%s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n" # originalet borde ha ett value -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "kontrollerar tillitsdatabasen\n" # Vad är detta!? -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d nycklar behandlade (%d validity counts rensade)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "hittade inga nycklar med förbehÃ¥llslöst förtroende\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "Hittar inte den öppna nyckeln tillhörande den förbehÃ¥llslöst betrodda " "nyckeln %08lX \n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n" @@ -6255,6 +6019,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "avsluta" + #: util/miscutil.c:351 msgid "qQ" msgstr "aA" @@ -6292,6 +6060,162 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha använt fel program för denna uppgift)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "visa en lista" + +# ??? +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "avlusa" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +# skall dessa översättas? +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "allmänt fel" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +# skall dessa översättas? +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "nyckelserverfel" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +# ska detta översättas? Verkar vara ett kommando. +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "sammandragsalgoritmen `%s' kan endast läsas i denna programutgÃ¥va\n" Index: gnupg/po/tr.po diff -u gnupg/po/tr.po:1.14 gnupg/po/tr.po:1.15 --- gnupg/po/tr.po:1.14 Fri Dec 10 23:20:41 2004 +++ gnupg/po/tr.po Tue Dec 14 08:49:27 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-07-08 08:10+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -32,7 +32,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -568,165 +568,88 @@ msgid "secret key already stored on a card\n" msgstr "atlandı: gizli anahtar zaten var\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quit" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "bu menüden çık" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "k" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "çeliÅŸen komutlar\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "bunu gösterir " -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "Anahtar burada: " -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "son kullanım tarihini deÄŸiÅŸtirir" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "sahibiningüvencesini deÄŸiÅŸtirir" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "parmak izini gösterir" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "genel hata" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "yeni bir anahtar çifti üretir" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "Komut> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "çeliÅŸen komutlar\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "çeliÅŸen komutlar\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n" @@ -773,7 +696,7 @@ "ikinci kez yazdığınız anahtar parolası ilkiyle aynı deÄŸil; iÅŸlem " "tekrarlanacak" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -783,13 +706,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output seçeneÄŸi bu komutla çalışmaz\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "anahtar `%s' yok: %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1248,7 +1171,7 @@ msgid "Pubkey: " msgstr "GenAnah: " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "Åžifre: " @@ -1256,7 +1179,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "Sıkıştırma: " @@ -1360,7 +1283,7 @@ msgid "reading options from `%s'\n" msgstr "\"%s\"den seçenekler okunuyor\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "BÄ°LGÄ°: %s normal kullanım için deÄŸil!\n" @@ -1370,334 +1293,334 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ÅŸifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s geçerli bir karakter seti deÄŸil\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "anahtar sunucusunun adresi çözümlenemedi\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "UYARI: program bir \"core\" dosyası oluÅŸturabilir!\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "UYARI: %s %s'i aşıyor\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ile %s birlikte kullanılmaz!\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s, %s ile etkisiz olur!\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 kipinde aynı anda hem imzalama hem de ÅŸifreleme yapamazsınız\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "seçilen özümleme algoritması geçersiz\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "\"completes-needed\" 0 dan büyük olmalı\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "\"marginals-needed\" 1 den büyük olmalı\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "öntanımlı tercihler geçersiz\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "kiÅŸisel ÅŸifre tercihleri geçersiz\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "kiÅŸisel özümleme tercihleri geçersiz\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "kiÅŸisel sıkıştırma tercihleri geçersiz\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s henüz %s ile çalışmıyor\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s ÅŸifreleme algoritması kullanılamayabilir.\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "\"TrustDB\" güvence veritabanı baÅŸlangıç aÅŸamasında baÅŸarısız: %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "UYARI: alıcılar (-r) genel anahtar ÅŸifrelemesi kullanılmadan belirtilmiÅŸ\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [dosyaismi]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [dosyaismi]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "ÅŸifre çözme baÅŸarısız: %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [dosyaismi]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [dosyaismi]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [DOSYA]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [dosyaismi]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [dosyaismi]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key KULL-KML" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key KULL-KML" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key kullanıcı-kimliÄŸi [komutlar]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kullanıcı-kimliÄŸi] [anahtar-zinciri]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "key export baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh baÅŸarısız: %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "zırhın kaldırılması baÅŸarısız: %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "zırhlama baÅŸarısız: %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "`%s' hash algoritması geçersiz\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[dosyaismi]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "Ä°letinizi yazın ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1705,23 +1628,23 @@ "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve " "sonuna bir '=' gelir.\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "bir niteleme deÄŸerinde kontrol karakterleri kullanılamaz\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "belirtilen sertifika güvence adresi geçersiz\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "belirtilen imza güvence adresi geçersiz\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "belirtilen imza güvence adresi geçersiz\n" @@ -2581,12 +2504,12 @@ msgstr "Kullanıcı kimliÄŸi \"%s\" yürürlükten kaldırıldı." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " Ä°mzalanamıyor.\n" @@ -2788,7 +2711,7 @@ msgid "Really sign? (y/N) " msgstr "Gerçekten imzalayacak mısınız? (e/H) " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2843,18 +2766,10 @@ msgstr "bir anahtar imzası doÄŸru yere taşınıyor\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "kaydet ve çık" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "parmak izini gösterir" @@ -2863,507 +2778,360 @@ msgstr "anahtarı ve kullanıcı kimliÄŸini gösterir" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "N kullanıcı kimliÄŸini seçer" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "N yardımcı anahtarını seçer" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "imzaları listeler" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "k" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "anahtarı imzalar" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "i" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "bağımsız bir imza yapar" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "anahtarı yerel olarak imzala" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "yürürlükten kaldırılamayan imza yapar" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "yürürlükten kaldırılamayan yerel imza yapar" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "bir kullanıcı kimliÄŸi ekler" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "bir foto kimliÄŸi ekler" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "kullanıcı kimliÄŸini siler" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "bir yardımcı anahtar ekler" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "bir yardımcı anahtar siler" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "bir yürürlükten kaldırma anahtarı ekler" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "imzaları siler" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "son kullanım tarihini deÄŸiÅŸtirir" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "kullanıcı kimliÄŸini asıl olarak imler" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "genel ve gizli anahtar listeleri arasında yer deÄŸiÅŸtirir" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "b" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "tercihleri listeler (uzman)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "tercihleri listeler (ayrıntılı)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "tercih listesi oluÅŸturmak için" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "güncelenmiÅŸ tercihler" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "anahtar sunucusu hatası" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "anahtar sunucusunun adresi çözümlenemedi\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "anahtar parolasını deÄŸiÅŸtirir" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "sahibiningüvencesini deÄŸiÅŸtirir" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "imzaları yürürlükten kaldırır" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "bir kullanıcı kimliÄŸi yürürlükten kaldırır" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "bir yardımcı anahtarı yürürlükten kaldırır" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "bir anahtarı iptal eder" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "bir anahtarı kullanıma sokar" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "foto kimliÄŸini gösterir" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "gizli anahtar bloÄŸu `%s' okunurken hata oluÅŸtu: %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "Gizli anahtar mevcut.\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "Bunu yapmak için gizli anahtar gerekli.\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "Anahtar yürürlükten kaldırıldı." -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "Ä°pucu: Ä°mzalamak için bir kullanıcı kimliÄŸi seçiniz\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "%s kipindeyken bu komut kullanılamaz.\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "En az bir kullanıcı kimliÄŸi seçmelisiniz.\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "Son kullanıcı kimliÄŸini silemezsiniz!\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Bu kullanıcı kimliÄŸi gerçekten silinecek mi? " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Bu kullanıcı kimliÄŸi gerçekten silinecek mi? " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "En az bir anahtar seçmelisiniz.\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "En az bir anahtar seçmelisiniz.\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Bu kullanıcı kimliÄŸi gerçekten iptal edilecek mi? " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "tercih listesi oluÅŸturmak için" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor " "musunuz? " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Kaydetmeden çıkılsın mı? " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "gizliyi güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "Güncelleme gereÄŸi olmadığından anahtar deÄŸiÅŸmedi.\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "Özümlenen: " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "Özellikler: " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "" "Bu anahtar %s tarafından ÅŸu anahtarla yürürlükten kaldırılmış olabilir: " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " (duyarlı)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s oluÅŸturulamıyor: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[yürürlükten kaldırıldı] " -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[son kullanma tarihi: %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[son kullanma tarihi: %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " güvencesi: %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " güvencesi: %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "Bu anahtar iptal edilmiÅŸti" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Bir PGP 2.x tarzı kullanıcı kimliÄŸine uygun tercih yok.\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3371,19 +3139,19 @@ "Gösterilen anahtarın, uygulamayı yeniden baÅŸlatıncaya kadar, gerekli\n" "doÄŸrulukta olmayacağını lütfen gözönüne alınız.\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[yürürlükten kaldırıldı] " -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3392,7 +3160,7 @@ " baÅŸka bir kullanıcı kimliÄŸinin birincil varsayılmasına sebep " "olabilir.\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3401,45 +3169,45 @@ "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliÄŸi eklenmesi bu anahtarın\n" " bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "Onu yine de eklemek istiyor musunuz? (e/H) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "PGP2 tarzı bir anahtara bir foto kimliÄŸi ekleyemeyebilirsiniz.\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "Bu geçersiz imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "Hiçbir ÅŸey silinmedi.\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3449,41 +3217,41 @@ " eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n" " ile sonuçlanabilir.\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı " "ekleyemeyebilirsiniz.\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "" "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliÄŸini giriniz: " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı " "olarak atanamaz\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak " "kullanamazsınız\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar baÅŸka amaçla\n" " kullanılamaz!\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3491,130 +3259,130 @@ "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediÄŸinizden emin " "misiniz? (e/H): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "Bir yardımcı anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "Asıl anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "Bir v3 anahtarının son kullanma tarihini deÄŸiÅŸtiremezsiniz\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "kullanıcı kimliÄŸi \"%s\" için v3 öz-imzası atlanıyor\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "%d endeksine sahip kullanıcı kimliÄŸi yok\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "%d endeksine sahip yardımcı anahtar yok\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Kullanıcı kimliÄŸi: \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " %08lX ile %s%s%s de imzalanmış\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "Bu anahtarın geçerliliÄŸi %s de bitti.\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" "Bu imza için bir yürürlükten kaldırma sertifikası oluÅŸturulsun mu? (e/H) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " %08lX tarafından %s de yürürlükten kaldırılmış\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "" "Bu yürürlükten kaldırma sertifikalarını gerçekten oluÅŸturacak mısınız? (e/H) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "gizli anahtar yok\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "UYARI: bir kullanıcı kimliÄŸi imzası %d saniye gelecekte oluÅŸturuldu\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3946,7 +3714,7 @@ "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4210,7 +3978,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" @@ -4225,106 +3993,106 @@ msgid "key not found on keyserver\n" msgstr "anahtar `%s' yok: %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "%08lX anahtarı %s adresinden isteniyor\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "%08lX anahtarı %s adresinden isteniyor\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" " %08lX anahtarınızla %s de imzalandı\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "anahtar sunucusu hatası" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "anahtar sunucusu hatası" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "keyserver receive baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "%08lX anahtarı %s adresinden isteniyor\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "%08lX anahtarı %s adresinden isteniyor\n" @@ -4505,7 +4273,7 @@ msgid "textmode" msgstr "metinkipi" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "bilinmeyen" @@ -4682,50 +4450,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "%d tipi alt paket kritik bit kümesine sahip\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent bu oturumda kullanılamaz\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "istemci pid'i belirlenemiyor\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO çevre deÄŸiÅŸkeni hatalı\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "\"%s\" sunucusuna baÄŸlanılamadı: %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ile haberleÅŸme problemi\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (asıl anahtar kimliÄŸi %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4736,41 +4504,41 @@ "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n" "%u bitlik %s anahtarı, kimlik %08lX, oluÅŸturulan %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "Parolayı tekrar yazınız\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "Anahtar parolasını giriniz\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "Parola çok uzun\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "yanıt geçersiz\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "kullanıcı tarafından durduruldu\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "önceden tanımlanmış iÅŸlemler kipinde (batchmode) parola sorgulanamaz\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "Anahtar parolasını girin: " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4780,19 +4548,19 @@ "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n" "Anahtarın sahibi: \"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "" "%u bitlik %s anahtarı, %08lX kimliÄŸi ile\n" "%s tarihinde üretilmiÅŸ" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "Tekrar: " @@ -5678,12 +5446,12 @@ msgstr "" "güvence veritabanı bozulmuÅŸ; lütfen \"gpg --fix-trustdb\" çalıştırın.\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "%d karakterden daha uzun metin satırları okunamıyor\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "girdi satırı %d karakterden daha uzun\n" @@ -5742,7 +5510,7 @@ msgid "[ revoked]" msgstr "[yürürlükten kaldırıldı] " -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[süresi doldu] " @@ -5752,101 +5520,101 @@ msgid "[ unknown]" msgstr "bilinmeyen" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "asla " -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "sonraki güvence veritabanı denetimi %s de\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "%08lX genel anahtarı yok: %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "lütfen bir --check-trustdb yapın\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "güvence veritabanı denetleniyor\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "son derece güvenli bir anahtar yok\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "son derece güvenli %08lX genel anahtarı yok\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma baÅŸarısız: %s\n" @@ -6118,6 +5886,10 @@ msgid "nN" msgstr "hH" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quit" + #: util/miscutil.c:351 msgid "qQ" msgstr "çÇ" @@ -6157,6 +5929,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n" +#~ msgid "q" +#~ msgstr "k" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "genel hata" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "k" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "i" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "b" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "anahtar sunucusu hatası" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n" Index: gnupg/po/zh_CN.po diff -u gnupg/po/zh_CN.po:1.8 gnupg/po/zh_CN.po:1.9 --- gnupg/po/zh_CN.po:1.8 Fri Dec 10 23:20:41 2004 +++ gnupg/po/zh_CN.po Tue Dec 14 08:49:27 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2004-11-08 21:30+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" @@ -31,7 +31,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -345,7 +345,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "检测到 OpenPGP å¡å· %s\n" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "在批处ç†æ¨¡å¼ä¸­æ— æ³•å®Œæˆæ­¤æ“作\n" @@ -539,151 +539,79 @@ msgid "secret key already stored on a card\n" msgstr "ç§é’¥å·²å­˜å‚¨åœ¨å¡ä¸Š\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quit" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "离开这个èœå•" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "admin" - #: g10/card-util.c:1252 msgid "show admin commands" msgstr "显示管ç†å‘˜å‘½ä»¤" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "显示这份在线说明" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 msgid "list all available data" msgstr "列出所有å¯ç”¨æ•°æ®" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -msgid "name" -msgstr "name" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "更改å¡æŒæœ‰äººçš„姓å" #: g10/card-util.c:1259 -msgid "url" -msgstr "url" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "更改获å–密钥的 URL" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "fetch" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "æ ¹æ®å¡ä¸­æŒ‡å®šçš„ URL 获å–密钥" -#: g10/card-util.c:1262 -msgid "login" -msgstr "login" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 msgid "change the login name" msgstr "更改登录å" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "lang" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 msgid "change the language preferences" msgstr "更改首选语言首选" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "性别" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "更改å¡æŒæœ‰äººçš„性别" -#: g10/card-util.c:1265 -msgid "cafpr" -msgstr "cafpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 msgid "change a CA fingerprint" msgstr "更改一个 CA 指纹" -#: g10/card-util.c:1266 -msgid "forcesig" -msgstr "forcesig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "设定 PIN 签字是å¦å¿…é¡»" -#: g10/card-util.c:1268 -msgid "generate" -msgstr "generate" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 msgid "generate new keys" msgstr "生æˆæ–°çš„密钥" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "æ›´æ”¹æˆ–è§£é” PIN çš„èœå•" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "命令> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 msgid "Admin-only command\n" msgstr "仅供管ç†å‘˜ä½¿ç”¨çš„命令\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 msgid "Admin commands are allowed\n" msgstr "å…许使用管ç†å‘˜å‘½ä»¤\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 msgid "Admin commands are not allowed\n" msgstr "ä¸å…许使用管ç†å‘˜å‘½ä»¤\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(å°è¯•â€œhelpâ€)\n" @@ -730,7 +658,7 @@ msgid "PIN not correctly repeated; try again" msgstr "PIN å†æ¬¡è¾“入时与首次输入ä¸ç¬¦ï¼›è¯·å†è¯•ä¸€æ¬¡" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -740,13 +668,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output 在这个命令中ä¸èµ·ä½œç”¨\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "密钥‘%s’找ä¸åˆ°ï¼š%s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1193,7 +1121,7 @@ msgid "Pubkey: " msgstr "公钥：" -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "对称加密：" @@ -1201,7 +1129,7 @@ msgid "Hash: " msgstr "散列：" -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "压缩：" @@ -1305,7 +1233,7 @@ msgid "reading options from `%s'\n" msgstr "从‘%s’读å–选项\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "注æ„：一般情况下ä¸ä¼šç”¨åˆ° %sï¼\n" @@ -1315,347 +1243,347 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "对称加算密法扩展模å—‘%s’因为æƒé™ä¸å®‰å…¨è€Œæœªè¢«è½½å…¥\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„字符集\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 msgid "could not parse keyserver URL\n" msgstr "无法解æžå…¬é’¥æœåŠ¡å™¨ URL\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 msgid "invalid keyserver options\n" msgstr "无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s：%d：无效的校验选项\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 msgid "invalid verify options\n" msgstr "无效的校验选项\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法把è¿è¡Œè·¯å¾„è®¾æˆ %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "警告：程åºå¯èƒ½ä¼šåˆ›å»ºæ ¸å¿ƒå†…存转储ï¼\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 会使得 %s 失效\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ä¸å¯ä¸Ž %s 并用\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用无æ„义ï¼\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "您åªæœ‰åœ¨ --pgp2 模å¼ä¸‹æ‰èƒ½åšåˆ†ç¦»å¼æˆ–明文签字\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "您在 --pgp2 模å¼ä¸‹æ—¶ï¼Œä¸èƒ½åŒæ—¶ç­¾å­—和加密\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "å¯ç”¨ --pgp2 时您应该åªä½¿ç”¨æ–‡ä»¶ï¼Œè€Œéžç®¡é“\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模å¼ä¸‹åŠ å¯†æŠ¥æ–‡éœ€è¦ IDEA 算法\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "所选的对称加密算法无效\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "所选的è¯ä¹¦æ•£åˆ—算法无效\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "需è¦çš„完全å¯ä¿¡ç­¾å­—数一定è¦å¤§äºŽ 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "需è¦çš„勉强å¯ä¿¡ç­¾å­—数一定è¦å¤§äºŽ 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大认è¯æ·±åº¦ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 255 之间\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认验è¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 0，1，2 或 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最å°éªŒè¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 1，2 或 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "注æ„：强烈ä¸å»ºè®®ä½¿ç”¨ç®€å•çš„ S2K 模å¼(0)\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模å¼ï¼›å¿…须是 0，1 或 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "无效的默认首选项\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "无效的个人对称加密算法首选项\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "无效的个人散列算法首选项\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s å°šä¸èƒ½å’Œ %s 并用\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’对称加密算法\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’散列算法\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’压缩算法\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "åˆå§‹åŒ–信任度数æ®åº“失败：%s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [文件å]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [文件å]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [文件å]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [文件å]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric -encrypt\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [文件å]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [文件å]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [文件å]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --sign --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric --sign -encrypt\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [文件å]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [文件å]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [文件å]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key 用户标识" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key 用户标识" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key 用户标识" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key 用户标识" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key 用户标识 [指令]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, c-format msgid "keyserver send failed: %s\n" msgstr "上传至公钥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥æœåŠ¡å™¨æŽ¥æ”¶å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, c-format msgid "keyserver search failed: %s\n" msgstr "æœå¯»å…¬é’¥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "从公钥æœåŠ¡å™¨æ›´æ–°å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开 ASCII å°è£…失败：%s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行 ASCII å°è£…失败：%s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "无效的‘%s’散列算法\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[文件å]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "请开始键入您的报文……\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "标记å称必须åªå«æœ‰å¯æ‰“å°çš„字符或空格，并以一个“=â€æ¥ç»“å°¾\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "用户标记å称一定è¦å«æœ‰â€œ@â€å­—符\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "标记值一定ä¸èƒ½ä½¿ç”¨ä»»ä½•çš„控制字符\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "给定的的验è¯ç­–ç•¥ URL 无效\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "给定的签字策略 URL 无效\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 msgid "the given preferred keyserver URL is invalid\n" msgstr "给定的首选公钥æœåŠ¡å™¨ URL 无效\n" @@ -2495,12 +2423,12 @@ msgstr "用户标识“%sâ€å·²è¢«åŠé”€ã€‚" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "您ä»ç„¶æƒ³è¦ä¸ºå®ƒç­¾å­—å—？(y/N)" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " 无法添加签字。\n" @@ -2674,7 +2602,7 @@ msgid "Really sign? (y/N) " msgstr "真的è¦ç­¾å­—å—？(y/N)" -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2726,18 +2654,10 @@ msgstr "正在把密钥的签字移动到正确的ä½ç½®åŽ»\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "ä¿å­˜å¹¶ç¦»å¼€" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "显示指纹" @@ -2746,505 +2666,361 @@ msgstr "列出密钥和用户标识" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "选择用户标识 N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "选择å­é’¥ N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "列出签字" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "为密钥添加签字" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -msgid "tsign" -msgstr "tsign" - #: g10/keyedit.c:1259 msgid "make a trust signature" msgstr "生æˆä¸€ä»½ä¿¡ä»»çš„签字" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "为密钥添加本地签字" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "为密钥添加ä¸å¯åŠé”€ç­¾å­—" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "为密钥添加ä¸å¯åŠé”€çš„本地签字" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "增加一个用户标识" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "增加一个照片标识" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "删除一个用户/照片标识" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "增加一把å­é’¥" -#: g10/keyedit.c:1271 -msgid "addcardkey" -msgstr "addcardkey" - -#: g10/keyedit.c:1271 +#: g10/keyedit.c:1272 msgid "add a key to a smartcard" msgstr "在智能å¡ä¸Šæ·»åŠ ä¸€æŠŠå¯†é’¥" -#: g10/keyedit.c:1272 -msgid "keytocard" -msgstr "å¡å¯†é’¥" - -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "将一把密钥移动到智能å¡ä¸Š" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "删除一把å­é’¥" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "增加一把åŠé”€å¯†é’¥" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "删除签字" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "更改使用期é™" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "设定首选用户标识" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "在ç§é’¥å’Œå…¬é’¥æ¸…å•é—´åˆ‡æ¢" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "列出首选项(专家模å¼)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "列出首选项(详细模å¼)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "设定首选项" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "更新过的首选项" -#: g10/keyedit.c:1286 -msgid "keyserver" -msgstr "keyserver" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 msgid "set preferred keyserver URL" msgstr "设定首选公钥æœåŠ¡å™¨çš„ URL" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "更改密ç " -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "更改信任度" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "åŠé”€ç­¾å­—" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "åŠé”€ä¸€ä¸ªç”¨æˆ·æ ‡è¯†" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "åŠé”€ä¸€æŠŠå­é’¥" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "ç¦ç”¨ä¸€æŠŠå¯†é’¥" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "å¯ç”¨ä¸€æŠŠå¯†é’¥" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "显示照片标识" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "读å–ç§é’¥åŒºå—“%sâ€æ—¶å‡ºé”™ï¼š%s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "ç§é’¥å¯ç”¨ã€‚\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "è¦æœ‰ç§é’¥æ‰èƒ½è¿™ä¹ˆåšã€‚\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "请先使用“toggleâ€æŒ‡ä»¤ã€‚\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "密钥已被åŠé”€ã€‚" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 msgid "Really sign all user IDs? (y/N) " msgstr "真的为所有的用户标识签字å—？(y/N)" -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "æ示：选择è¦æ·»åŠ ç­¾å­—的用户标识\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "在 %s 模å¼ä¸­ä¸å…许使用这个指令。\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "您至少得选择一个用户标识。\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "您ä¸èƒ½åˆ é™¤æœ€åŽä¸€ä¸ªç”¨æˆ·æ ‡è¯†ï¼\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 msgid "Really remove all selected user IDs? (y/N) " msgstr "真的è¦åˆ é™¤æ‰€æœ‰è¢«é€‰æ‹©çš„用户标识å—？(y/N)" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 msgid "Really remove this user ID? (y/N) " msgstr "真的è¦åˆ é™¤è¿™ä¸ªç”¨æˆ·æ ‡è¯†å—？(y/N)" -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 msgid "Really move the primary key? (y/N) " msgstr "真的è¦åˆ é™¤ä¸»é’¥å—？(y/N)" -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 msgid "You must select exactly one key.\n" msgstr "您必须指定一把密钥。\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "您必须选择至少一把密钥。\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "您真的想è¦åˆ é™¤è¢«é€‰æ‹©çš„密钥å—？(y/N)" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 msgid "Do you really want to delete this key? (y/N) " msgstr "您真的è¦åˆ é™¤è¿™æŠŠå¯†é’¥å—？(y/N)" -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 msgid "Really revoke all selected user IDs? (y/N) " msgstr "真的è¦åŠé”€æ‰€æœ‰è¢«é€‰æ‹©çš„用户标识å—？(y/N)" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 msgid "Really revoke this user ID? (y/N) " msgstr "真的è¦åŠé”€è¿™ä¸ªç”¨æˆ·æ ‡è¯†å—？(y/N)" -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "您真的想è¦åŠé”€è¢«é€‰æ‹©çš„密钥å—？(y/N)" -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 msgid "Do you really want to revoke this key? (y/N) " msgstr "您真的想è¦åŠé”€è¿™æŠŠå¯†é’¥å—？(y/N)" -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "使用用户æ供的信任度数æ®åº“时信任度å¯èƒ½å¹¶æœªè¢«è®¾å®š\n" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 msgid "Set preference list to:\n" msgstr "设为首选项列表为：\n" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "真的è¦æ›´æ–°è¢«é€‰æ‹©ç”¨æˆ·æ ‡è¯†çš„首选项å—？(y/N)" -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 msgid "Really update the preferences? (y/N) " msgstr "真的è¦æ›´æ–°é¦–选项å—？(y/N)" -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 msgid "Save changes? (y/N) " msgstr "è¦ä¿å­˜å˜åŠ¨å—？(y/N)" -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 msgid "Quit without saving? (y/N) " msgstr "è¦ä¸ä¿å­˜è€Œç¦»å¼€å—？(y/N)" -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "æ›´æ–°ç§é’¥å¤±è´¥ï¼š%s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "密钥没有å˜åŠ¨æ‰€ä»¥ä¸éœ€è¦æ›´æ–°ã€‚\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "散列：" -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "特点：" -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "公钥æœåŠ¡å™¨ä¸å¯å˜é€ " -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "首选公钥æœåŠ¡å™¨ï¼š" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这把密钥å¯è¢« %s 密钥 %s åŠé”€" -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 msgid "(sensitive)" msgstr " (æ•æ„Ÿçš„)" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "å·²åŠé”€ï¼š%s" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "已过期：%s" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, c-format msgid "usage: %s" msgstr "å¯ç”¨äºŽï¼š%s" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "这把密钥已ç»è¢«ç¦ç”¨" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "å¡å·ï¼š" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x æ ·å¼çš„用户标识没有首选项。\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "请注æ„，在您é‡å¯ç¨‹åºä¹‹å‰ï¼Œæ˜¾ç¤ºçš„密钥有效性未必正确，\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 msgid "revoked" msgstr "å·²åŠé”€" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" "警告：没有首选用户标识。此指令å¯èƒ½å‡å®šä¸€ä¸ªä¸åŒçš„用户标识为首选用户标识。\n" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3253,45 +3029,45 @@ "警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" " 增加照片标识å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP ä¸èƒ½è¯†åˆ«è¿™æŠŠå¯†é’¥ã€‚\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定ä»ç„¶æƒ³è¦å¢žåŠ å—？(y/N)" -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您ä¸å¯ä»¥æŠŠç…§ç‰‡æ ‡è¯†å¢žåŠ åˆ° PGP2 æ ·å¼çš„密钥里。\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签字å—？(y/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签字å—？(y/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签字å—？(y/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "真的è¦åˆ é™¤è¿™ä¸ªè‡ªèº«ç­¾å­—å—？(y/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "å·²ç»åˆ é™¤äº† %d 个签字。\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "å·²ç»åˆ é™¤äº† %d 个签字。\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3300,160 +3076,160 @@ "警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" " 增加指定åŠé”€è€…å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "您ä¸å¯ä»¥ä¸º PGP 2.x æ ·å¼çš„密钥添加指定åŠé”€è€…。\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定åŠé”€è€…的用户标识：" -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "无法将 PGP 2.x æ ·å¼çš„密钥设为指定åŠé”€è€…\n" # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "您ä¸èƒ½å°†æŸæŠŠå¯†é’¥è®¾ä¸ºå®ƒè‡ªå·±çš„指定åŠé”€è€…\n" # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 msgid "this key has already been designated as a revoker\n" msgstr "这把密钥已被指定为一个åŠé”€è€…\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将æŸæŠŠå¯†é’¥æŒ‡æ´¾ä¸ºæŒ‡å®šåŠé”€è€…çš„æ“作无法撤销ï¼\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "您确定è¦å°†è¿™æŠŠå¯†é’¥è®¾ä¸ºæŒ‡å®šåŠé”€è€…å—？(y/N)：" -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "请从ç§é’¥ä¸­åˆ é™¤é€‰æ‹©ã€‚\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "请至多选择一把å­é’¥ã€‚\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "正在å˜æ›´å­é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "正在å˜æ›´ä¸»é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "您ä¸èƒ½å˜æ›´v3密钥的使用期é™\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "在ç§é’¥çŽ¯é‡Œæ²¡æœ‰ä¸€è‡´çš„签字\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "请精确地选择一个用户标识。\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识“%sâ€çš„ v3 自身签字\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选的公钥æœåŠ¡å™¨çš„ URL：" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定è¦æ›¿æ¢å®ƒå—？(y/N)" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定è¦åˆ é™¤å®ƒå—？(y/N)" -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "没有索引为 %d çš„å­é’¥\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, c-format msgid "user ID: \"%s\"\n" msgstr "用户标识：“%sâ€\n" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (ä¸å¯å¯¼å‡º)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "这份签字已在 %s 过期。\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您ä»ç„¶æƒ³è¦åŠé”€å®ƒå—？(y/N)" -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "è¦ä¸ºè¿™ä»½ç­¾å­—生æˆä¸€ä»½åŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已ç»ä¸ºè¿™äº›å¯†é’¥ %s 上的这些用户标识添加签字：\n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 msgid " (non-revocable)" msgstr " (ä¸å¯åŠé”€)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 于 %s åŠé”€\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "您正在åŠé”€è¿™äº›ç­¾å­—：\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "真的è¦ç”ŸæˆåŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "没有ç§é’¥\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识“%sâ€å·²ç»è¢«åŠé”€ã€‚\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告：有一份用户标识签字的日期标记为 %d 秒åŽçš„未æ¥\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在显示 %s 照片标识(大å°ä¸º %ld，属于密钥 %s，用户标识 %d)\n" @@ -3774,7 +3550,7 @@ "您需è¦ä¸€ä¸ªå¯†ç æ¥ä¿æŠ¤æ‚¨çš„ç§é’¥ã€‚\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4028,7 +3804,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "无效的公钥æœåŠ¡å™¨åè®®(us %d!=handler %d)\n" @@ -4042,101 +3818,101 @@ msgid "key not found on keyserver\n" msgstr "在公钥æœåŠ¡å™¨ä¸Šæ‰¾ä¸åˆ°å¯†é’¥\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "下载密钥‘%s’，从 %s æœåŠ¡å™¨ %s\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, c-format msgid "requesting key %s from %s\n" msgstr "下载密钥 %s，从 %s\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, c-format msgid "sending key %s to %s server %s\n" msgstr "将密钥‘%s’上传到 %s æœåŠ¡å™¨ %s\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, c-format msgid "sending key %s to %s\n" msgstr "将密钥‘%s’上传到 %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s æœåŠ¡å™¨ %s 上\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "æœç´¢â€œ%sâ€ï¼Œåœ¨ %s 上\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 msgid "no keyserver action!\n" msgstr "公钥æœåŠ¡å™¨æ— åŠ¨ä½œï¼\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "警告：处ç†å…¬é’¥æœåŠ¡å™¨çš„程åºæ¥è‡ªä¸åŒç‰ˆæœ¬çš„ GnuPG (%s)\n" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "公钥æœåŠ¡å™¨æœªå‘é€ VERSION\n" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "未给出公钥æœåŠ¡å™¨(使用 --keyserver 选项)\n" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "这一编译版本ä¸æ”¯æŒå¤–部调用公钥æœåŠ¡å™¨\n" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "没有处ç†â€˜%s’公钥æœåŠ¡å™¨çš„程åº\n" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "‘%s’æ“作ä¸ä¸ºâ€˜%s’公钥æœåŠ¡å™¨æ‰€æ”¯æŒ\n" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "gpgkeys_%s ä¸æ”¯æŒå¯¹ç‰ˆæœ¬ %d 的处ç†\n" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 msgid "keyserver timed out\n" msgstr "公钥æœåŠ¡å™¨è¶…æ—¶\n" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 msgid "keyserver internal error\n" msgstr "公钥æœåŠ¡å™¨å†…部错误\n" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, c-format msgid "keyserver communications error: %s\n" msgstr "公钥æœåŠ¡å™¨é€šè®¯é”™è¯¯ï¼š%s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªç”¨æˆ·æ ‡è¯†ï¼šè·³è¿‡\n" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d 个密钥正从 %s 得到更新\n" @@ -4313,7 +4089,7 @@ msgid "textmode" msgstr "文本模å¼" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "未知" @@ -4482,50 +4258,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "%d 类别的å­åŒ…设定了关键ä½\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent 在此次èˆè¯ä¸­æ— æ³•ä½¿ç”¨\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "无法设定代ç†ç¨‹åºå®¢æˆ·ç«¯çš„进程标识\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "无法å–得代ç†ç¨‹åºæ‰€éœ€çš„æœåŠ¡å™¨è¯»å–文件æ述符\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "无法å–得代ç†ç¨‹åºæ‰€éœ€çš„æœåŠ¡å™¨å†™å…¥æ–‡ä»¶æ述符\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO 环境å˜é‡æ ¼å¼é”™è¯¯\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "ä¸æ”¯æŒ gpg-agent å议版本 %d\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "无法连接至‘%s’：%s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "与 gpg-agent 通讯有问题\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "代ç†ç¨‹åºçš„问题――正在åœç”¨ä»£ç†ç¨‹åº\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, c-format msgid " (main key ID %s)" msgstr "(ä¸»é’¥åŒ™å· %s)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4536,57 +4312,57 @@ "“%.*sâ€\n" "%u ä½çš„ %s å¯†é’¥ï¼Œé’¥åŒ™å· %s，建立于 %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "请å†è¾“入一次密ç \n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "请输入密ç \n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "密ç å¤ªé•¿\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "代ç†ç¨‹åºå“应无效\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "用户å–消\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "代ç†ç¨‹åºçš„问题：代ç†ç¨‹åºè¿”回 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 msgid "can't query passphrase in batch mode\n" msgstr "在批处ç†æ¨¡å¼ä¸­æ— æ³•æŸ¥è¯¢å¯†ç \n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "请输入密ç ï¼š" -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" msgstr "您需è¦è¾“入密ç ï¼Œæ‰èƒ½è§£å¼€è¿™ä¸ªç”¨æˆ·çš„ç§é’¥ï¼šâ€œ%sâ€\n" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u ä½çš„ %s å¯†é’¥ï¼Œé’¥åŒ™å· %s，建立于 %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr " (主钥 %s çš„å­é’¥)" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "请å†è¾“入一次密ç ï¼š" @@ -5418,12 +5194,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "信任度数æ®åº“å·²æŸå；请执行“gpg --fix-trustdbâ€ã€‚\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "无法处ç†é•¿äºŽ %d 字符的文本行\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "输入行长度超过 %d 字符\n" @@ -5482,7 +5258,7 @@ msgid "[ revoked]" msgstr "å·²åŠé”€" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "已过期" @@ -5492,103 +5268,103 @@ msgid "[ unknown]" msgstr "未知" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 #, fuzzy msgid "[marginal]" msgstr "勉强" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 #, fuzzy msgid "[ultimate]" msgstr "ç»å¯¹" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "未定义" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "never" msgstr "从ä¸" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "勉强" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "完全" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "ç»å¯¹" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任度数æ®åº“检查将于 %s 进行\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ›´æ–°ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, c-format msgid "public key %s not found: %s\n" msgstr "找ä¸åˆ°å…¬é’¥ %s：%s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "正在检查信任度数æ®åº“\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "å·²ç»å¤„ç†äº† %d 把密钥(共计已解决了 %d 份的有效性)\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "没有找到任何ç»å¯¹ä¿¡ä»»çš„密钥\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ç»å¯¹ä¿¡ä»»çš„密钥 %s 的公钥未被找到\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "éœ€è¦ %d 份勉强信任和 %d 份完全信任，%s 信任模型\n" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "无法更新信任度数æ®åº“版本记录：写入失败：%s\n" @@ -5858,6 +5634,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quit" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -5894,6 +5674,168 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(您å¯èƒ½ä½¿ç”¨äº†é”™è¯¯çš„程åºæ¥å®Œæˆæ­¤é¡¹ä»»åŠ¡)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "admin" +#~ msgstr "admin" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#~ msgid "name" +#~ msgstr "name" + +#~ msgid "url" +#~ msgstr "url" + +#~ msgid "fetch" +#~ msgstr "fetch" + +#~ msgid "login" +#~ msgstr "login" + +#~ msgid "lang" +#~ msgstr "lang" + +#~ msgid "sex" +#~ msgstr "性别" + +#~ msgid "cafpr" +#~ msgstr "cafpr" + +#~ msgid "forcesig" +#~ msgstr "forcesig" + +#~ msgid "generate" +#~ msgstr "generate" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#~ msgid "tsign" +#~ msgstr "tsign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#~ msgid "addcardkey" +#~ msgstr "addcardkey" + +#~ msgid "keytocard" +#~ msgstr "å¡å¯†é’¥" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#~ msgid "keyserver" +#~ msgstr "keyserver" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "‘%s’散列算法在本å‘行版本中åªè¯»\n" Index: gnupg/po/zh_TW.po diff -u gnupg/po/zh_TW.po:1.8 gnupg/po/zh_TW.po:1.9 --- gnupg/po/zh_TW.po:1.8 Fri Dec 10 23:20:40 2004 +++ gnupg/po/zh_TW.po Tue Dec 14 08:49:27 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-10 20:16+0100\n" +"POT-Creation-Date: 2004-12-14 08:40+0100\n" "PO-Revision-Date: 2003-05-13 15:48+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -33,7 +33,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -353,7 +353,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -564,165 +564,88 @@ msgid "secret key already stored on a card\n" msgstr "¤w¸õ¹L¡G¨pÆ_¤w¸g¦s¦b\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348 -msgid "quit" -msgstr "quit" - #: g10/card-util.c:1250 g10/keyedit.c:1245 msgid "quit this menu" msgstr "Â÷¶}³o­Ó¿ï³æ" -#: g10/card-util.c:1251 g10/keyedit.c:1246 -msgid "q" -msgstr "q" - -#: g10/card-util.c:1252 -msgid "admin" -msgstr "" - #: g10/card-util.c:1252 #, fuzzy msgid "show admin commands" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" #: g10/card-util.c:1253 g10/keyedit.c:1248 -msgid "help" -msgstr "help" - -#: g10/card-util.c:1253 g10/keyedit.c:1248 msgid "show this help" msgstr "Åã¥Ü³o¥÷½u¤W»¡©ú" -#: g10/card-util.c:1255 g10/keyedit.c:1251 -msgid "list" -msgstr "list" - #: g10/card-util.c:1255 #, fuzzy msgid "list all available data" msgstr "¨S¦³¥i¥Îªº»¡©ú" -#: g10/card-util.c:1256 g10/keyedit.c:1252 -msgid "l" -msgstr "l" - -#: g10/card-util.c:1257 g10/keyedit.c:1263 -msgid "debug" -msgstr "debug" - -#: g10/card-util.c:1258 -#, fuzzy -msgid "name" -msgstr "enable" - #: g10/card-util.c:1258 msgid "change card holder's name" msgstr "" #: g10/card-util.c:1259 -msgid "url" -msgstr "" - -#: g10/card-util.c:1259 msgid "change URL to retrieve key" msgstr "" #: g10/card-util.c:1260 -msgid "fetch" -msgstr "" - -#: g10/card-util.c:1261 msgid "fetch the key specified in the card URL" msgstr "" -#: g10/card-util.c:1262 -#, fuzzy -msgid "login" -msgstr "lsign" - -#: g10/card-util.c:1262 +#: g10/card-util.c:1261 #, fuzzy msgid "change the login name" msgstr "§ó§ï¨Ï¥Î´Á­­" -#: g10/card-util.c:1263 -msgid "lang" -msgstr "" - -#: g10/card-util.c:1263 +#: g10/card-util.c:1262 #, fuzzy msgid "change the language preferences" msgstr "§ó§ï¥DÆ[«H¥ô" -#: g10/card-util.c:1264 -msgid "sex" -msgstr "" - -#: g10/card-util.c:1264 +#: g10/card-util.c:1263 msgid "change card holder's sex" msgstr "" -#: g10/card-util.c:1265 -#, fuzzy -msgid "cafpr" -msgstr "fpr" - -#: g10/card-util.c:1265 +#: g10/card-util.c:1264 #, fuzzy msgid "change a CA fingerprint" msgstr "Åã¥Ü«ü¯¾" -#: g10/card-util.c:1266 -#, fuzzy -msgid "forcesig" -msgstr "revsig" - -#: g10/card-util.c:1267 +#: g10/card-util.c:1265 msgid "toggle the signature force PIN flag" msgstr "" -#: g10/card-util.c:1268 -#, fuzzy -msgid "generate" -msgstr "¤@¯ë©Ê¿ù»~" - -#: g10/card-util.c:1269 +#: g10/card-util.c:1266 #, fuzzy msgid "generate new keys" msgstr "²£¥Í¤@¥÷·sªºª÷Æ_¹ï" -#: g10/card-util.c:1270 g10/keyedit.c:1287 -msgid "passwd" -msgstr "passwd" - -#: g10/card-util.c:1270 +#: g10/card-util.c:1267 msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1272 -msgid "privatedo" -msgstr "" - -#: g10/card-util.c:1336 g10/keyedit.c:1397 +#: g10/card-util.c:1333 g10/keyedit.c:1398 msgid "Command> " msgstr "«ü¥O> " -#: g10/card-util.c:1371 +#: g10/card-util.c:1368 #, fuzzy msgid "Admin-only command\n" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/card-util.c:1387 +#: g10/card-util.c:1384 #, fuzzy msgid "Admin commands are allowed\n" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/card-util.c:1389 +#: g10/card-util.c:1386 #, fuzzy msgid "Admin commands are not allowed\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/card-util.c:1458 g10/keyedit.c:1864 +#: g10/card-util.c:1455 g10/keyedit.c:1865 msgid "Invalid command (try \"help\")\n" msgstr "µL®Äªº«ü¥O (¸Õ¸Õ¬Ý \"help\")\n" @@ -767,7 +690,7 @@ msgid "PIN not correctly repeated; try again" msgstr "±K½X¦ê¦A¦¸¿é¤J®É¨S¦³¥¿½T­«½Æ¡F½Ð¦A¸Õ¤@¦¸" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -777,13 +700,13 @@ msgid "--output doesn't work for this command\n" msgstr "--output ¦b³o­Ó©R¥O¤¤¨S¦³§@¥Î\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" msgstr "§ä¤£¨ì `%s' ª÷Æ_¡G %s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232 +#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 #: g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" @@ -1233,7 +1156,7 @@ msgid "Pubkey: " msgstr "¤½Æ_¡G " -#: g10/g10.c:756 g10/keyedit.c:1901 +#: g10/g10.c:756 g10/keyedit.c:1902 msgid "Cipher: " msgstr "½s±Kªk¡G " @@ -1241,7 +1164,7 @@ msgid "Hash: " msgstr "Âø´ê¡G " -#: g10/g10.c:768 g10/keyedit.c:1947 +#: g10/g10.c:768 g10/keyedit.c:1948 msgid "Compression: " msgstr "À£ÁY¡G " @@ -1345,7 +1268,7 @@ msgid "reading options from `%s'\n" msgstr "±q `%s' Ū¨ú¿ï¶µ\n" -#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595 +#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "½Ðª`·N¡G¤@¯ë±¡ªp¤U¤£·|¥Î¨ì %s¡I\n" @@ -1355,357 +1278,357 @@ msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "½s±Kªk©µ¦ù¼Ò²Õ \"%s\" ¦]¬°³\¥i¤£¦w¥þ¦Ó¥¼³Q¸ü¤J\n" -#: g10/g10.c:2293 +#: g10/g10.c:2291 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ¤£¬O¤@­Ó¦³®Äªº¦r¤¸¶°\n" -#: g10/g10.c:2312 g10/keyedit.c:3434 +#: g10/g10.c:2310 g10/keyedit.c:3435 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n" -#: g10/g10.c:2318 +#: g10/g10.c:2316 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2321 +#: g10/g10.c:2319 #, fuzzy msgid "invalid keyserver options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2328 +#: g10/g10.c:2326 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2331 +#: g10/g10.c:2329 msgid "invalid import options\n" msgstr "µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2338 +#: g10/g10.c:2336 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2341 +#: g10/g10.c:2339 msgid "invalid export options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2348 +#: g10/g10.c:2346 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2351 +#: g10/g10.c:2349 #, fuzzy msgid "invalid list options\n" msgstr "µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2373 +#: g10/g10.c:2371 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2376 +#: g10/g10.c:2374 #, fuzzy msgid "invalid verify options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2383 +#: g10/g10.c:2381 #, c-format msgid "unable to set exec-path to %s\n" msgstr "µLªk§â°õ¦æÀɸô®|³]¦¨ %s\n" -#: g10/g10.c:2573 +#: g10/g10.c:2571 msgid "WARNING: program may create a core file!\n" msgstr "ĵ§i¡Gµ{¦¡¥i¯à·|¶É¦L¥X®Ö¤ßÀÉ¡I\n" -#: g10/g10.c:2577 +#: g10/g10.c:2575 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ĵ§i¡G %s ·|¨Ï±o %s ¥¢®Ä\n" -#: g10/g10.c:2586 +#: g10/g10.c:2584 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ¤£³Q¤¹³\¸ò %s ¨Ö¥Î\n" -#: g10/g10.c:2589 +#: g10/g10.c:2587 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n" -#: g10/g10.c:2610 +#: g10/g10.c:2608 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "©p¬é¦³¦b --pgp2 ¼Ò¦¡¤UÅׯవ¥X¤ÀÂ÷¦¡©Î©ú¤åñ³¹\n" -#: g10/g10.c:2616 +#: g10/g10.c:2614 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U®É¡A¤£¯à¦P®Éñ¸p©M¥[±K\n" -#: g10/g10.c:2622 +#: g10/g10.c:2620 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "±Ò¥Î --pgp2 ®É©p¬éÀ³¸Ó¨Ï¥ÎÀɮסA¦Ó«DºÞ¹D\n" -#: g10/g10.c:2635 +#: g10/g10.c:2633 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¦b --pgp2 ¼Ò¦¡¤U¥[±K°T®§»Ý­n IDEA ½s±Kªk\n" -#: g10/g10.c:2705 g10/g10.c:2729 +#: g10/g10.c:2703 g10/g10.c:2727 msgid "selected cipher algorithm is invalid\n" msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2709 g10/g10.c:2733 msgid "selected digest algorithm is invalid\n" msgstr "©Ò¿ïªººK­nºtºâªkµL®Ä\n" -#: g10/g10.c:2717 +#: g10/g10.c:2715 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n" -#: g10/g10.c:2723 +#: g10/g10.c:2721 msgid "selected certification digest algorithm is invalid\n" msgstr "©Ò¿ïªº¾ÌÃÒºK­nºtºâªkµL®Ä\n" -#: g10/g10.c:2738 +#: g10/g10.c:2736 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ¤@©w­n¤j©ó 0\n" -#: g10/g10.c:2740 +#: g10/g10.c:2738 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ¤@©w­n¤j©ó 1\n" -#: g10/g10.c:2742 +#: g10/g10.c:2740 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ¤@©w­n¤¶©ó 1 ©M 255 ¤§¶¡\n" -#: g10/g10.c:2744 +#: g10/g10.c:2742 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n" -#: g10/g10.c:2746 +#: g10/g10.c:2744 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n" -#: g10/g10.c:2749 +#: g10/g10.c:2747 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "½Ðª`·N¡G±j¯P¤£«Øij¨Ï¥Î³æ¯Âªº S2K ¼Ò¦¡ (0)\n" -#: g10/g10.c:2753 +#: g10/g10.c:2751 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "µL®Äªº S2K ¼Ò¦¡¡F¤@©w­n¬O 0 ¡B 1 ©Î 3\n" -#: g10/g10.c:2760 +#: g10/g10.c:2758 msgid "invalid default preferences\n" msgstr "µL®Äªº¹w³]°¾¦n\n" -#: g10/g10.c:2769 +#: g10/g10.c:2767 msgid "invalid personal cipher preferences\n" msgstr "µL®Äªº­Ó¤H½s±Kªk°¾¦n\n" -#: g10/g10.c:2773 +#: g10/g10.c:2771 msgid "invalid personal digest preferences\n" msgstr "µL®Äªº­Ó¤HºK­n°¾¦n\n" -#: g10/g10.c:2777 +#: g10/g10.c:2775 msgid "invalid personal compress preferences\n" msgstr "µL®Äªº­Ó¤HÀ£ÁY°¾¦n\n" -#: g10/g10.c:2810 +#: g10/g10.c:2808 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n" -#: g10/g10.c:2857 +#: g10/g10.c:2855 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2862 +#: g10/g10.c:2860 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2867 +#: g10/g10.c:2865 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2963 +#: g10/g10.c:2961 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "«H¥ô¸ê®Æ®w±Ò©l¥¢±Ñ¡G %s\n" -#: g10/g10.c:2974 +#: g10/g10.c:2972 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "ĵ§i¡Gµ¹©wªº¦¬¥óªÌ (-r) ¥¼¨Ï¥Î¤½Æ_¥[±K\n" -#: g10/g10.c:2985 +#: g10/g10.c:2983 msgid "--store [filename]" msgstr "--store [ÀɦW]" -#: g10/g10.c:2992 +#: g10/g10.c:2990 msgid "--symmetric [filename]" msgstr "--symmetric [ÀɦW]" -#: g10/g10.c:2994 +#: g10/g10.c:2992 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "¸Ñ±K¥¢±Ñ¡G %s\n" -#: g10/g10.c:3004 +#: g10/g10.c:3002 msgid "--encrypt [filename]" msgstr "--encrypt [ÀɦW]" -#: g10/g10.c:3017 +#: g10/g10.c:3015 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3019 +#: g10/g10.c:3017 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3022 +#: g10/g10.c:3020 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:3040 +#: g10/g10.c:3038 msgid "--sign [filename]" msgstr "--sign [ÀɦW]" -#: g10/g10.c:3053 +#: g10/g10.c:3051 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3068 +#: g10/g10.c:3066 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3070 +#: g10/g10.c:3068 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3073 +#: g10/g10.c:3071 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:3093 +#: g10/g10.c:3091 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ÀɦW]" -#: g10/g10.c:3102 +#: g10/g10.c:3100 msgid "--clearsign [filename]" msgstr "--clearsign [ÀɦW]" -#: g10/g10.c:3127 +#: g10/g10.c:3125 msgid "--decrypt [filename]" msgstr "--decrypt [ÀɦW]" -#: g10/g10.c:3135 +#: g10/g10.c:3133 msgid "--sign-key user-id" msgstr "--sign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3139 +#: g10/g10.c:3137 msgid "--lsign-key user-id" msgstr "--lsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3143 +#: g10/g10.c:3141 msgid "--nrsign-key user-id" msgstr "--nrsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3147 +#: g10/g10.c:3145 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3171 +#: g10/g10.c:3169 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¨Ï¥ÎªÌID [«ü¥O]" -#: g10/g10.c:3242 +#: g10/g10.c:3240 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¨Ï¥ÎªÌID] [Æ_°Í°é]" -#: g10/g10.c:3279 +#: g10/g10.c:3277 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3279 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3283 +#: g10/g10.c:3281 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3294 +#: g10/g10.c:3292 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3304 +#: g10/g10.c:3302 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3345 +#: g10/g10.c:3343 #, c-format msgid "dearmoring failed: %s\n" msgstr "¸Ñ¶}«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:3353 +#: g10/g10.c:3351 #, c-format msgid "enarmoring failed: %s\n" msgstr "¶i¦æ«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:3440 +#: g10/g10.c:3438 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "µL®Äªº `%s' Âø´êºtºâªk\n" -#: g10/g10.c:3563 +#: g10/g10.c:3561 msgid "[filename]" msgstr "[ÀɦW]" -#: g10/g10.c:3567 +#: g10/g10.c:3565 msgid "Go ahead and type your message ...\n" msgstr "½Ð¶}©lÁä¤J©pªº°T®§ ...\n" -#: g10/g10.c:3857 +#: g10/g10.c:3855 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "¼Ð°O¦WºÙ¤@©w­n±Ä¥Î¥i¦L¥Xªº¦r²Å©ÎªÅ¥Õ¡A¨Ã¥H¤@­Ó¡u=¡v¨Óµ²§À\n" -#: g10/g10.c:3865 +#: g10/g10.c:3863 msgid "a user notation name must contain the '@' character\n" msgstr "¨Ï¥ÎªÌ¼Ð°O¦WºÙ¤@©w­n§t¦³¡u@¡v¦r²Å\n" -#: g10/g10.c:3875 +#: g10/g10.c:3873 msgid "a notation value must not use any control characters\n" msgstr "¼Ð°O­È¤@©w¤£¯à¨Ï¥Î¥ô¦óªº±±¨î¦r²Å\n" -#: g10/g10.c:3909 +#: g10/g10.c:3907 msgid "the given certification policy URL is invalid\n" msgstr "µ¹©wªºªº¾ÌÃÒ­ì«h URL µL®Ä\n" -#: g10/g10.c:3911 +#: g10/g10.c:3909 msgid "the given signature policy URL is invalid\n" msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n" -#: g10/g10.c:3944 +#: g10/g10.c:3942 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n" @@ -2547,12 +2470,12 @@ msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1486 +#: g10/keyedit.c:857 g10/keyedit.c:1487 msgid "Are you sure you still want to sign it? (y/N) " msgstr "©p¤´µM·Q­nñ¸p¥¦¶Ü¡H (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1492 +#: g10/keyedit.c:1493 msgid " Unable to sign.\n" msgstr " µLªkñ¸p¡C\n" @@ -2750,7 +2673,7 @@ msgid "Really sign? (y/N) " msgstr "¯uªº­nñ¸p¶Ü¡H " -#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046 +#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2803,18 +2726,10 @@ msgstr "¥¿¦b§âª÷Æ_ªºÃ±³¹·h²¾¨ì¥¿½Tªº¦ì¸m¥h\n" #: g10/keyedit.c:1247 -msgid "save" -msgstr "save" - -#: g10/keyedit.c:1247 msgid "save and quit" msgstr "Àx¦s¨ÃÂ÷¶}" #: g10/keyedit.c:1250 -msgid "fpr" -msgstr "fpr" - -#: g10/keyedit.c:1250 msgid "show fingerprint" msgstr "Åã¥Ü«ü¯¾" @@ -2823,504 +2738,357 @@ msgstr "¦C¥Xª÷Æ_©M¨Ï¥ÎªÌ ID" #: g10/keyedit.c:1253 -msgid "uid" -msgstr "uid" - -#: g10/keyedit.c:1253 msgid "select user ID N" msgstr "¨Ï¥ÎªÌ ID ¿ï¤F N" #: g10/keyedit.c:1254 -msgid "key" -msgstr "key" - -#: g10/keyedit.c:1254 msgid "select secondary key N" msgstr "¿ï¾Ü¦¸Æ_ N" #: g10/keyedit.c:1255 -msgid "check" -msgstr "check" - -#: g10/keyedit.c:1255 msgid "list signatures" msgstr "¦C¥Xñ³¹" -#: g10/keyedit.c:1256 -msgid "c" -msgstr "c" - -#: g10/keyedit.c:1257 -msgid "sign" -msgstr "sign" - #: g10/keyedit.c:1257 msgid "sign the key" msgstr "ñ¸pª÷Æ_" -#: g10/keyedit.c:1258 -msgid "s" -msgstr "s" - -#: g10/keyedit.c:1259 -#, fuzzy -msgid "tsign" -msgstr "sign" - #: g10/keyedit.c:1259 #, fuzzy msgid "make a trust signature" msgstr "«Ø¥ß¤@¥÷¤ÀÂ÷¦¡Ã±³¹" #: g10/keyedit.c:1260 -msgid "lsign" -msgstr "lsign" - -#: g10/keyedit.c:1260 msgid "sign the key locally" msgstr "¶È¦b¥»¦añ¸pª÷Æ_" #: g10/keyedit.c:1261 -msgid "nrsign" -msgstr "nrsign" - -#: g10/keyedit.c:1261 msgid "sign the key non-revocably" msgstr "¥H¤£¥iºM¾P¼Ò¦¡Ã±¸pª÷Æ_" #: g10/keyedit.c:1262 -msgid "nrlsign" -msgstr "nrlsign" - -#: g10/keyedit.c:1262 msgid "sign the key locally and non-revocably" msgstr "¥H¤£¥iºM¾P¼Ò¦¡¦b¥»¦añ¸pª÷Æ_" -#: g10/keyedit.c:1264 -msgid "adduid" -msgstr "adduid" - -#: g10/keyedit.c:1264 +#: g10/keyedit.c:1265 msgid "add a user ID" msgstr "¼W¥[¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:1265 -msgid "addphoto" -msgstr "addphoto" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "add a photo ID" msgstr "¼W¥[¤@­Ó·Ó¤ù ID" -#: g10/keyedit.c:1266 -msgid "deluid" -msgstr "deluid" - -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "delete user ID" msgstr "§R°£¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:1268 -msgid "delphoto" -msgstr "delphoto" - -#: g10/keyedit.c:1269 -msgid "addkey" -msgstr "addkey" - -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "add a secondary key" msgstr "¼W¥[¤@§â¦¸Æ_" -#: g10/keyedit.c:1271 -#, fuzzy -msgid "addcardkey" -msgstr "addkey" - -#: g10/keyedit.c:1271 -msgid "add a key to a smartcard" -msgstr "" - #: g10/keyedit.c:1272 -msgid "keytocard" +msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1273 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1274 -msgid "delkey" -msgstr "delkey" - -#: g10/keyedit.c:1274 +#: g10/keyedit.c:1275 msgid "delete a secondary key" msgstr "§R°£¤@§â¦¸Æ_" -#: g10/keyedit.c:1275 -msgid "addrevoker" -msgstr "addrevoker" - -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1276 msgid "add a revocation key" msgstr "¼W¥[¤@§âºM¾Pª÷Æ_" -#: g10/keyedit.c:1276 -msgid "delsig" -msgstr "delsig" - -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1277 msgid "delete signatures" msgstr "§R°£Ã±³¹" -#: g10/keyedit.c:1277 -msgid "expire" -msgstr "expire" - -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "change the expire date" msgstr "§ó§ï¨Ï¥Î´Á­­" -#: g10/keyedit.c:1278 -msgid "primary" -msgstr "primary" - -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1279 msgid "flag user ID as primary" msgstr "§â¨Ï¥ÎªÌ ID ¼Ð°O¬°¥D­n" -#: g10/keyedit.c:1279 -msgid "toggle" -msgstr "toggle" - -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1280 msgid "toggle between secret and public key listing" msgstr "§â¨pÆ_©M¤½Æ_²M³æô¦b¤@°_" -#: g10/keyedit.c:1281 -msgid "t" -msgstr "t" - -#: g10/keyedit.c:1282 -msgid "pref" -msgstr "pref" - -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "list preferences (expert)" msgstr "¦C¥X°¾¦n (±M®a¼Ò¦¡)" -#: g10/keyedit.c:1283 -msgid "showpref" -msgstr "showpref" - -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "list preferences (verbose)" msgstr "¦C¥X°¾¦n (Åo­ö¼Ò¦¡)" -#: g10/keyedit.c:1284 -msgid "setpref" -msgstr "setpref" - -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1285 msgid "set preference list" msgstr "³]©w°¾¦n²M³æ" -#: g10/keyedit.c:1285 -msgid "updpref" -msgstr "updpref" - -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "updated preferences" msgstr "§ó·s¹Lªº°¾¦n" -#: g10/keyedit.c:1286 -#, fuzzy -msgid "keyserver" -msgstr "ª÷Æ_¦øªA¾¹¿ù»~" - -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1287 #, fuzzy msgid "set preferred keyserver URL" msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "change the passphrase" msgstr "§ó§ï±K½X¦ê" -#: g10/keyedit.c:1288 -msgid "trust" -msgstr "trust" - -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1289 msgid "change the ownertrust" msgstr "§ó§ï¥DÆ[«H¥ô" -#: g10/keyedit.c:1289 -msgid "revsig" -msgstr "revsig" - -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "revoke signatures" msgstr "ºM¾Pñ³¹" -#: g10/keyedit.c:1290 -msgid "revuid" -msgstr "revuid" - -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "revoke a user ID" msgstr "ºM¾P¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:1291 -msgid "revkey" -msgstr "revkey" - -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1292 msgid "revoke a secondary key" msgstr "ºM¾P¤@§â¦¸Æ_" -#: g10/keyedit.c:1292 -msgid "disable" -msgstr "disable" - -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1293 msgid "disable a key" msgstr "¸T¥Î¤@§âª÷Æ_" -#: g10/keyedit.c:1293 -msgid "enable" -msgstr "enable" - -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "enable a key" msgstr "±Ò¥Î¤@§âª÷Æ_" -#: g10/keyedit.c:1294 -msgid "showphoto" -msgstr "showphoto" - -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1295 msgid "show photo ID" msgstr "Åã¥Ü·Ó¤ù ID" -#: g10/keyedit.c:1347 +#: g10/keyedit.c:1348 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "Ū¨úª÷Æ_°Ï¶ô `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1366 msgid "Secret key is available.\n" msgstr "¨pÆ_¥i¥Î¡C\n" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1428 msgid "Need the secret key to do this.\n" msgstr "­n¦³¨pÆ_Åׯà³o»ò°µ¡C\n" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1433 msgid "Please use the command \"toggle\" first.\n" msgstr "½Ð¥ý¨Ï¥Î \"toggle\" «ü¥O¡C\n" -#: g10/keyedit.c:1480 +#: g10/keyedit.c:1481 msgid "Key is revoked." msgstr "ª÷Æ_¤w¸g³QºM¾P¤F¡C" -#: g10/keyedit.c:1500 +#: g10/keyedit.c:1501 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "¯uªº­nñ¸p©Ò¦³ªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1502 +#: g10/keyedit.c:1503 msgid "Hint: Select the user IDs to sign\n" msgstr "´£¥Ü¡G¿ï¾Ü­nñ¸pªº¨Ï¥ÎªÌ ID\n" -#: g10/keyedit.c:1527 +#: g10/keyedit.c:1528 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "¦b %s ¼Ò¦¡¤¤¤£¤¹³\¨Ï¥Î³o­Ó«ü¥O¡C\n" -#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672 +#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 msgid "You must select at least one user ID.\n" msgstr "©p¦Ü¤Ö±o¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n" -#: g10/keyedit.c:1551 +#: g10/keyedit.c:1552 msgid "You can't delete the last user ID!\n" msgstr "©p¤£¯à§R°£³Ì«á¤@­Ó¨Ï¥ÎªÌ ID ¡I\n" -#: g10/keyedit.c:1553 +#: g10/keyedit.c:1554 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "¯uªº­n²¾°£©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1555 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "¯uªº­n²¾°£³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1604 +#: g10/keyedit.c:1605 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "¯uªº­n²¾°£³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1616 +#: g10/keyedit.c:1617 #, fuzzy msgid "You must select exactly one key.\n" msgstr "©p¦Ü¤Ö¥²¶·¿ï¾Ü¤@§âª÷Æ_¡C\n" -#: g10/keyedit.c:1636 g10/keyedit.c:1691 +#: g10/keyedit.c:1637 g10/keyedit.c:1692 msgid "You must select at least one key.\n" msgstr "©p¦Ü¤Ö¥²¶·¿ï¾Ü¤@§âª÷Æ_¡C\n" -#: g10/keyedit.c:1639 +#: g10/keyedit.c:1640 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "©p¯uªº·Q­n§R°£³Q¿ï¾Üªºª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1641 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "©p¯uªº­n§R°£³o§âª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1676 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "¯uªº­nºM¾P©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1677 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "¯uªº­nºM¾P³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1696 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "©p¯uªº·Q­nºM¾P³o¨Ç³Q¿ï¾Üªºª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1697 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "©p¯uªº·Q­nºM¾P³o§âª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1735 +#: g10/keyedit.c:1736 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1768 #, fuzzy msgid "Set preference list to:\n" msgstr "³]©w°¾¦n²M³æ" -#: g10/keyedit.c:1773 +#: g10/keyedit.c:1774 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "¯uªº­n§ó·s³Q¿ï¾Ü¨Ï¥ÎªÌ ID ªº°¾¦n¶Ü¡H " -#: g10/keyedit.c:1775 +#: g10/keyedit.c:1776 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "¯uªº­n§ó·s°¾¦n¶Ü¡H " -#: g10/keyedit.c:1825 +#: g10/keyedit.c:1826 #, fuzzy msgid "Save changes? (y/N) " msgstr "­nÀx¦sÅܧó¶Ü¡H " -#: g10/keyedit.c:1828 +#: g10/keyedit.c:1829 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "­n¤£Àx¦s¦ÓÂ÷¶}¶Ü¡H " -#: g10/keyedit.c:1838 +#: g10/keyedit.c:1839 #, c-format msgid "update failed: %s\n" msgstr "§ó·s¥¢±Ñ¡G %s\n" -#: g10/keyedit.c:1845 +#: g10/keyedit.c:1846 #, c-format msgid "update secret failed: %s\n" msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n" -#: g10/keyedit.c:1852 +#: g10/keyedit.c:1853 msgid "Key not changed so no update needed.\n" msgstr "ª÷Æ_¨S¦³Åܧó©Ò¥H¤£»Ý­n§ó·s¡C\n" -#: g10/keyedit.c:1924 +#: g10/keyedit.c:1925 msgid "Digest: " msgstr "ºK­n¡G " -#: g10/keyedit.c:1976 +#: g10/keyedit.c:1977 msgid "Features: " msgstr "¯SÂI¡G " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:1988 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2002 g10/keylist.c:244 +#: g10/keyedit.c:2003 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2245 +#: g10/keyedit.c:2246 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "³o§âª÷Æ_¥i¯à³Q %s ª÷Æ_ºM¾P¤F " -#: g10/keyedit.c:2251 +#: g10/keyedit.c:2252 #, fuzzy msgid "(sensitive)" msgstr " ¡]¾÷±Kªº¡^" -#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450 +#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "µLªk«Ø¥ß %s: %s\n" -#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[¤wºM¾P]" -#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452 +#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keyedit.c:2276 +#: g10/keyedit.c:2277 #, fuzzy, c-format msgid "usage: %s" msgstr " «H¥ô¡G %c/%c" -#: g10/keyedit.c:2291 +#: g10/keyedit.c:2292 #, fuzzy, c-format msgid "trust: %s" msgstr " «H¥ô¡G %c/%c" -#: g10/keyedit.c:2295 +#: g10/keyedit.c:2296 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2302 +#: g10/keyedit.c:2303 msgid "This key has been disabled" msgstr "³o§âª÷Æ_¤w¸g³Q¸T¥Î¤F" -#: g10/keyedit.c:2330 +#: g10/keyedit.c:2331 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2397 +#: g10/keyedit.c:2398 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x «¬ºAªº¨Ï¥ÎªÌ ID ¨S¦³°¾¦n¡C\n" -#: g10/keyedit.c:2405 +#: g10/keyedit.c:2406 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3328,25 +3096,25 @@ "½Ðª`·NÅã¥Ü¥X¨Óªºª÷Æ_¦³®Ä©Ê¤£»Ý­n§ó¥¿¡A\n" "°£«D©p­«·s°õ¦æµ{¦¡¡C\n" -#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1162 +#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1163 #, fuzzy msgid "revoked" msgstr "[¤wºM¾P]" -#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:529 +#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:530 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2536 +#: g10/keyedit.c:2537 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2596 +#: g10/keyedit.c:2597 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3355,45 +3123,45 @@ "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[·Ó¤ù ID ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2601 g10/keyedit.c:2879 +#: g10/keyedit.c:2602 g10/keyedit.c:2880 msgid "Are you sure you still want to add it? (y/N) " msgstr "©p½T©w¤´µM·Q­n¼W¥[¶Ü¡H (y/N) " -#: g10/keyedit.c:2607 +#: g10/keyedit.c:2608 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "©p¤£¥i¥H§â·Ó¤ù ID ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2747 +#: g10/keyedit.c:2748 msgid "Delete this good signature? (y/N/q)" msgstr "§R°£³o­Ó§¹¦nªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2757 +#: g10/keyedit.c:2758 msgid "Delete this invalid signature? (y/N/q)" msgstr "§R°£³o­ÓµL®ÄªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2761 +#: g10/keyedit.c:2762 msgid "Delete this unknown signature? (y/N/q)" msgstr "§R°£³o­Ó¥¼ª¾ªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2767 +#: g10/keyedit.c:2768 msgid "Really delete this self-signature? (y/N)" msgstr "¯uªº­n§R°£³o­Ó¦Û§Úñ³¹¶Ü¡H (y/N)" -#: g10/keyedit.c:2781 +#: g10/keyedit.c:2782 #, c-format msgid "Deleted %d signature.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2783 #, c-format msgid "Deleted %d signatures.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2785 +#: g10/keyedit.c:2786 msgid "Nothing deleted.\n" msgstr "¨S¦³ªF¦è³Q§R°£¡C\n" -#: g10/keyedit.c:2874 +#: g10/keyedit.c:2875 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3402,159 +3170,159 @@ "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[«ü©wºM¾PªÌ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2885 +#: g10/keyedit.c:2886 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "©p¤£¥i¥H§â«ü©wºM¾PªÌ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2905 +#: g10/keyedit.c:2906 msgid "Enter the user ID of the designated revoker: " msgstr "¿é¤J«ü©wºM¾PªÌªº¨Ï¥ÎªÌ ID ¡G " -#: g10/keyedit.c:2928 +#: g10/keyedit.c:2929 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n" -#: g10/keyedit.c:2943 +#: g10/keyedit.c:2944 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "©p¤£¯à«ü¬£¬Y§âª÷Æ_¬°¥¦¦Û¤vªº«ü©wºM¾PªÌ\n" -#: g10/keyedit.c:2965 +#: g10/keyedit.c:2966 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "ĵ§i¡G³o§âª÷Æ_¤w¸g³Q¥¦ªº«ù¦³¤HºM¾P¤F¡I\n" -#: g10/keyedit.c:2984 +#: g10/keyedit.c:2985 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "ĵ§i¡G¤@¥¹§â¬Y§âª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ«á¡A´NµLªk¤Ï®¬¤F¡I\n" -#: g10/keyedit.c:2990 +#: g10/keyedit.c:2991 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "©p½T©w­n«ü¬£³o§âª÷Æ_¬°«ü©wºM¾PªÌ¶Ü¡H (y/N): " -#: g10/keyedit.c:3051 +#: g10/keyedit.c:3052 msgid "Please remove selections from the secret keys.\n" msgstr "½Ð±q¨pÆ_¤¤²¾°£¿ï¾Ü¡C\n" -#: g10/keyedit.c:3057 +#: g10/keyedit.c:3058 msgid "Please select at most one secondary key.\n" msgstr "½Ð¦Ü¦h¿ï¾Ü¤@§â¦¸Æ_¡C\n" -#: g10/keyedit.c:3061 +#: g10/keyedit.c:3062 msgid "Changing expiration time for a secondary key.\n" msgstr "¥¿¦bÅܧó¬Y§â¦¸Æ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:3064 +#: g10/keyedit.c:3065 msgid "Changing expiration time for the primary key.\n" msgstr "¥¿¦bÅܧó¥DÆ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:3110 +#: g10/keyedit.c:3111 msgid "You can't change the expiration date of a v3 key\n" msgstr "©p¤£¯àÅܧó v3 ª÷Æ_ªº¨Ï¥Î´Á­­\n" -#: g10/keyedit.c:3126 +#: g10/keyedit.c:3127 msgid "No corresponding signature in secret ring\n" msgstr "¦b¨pÆ_°é¸Ì¨S¦³¤@­PªºÃ±³¹\n" -#: g10/keyedit.c:3206 +#: g10/keyedit.c:3207 msgid "Please select exactly one user ID.\n" msgstr "½Ðºë½T¦a¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n" -#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474 +#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "¥¿¦b¨Ï¥ÎªÌ ID \"%s\" ¸õ¹L v3 ¦Û§Úñ³¹\n" -#: g10/keyedit.c:3416 +#: g10/keyedit.c:3417 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3495 +#: g10/keyedit.c:3496 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3497 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3559 #, c-format msgid "No user ID with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/keyedit.c:3604 +#: g10/keyedit.c:3605 #, c-format msgid "No secondary key with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¦¸Æ_\n" -#: g10/keyedit.c:3721 +#: g10/keyedit.c:3722 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "¨Ï¥ÎªÌ ID¡G \"" -#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831 +#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " ¥Ñ %08lX ñ¸p©ó %s%s%s\n" -#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833 +#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 msgid " (non-exportable)" msgstr " (¤£¥i¶×¥X)" -#: g10/keyedit.c:3730 +#: g10/keyedit.c:3731 #, c-format msgid "This signature expired on %s.\n" msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n" -#: g10/keyedit.c:3734 +#: g10/keyedit.c:3735 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "©p½T©w©p¤´µM·Q­nºM¾P¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3738 +#: g10/keyedit.c:3739 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "­n¬°³o¥÷ñ³¹«Ø¥ß¤@¥÷ºM¾P¾ÌÃҶܡH (y/N) " -#: g10/keyedit.c:3765 +#: g10/keyedit.c:3766 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "©p¤w¸gñ¸p¤F³o¨Ç¨Ï¥ÎªÌ ID¡G \n" -#: g10/keyedit.c:3791 +#: g10/keyedit.c:3792 #, fuzzy msgid " (non-revocable)" msgstr " (¤£¥i¶×¥X)" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3799 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " ¥Ñ %08lX ºM¾P©ó %s\n" -#: g10/keyedit.c:3820 +#: g10/keyedit.c:3821 msgid "You are about to revoke these signatures:\n" msgstr "©p¥¿¦bºM¾P³o¨Çñ³¹¡G\n" -#: g10/keyedit.c:3840 +#: g10/keyedit.c:3841 msgid "Really create the revocation certificates? (y/N) " msgstr "¯uªº­n«Ø¥ßºM¾P¾ÌÃҶܡH (y/N) " -#: g10/keyedit.c:3870 +#: g10/keyedit.c:3871 msgid "no secret key\n" msgstr "¨S¦³¨pÆ_\n" -#: g10/keyedit.c:3940 +#: g10/keyedit.c:3941 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C\n" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3958 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "ĵ§i¡G¦³¤@¥÷¨Ï¥ÎªÌ ID ñ³¹ªº¤é´Á¼Ð°O¬° %d ¬í«áªº¥¼¨Ó\n" -#: g10/keyedit.c:4126 +#: g10/keyedit.c:4127 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "¥¿¦bÅã¥Ü %s ¤Ø¤o¬° %ld ªºª÷Æ_ 0x%08lX (uid %d) ªº·Ó¤ù ID\n" @@ -3881,7 +3649,7 @@ "©p»Ý­n¤@­Ó±K½X¦ê¨Ó«OÅ@©pªº¨pÆ_¡C\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1099 +#: g10/keygen.c:1819 g10/passphrase.c:1102 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4138,7 +3906,7 @@ msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:662 g10/keyserver.c:1142 +#: g10/keyserver.c:662 g10/keyserver.c:1147 #, fuzzy, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" @@ -4153,106 +3921,106 @@ msgid "key not found on keyserver\n" msgstr "§ä¤£¨ì `%s' ª÷Æ_¡G %s\n" -#: g10/keyserver.c:896 +#: g10/keyserver.c:901 #, fuzzy, c-format msgid "requesting key %s from %s server %s\n" msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n" -#: g10/keyserver.c:900 +#: g10/keyserver.c:905 #, fuzzy, c-format msgid "requesting key %s from %s\n" msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n" -#: g10/keyserver.c:1045 +#: g10/keyserver.c:1050 #, fuzzy, c-format msgid "sending key %s to %s server %s\n" msgstr "¥¿¦b·j´M \"%s\" ©ó HKP ¦øªA¾¹ %s ¤W\n" -#: g10/keyserver.c:1049 +#: g10/keyserver.c:1054 #, fuzzy, c-format msgid "sending key %s to %s\n" msgstr "" "\"\n" "¤w¸g³Q©pªºª÷Æ_ %08lX ñ¸p©ó %s\n" -#: g10/keyserver.c:1092 +#: g10/keyserver.c:1097 #, fuzzy, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "¥¿¦b·j´M \"%s\" ©ó HKP ¦øªA¾¹ %s ¤W\n" -#: g10/keyserver.c:1095 +#: g10/keyserver.c:1100 #, fuzzy, c-format msgid "searching for \"%s\" from %s\n" msgstr "¥¿¦b·j´M \"%s\" ©ó HKP ¦øªA¾¹ %s ¤W\n" -#: g10/keyserver.c:1102 g10/keyserver.c:1197 +#: g10/keyserver.c:1107 g10/keyserver.c:1202 #, fuzzy msgid "no keyserver action!\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/keyserver.c:1150 +#: g10/keyserver.c:1155 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1159 +#: g10/keyserver.c:1164 msgid "keyserver did not send VERSION\n" msgstr "" -#: g10/keyserver.c:1218 +#: g10/keyserver.c:1223 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1224 +#: g10/keyserver.c:1229 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1236 +#: g10/keyserver.c:1241 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1246 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1249 +#: g10/keyserver.c:1254 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1261 #, fuzzy msgid "keyserver timed out\n" msgstr "ª÷Æ_¦øªA¾¹¿ù»~" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1266 #, fuzzy msgid "keyserver internal error\n" msgstr "ª÷Æ_¦øªA¾¹¿ù»~" -#: g10/keyserver.c:1268 +#: g10/keyserver.c:1275 #, fuzzy, c-format msgid "keyserver communications error: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/keyserver.c:1293 g10/keyserver.c:1327 +#: g10/keyserver.c:1300 g10/keyserver.c:1334 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1578 +#: g10/keyserver.c:1585 #, fuzzy, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "ĵ§i¡GµLªk²¾°£¼È¦sÀÉ (%s) `%s': %s\n" -#: g10/keyserver.c:1600 +#: g10/keyserver.c:1607 #, fuzzy, c-format msgid "refreshing 1 key from %s\n" msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n" -#: g10/keyserver.c:1602 +#: g10/keyserver.c:1609 #, fuzzy, c-format msgid "refreshing %d keys from %s\n" msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n" @@ -4431,7 +4199,7 @@ msgid "textmode" msgstr "¤å¦r¼Ò¦¡" -#: g10/mainproc.c:1672 g10/trustdb.c:528 +#: g10/mainproc.c:1672 g10/trustdb.c:529 msgid "unknown" msgstr "¥¼ª¾" @@ -4603,50 +4371,50 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "%d Ãþ§Oªº¤l«Ê¥]³]©w¤FÃöÁä¦ì¤¸\n" -#: g10/passphrase.c:475 g10/passphrase.c:522 +#: g10/passphrase.c:478 g10/passphrase.c:525 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent ¦b¦¹¶¥¬qµLªk¨Ï¥Î\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:486 msgid "can't set client pid for the agent\n" msgstr "µLªk³]©w¥N²zµ{¦¡¤¤ªº¨Ï¥ÎªÌºÝ pid\n" -#: g10/passphrase.c:491 +#: g10/passphrase.c:494 msgid "can't get server read FD for the agent\n" msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹Åª¨úÀÉ®×´y­z\n" -#: g10/passphrase.c:498 +#: g10/passphrase.c:501 msgid "can't get server write FD for the agent\n" msgstr "µLªk¨ú±o¥N²zµ{¦¡©Ò»Ýªº¦øªA¾¹¼g¤JÀÉ®×´y­z\n" -#: g10/passphrase.c:531 +#: g10/passphrase.c:534 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "³QÅܳyªº GPG_AGENT_INFO Àô¹ÒÅܼÆ\n" -#: g10/passphrase.c:544 +#: g10/passphrase.c:547 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent ¨ó©wª©¥» %d ¥¼³Q¤ä´©\n" -#: g10/passphrase.c:565 +#: g10/passphrase.c:568 #, c-format msgid "can't connect to `%s': %s\n" msgstr "µLªk³s±µ¦Ü `%s' ¡G %s\n" -#: g10/passphrase.c:587 +#: g10/passphrase.c:590 msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ªº³q°T°ÝÃD\n" -#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042 +#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 msgid "problem with the agent - disabling agent use\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD ¢w ¥¿¦b°±¥Î¥N²zµ{¦¡\n" -#: g10/passphrase.c:698 g10/passphrase.c:1203 +#: g10/passphrase.c:701 g10/passphrase.c:1206 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (¥D­nª÷Æ_ ID %08lX)" -#: g10/passphrase.c:712 +#: g10/passphrase.c:715 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4657,41 +4425,41 @@ "\"%.*s\"\n" "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s%s\n" -#: g10/passphrase.c:737 +#: g10/passphrase.c:740 msgid "Repeat passphrase\n" msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:742 msgid "Enter passphrase\n" msgstr "½Ð¿é¤J±K½X¦ê\n" -#: g10/passphrase.c:777 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "±K½X¦ê¤Óªø\n" -#: g10/passphrase.c:790 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "¥N²zµ{¦¡¶Ç¦^µL®Äªº¦^À³\n" -#: g10/passphrase.c:805 g10/passphrase.c:924 +#: g10/passphrase.c:808 g10/passphrase.c:927 msgid "cancelled by user\n" msgstr "¥Ñ¨Ï¥ÎªÌ¨ú®ø¤F\n" -#: g10/passphrase.c:810 g10/passphrase.c:1013 +#: g10/passphrase.c:813 g10/passphrase.c:1016 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD¡G¥N²zµ{¦¡¶Ç¦^ 0x%lx\n" -#: g10/passphrase.c:1094 g10/passphrase.c:1256 +#: g10/passphrase.c:1097 g10/passphrase.c:1259 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "¦b§å¦¸¼Ò¦¡¤¤µLªk¸ß°Ý±K½X\n" -#: g10/passphrase.c:1101 g10/passphrase.c:1261 +#: g10/passphrase.c:1104 g10/passphrase.c:1264 msgid "Enter passphrase: " msgstr "½Ð¿é¤J±K½X¦ê¡G " -#: g10/passphrase.c:1184 +#: g10/passphrase.c:1187 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4701,17 +4469,17 @@ "©p»Ý­n¤U¦C¨Ï¥ÎªÌªº±K½X¦ê¡AÅׯà¸Ñ¶}¨pÆ_¡G\n" "\"" -#: g10/passphrase.c:1190 +#: g10/passphrase.c:1193 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s" -#: g10/passphrase.c:1199 +#: g10/passphrase.c:1202 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1265 +#: g10/passphrase.c:1268 msgid "Repeat passphrase: " msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê¡G " @@ -5565,12 +5333,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "«H¥ô¸ê®Æ®w·l·´¤F¡F½Ð°õ¦æ \"gpg --fix-trustdb\" ¡C\n" -#: g10/textfilter.c:143 +#: g10/textfilter.c:142 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "µLªk³B²zªø©ó %d ¦r²Åªº¤å¦r¦C\n" -#: g10/textfilter.c:240 +#: g10/textfilter.c:239 #, c-format msgid "input line longer than %d characters\n" msgstr "¿é¤J¦C¤ñ %d ¦r²ÅÁÙªø\n" @@ -5629,7 +5397,7 @@ msgid "[ revoked]" msgstr "[¤wºM¾P]" -#: g10/trustdb.c:507 +#: g10/trustdb.c:507 g10/trustdb.c:512 #, fuzzy msgid "[ expired]" msgstr "[¤w¹L´Á]" @@ -5639,101 +5407,101 @@ msgid "[ unknown]" msgstr "¥¼ª¾" -#: g10/trustdb.c:512 +#: g10/trustdb.c:513 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:530 +#: g10/trustdb.c:531 msgid "undefined" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 #, fuzzy msgid "never" msgstr "¥Ã»·¤£¹L´Á" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "marginal" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "full" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "ultimate" msgstr "" -#: g10/trustdb.c:574 +#: g10/trustdb.c:575 msgid "no need for a trustdb check\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:580 g10/trustdb.c:2141 +#: g10/trustdb.c:581 g10/trustdb.c:2142 #, c-format msgid "next trustdb check due at %s\n" msgstr "¤U¦¸«H¥ô¸ê®Æ®wÀˬd±N©ó %s ¶i¦æ\n" -#: g10/trustdb.c:589 +#: g10/trustdb.c:590 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:604 +#: g10/trustdb.c:605 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:822 g10/trustdb.c:1260 +#: g10/trustdb.c:823 g10/trustdb.c:1261 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "¤½Æ_ %08lX ¨S¦³³Q§ä¨ì¡G %s\n" -#: g10/trustdb.c:1017 +#: g10/trustdb.c:1018 msgid "please do a --check-trustdb\n" msgstr "½Ð°µ¤@¦¸ --check-trustdb\n" -#: g10/trustdb.c:1021 +#: g10/trustdb.c:1022 msgid "checking the trustdb\n" msgstr "¥¿¦bÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:1885 +#: g10/trustdb.c:1886 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "¤w¸g³B²z¤F %d §âª÷Æ_¡]¦@­p¤w¸Ñ¨M¤F %d ¥÷¦³®Ä©Ê¡^\n" -#: g10/trustdb.c:1949 +#: g10/trustdb.c:1950 msgid "no ultimately trusted keys found\n" msgstr "¨S¦³§ä¨ì¥ô¦ó¹ý©³«H¥ôªºª÷Æ_\n" -#: g10/trustdb.c:1963 +#: g10/trustdb.c:1964 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "¹ý©³«H¥ôª÷Æ_ %08lX ªº¤½Æ_¨S¦³³Q§ä¨ì\n" -#: g10/trustdb.c:1986 +#: g10/trustdb.c:1987 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2072 +#: g10/trustdb.c:2073 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2147 +#: g10/trustdb.c:2148 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "«H¥ô°O¿ý %lu ¡AÃþ§O %d: ¼g¤J¥¢±Ñ¡G %s\n" @@ -6006,6 +5774,10 @@ msgid "nN" msgstr "nN" +#: util/miscutil.c:348 +msgid "quit" +msgstr "quit" + #: util/miscutil.c:351 msgid "qQ" msgstr "qQ" @@ -6043,6 +5815,158 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(¤]³\©p¿ï¿ùµ{¦¡¨Ó°µ³o¥ó¨Æ¤F)\n" +#~ msgid "q" +#~ msgstr "q" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "l" +#~ msgstr "l" + +#~ msgid "debug" +#~ msgstr "debug" + +#, fuzzy +#~ msgid "name" +#~ msgstr "enable" + +#, fuzzy +#~ msgid "login" +#~ msgstr "lsign" + +#, fuzzy +#~ msgid "cafpr" +#~ msgstr "fpr" + +#, fuzzy +#~ msgid "forcesig" +#~ msgstr "revsig" + +#, fuzzy +#~ msgid "generate" +#~ msgstr "¤@¯ë©Ê¿ù»~" + +#~ msgid "passwd" +#~ msgstr "passwd" + +#~ msgid "save" +#~ msgstr "save" + +#~ msgid "fpr" +#~ msgstr "fpr" + +#~ msgid "uid" +#~ msgstr "uid" + +#~ msgid "key" +#~ msgstr "key" + +#~ msgid "check" +#~ msgstr "check" + +#~ msgid "c" +#~ msgstr "c" + +#~ msgid "sign" +#~ msgstr "sign" + +#~ msgid "s" +#~ msgstr "s" + +#, fuzzy +#~ msgid "tsign" +#~ msgstr "sign" + +#~ msgid "lsign" +#~ msgstr "lsign" + +#~ msgid "nrsign" +#~ msgstr "nrsign" + +#~ msgid "nrlsign" +#~ msgstr "nrlsign" + +#~ msgid "adduid" +#~ msgstr "adduid" + +#~ msgid "addphoto" +#~ msgstr "addphoto" + +#~ msgid "deluid" +#~ msgstr "deluid" + +#~ msgid "delphoto" +#~ msgstr "delphoto" + +#~ msgid "addkey" +#~ msgstr "addkey" + +#, fuzzy +#~ msgid "addcardkey" +#~ msgstr "addkey" + +#~ msgid "delkey" +#~ msgstr "delkey" + +#~ msgid "addrevoker" +#~ msgstr "addrevoker" + +#~ msgid "delsig" +#~ msgstr "delsig" + +#~ msgid "expire" +#~ msgstr "expire" + +#~ msgid "primary" +#~ msgstr "primary" + +#~ msgid "toggle" +#~ msgstr "toggle" + +#~ msgid "t" +#~ msgstr "t" + +#~ msgid "pref" +#~ msgstr "pref" + +#~ msgid "showpref" +#~ msgstr "showpref" + +#~ msgid "setpref" +#~ msgstr "setpref" + +#~ msgid "updpref" +#~ msgstr "updpref" + +#, fuzzy +#~ msgid "keyserver" +#~ msgstr "ª÷Æ_¦øªA¾¹¿ù»~" + +#~ msgid "trust" +#~ msgstr "trust" + +#~ msgid "revsig" +#~ msgstr "revsig" + +#~ msgid "revuid" +#~ msgstr "revuid" + +#~ msgid "revkey" +#~ msgstr "revkey" + +#~ msgid "disable" +#~ msgstr "disable" + +#~ msgid "enable" +#~ msgstr "enable" + +#~ msgid "showphoto" +#~ msgstr "showphoto" + #~ msgid "digest algorithm `%s' is read-only in this release\n" #~ msgstr "`%s' ºK­nºtºâªk¦b³o¦¸ÄÀ¥Xªºª©¥»¤¤°ßŪ\n" Index: gnupg/scripts/depcomp diff -u gnupg/scripts/depcomp:1.2 gnupg/scripts/depcomp:1.3 --- gnupg/scripts/depcomp:1.2 Fri Oct 1 12:11:26 2004 +++ gnupg/scripts/depcomp Tue Dec 14 08:49:27 2004 @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000, 2003 Free Software Foundation, Inc. + +scriptversion=2004-05-31.23 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,22 +27,45 @@ # Originally written by Alexandre Oliva . +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -262,26 +287,35 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else tmpdepfile1="$dir$base.o.d" tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" - else + elif test -f "$tmpdepfile2"; then tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" @@ -477,3 +511,12 @@ esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gnupg/scripts/install-sh diff -u gnupg/scripts/install-sh:1.4 gnupg/scripts/install-sh:1.5 --- gnupg/scripts/install-sh:1.4 Fri Oct 1 12:11:26 2004 +++ gnupg/scripts/install-sh Tue Dec 14 08:49:27 2004 @@ -1,7 +1,8 @@ #!/bin/sh -# # install - install a program, script, or datafile -# + +scriptversion=2004-10-22.00 + # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -41,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -59,236 +58,266 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' + -t) dstarg=$2 + shift + shift + continue;; -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 + -T) no_target_directory=true shift + continue;; - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi + --version) echo "$0 $scriptversion"; exit 0;; - pathcomp=$pathcomp/ + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac -fi && + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } +done # The final little trick to "correctly" pass the exit status to the exit trap. - { - (exit 0); exit + (exit 0); exit } + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gnupg/scripts/missing diff -u gnupg/scripts/missing:1.3 gnupg/scripts/missing:1.4 --- gnupg/scripts/missing:1.3 Fri Oct 1 12:11:26 2004 +++ gnupg/scripts/missing Tue Dec 14 08:49:27 2004 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + +scriptversion=2004-09-07.08 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -38,18 +42,24 @@ configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit 0 ;; -*) @@ -87,14 +101,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,14 +185,9 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. You can get \`$1' as part of \`Autoconf' from any GNU archive site." @@ -185,7 +209,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,13 +281,8 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -284,10 +298,6 @@ tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -323,8 +333,8 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case @@ -334,3 +344,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gnupg/scripts/mkinstalldirs diff -u gnupg/scripts/mkinstalldirs:1.6 gnupg/scripts/mkinstalldirs:1.7 --- gnupg/scripts/mkinstalldirs:1.6 Sat Oct 25 18:27:59 2003 +++ gnupg/scripts/mkinstalldirs Tue Dec 14 08:49:27 2004 @@ -1,20 +1,32 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2004-02-15.20 + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" 1>&2 + echo "$usage" exit 0 ;; -m) # -m PERM arg @@ -23,6 +35,10 @@ dirmode=$1 shift ;; + --version) + echo "$0 $scriptversion" + exit 0 + ;; --) # stop option processing shift break @@ -50,17 +66,37 @@ 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') - if mkdir -p -- . 2>/dev/null; then + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; esac @@ -84,17 +120,17 @@ mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi @@ -107,5 +143,8 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here From cvs at cvs.gnupg.org Wed Dec 15 15:10:48 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:56:30 2004 Subject: GNUPG-1-9-BRANCH gnupg (31 files) Message-ID: Date: Wednesday, December 15, 2004 @ 15:15:09 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: common/ttyname.c Modified: ChangeLog Makefile.am acinclude.m4 agent/ChangeLog agent/call-scd.c agent/gpg-agent.c agent/protect-tool.c common/ChangeLog common/asshelp.c common/exechelp.c common/iobuf.c common/simple-pwquery.c common/sysutils.h common/util.h common/w32reg.c configure.ac g10/call-agent.c jnlib/ChangeLog jnlib/logging.c m4/ksba.m4 scd/ChangeLog scd/Makefile.am scd/apdu.c scd/command.c scd/scdaemon.c sm/Makefile.am sm/gpgsm.c tools/ChangeLog tools/Makefile.am tools/gpgconf-comp.c A whole bunch of changes to allow building for W32. -------------------------+ ChangeLog | 10 + Makefile.am | 8 + acinclude.m4 | 22 +-- agent/ChangeLog | 13 ++ agent/call-scd.c | 2 agent/gpg-agent.c | 16 +- agent/protect-tool.c | 20 ++- common/ChangeLog | 15 ++ common/asshelp.c | 119 +++++++++---------- common/exechelp.c | 276 ++++++++++++++++++++++++++++++++++++++++++++-- common/iobuf.c | 4 common/simple-pwquery.c | 6 - common/sysutils.h | 7 + common/ttyname.c | 32 +++++ common/util.h | 4 common/w32reg.c | 5 configure.ac | 30 ----- g10/call-agent.c | 2 jnlib/ChangeLog | 4 jnlib/logging.c | 7 - m4/ksba.m4 | 2 scd/ChangeLog | 11 + scd/Makefile.am | 14 +- scd/apdu.c | 9 + scd/command.c | 5 scd/scdaemon.c | 40 ++++++ sm/Makefile.am | 8 - sm/gpgsm.c | 15 ++ tools/ChangeLog | 10 + tools/Makefile.am | 5 tools/gpgconf-comp.c | 18 +++ 31 files changed, 580 insertions(+), 159 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.131.2.60 gnupg/ChangeLog:1.131.2.61 --- gnupg/ChangeLog:1.131.2.60 Mon Dec 6 14:49:14 2004 +++ gnupg/ChangeLog Wed Dec 15 15:15:09 2004 @@ -1,3 +1,13 @@ +2004-12-15 Werner Koch + + * Makefile.am (SUBDIRS) [W32]: Do not build in tests/. + + * acinclude.m4: Add proper macro name quoting for use with + automake 1.9. + + * configure.ac: Add replacement check for ttyname. + Removed support for a included zlib. + 2004-12-06 Werner Koch * configure.ac (have_w32_system): New. Disable Pth checks for W32. Index: gnupg/Makefile.am diff -u gnupg/Makefile.am:1.46.4.11 gnupg/Makefile.am:1.46.4.12 --- gnupg/Makefile.am:1.46.4.11 Fri Oct 22 18:03:04 2004 +++ gnupg/Makefile.am Wed Dec 15 15:15:09 2004 @@ -53,8 +53,14 @@ scd = endif +if HAVE_W32_SYSTEM +tests = +else +tests = tests +endif + SUBDIRS = m4 intl jnlib common ${kbx} \ - ${gpg} ${sm} ${agent} ${scd} tools po doc tests + ${gpg} ${sm} ${agent} ${scd} tools po doc ${tests} dist-hook: @set -e; \ Index: gnupg/acinclude.m4 diff -u gnupg/acinclude.m4:1.34.4.6 gnupg/acinclude.m4:1.34.4.7 --- gnupg/acinclude.m4:1.34.4.6 Wed Feb 18 19:38:50 2004 +++ gnupg/acinclude.m4 Wed Dec 15 15:15:09 2004 @@ -20,7 +20,7 @@ dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME) dnl Check whether a typedef exists and create a #define $2 if it exists dnl -AC_DEFUN(GNUPG_CHECK_TYPEDEF, +AC_DEFUN([GNUPG_CHECK_TYPEDEF], [ AC_MSG_CHECKING(for $1 typedef) AC_CACHE_VAL(gnupg_cv_typedef_$1, [AC_TRY_COMPILE([#define _GNU_SOURCE 1 @@ -38,7 +38,7 @@ dnl GNUPG_CHECK_GNUMAKE dnl -AC_DEFUN(GNUPG_CHECK_GNUMAKE, +AC_DEFUN([GNUPG_CHECK_GNUMAKE], [ if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then : @@ -55,7 +55,7 @@ dnl GNUPG_CHECK_FAQPROG dnl -AC_DEFUN(GNUPG_CHECK_FAQPROG, +AC_DEFUN([GNUPG_CHECK_FAQPROG], [ AC_MSG_CHECKING(for faqprog.pl) if faqprog.pl -V 2>/dev/null | grep '^faqprog.pl ' >/dev/null 2>&1; then working_faqprog=yes @@ -82,7 +82,7 @@ dnl GNUPG_CHECK_DOCBOOK_TO_TEXI dnl -AC_DEFUN(GNUPG_CHECK_DOCBOOK_TO_TEXI, +AC_DEFUN([GNUPG_CHECK_DOCBOOK_TO_TEXI], [ AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no) AC_MSG_CHECKING(for sgml to texi tools) @@ -101,7 +101,7 @@ dnl GNUPG_CHECK_ENDIAN dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST dnl -define(GNUPG_CHECK_ENDIAN, +AC_DEFUN([GNUPG_CHECK_ENDIAN], [ tmp_assumed_endian=big if test "$cross_compiling" = yes; then @@ -158,7 +158,7 @@ # Check for the getsockopt SO_PEERCRED -AC_DEFUN(GNUPG_SYS_SO_PEERCRED, +AC_DEFUN([GNUPG_SYS_SO_PEERCRED], [ AC_MSG_CHECKING(for SO_PEERCRED) AC_CACHE_VAL(gnupg_cv_sys_so_peercred, [AC_TRY_COMPILE([#include ], @@ -183,7 +183,7 @@ # either be "yes" or "no" and decided on the default value for # build_NAME and whether --enable-NAME or --disable-NAME is shown with # ./configure --help -AC_DEFUN(GNUPG_BUILD_PROGRAM, +AC_DEFUN([GNUPG_BUILD_PROGRAM], [build_$1=$2 m4_if([$2],[yes],[ AC_ARG_ENABLE([$1], AC_HELP_STRING([--disable-$1], @@ -210,7 +210,7 @@ # If the version is sufficient, HAVE_PTH will be set to yes. # # Taken form the m4 macros which come with Pth -AC_DEFUN(GNUPG_PTH_VERSION_CHECK, +AC_DEFUN([GNUPG_PTH_VERSION_CHECK], [ _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'` _req_version="ifelse([$1],,1.2.0,$1)" @@ -253,7 +253,7 @@ # mlock is there a macro using memlk() dnl GNUPG_CHECK_MLOCK dnl -define(GNUPG_CHECK_MLOCK, +AC_DEFUN([GNUPG_CHECK_MLOCK], [ AC_CHECK_FUNCS(mlock) if test "$ac_cv_func_mlock" = "no"; then AC_CHECK_HEADERS(sys/mman.h) @@ -343,7 +343,7 @@ dnl Stolen from gcc dnl Define MKDIR_TAKES_ONE_ARG if mkdir accepts only one argument instead dnl of the usual 2. -AC_DEFUN(GNUPG_FUNC_MKDIR_TAKES_ONE_ARG, +AC_DEFUN([GNUPG_FUNC_MKDIR_TAKES_ONE_ARG], [AC_CHECK_HEADERS(sys/stat.h unistd.h direct.h) AC_CACHE_CHECK([if mkdir takes one argument], gnupg_cv_mkdir_takes_one_arg, [AC_TRY_COMPILE([ @@ -371,7 +371,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for OpenSC and define OPENSC_CFLAGS and OPENSC_LIBS dnl -AC_DEFUN(AM_PATH_OPENSC, +AC_DEFUN([AM_PATH_OPENSC], [ AC_ARG_WITH(opensc-prefix, AC_HELP_STRING([--with-opensc-prefix=PFX], [prefix where OpenSC is installed (optional)]), Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.44 gnupg/agent/ChangeLog:1.59.2.45 --- gnupg/agent/ChangeLog:1.59.2.44 Sun Dec 5 16:36:49 2004 +++ gnupg/agent/ChangeLog Wed Dec 15 15:15:09 2004 @@ -1,3 +1,16 @@ +2004-12-15 Werner Koch + + * gpg-agent.c [W32]: Various hacks to make it work. + + * findkey.c (agent_write_private_key) [W32]: Adjust open call. + + * call-scd.c (start_scd) [W32]: Don't check whether the daemon + didn't died. To hard to do under Windows. + (start_scd) [W32]: Disable sending of the event signal option. + + * protect-tool.c (read_file, export_p12_file) [W32]: Use setmode + to get stdout and stin into binary mode. + 2004-12-05 Moritz Schulte * query.c (start_pinentry): Allow CTRL be NULL. Index: gnupg/agent/call-scd.c diff -u gnupg/agent/call-scd.c:1.13.2.5 gnupg/agent/call-scd.c:1.13.2.6 --- gnupg/agent/call-scd.c:1.13.2.5 Mon Dec 13 16:49:56 2004 +++ gnupg/agent/call-scd.c Wed Dec 15 15:15:09 2004 @@ -215,7 +215,7 @@ /* We better do a sanity check now to see whether it has accidently died. */ -#ifndef HAVE_W32_SYSTEM /* fixme */ +#ifndef HAVE_W32_SYSTEM pid = assuan_get_pid (scd_ctx); if (pid != (pid_t)(-1) && pid && ((rc=waitpid (pid, NULL, WNOHANG))==-1 || (rc == pid)) ) Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.23 gnupg/agent/gpg-agent.c:1.31.2.24 --- gnupg/agent/gpg-agent.c:1.31.2.23 Tue Dec 14 20:20:36 2004 +++ gnupg/agent/gpg-agent.c Wed Dec 15 15:15:09 2004 @@ -33,7 +33,7 @@ #ifndef HAVE_W32_SYSTEM #include #include -#endif +#endif /*HAVE_W32_SYSTEM*/ #include #include #ifdef USE_GNU_PTH @@ -438,17 +438,18 @@ /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ -#if defined(USE_GNU_PTH) && !defined(HAVE_W32_SYSTEM) +#ifdef USE_GNU_PTH +# ifdef HAVE_W32_SYSTEM + pth_init (); +# else /*!HAVE_W32_SYSTEM*/ err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } -#endif /*USE_GNU_PTH && !HAVE_W32_SYSTEM*/ -#ifdef HAVE_W32_SYSTEM - pth_init (); -#endif +# endif/*!HAVE_W32_SYSTEM*/ +#endif /*USE_GNU_PTH*/ /* Check that the libraries are suitable. Do it here because the option parsing may need services of the library. */ @@ -716,12 +717,11 @@ } /* Make sure that we have a default ttyname. */ -#ifndef HAVE_W32_SYSTEM if (!default_ttyname && ttyname (1)) default_ttyname = xstrdup (ttyname (1)); if (!default_ttytype && getenv ("TERM")) default_ttytype = xstrdup (getenv ("TERM")); -#endif + if (pipe_server) { /* this is the simple pipe based server */ Index: gnupg/agent/protect-tool.c diff -u gnupg/agent/protect-tool.c:1.15.2.10 gnupg/agent/protect-tool.c:1.15.2.11 --- gnupg/agent/protect-tool.c:1.15.2.10 Wed Sep 29 15:50:31 2004 +++ gnupg/agent/protect-tool.c Wed Dec 15 15:15:09 2004 @@ -35,6 +35,9 @@ #ifdef HAVE_LANGINFO_CODESET #include #endif +#ifdef HAVE_DOSISH_SYSTEM +#include /* for setmode() */ +#endif #define JNLIB_NEED_LOG_LOGV #include "agent.h" @@ -262,6 +265,9 @@ size_t nread, bufsize = 0; fp = stdin; +#ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno(fp) , O_BINARY ); +#endif buf = NULL; buflen = 0; #define NCHUNK 8192 @@ -975,6 +981,9 @@ if (!key) return; +#ifdef HAVE_DOSISH_SYSTEM + setmode ( fileno (stdout) , O_BINARY ); +#endif fwrite (key, keylen, 1, stdout); xfree (key); } @@ -1056,12 +1065,12 @@ gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0); -#ifdef __MINGW32__ +#ifdef HAVE_W32_SYSTEM opt_homedir = read_w32_registry_string ( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); -#else +#else /*!HAVE_W32_SYSTEM*/ opt_homedir = getenv ("GNUPGHOME"); -#endif +#endif /*!HAVE_W32_SYSTEM*/ if (!opt_homedir || !*opt_homedir) opt_homedir = GNUPG_DEFAULT_HOMEDIR; @@ -1213,9 +1222,10 @@ if (!pw) { if (err) - log_error ("error while asking for the passphrase\n"); + log_error (_("error while asking for the passphrase: %s\n"), + gpg_strerror (err)); else - log_info ("cancelled\n"); + log_info (_("cancelled\n")); agent_exit (0); } Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.33 gnupg/common/ChangeLog:1.30.2.34 --- gnupg/common/ChangeLog:1.30.2.33 Tue Dec 7 12:21:40 2004 +++ gnupg/common/ChangeLog Wed Dec 15 15:15:09 2004 @@ -1,3 +1,18 @@ +2004-12-15 Werner Koch + + * sysutils.h [W32]: Prototypes for registry functions. + * w32reg.c: Include sysutils.h + + * simple-pwquery.c [W32]: Dummy code to allow a build. + + * exechelp.c [W32]: Implemented for W32 . + + * ttyname.c: New. + + * asshelp.c (send_one_option): New. + (send_pinentry_environment): Cleaned up and made sure that empty + values are not send. + 2004-12-07 Werner Koch * asshelp.c (send_pinentry_environment) [W32]: Do not use ttyname. Index: gnupg/common/asshelp.c diff -u gnupg/common/asshelp.c:1.1.2.2 gnupg/common/asshelp.c:1.1.2.3 --- gnupg/common/asshelp.c:1.1.2.2 Tue Dec 7 12:21:40 2004 +++ gnupg/common/asshelp.c Wed Dec 15 15:15:09 2004 @@ -32,8 +32,32 @@ #include "asshelp.h" -/* Send the assuan command pertaining to the pinenry environment. The - OPT_* arguments are optional and may be used to overide the + +static gpg_error_t +send_one_option (assuan_context_t ctx, const char *name, const char *value) +{ + gpg_error_t err; + char *optstr; + + if (!value || !*value) + err = 0; /* Avoid sending empty strings. */ + else if (asprintf (&optstr, "OPTION %s=%s", name, value ) < 0) + err = gpg_error_from_errno (errno); + else + { + assuan_error_t ae; + + ae = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); + err = ae? map_assuan_err (ae) : 0; + free (optstr); + } + + return err; +} + + +/* Send the assuan commands pertaining to the pinenry environment. The + OPT_* arguments are optional and may be used to override the defaults taken from the current locale. */ gpg_error_t send_pinentry_environment (assuan_context_t ctx, @@ -43,62 +67,49 @@ const char *opt_lc_ctype, const char *opt_lc_messages) { - int rc = 0; + gpg_error_t err = 0; char *dft_display = NULL; char *dft_ttyname = NULL; char *dft_ttytype = NULL; char *old_lc = NULL; char *dft_lc = NULL; + /* Send the DISPLAY variable. */ dft_display = getenv ("DISPLAY"); if (opt_display || dft_display) { - char *optstr; - if (asprintf (&optstr, "OPTION display=%s", - opt_display ? opt_display : dft_display) < 0) - return gpg_error_from_errno (errno); - rc = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, - NULL); - free (optstr); - if (rc) - return map_assuan_err (rc); + err = send_one_option (ctx, "display", + opt_display ? opt_display : dft_display); + if (err) + return err; } + + /* Send the name of the TTY. */ if (!opt_ttyname) { dft_ttyname = getenv ("GPG_TTY"); -#ifdef HAVE_DOSISH_SYSTEM - if (!dft_ttyname || !*dft_ttyname ) - dft_ttyname = "/dev/tty"; /* Use a fake. */ -#else if ((!dft_ttyname || !*dft_ttyname) && ttyname (0)) dft_ttyname = ttyname (0); -#endif } if (opt_ttyname || dft_ttyname) { - char *optstr; - if (asprintf (&optstr, "OPTION ttyname=%s", - opt_ttyname ? opt_ttyname : dft_ttyname) < 0) - return gpg_error_from_errno (errno); - rc = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, - NULL); - free (optstr); - if (rc) - return map_assuan_err (rc); + err = send_one_option (ctx, "ttyname", + opt_ttyname ? opt_ttyname : dft_ttyname); + if (err) + return err; } + + /* Send the type of the TTY. */ dft_ttytype = getenv ("TERM"); if (opt_ttytype || (dft_ttyname && dft_ttytype)) { - char *optstr; - if (asprintf (&optstr, "OPTION ttytype=%s", - opt_ttyname ? opt_ttytype : dft_ttytype) < 0) - return gpg_error_from_errno (errno); - rc = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, - NULL); - free (optstr); - if (rc) - return map_assuan_err (rc); + err = send_one_option (ctx, "ttytype", + opt_ttyname ? opt_ttytype : dft_ttytype); + if (err) + return err; } + + /* Send the value for LC_CTYPE. */ #if defined(HAVE_SETLOCALE) && defined(LC_CTYPE) old_lc = setlocale (LC_CTYPE, NULL); if (old_lc) @@ -111,18 +122,8 @@ #endif if (opt_lc_ctype || (dft_ttyname && dft_lc)) { - char *optstr; - if (asprintf (&optstr, "OPTION lc-ctype=%s", - opt_lc_ctype ? opt_lc_ctype : dft_lc) < 0) - rc = gpg_error_from_errno (errno); - else - { - rc = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, - NULL); - free (optstr); - if (rc) - rc = map_assuan_err (rc); - } + err = send_one_option (ctx, "lc-ctype", + opt_lc_ctype ? opt_lc_ctype : dft_lc); } #if defined(HAVE_SETLOCALE) && defined(LC_CTYPE) if (old_lc) @@ -131,8 +132,10 @@ free (old_lc); } #endif - if (rc) - return rc; + if (err) + return err; + + /* Send the value for LC_MESSAGES. */ #if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES) old_lc = setlocale (LC_MESSAGES, NULL); if (old_lc) @@ -145,18 +148,8 @@ #endif if (opt_lc_messages || (dft_ttyname && dft_lc)) { - char *optstr; - if (asprintf (&optstr, "OPTION lc-messages=%s", - opt_lc_messages ? opt_lc_messages : dft_lc) < 0) - rc = gpg_error_from_errno (errno); - else - { - rc = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, - NULL); - free (optstr); - if (rc) - rc = map_assuan_err (rc); - } + err = send_one_option (ctx, "display", + opt_lc_messages ? opt_lc_messages : dft_lc); } #if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES) if (old_lc) @@ -165,7 +158,9 @@ free (old_lc); } #endif + if (err) + return err; - return rc; + return 0; } Index: gnupg/common/exechelp.c diff -u gnupg/common/exechelp.c:1.1.2.1 gnupg/common/exechelp.c:1.1.2.2 --- gnupg/common/exechelp.c:1.1.2.1 Mon Dec 6 19:28:56 2004 +++ gnupg/common/exechelp.c Wed Dec 15 15:15:09 2004 @@ -30,8 +30,7 @@ #ifdef USE_GNU_PTH #include #endif -#ifdef _WIN32 -#else +#ifndef HAVE_W32_SYSTEM #include #endif @@ -39,6 +38,9 @@ #include "i18n.h" #include "exechelp.h" +/* Define to 1 do enable debugging. */ +#define DEBUG_W32_SPAWN 1 + #ifdef _POSIX_OPEN_MAX #define MAX_OPEN_FDS _POSIX_OPEN_MAX @@ -57,6 +59,105 @@ #endif +#ifdef HAVE_W32_SYSTEM +/* We assume that a HANDLE can be represented by an int which should + be true for all i386 systems (HANDLE is defined as void *) and + these are the only systems for which Windows is available. Further + we assume that -1 denotes an invalid handle. */ +# define fd_to_handle(a) ((HANDLE)(a)) +# define handle_to_fd(a) ((int)(a)) +# define pid_to_handle(a) ((HANDLE)(a)) +# define handle_to_pid(a) ((int)(a)) +#endif + + +#ifdef HAVE_W32_SYSTEM +/* Build a command line for use with W32's CreateProcess. On success + CMDLINE gets the address of a newly allocated string. */ +static gpg_error_t +build_w32_commandline (const char *pgmname, const char **argv, char **cmdline) +{ + int i, n; + const char *s; + char *buf, *p; + + *cmdline = NULL; + n = strlen (pgmname); + for (i=0; (s=argv[i]); i++) + { + n += strlen (s) + 1 + 2; /* (1 space, 2 quoting */ + for (; *s; s++) + if (*s == '\"') + n++; /* Need to double inner quotes. */ + } + n++; + + buf = p = xtrymalloc (n); + if (!buf) + return gpg_error_from_errno (errno); + + /* fixme: PGMNAME may not contain spaces etc. */ + p = stpcpy (p, pgmname); + for (i=0; argv[i]; i++) + { + if (!*argv[i]) /* Empty string. */ + p = stpcpy (p, " \"\""); + else if (strpbrk (argv[i], " \t\n\v\f\"")) + { + p = stpcpy (p, " \""); + for (s=argv[i]; *s; s++) + { + *p++ = *s; + if (*s == '\"') + *p++ = *s; + } + *p++ = '\"'; + *p = 0; + } + else + p = stpcpy (stpcpy (p, " "), argv[i]); + } + + *cmdline= buf; + return 0; +} +#endif /*HAVE_W32_SYSTEM*/ + + +#ifdef HAVE_W32_SYSTEM +/* Create pipe where the write end is inheritable. */ +static int +create_inheritable_pipe (int filedes[2]) +{ + HANDLE r, w, h; + SECURITY_ATTRIBUTES sec_attr; + + memset (&sec_attr, 0, sizeof sec_attr ); + sec_attr.nLength = sizeof sec_attr; + sec_attr.bInheritHandle = FALSE; + + if (!CreatePipe (&r, &w, &sec_attr, 0)) + return -1; + + if (!DuplicateHandle (GetCurrentProcess(), w, + GetCurrentProcess(), &h, 0, + TRUE, DUPLICATE_SAME_ACCESS )) + { + log_error ("DuplicateHandle failed: %s\n", w32_strerror (-1)); + CloseHandle (r); + CloseHandle (w); + return -1; + } + CloseHandle (w); + w = h; + + filedes[0] = handle_to_fd (r); + filedes[1] = handle_to_fd (w); + return 0; +} +#endif /*HAVE_W32_SYSTEM*/ + + /* Fork and exec the PGMNAME, connect the file descriptor of INFILE to stdin, write the output to OUTFILE, return a new stream in @@ -73,10 +174,121 @@ void (*preexec)(void), FILE **statusfile, pid_t *pid) { -#ifdef _WIN32 - return gpg_error (GPG_ERR_NOT_IMPLEMENTED); +#ifdef HAVE_W32_SYSTEM + gpg_error_t err; + SECURITY_ATTRIBUTES sec_attr; + PROCESS_INFORMATION pi = + { + NULL, /* Returns process handle. */ + 0, /* Returns primary thread handle. */ + 0, /* Returns pid. */ + 0 /* Returns tid. */ + }; + STARTUPINFO si; + int cr_flags; + char *cmdline; + int fd, fdout, rp[2]; + + /* Setup return values. */ + *statusfile = NULL; + *pid = (pid_t)(-1); + fflush (infile); + rewind (infile); + fd = _get_osfhandle (fileno (infile)); + fdout = _get_osfhandle (fileno (outfile)); + if (fd == -1 || fdout == -1) + log_fatal ("no file descriptor for file passed to gnupg_spawn_process\n"); + + /* Prepare security attributes. */ + memset (&sec_attr, 0, sizeof sec_attr ); + sec_attr.nLength = sizeof sec_attr; + sec_attr.bInheritHandle = FALSE; + + /* Build the command line. */ + err = build_w32_commandline (pgmname, argv, &cmdline); + if (err) + return err; + + /* Create a pipe. */ + if (create_inheritable_pipe (rp)) + { + err = gpg_error (GPG_ERR_GENERAL); + log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); + xfree (cmdline); + return err; + } + + /* Start the process. Note that we can't run the PREEXEC function + because this would change our own environment. */ + memset (&si, 0, sizeof si); + si.cb = sizeof (si); + si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; + si.wShowWindow = DEBUG_W32_SPAWN? SW_SHOW : SW_MINIMIZE; + si.hStdInput = fd_to_handle (fd); + si.hStdOutput = fd_to_handle (fdout); + si.hStdError = fd_to_handle (rp[1]); + + cr_flags = (CREATE_DEFAULT_ERROR_MODE + | GetPriorityClass (GetCurrentProcess ()) + | CREATE_SUSPENDED); + log_debug ("CreateProcess, path=`%s' cmdline=`%s'", pgmname, cmdline); + if (!CreateProcess (pgmname, /* Program to start. */ + cmdline, /* Command line arguments. */ + &sec_attr, /* Process security attributes. */ + &sec_attr, /* Thread security attributes. */ + TRUE, /* Inherit handles. */ + cr_flags, /* Creation flags. */ + NULL, /* Environment. */ + NULL, /* Use current drive/directory. */ + &si, /* Startup information. */ + &pi /* Returns process information. */ + )) + { + log_error ("CreateProcess failed: %s\n", w32_strerror (-1)); + xfree (cmdline); + CloseHandle (fd_to_handle (rp[0])); + CloseHandle (fd_to_handle (rp[1])); + return gpg_error (GPG_ERR_GENERAL); + } + xfree (cmdline); + cmdline = NULL; -#else /* !_WIN32 */ + /* Close the other end of the pipe. */ + CloseHandle (fd_to_handle (rp[1])); + + log_debug ("CreateProcess ready: hProcess=%p hThread=%p" + " dwProcessID=%d dwThreadId=%d\n", + pi.hProcess, pi.hThread, + (int) pi.dwProcessId, (int) pi.dwThreadId); + + /* Process ha been created suspended; resume it now. */ + ResumeThread (pi.hThread); + CloseHandle (pi.hThread); + + { + int x; + + x = _open_osfhandle (rp[0], 0); + if (x == -1) + log_error ("failed to translate osfhandle %p\n", (void*)rp[0] ); + else + { + log_debug ("_open_osfhandle %p yields %d\n", (void*)fd, x ); + *statusfile = fdopen (x, "r"); + } + } + if (!*statusfile) + { + err = gpg_error_from_errno (errno); + log_error (_("can't fdopen pipe for reading: %s\n"), gpg_strerror (err)); + CloseHandle (pi.hProcess); + return err; + } + + *pid = handle_to_pid (pi.hProcess); + return 0; + +#else /* !HAVE_W32_SYSTEM */ gpg_error_t err; int fd, fdout, rp[2]; @@ -87,8 +299,7 @@ fd = fileno (infile); fdout = fileno (outfile); if (fd == -1 || fdout == -1) - log_fatal ("no file descriptor for file passed" - " to gnupg_spawn_process: %s\n", strerror (errno) ); + log_fatal ("no file descriptor for file passed to gnupg_spawn_process\n"); if (pipe (rp) == -1) { @@ -170,7 +381,7 @@ } return 0; -#endif /* !_WIN32 */ +#endif /* !HAVE_W32_SYSTEM */ } @@ -183,10 +394,51 @@ { gpg_err_code_t ec; -#ifdef _WIN32 - ec = GPG_ERR_NOT_IMPLEMENTED; +#ifdef HAVE_W32_SYSTEM + HANDLE proc = fd_to_handle (pid); + int code; + DWORD exc; + + if (pid == (pid_t)(-1)) + return gpg_error (GPG_ERR_INV_VALUE); + + /* FIXME: We should do a pth_waitpid here. However this has not yet + been implemented. A special W32 pth system call would even be + better. */ + code = WaitForSingleObject (proc, INFINITE); + switch (code) + { + case WAIT_FAILED: + log_error (_("waiting for process %d to terminate failed: %s\n"), + (int)pid, w32_strerror (-1)); + ec = GPG_ERR_GENERAL; + break; + + case WAIT_OBJECT_0: + if (!GetExitCodeProcess (proc, &exc)) + { + log_error (_("error getting exit code of process %d: %s\n"), + (int)pid, w32_strerror (-1) ); + ec = GPG_ERR_GENERAL; + } + else if (exc) + { + log_error (_("error running `%s': exit status %d\n"), + pgmname, (int)exc ); + ec = GPG_ERR_GENERAL; + } + else + ec = 0; + break; + + default: + log_error ("WaitForSingleObject returned unexpected " + "code %d for pid %d\n", code, (int)pid ); + ec = GPG_ERR_GENERAL; + break; + } -#else /* !_WIN32 */ +#else /* !HAVE_W32_SYSTEM */ int i, status; if (pid == (pid_t)(-1)) @@ -222,7 +474,7 @@ } else ec = 0; -#endif /* !_WIN32 */ +#endif /* !HAVE_W32_SYSTEM */ return gpg_err_make (GPG_ERR_SOURCE_DEFAULT, ec); Index: gnupg/common/iobuf.c diff -u gnupg/common/iobuf.c:1.1.2.1 gnupg/common/iobuf.c:1.1.2.2 --- gnupg/common/iobuf.c:1.1.2.1 Tue Sep 23 19:48:32 2003 +++ gnupg/common/iobuf.c Wed Dec 15 15:15:09 2004 @@ -1096,7 +1096,7 @@ if (s && *s) { #if defined(HAVE_DOSISH_SYSTEM) || defined(__riscos__) - remove_name = m_strdup (s); + remove_name = xstrdup (s); #else remove (s); #endif @@ -1267,7 +1267,7 @@ size_t len; a = iobuf_alloc (strchr (mode, 'w') ? 2 : 1, 8192); - scx = m_alloc (sizeof *scx + 25); + scx = xmalloc (sizeof *scx + 25); scx->sock = fd; scx->print_only_name = 1; sprintf (scx->fname, "[sock %d]", fd); Index: gnupg/common/simple-pwquery.c diff -u gnupg/common/simple-pwquery.c:1.1.2.6 gnupg/common/simple-pwquery.c:1.1.2.7 --- gnupg/common/simple-pwquery.c:1.1.2.6 Mon Dec 13 16:49:56 2004 +++ gnupg/common/simple-pwquery.c Wed Dec 15 15:15:09 2004 @@ -31,7 +31,7 @@ #include #include #include -#ifdef _WIN32 +#ifdef HAVE_W32_SYSTEM #include #else #include @@ -182,10 +182,8 @@ } dft_ttyname = getenv ("GPG_TTY"); -#ifndef HAVE_W32_SYSTEM if ((!dft_ttyname || !*dft_ttyname) && ttyname (0)) dft_ttyname = ttyname (0); -#endif if (dft_ttyname && *dft_ttyname) { if ((rc=agent_send_option (fd, "ttyname", dft_ttyname))) @@ -261,7 +259,7 @@ static int agent_open (int *rfd) { -#ifdef _WIN32 +#ifdef HAVE_W32_SYSTEM return SPWQ_NO_AGENT; /* FIXME */ #else int rc; Index: gnupg/common/sysutils.h diff -u gnupg/common/sysutils.h:1.1.2.1 gnupg/common/sysutils.h:1.1.2.2 --- gnupg/common/sysutils.h:1.1.2.1 Tue May 11 11:54:52 2004 +++ gnupg/common/sysutils.h Wed Dec 15 15:15:09 2004 @@ -27,5 +27,12 @@ const unsigned char *get_session_marker (size_t *rlen); int check_permissions (const char *path,int extension,int checkonly); +#ifdef HAVE_W32_SYSTEM +/*-- w32reg.c --*/ +char *read_w32_registry_string( const char *root, + const char *dir, const char *name ); +int write_w32_registry_string(const char *root, const char *dir, + const char *name, const char *value); +#endif /*HAVE_W32_SYSTEM*/ #endif /*GNUPG_COMMON_SYSUTILS_H*/ Index: gnupg/common/ttyname.c diff -u /dev/null gnupg/common/ttyname.c:1.1.2.1 --- /dev/null Wed Dec 15 15:15:09 2004 +++ gnupg/common/ttyname.c Wed Dec 15 15:15:09 2004 @@ -0,0 +1,32 @@ +/* ttyname.c - Replacement for ttyname. + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +/* This one is a simple dummy and suitable for Dosish systems. */ + +#ifdef HAVE_CONFIG_H +#include +#endif +#include + +char * +ttyname (int fd) +{ + return NULL; +} Index: gnupg/common/util.h diff -u gnupg/common/util.h:1.12.2.10 gnupg/common/util.h:1.12.2.11 --- gnupg/common/util.h:1.12.2.10 Thu Dec 2 08:48:09 2004 +++ gnupg/common/util.h Wed Dec 15 15:15:09 2004 @@ -147,7 +147,9 @@ #ifndef HAVE_STRSEP char *strsep (char **stringp, const char *delim); #endif - +#ifndef HAVE_TTYNAME +char *ttyname (int fd); +#endif /*-- some macros to replace ctype ones and avoid locale problems --*/ #define spacep(p) (*(p) == ' ' || *(p) == '\t') Index: gnupg/common/w32reg.c diff -u gnupg/common/w32reg.c:1.1.2.1 gnupg/common/w32reg.c:1.1.2.2 --- gnupg/common/w32reg.c:1.1.2.1 Thu Dec 2 08:48:09 2004 +++ gnupg/common/w32reg.c Wed Dec 15 15:15:09 2004 @@ -19,7 +19,7 @@ */ #include -#if defined (_WIN32) || defined (__CYGWIN32__) +#ifdef HAVE_W32_SYSTEM /* This module is only used in this environment */ #include @@ -29,6 +29,7 @@ #include #include "util.h" +#include "sysutils.h" static HKEY get_root_key(const char *root) @@ -169,4 +170,4 @@ return 0; } -#endif /* __MINGW32__ || __CYGWIN32__ */ +#endif /*HAVE_W32_SYSTEM*/ Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.72 gnupg/configure.ac:1.36.2.73 --- gnupg/configure.ac:1.36.2.72 Tue Dec 7 12:21:40 2004 +++ gnupg/configure.ac Wed Dec 15 15:15:09 2004 @@ -218,12 +218,6 @@ AC_MSG_RESULT($enableval) fi -AC_MSG_CHECKING([whether the included zlib is requested]) -AC_ARG_WITH(included-zlib, - [ --with-included-zlib use the zlib code included here], -[g10_force_zlib=yes], [g10_force_zlib=no] ) -AC_MSG_RESULT($g10_force_zlib) - dnl dnl Check whether we want to use Linux capabilities dnl @@ -799,6 +793,7 @@ AC_REPLACE_FUNCS(isascii) AC_REPLACE_FUNCS(putc_unlocked) AC_REPLACE_FUNCS(strsep) +AC_REPLACE_FUNCS(ttyname) @@ -923,14 +918,10 @@ dnl Do we have zlib? Must do it here because Solaris failed dnl when compiling a conftest (due to the "-lz" from LIBS). -use_local_zlib=yes -if test "$g10_force_zlib" = "yes"; then - : -else - _cppflags="${CPPFLAGS}" - _ldflags="${LDFLAGS}" +_cppflags="${CPPFLAGS}" +_ldflags="${LDFLAGS}" - AC_ARG_WITH(zlib, +AC_ARG_WITH(zlib, [ --with-zlib=DIR use libz in DIR],[ if test -d "$withval"; then CPPFLAGS="${CPPFLAGS} -I$withval/include" @@ -938,23 +929,12 @@ fi ]) - AC_CHECK_HEADER(zlib.h, +AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflateInit2_, - use_local_zlib=no LIBS="$LIBS -lz", CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}), CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}) -fi -if test "$use_local_zlib" = yes ; then - AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true) - AC_CONFIG_LINKS(zlib.h:zlib/zlib.h zconf.h:zlib/zconf.h ) - ZLIBS="../zlib/libzlib.a" -else - AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false) - ZLIBS= -fi -AC_SUBST(ZLIBS) # See wether we want to run the long test suite. Index: gnupg/g10/call-agent.c diff -u gnupg/g10/call-agent.c:1.1.2.15 gnupg/g10/call-agent.c:1.1.2.16 --- gnupg/g10/call-agent.c:1.1.2.15 Thu Jul 1 19:42:09 2004 +++ gnupg/g10/call-agent.c Wed Dec 15 15:15:08 2004 @@ -171,6 +171,8 @@ if (rc) return map_assuan_err (rc); +#warning put this code into common/asshelp.c + dft_display = getenv ("DISPLAY"); if (opt.display || dft_display) { Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.26 gnupg/jnlib/ChangeLog:1.3.2.27 --- gnupg/jnlib/ChangeLog:1.3.2.26 Tue Dec 14 20:20:36 2004 +++ gnupg/jnlib/ChangeLog Wed Dec 15 15:15:08 2004 @@ -1,3 +1,7 @@ +2004-12-15 Werner Koch + + * logging.c [W32]: Don't include unavailable headers. + 2004-12-14 Werner Koch * w32-pth.c (_pth_strerror): Renamed to ... Index: gnupg/jnlib/logging.c diff -u gnupg/jnlib/logging.c:1.2.2.11 gnupg/jnlib/logging.c:1.2.2.12 --- gnupg/jnlib/logging.c:1.2.2.11 Thu Dec 2 08:48:09 2004 +++ gnupg/jnlib/logging.c Wed Dec 15 15:15:08 2004 @@ -35,16 +35,13 @@ #include #include #include -#ifndef _WIN32 +#ifndef HAVE_W32_SYSTEM #include #include -#endif +#endif /*!HAVE_W32_SYSTEM*/ #include #include #include -#ifdef __MINGW32__ -# include -#endif #define JNLIB_NEED_LOG_LOGV 1 Index: gnupg/m4/ksba.m4 diff -u gnupg/m4/ksba.m4:1.1.2.1 gnupg/m4/ksba.m4:1.1.2.2 --- gnupg/m4/ksba.m4:1.1.2.1 Wed Feb 18 19:38:49 2004 +++ gnupg/m4/ksba.m4 Wed Dec 15 15:15:08 2004 @@ -14,7 +14,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS dnl -AC_DEFUN(AM_PATH_KSBA, +AC_DEFUN([AM_PATH_KSBA], [ AC_ARG_WITH(ksba-prefix, AC_HELP_STRING([--with-ksba-prefix=PFX], [prefix where KSBA is installed (optional)]), Index: gnupg/scd/ChangeLog diff -u gnupg/scd/ChangeLog:1.25.2.59 gnupg/scd/ChangeLog:1.25.2.60 --- gnupg/scd/ChangeLog:1.25.2.59 Mon Dec 6 14:49:14 2004 +++ gnupg/scd/ChangeLog Wed Dec 15 15:15:08 2004 @@ -1,3 +1,14 @@ +2004-12-15 Werner Koch + + * scdaemon.c [W32]: Various hacks to make it run under W32. + + * command.c (scd_update_reader_status_file) [W32]: Don't use kill. + + * apdu.c [W32]: Disable use of pcsc_wrapper. + + * Makefile.am (scdaemon_LDADD): Reorder libs. + (sc_copykeys_LDADD): Add libassuan because it is needed for W32. + 2004-12-06 Werner Koch * Makefile.am (pkglib_PROGRAMS): Build only for W32. Index: gnupg/scd/Makefile.am diff -u gnupg/scd/Makefile.am:1.15.2.11 gnupg/scd/Makefile.am:1.15.2.12 --- gnupg/scd/Makefile.am:1.15.2.11 Mon Dec 6 14:49:14 2004 +++ gnupg/scd/Makefile.am Wed Dec 15 15:15:08 2004 @@ -19,7 +19,7 @@ ## Process this file with automake to produce Makefile.in bin_PROGRAMS = scdaemon sc-copykeys -if HAVE_W32_SYSTEM +if ! HAVE_W32_SYSTEM pkglib_PROGRAMS = pcsc-wrapper endif @@ -53,10 +53,8 @@ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \ - $(LIBGCRYPT_LIBS) $(pth_libs) \ - $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ - $(LIBUSB_LIBS) $(OPENSC_LIBS) -lgpg-error @LIBINTL@ \ - @DL_LIBS@ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(pth_libs) $(LIBASSUAN_LIBS) \ + $(LIBUSB_LIBS) $(OPENSC_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS) sc_copykeys_SOURCES = \ sc-copykeys.c scdaemon.h \ @@ -70,10 +68,10 @@ sc_copykeys_LDADD = \ ../jnlib/libjnlib.a ../common/libcommon.a \ ../common/libsimple-pwquery.a \ - $(LIBGCRYPT_LIBS) $(pth_libs) \ - $(KSBA_LIBS) $(LIBUSB_LIBS) $(OPENSC_LIBS) \ + $(LIBGCRYPT_LIBS) $(pth_libs) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ + $(LIBUSB_LIBS) $(OPENSC_LIBS) \ -lgpg-error @LIBINTL@ @DL_LIBS@ pcsc_wrapper_SOURCES = pcsc-wrapper.c -pcsc_wrapper_LDADD = @DL_LIBS@ +pcsc_wrapper_LDADD = $(DL_LIBS) pcsc_wrapper_CFLAGS = Index: gnupg/scd/apdu.c diff -u gnupg/scd/apdu.c:1.4.2.24 gnupg/scd/apdu.c:1.4.2.25 --- gnupg/scd/apdu.c:1.4.2.24 Wed Oct 20 10:54:45 2004 +++ gnupg/scd/apdu.c Wed Dec 15 15:15:08 2004 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: apdu.c,v 1.4.2.24 2004/10/20 08:54:45 wk Exp $ + * $Id: apdu.c,v 1.4.2.25 2004/12/15 14:15:08 wk Exp $ */ #include @@ -65,11 +65,16 @@ #include "dynload.h" #include "ccid-driver.h" + +/* To to conflicting use of threading libraries we usually can't link + against libpcsclite. Instead we use a wrapper program. */ #ifdef USE_GNU_PTH +#ifndef HAVE_W32_SYSTEM #define NEED_PCSC_WRAPPER 1 #endif +#endif - + #define MAX_READER 4 /* Number of readers we support concurrently. */ Index: gnupg/scd/command.c diff -u gnupg/scd/command.c:1.19.2.13 gnupg/scd/command.c:1.19.2.14 --- gnupg/scd/command.c:1.19.2.13 Wed Apr 21 16:44:09 2004 +++ gnupg/scd/command.c Wed Dec 15 15:15:08 2004 @@ -1260,8 +1260,13 @@ int signo = primary_connection->server_local->event_signal; log_info ("client pid is %d, sending signal %d\n", pid, signo); + +#ifdef HAVE_W32_SYSTEM +#warning Need to implement a notification service +#else if (pid != (pid_t)(-1) && pid && signo > 0) kill (pid, signo); +#endif } } } Index: gnupg/scd/scdaemon.c diff -u gnupg/scd/scdaemon.c:1.12.2.20 gnupg/scd/scdaemon.c:1.12.2.21 --- gnupg/scd/scdaemon.c:1.12.2.20 Thu Aug 5 11:24:35 2004 +++ gnupg/scd/scdaemon.c Wed Dec 15 15:15:08 2004 @@ -29,8 +29,10 @@ #include #include #include +#ifndef HAVE_W32_SYSTEM #include #include +#endif /*HAVE_W32_SYSTEM*/ #include #include #ifdef USE_GNU_PTH @@ -47,6 +49,9 @@ #include "i18n.h" #include "sysutils.h" #include "app-common.h" +#ifdef HAVE_W32_SYSTEM +#include "../jnlib/w32-afunix.h" +#endif enum cmd_and_opt_values @@ -131,7 +136,12 @@ }; +/* The card dirver we use by default for PC/SC. */ +#ifdef HAVE_W32_SYSTEM +#define DEFAULT_PCSC_DRIVER "winscard.dll" +#else #define DEFAULT_PCSC_DRIVER "libpcsclite.so" +#endif static volatile int caught_fatal_sig = 0; @@ -148,8 +158,10 @@ #ifndef HAVE_OPENSC #ifdef USE_GNU_PTH +#ifndef HAVE_W32_SYSTEM /* Pth wrapper function definitions. */ GCRY_THREAD_OPTION_PTH_IMPL; +#endif static void *ticker_thread (void *arg); #endif /*USE_GNU_PTH*/ @@ -341,12 +353,16 @@ Note that this will also do the pth_init. */ #ifndef HAVE_OPENSC #ifdef USE_GNU_PTH +# ifdef HAVE_W32_SYSTEM + pth_init (); +# else /*!HAVE_W32_SYSTEM*/ err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } +# endif /*!HAVE_W32_SYSTEM*/ #endif /*USE_GNU_PTH*/ #endif /*!HAVE_OPENSC*/ @@ -649,12 +665,15 @@ if (!p) BUG (); *p = 0;; + +#ifndef HAVE_W32_SYSTEM if (!mkdtemp(socket_name)) { log_error ("can't create directory `%s': %s\n", socket_name, strerror(errno) ); exit (1); } +#endif *p = '/'; if (strchr (socket_name, ':') ) @@ -669,7 +688,11 @@ } +#ifdef HAVE_W32_SYSTEM + fd = _w32_sock_new (AF_UNIX, SOCK_STREAM, 0); +#else fd = socket (AF_UNIX, SOCK_STREAM, 0); +#endif if (fd == -1) { log_error ("can't create socket: %s\n", strerror(errno) ); @@ -682,7 +705,13 @@ len = (offsetof (struct sockaddr_un, sun_path) + strlen(serv_addr.sun_path) + 1); - if (bind (fd, (struct sockaddr*)&serv_addr, len) == -1) + if ( +#ifdef HAVE_W32_SYSTEM + _w32_sock_bind +#else + bind +#endif + (fd, (struct sockaddr*)&serv_addr, len) == -1) { log_error ("error binding socket to `%s': %s\n", serv_addr.sun_path, strerror (errno) ); @@ -702,6 +731,7 @@ fflush (NULL); +#ifndef HAVE_W32_SYSTEM pid = fork (); if (pid == (pid_t)-1) { @@ -800,6 +830,8 @@ exit (1); } +#endif /*!HAVE_W32_SYSTEM*/ + scd_command_handler (fd); close (fd); @@ -846,6 +878,7 @@ { switch (signo) { +#ifndef HAVE_W32_SYSTEM case SIGHUP: log_info ("SIGHUP received - " "re-reading configuration and resetting cards\n"); @@ -882,6 +915,7 @@ cleanup (); scd_exit (0); break; +#endif /*!HAVE_W32_SYSTEM*/ default: log_info ("signal %d received - no action defined\n", signo); @@ -901,6 +935,7 @@ sigset_t sigs; int signo; +#ifndef HAVE_W32_SYSTEM /* fixme */ sigemptyset (&sigs ); sigaddset (&sigs, SIGHUP); sigaddset (&sigs, SIGUSR1); @@ -908,6 +943,9 @@ sigaddset (&sigs, SIGINT); sigaddset (&sigs, SIGTERM); sigs_ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo); +#else + sigs_ev = NULL; +#endif for (;;) { Index: gnupg/sm/Makefile.am diff -u gnupg/sm/Makefile.am:1.27.2.3 gnupg/sm/Makefile.am:1.27.2.4 --- gnupg/sm/Makefile.am:1.27.2.3 Tue Dec 7 12:21:40 2004 +++ gnupg/sm/Makefile.am Wed Dec 15 15:15:08 2004 @@ -51,9 +51,9 @@ certreqgen.c -gpgsm_LDADD = $(LIBASSUAN_LIBS) ../jnlib/libjnlib.a ../kbx/libkeybox.a \ - ../common/libcommon.a \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) -lgpg-error \ - $(LIBINTL) +gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a \ + ../common/libcommon.a \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \ + $(LIBINTL) Index: gnupg/sm/gpgsm.c diff -u gnupg/sm/gpgsm.c:1.67.2.33 gnupg/sm/gpgsm.c:1.67.2.34 --- gnupg/sm/gpgsm.c:1.67.2.33 Mon Dec 6 19:28:56 2004 +++ gnupg/sm/gpgsm.c Wed Dec 15 15:15:08 2004 @@ -26,6 +26,9 @@ #include #include #include +#ifdef USE_GNU_PTH +# include +#endif #include "gpgsm.h" #include @@ -736,6 +739,11 @@ NEED_KSBA_VERSION, ksba_check_version (NULL) ); } +#ifdef HAVE_W32_SYSTEM + pth_init (); +#endif + + gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); may_coredump = disable_core_dumps (); @@ -746,7 +754,8 @@ i18n_init(); opt.def_cipher_algoid = "1.2.840.113549.3.7"; /*des-EDE3-CBC*/ -#ifdef __MINGW32__ + +#ifdef HAVE_W32_SYSTEM opt.homedir = read_w32_registry_string ( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); #else @@ -1688,7 +1697,7 @@ static void run_protect_tool (int argc, char **argv) { -#ifndef _WIN32 +#ifndef HAVE_W32_SYSTEM const char *pgm; char **av; int i; @@ -1707,6 +1716,6 @@ av[i] = NULL; execv (pgm, av); log_error ("error executing `%s': %s\n", pgm, strerror (errno)); -#endif +#endif /*HAVE_W32_SYSTEM*/ gpgsm_exit (2); } Index: gnupg/tools/ChangeLog diff -u gnupg/tools/ChangeLog:1.25.2.59 gnupg/tools/ChangeLog:1.25.2.60 --- gnupg/tools/ChangeLog:1.25.2.59 Mon Dec 13 16:49:56 2004 +++ gnupg/tools/ChangeLog Wed Dec 15 15:15:08 2004 @@ -1,3 +1,13 @@ +2004-12-15 Werner Koch + + * Makefile.am (bin_PROGRAMS) [W32]: Do not build watchgnupg. + + * gpgconf-comp.c (gpg_agent_runtime_change) [W32]: No way yet to + send a signal. Disable. + (change_options_file, change_options_program) [W32]: No link(2), + so we disable it. + (gc_component_change_options): Use rename instead of link. + 2004-12-13 Werner Koch * gpgconf-comp.c : Fixed typo. Index: gnupg/tools/Makefile.am diff -u gnupg/tools/Makefile.am:1.31.2.10 gnupg/tools/Makefile.am:1.31.2.11 --- gnupg/tools/Makefile.am:1.31.2.10 Fri Oct 22 18:03:02 2004 +++ gnupg/tools/Makefile.am Wed Dec 15 15:15:08 2004 @@ -32,7 +32,10 @@ bin_SCRIPTS = gpgsm-gencert.sh -bin_PROGRAMS = gpgconf watchgnupg +bin_PROGRAMS = gpgconf +if !HAVE_W32_SYSTEM +bin_PROGRAMS += watchgnupg +endif gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c Index: gnupg/tools/gpgconf-comp.c diff -u gnupg/tools/gpgconf-comp.c:1.1.2.47 gnupg/tools/gpgconf-comp.c:1.1.2.48 --- gnupg/tools/gpgconf-comp.c:1.1.2.47 Mon Dec 13 16:49:56 2004 +++ gnupg/tools/gpgconf-comp.c Wed Dec 15 15:15:08 2004 @@ -861,6 +861,7 @@ void gpg_agent_runtime_change (void) { +#ifndef HAVE_W32_SYSTEM char *agent = getenv ("GPG_AGENT_INFO"); char *pid_str; unsigned long pid_long; @@ -888,6 +889,7 @@ /* Ignore any errors here. */ kill (pid, SIGHUP); +#endif /*!HAVE_W32_SYSTEM*/ } @@ -1741,7 +1743,12 @@ arg = NULL; } +#if HAVE_W32_SYSTEM + res = 0; +#warning no backups for W32 yet - need to write a copy function +#else res = link (dest_filename, orig_filename); +#endif if (res < 0 && errno != ENOENT) return -1; if (res < 0) @@ -2005,7 +2012,12 @@ src_filename = xasprintf ("%s.gpgconf.%i.new", dest_filename, getpid ()); orig_filename = xasprintf ("%s.gpgconf.%i.bak", dest_filename, getpid ()); +#if HAVE_W32_SYSTEM + res = 0; +#warning no backups for W32 yet - need to write a copy function +#else res = link (dest_filename, orig_filename); +#endif if (res < 0 && errno != ENOENT) return -1; if (res < 0) @@ -2418,12 +2430,18 @@ err = rename (src_pathname[i], dest_pathname[i]); else { +#ifdef HAVE_W32_SYSTEM + /* FIXME: Won't work becuase W32 doesn't silently + overwrite. */ + err = rename (src_pathname[i], dest_pathname[i]); +#else /*!HAVE_W32_SYSTEM*/ /* This is a bit safer than rename() because we expect DEST_PATHNAME not to be there. If it happens to be there, this will fail. */ err = link (src_pathname[i], dest_pathname[i]); if (!err) unlink (src_pathname[i]); +#endif /*!HAVE_W32_SYSTEM*/ } if (err) break; From cvs at cvs.gnupg.org Wed Dec 15 23:07:35 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 14:56:34 2004 Subject: dirmngr/src (6 files) Message-ID: Date: Wednesday, December 15, 2004 @ 23:11:59 Author: wk Path: /cvs/dirmngr/dirmngr/src Modified: ChangeLog certcache.h crlcache.c dirmngr.c ldap.c validate.c * ldap.c (ldap_wrapper): Print a diagnostic after forking for the ldap wrapper. * certcache.h (find_cert_bysn): Add this prototype. * crlcache.c (start_sig_check): Write CRL hash debug file. (finish_sig_check): Dump the signer's certificate. (crl_parse_insert): Try to get the issuing cert by authKeyId. Moved certificate retrieval after item processing. -------------+ ChangeLog | 10 ++++++ certcache.h | 5 +++ crlcache.c | 85 ++++++++++++++++++++++++++++++++++++++++++---------------- dirmngr.c | 2 - ldap.c | 3 +- validate.c | 4 +- 6 files changed, 82 insertions(+), 27 deletions(-) Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.35 dirmngr/src/ChangeLog:1.36 --- dirmngr/src/ChangeLog:1.35 Mon Dec 13 16:16:35 2004 +++ dirmngr/src/ChangeLog Wed Dec 15 23:11:59 2004 @@ -1,3 +1,13 @@ +2004-12-15 Werner Koch + + * ldap.c (ldap_wrapper): Print a diagnostic after forking for the + ldap wrapper. + * certcache.h (find_cert_bysn): Add this prototype. + * crlcache.c (start_sig_check): Write CRL hash debug file. + (finish_sig_check): Dump the signer's certificate. + (crl_parse_insert): Try to get the issuing cert by authKeyId. + Moved certificate retrieval after item processing. + 2004-12-13 Werner Koch * dirmngr_ldap.c (catch_alarm, set_timeout): new. Index: dirmngr/src/certcache.h diff -u dirmngr/src/certcache.h:1.5 dirmngr/src/certcache.h:1.6 --- dirmngr/src/certcache.h:1.5 Fri Dec 3 15:42:36 2004 +++ dirmngr/src/certcache.h Wed Dec 15 23:11:59 2004 @@ -62,6 +62,11 @@ ksba_cert_t get_cert_byissuer (const char *issuer_dn, unsigned int seq); +/* Return the certificate matching ISSUER_DN and SERIALNO; if it is + not already in the cache, try to find it from other resources. */ +ksba_cert_t find_cert_bysn (ctrl_t ctrl, + const char *issuer_dn, ksba_sexp_t serialno); + /* Given the certificate CERT locate the issuer for this certificate and return it at R_CERT. Returns 0 on success or GPG_ERR_NOT_FOUND. */ Index: dirmngr/src/crlcache.c diff -u dirmngr/src/crlcache.c:1.51 dirmngr/src/crlcache.c:1.52 --- dirmngr/src/crlcache.c:1.51 Fri Dec 3 15:42:36 2004 +++ dirmngr/src/crlcache.c Wed Dec 15 23:11:59 2004 @@ -1443,7 +1443,9 @@ *algo, gcry_strerror (err)); return err; } - + if (DBG_HASHING) + gcry_md_start_debug (*md, "crl"); + ksba_crl_set_hash_function (crl, HASH_FNC, *md); return 0; } @@ -1486,6 +1488,8 @@ } /* Get and convert the public key for the issuer certificate. */ + if (DBG_X509) + dump_cert ("crl_issuer_cert", issuer_cert); pubkey = ksba_cert_get_public_key (issuer_cert); n = gcry_sexp_canon_len (pubkey, 0, NULL, NULL); if (!n) @@ -1518,6 +1522,8 @@ /* Pass this on to the signature verification. */ err = gcry_pk_verify (s_sig, s_hash, s_pkey); + if (DBG_X509) + log_debug ("gcry_pk_verify: %s\n", gpg_strerror (err)); leave: xfree (sigval); @@ -1572,29 +1578,9 @@ { case KSBA_SR_BEGIN_ITEMS: { - char *issuer; - if (start_sig_check (crl, &md, &algo )) goto failure; - err = ksba_crl_get_issuer (crl, &issuer); - if( err ) - { - log_error (_("no issuer found in CRL: %s\n"), - gpg_strerror (err) ); - err = gpg_error (GPG_ERR_INV_CRL); - goto failure; - } - *r_issuer = issuer; /* (Do it here so we don't need to - free it later) */ - - issuer_cert = get_issuer_cert (ctrl, issuer); - if (!issuer_cert) - { - err = gpg_error (GPG_ERR_MISSING_CERT); - goto failure; - } - err = ksba_crl_get_update_times (crl, thisupdate, nextupdate); if (err) { @@ -1607,8 +1593,6 @@ if (opt.verbose) log_info (_("update times of this CRL: this=%s next=%s\n"), thisupdate, nextupdate); - - issuer = NULL; } break; @@ -1654,6 +1638,52 @@ case KSBA_SR_READY: { + char *issuer; + ksba_name_t authid; + ksba_sexp_t authidsn; + + err = ksba_crl_get_issuer (crl, &issuer); + if( err ) + { + log_error (_("no issuer found in CRL: %s\n"), + gpg_strerror (err) ); + err = gpg_error (GPG_ERR_INV_CRL); + goto failure; + } + *r_issuer = issuer; /* (Do it here so we don't need to + free it later) */ + + if (!ksba_crl_get_auth_key_id (crl, NULL, &authid, &authidsn)) + { + const char *s; + + if (opt.verbose) + log_info (_("locating CRL issuer certificate by " + "authorityKeyIdentifier\n")); + + s = ksba_name_enum (authid, 0); + if (s && *authidsn) + issuer_cert = find_cert_bysn (ctrl, s, authidsn); + if (!issuer_cert) + { + log_info ("issuer certificate (#"); + dump_serial (authidsn); + log_printf ("/"); + dump_string (s); + log_printf (") not found\n"); + } + ksba_name_release (authid); + xfree (authidsn); + } + else + issuer_cert = get_issuer_cert (ctrl, issuer); + err = 0; + if (!issuer_cert) + { + err = gpg_error (GPG_ERR_MISSING_CERT); + goto failure; + } + err = finish_sig_check (crl, md, algo, issuer_cert); if (err) { @@ -1670,6 +1700,7 @@ gpg_strerror (err)); goto failure; } + } break; @@ -2221,6 +2252,8 @@ any_dist_point = 1; + if (DBG_X509) + log_debug ("fetching CRL from `%s'\n", distpoint_uri); err = crl_fetch (ctrl, distpoint_uri, &reader); if (err) { @@ -2228,6 +2261,8 @@ goto leave; } + if (DBG_X509) + log_debug ("inserting CRL\n"); err = crl_cache_insert (ctrl, distpoint_uri, reader); if (err) { @@ -2259,6 +2294,8 @@ goto leave; } + if (DBG_X509) + log_debug ("fetching CRL from default location\n"); err = crl_fetch_default (ctrl, issuer, &reader); if (err) { @@ -2267,6 +2304,8 @@ goto leave; } + if (DBG_X509) + log_debug ("inserting CRL\n"); err = crl_cache_insert (ctrl, "default location(s)", reader); if (err) { Index: dirmngr/src/dirmngr.c diff -u dirmngr/src/dirmngr.c:1.52 dirmngr/src/dirmngr.c:1.53 --- dirmngr/src/dirmngr.c:1.52 Mon Dec 13 16:16:35 2004 +++ dirmngr/src/dirmngr.c Wed Dec 15 23:11:59 2004 @@ -285,7 +285,7 @@ else if (!strcmp (debug_level, "basic")) opt.debug = DBG_ASSUAN_VALUE; else if (!strcmp (debug_level, "advanced")) - opt.debug = DBG_ASSUAN_VALUE|DBG_X509_VALUE|DBG_LOOKUP_VALUE; + opt.debug = (DBG_ASSUAN_VALUE|DBG_X509_VALUE|DBG_LOOKUP_VALUE); else if (!strcmp (debug_level, "expert")) opt.debug = (DBG_ASSUAN_VALUE|DBG_X509_VALUE|DBG_LOOKUP_VALUE |DBG_CACHE_VALUE|DBG_CRYPTO_VALUE); Index: dirmngr/src/ldap.c diff -u dirmngr/src/ldap.c:1.42 dirmngr/src/ldap.c:1.43 --- dirmngr/src/ldap.c:1.42 Mon Dec 13 16:16:35 2004 +++ dirmngr/src/ldap.c Wed Dec 15 23:11:59 2004 @@ -684,7 +684,8 @@ ctx->reader = *reader; ctx->next = wrapper_list; wrapper_list = ctx; - + if (opt.verbose) + log_info (_("ldap wrapper %d started\n"), (int)ctx->pid); return 0; } Index: dirmngr/src/validate.c diff -u dirmngr/src/validate.c:1.6 dirmngr/src/validate.c:1.7 --- dirmngr/src/validate.c:1.6 Wed Dec 1 17:11:14 2004 +++ dirmngr/src/validate.c Wed Dec 15 23:11:59 2004 @@ -701,7 +701,7 @@ ksba_free (p); return gpg_error (GPG_ERR_BUG); } - if (DBG_X509) + if (DBG_CRYPTO) { int j; log_debug ("signature value:"); @@ -774,7 +774,7 @@ } err = gcry_pk_verify (s_sig, s_hash, s_pkey); - if (DBG_CRYPTO) + if (DBG_X509) log_debug ("gcry_pk_verify: %s\n", gpg_strerror (err)); gcry_md_close (md); gcry_sexp_release (s_sig); From cvs at cvs.gnupg.org Thu Dec 16 06:11:43 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 16 14:56:36 2004 Subject: gnupg (6 files) Message-ID: Date: Thursday, December 16, 2004 @ 06:16:09 Author: dshaw Path: /cvs/gnupg/gnupg Modified: g10/ChangeLog g10/g10.c include/ChangeLog include/memory.h util/ChangeLog util/secmem.c * g10.c (main): Add --require-secmem/--no-require-secmem to cause gpg to exit if it cannot lock memory. Also remove --nrsign-key and --nrlsign-key since this can better be done via --edit-key. * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. * memory.h: Return a flag to indicate whether we got the lock. -------------------+ g10/ChangeLog | 6 ++++++ g10/g10.c | 33 +++++++++++++++------------------ include/ChangeLog | 4 ++++ include/memory.h | 2 +- util/ChangeLog | 5 +++++ util/secmem.c | 9 ++++++--- 6 files changed, 37 insertions(+), 22 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.659 gnupg/g10/ChangeLog:1.660 --- gnupg/g10/ChangeLog:1.659 Wed Dec 15 06:16:53 2004 +++ gnupg/g10/ChangeLog Thu Dec 16 06:16:08 2004 @@ -1,3 +1,9 @@ +2004-12-16 David Shaw + + * g10.c (main): Add --require-secmem/--no-require-secmem to cause + gpg to exit if it cannot lock memory. Also remove --nrsign-key + and --nrlsign-key since this can better be done via --edit-key. + 2004-12-15 David Shaw * apdu.c (apdu_send_le, apdu_send_direct), keylist.c Index: gnupg/g10/g10.c diff -u gnupg/g10/g10.c:1.293 gnupg/g10/g10.c:1.294 --- gnupg/g10/g10.c:1.293 Wed Dec 15 06:16:53 2004 +++ gnupg/g10/g10.c Thu Dec 16 06:16:08 2004 @@ -108,8 +108,6 @@ aSignSym, aSignKey, aLSignKey, - aNRSignKey, - aNRLSignKey, aListConfig, aGPGConfList, aListPackets, @@ -218,6 +216,8 @@ oNoVerbose, oTrustDBName, oNoSecmemWarn, + oRequireSecmem, + oNoRequireSecmem, oNoPermissionWarn, oNoMDCWarn, oNoArmor, @@ -380,8 +380,6 @@ N_("remove keys from the secret keyring")}, { aSignKey, "sign-key" ,256, N_("sign a key")}, { aLSignKey, "lsign-key" ,256, N_("sign a key locally")}, - { aNRSignKey, "nrsign-key" ,256, "@"}, - { aNRLSignKey, "nrlsign-key" ,256, "@"}, { aEditKey, "edit-key" ,256, N_("sign or edit a key")}, { aGenRevoke, "gen-revoke",256, N_("generate a revocation certificate")}, { aDesigRevoke, "desig-revoke",256, "@" }, @@ -557,6 +555,8 @@ { oNoVerbose, "no-verbose", 0, "@"}, { oTrustDBName, "trustdb-name", 2, "@" }, { oNoSecmemWarn, "no-secmem-warning", 0, "@" }, + { oRequireSecmem,"require-secmem", 0, "@" }, + { oNoRequireSecmem,"no-require-secmem", 0, "@" }, { oNoPermissionWarn, "no-permission-warning", 0, "@" }, { oNoMDCWarn, "no-mdc-warning", 0, "@" }, { oNoArmor, "no-armor", 0, "@"}, @@ -1614,6 +1614,7 @@ int pwfd = -1; int with_fpr = 0; /* make an option out of --fingerprint */ int any_explicit_recipient = 0; + int require_secmem=0,got_secmem=0; #ifdef USE_SHM_COPROCESSING ulong requested_shm_size=0; #endif @@ -1746,7 +1747,7 @@ } #endif /* initialize the secure memory. */ - secmem_init( 32768 ); + got_secmem=secmem_init( 32768 ); maybe_setuid = 0; /* Okay, we are now working under our real uid */ @@ -1899,8 +1900,6 @@ case aKeygen: set_cmd( &cmd, aKeygen); greeting=1; break; case aSignKey: set_cmd( &cmd, aSignKey); break; case aLSignKey: set_cmd( &cmd, aLSignKey); break; - case aNRSignKey: set_cmd( &cmd, aNRSignKey); break; - case aNRLSignKey: set_cmd( &cmd, aNRLSignKey); break; case aStore: set_cmd( &cmd, aStore); break; case aEditKey: set_cmd( &cmd, aEditKey); greeting=1; break; case aClearsign: set_cmd( &cmd, aClearsign); break; @@ -2284,6 +2283,8 @@ break; case oCertDigestAlgo: cert_digest_string = m_strdup(pargs.r.ret_str); break; case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break; + case oRequireSecmem: require_secmem=1; break; + case oNoRequireSecmem: require_secmem=0; break; case oNoPermissionWarn: opt.no_perm_warn=1; break; case oNoMDCWarn: opt.no_mdc_warn=1; break; case oDisplayCharset: @@ -2596,6 +2597,13 @@ secmem_set_flags( secmem_get_flags() & ~2 ); /* resume warnings */ + if(require_secmem && !got_secmem) + { + log_info(_("will not run with insecure memory due to %s"), + "--require-secmem\n"); + g10_exit(2); + } + set_debug(); /* Do these after the switch(), so they can override settings. */ @@ -3136,13 +3144,6 @@ if( argc != 1 ) wrong_args(_("--lsign-key user-id")); /* fall through */ - case aNRSignKey: - if( argc != 1 ) - wrong_args(_("--nrsign-key user-id")); - /* fall through */ - case aNRLSignKey: - if( argc != 1 ) - wrong_args(_("--nrlsign-key user-id")); sl=NULL; @@ -3150,10 +3151,6 @@ append_to_strlist(&sl,"sign"); else if(cmd==aLSignKey) append_to_strlist(&sl,"lsign"); - else if(cmd==aNRSignKey) - append_to_strlist(&sl,"nrsign"); - else if(cmd==aNRLSignKey) - append_to_strlist(&sl,"nrlsign"); else BUG(); Index: gnupg/include/ChangeLog diff -u gnupg/include/ChangeLog:1.80 gnupg/include/ChangeLog:1.81 --- gnupg/include/ChangeLog:1.80 Mon Nov 29 22:14:18 2004 +++ gnupg/include/ChangeLog Thu Dec 16 06:16:08 2004 @@ -1,3 +1,7 @@ +2004-12-16 David Shaw + + * memory.h: Return a flag to indicate whether we got the lock. + 2004-11-29 David Shaw * cipher.h: Add PUBKEY_USAGE_UNKNOWN. Index: gnupg/include/memory.h diff -u gnupg/include/memory.h:1.15 gnupg/include/memory.h:1.16 --- gnupg/include/memory.h:1.15 Sun Sep 28 15:42:18 2003 +++ gnupg/include/memory.h Thu Dec 16 06:16:08 2004 @@ -66,7 +66,7 @@ void m_print_stats(const char *prefix); /*-- secmem.c --*/ -void secmem_init( size_t npool ); +int secmem_init( size_t npool ); void secmem_term( void ); void *secmem_malloc( size_t size ); void *secmem_realloc( void *a, size_t newsize ); Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.169 gnupg/util/ChangeLog:1.170 --- gnupg/util/ChangeLog:1.169 Mon Dec 6 11:32:20 2004 +++ gnupg/util/ChangeLog Thu Dec 16 06:16:09 2004 @@ -1,3 +1,8 @@ +2004-12-16 David Shaw + + * secmem.c (secmem_init): Return a flag to indicate whether we got + the lock. + 2004-12-06 Werner Koch * iobuf.c (fd_cache_strcmp): New. Use whenever we compare Index: gnupg/util/secmem.c diff -u gnupg/util/secmem.c:1.41 gnupg/util/secmem.c:1.42 --- gnupg/util/secmem.c:1.41 Tue Feb 24 17:06:55 2004 +++ gnupg/util/secmem.c Thu Dec 16 06:16:09 2004 @@ -88,8 +88,8 @@ if (!no_warning) { log_info(_("WARNING: using insecure memory!\n")); - log_info(_("please see http://www.gnupg.org/faq.html " - "for more information\n")); + log_info(_("please see http://www.gnupg.org/faq.html" + " for more information\n")); } } @@ -297,7 +297,8 @@ return flags; } -void +/* Returns 1 if memory was locked, 0 if not. */ +int secmem_init( size_t n ) { if( !n ) { @@ -326,6 +327,8 @@ else log_error("Oops, secure memory pool already initialized\n"); } + + return !show_warning; } From cvs at cvs.gnupg.org Thu Dec 16 06:56:53 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 16 14:56:39 2004 Subject: gnupg/doc (ChangeLog gpg.sgml) Message-ID: Date: Thursday, December 16, 2004 @ 07:01:19 Author: dshaw Path: /cvs/gnupg/gnupg/doc Modified: ChangeLog gpg.sgml * gpg.sgml: Document --require-secmem/--no-require-secmem. Note that the sign flags (l, t, nr) can be mixed. Remove --nrsign-key. -----------+ ChangeLog | 5 ++++ gpg.sgml | 63 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 37 insertions(+), 31 deletions(-) Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.88 gnupg/doc/ChangeLog:1.89 --- gnupg/doc/ChangeLog:1.88 Sun Dec 12 17:03:47 2004 +++ gnupg/doc/ChangeLog Thu Dec 16 07:01:19 2004 @@ -1,3 +1,8 @@ +2004-12-16 David Shaw + + * gpg.sgml: Document --require-secmem/--no-require-secmem. Note + that the sign flags (l, t, nr) can be mixed. Remove --nrsign-key. + 2004-12-12 Werner Koch * samplekeys.asc, mksamplekeys (keys): Removed my old 621CC013 key Index: gnupg/doc/gpg.sgml diff -u gnupg/doc/gpg.sgml:1.77 gnupg/doc/gpg.sgml:1.78 --- gnupg/doc/gpg.sgml:1.77 Fri Nov 26 17:46:53 2004 +++ gnupg/doc/gpg.sgml Thu Dec 16 07:01:19 2004 @@ -271,11 +271,12 @@ each signature. From left to right, they are the numbers 1-3 for certificate check level (see --ask-cert-level), "L" for a local or non-exportable signature (see --lsign-key), "R" for a nonRevocable -signature (see --nrsign-key), "P" for a signature that contains a -policy URL (see --cert-policy-url), "N" for a signature that contains -a notation (see --cert-notation), "X" for an eXpired signature (see ---ask-cert-expire), and the numbers 1-9 or "T" for 10 and above to -indicate trust signature levels (see the --edit-key command "tsign"). +signature (see the --edit-key command "nrsign"), "P" for a signature +that contains a policy URL (see --cert-policy-url), "N" for a +signature that contains a notation (see --cert-notation), "X" for an +eXpired signature (see --ask-cert-expire), and the numbers 1-9 or "T" +for 10 and above to indicate trust signature levels (see the +--edit-key command "tsign"). @@ -328,33 +329,24 @@ sign -Make a signature on key of user &ParmName; -If the key is not yet signed by the default -user (or the users given with -u), the -program displays the information of the key -again, together with its fingerprint and -asks whether it should be signed. This -question is repeated for all users specified -with -u. +Make a signature on key of user &ParmName; If the key is not yet +signed by the default user (or the users given with -u), the program +displays the information of the key again, together with its +fingerprint and asks whether it should be signed. This question is +repeated for all users specified with +-u. lsign -Same as --sign but the signature is marked as -non-exportable and will therefore never be used -by others. This may be used to make keys valid -only in the local environment. +Same as "sign" but the signature is marked as non-exportable and will +therefore never be used by others. This may be used to make keys +valid only in the local environment. nrsign -Same as --sign but the signature is marked as non-revocable and can +Same as "sign" but the signature is marked as non-revocable and can therefore never be revoked. - nrlsign - -Combines the functionality of nrsign and lsign to make a signature -that is both non-revocable and -non-exportable. - tsign Make a trust signature. This is a signature that combines the notions @@ -362,6 +354,15 @@ "trust" command). It is generally only useful in distinct communities or groups. + + + +Note that "l" (for local / non-exportable), "nr" (for non-revocable, +and "t" (for trust) may be freely mixed and prefixed to "sign" to +create a signature of any type desired. + + + revsig @@ -574,13 +575,6 @@ ---nrsign-key &ParmName; - -Signs a public key with your secret key but marks it as non-revocable. -This is a shortcut version of the subcommand "nrsign" from --edit. - - - --delete-key &ParmName; Remove key from the public keyring. In batch mode either --yes is @@ -2382,6 +2376,13 @@ Suppress the warning about missing MDC integrity protection. + +--require-secmem +--no-require-secmem + +Refuse to run if GnuPG cannot get secure memory. Defaults to no +(i.e. run, but give a warning). + --no-armor From cvs at cvs.gnupg.org Thu Dec 16 17:28:41 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 17:28:56 2004 Subject: LIBGCRYPT-1-2-BRANCH libgcrypt (THANKS mpi/ChangeLog mpi/config.links) Message-ID: Date: Thursday, December 16, 2004 @ 17:32:52 Author: wk Path: /cvs/libgcrypt/libgcrypt Tag: LIBGCRYPT-1-2-BRANCH Modified: THANKS mpi/ChangeLog mpi/config.links (mpi_optional_modules): Move entry for powerpc64 before generic powerpc. Suggested by Rafael Ãvila de Espíndola. ------------------+ THANKS | 13 +++++++------ mpi/ChangeLog | 7 ++++++- mpi/config.links | 8 +++++--- 3 files changed, 18 insertions(+), 10 deletions(-) Index: libgcrypt/THANKS diff -u libgcrypt/THANKS:1.79.2.1 libgcrypt/THANKS:1.79.2.2 --- libgcrypt/THANKS:1.79.2.1 Mon Aug 9 12:36:26 2004 +++ libgcrypt/THANKS Thu Dec 16 17:32:52 2004 @@ -30,7 +30,7 @@ Felix von Leitner leitner@amdiv.de Frank Heckenbach heckenb@mi.uni-erlangen.de Frank Stajano frank.stajano@cl.cam.ac.uk -Gaël Quéri gqueri@mail.dotcom.fr +Gaël Quéri gqueri@mail.dotcom.fr Gerlinde Klaes gk@u64.de Greg Louis glouis@dynamicro.on.ca Greg Troxel gdt@ir.bbn.com @@ -51,8 +51,8 @@ Joachim Backes backes@rhrk.uni-kl.de Jordi Mallach jordi@sindominio.net John A. Martin jam@jamux.com -Johnny Teveßen j.tevessen@gmx.de -Jörg Schilling schilling@fokus.gmd.de +Johnny Teveßen j.tevessen@gmx.de +Jörg Schilling schilling@fokus.gmd.de Jun Kuriyama kuriyama@sky.rim.or.jp Karl Fogel kfogel@guanabana.onshore.com Karsten Thygesen karthy@kom.auc.dk @@ -83,11 +83,12 @@ Nimrod Zimerman zimerman@forfree.at N J Doye nic@niss.ac.uk Oliver Haakert haakert@hsp.de -Oskari Jääskeläinen f33003a@cc.hut.fi +Oskari Jääskeläinen f33003a@cc.hut.fi Paul D. Smith psmith@baynetworks.com Philippe Laliberte arsphl@oeil.qc.ca Peter Gutmann pgut001@cs.auckland.ac.nz QingLong qinglong@bolizm.ihep.su +Rafael Ãvila de Espíndola rafael.espindola@gmail.com Ralf Hildebrandt Ralf.Hildebrandt@innominate.com Ralf Schneider ralf@tapfere-schneiderleins.de Ralph Gillen gillen@theochem.uni-duesseldorf.de @@ -96,7 +97,7 @@ Randy mcclellr@oit.edu Rat ratinox@peorth.gweep.net Reinhard Wobst R.Wobst@ifw-dresden.de -Rémi Guyomarch rguyom@mail.dotcom.fr +Rémi Guyomarch rguyom@mail.dotcom.fr Reuben Sumner rasumner@wisdom.weizmann.ac.il Richard Outerbridge outer@interlog.com Roddy Strachan roddy@satlink.com.au @@ -121,7 +122,7 @@ Tomas Fasth tomas.fasth@twinspot.net Tommi Komulainen Tommi.Komulainen@iki.fi Thomas Mikkelsen tbm@image.dk -Ulf Möller 3umoelle@informatik.uni-hamburg.de +Ulf Möller 3umoelle@informatik.uni-hamburg.de Umberto Salsi salsi@icosaedro.it Urko Lusa ulusa@euskalnet.net Walter Koch koch@u32.de Index: libgcrypt/mpi/ChangeLog diff -u libgcrypt/mpi/ChangeLog:1.89 libgcrypt/mpi/ChangeLog:1.89.2.1 --- libgcrypt/mpi/ChangeLog:1.89 Wed Mar 3 09:08:43 2004 +++ libgcrypt/mpi/ChangeLog Thu Dec 16 17:32:51 2004 @@ -1,3 +1,8 @@ +2004-12-16 Werner Koch + + * config.links (mpi_optional_modules): Move entry for powerpc64 + before generic powerpc. Suggested by Rafael Ãvila de Espíndola. + 2004-03-02 Werner Koch * hppa1.1/udiv-qrnnd.S: Alignment fix from Lamont Jones for @@ -533,7 +538,7 @@ Wed Apr 8 09:44:33 1998 Werner Koch (wk@isil.d.shuttle.de) - * config.links: Applied small fix from Ulf Möller. + * config.links: Applied small fix from Ulf Möller. Mon Apr 6 12:38:52 1998 Werner Koch (wk@isil.d.shuttle.de) Index: libgcrypt/mpi/config.links diff -u libgcrypt/mpi/config.links:1.33 libgcrypt/mpi/config.links:1.33.2.1 --- libgcrypt/mpi/config.links:1.33 Wed Mar 3 09:08:43 2004 +++ libgcrypt/mpi/config.links Thu Dec 16 17:32:51 2004 @@ -260,8 +260,7 @@ mpi_sflags="-Wa,-mppc" path="power powerpc32" ;; - ppc60[234]*-*-* | \ - powerpc*-*-*) + ppc60[234]*-*-*) mpi_sflags="-Wa,-mppc" path="powerpc32" ;; @@ -270,7 +269,10 @@ mpi_sflags="-Wa,-mppc" path="powerpc64" ;; - + powerpc*-*-*) + mpi_sflags="-Wa,-mppc" + path="powerpc32" + ;; *) echo '/* No assembler modules configured */' >>./mpi/asm-syntax.h path="" From cvs at cvs.gnupg.org Thu Dec 16 17:30:27 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Thu Dec 16 17:30:45 2004 Subject: libgcrypt/mpi (ChangeLog config.links) Message-ID: Date: Thursday, December 16, 2004 @ 17:34:56 Author: wk Path: /cvs/libgcrypt/libgcrypt/mpi Modified: ChangeLog config.links (mpi_optional_modules): Move entry for powerpc64 before generic powerpc. Suggested by Rafael Ãvila de Espíndola. --------------+ ChangeLog | 5 +++++ config.links | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) Index: libgcrypt/mpi/ChangeLog diff -u libgcrypt/mpi/ChangeLog:1.89 libgcrypt/mpi/ChangeLog:1.90 --- libgcrypt/mpi/ChangeLog:1.89 Wed Mar 3 09:08:43 2004 +++ libgcrypt/mpi/ChangeLog Thu Dec 16 17:34:56 2004 @@ -1,3 +1,8 @@ +2004-12-16 Werner Koch + + * config.links (mpi_optional_modules): Move entry for powerpc64 + before generic powerpc. Suggested by Rafael Ávila de Espíndola. + 2004-03-02 Werner Koch * hppa1.1/udiv-qrnnd.S: Alignment fix from Lamont Jones for Index: libgcrypt/mpi/config.links diff -u libgcrypt/mpi/config.links:1.33 libgcrypt/mpi/config.links:1.34 --- libgcrypt/mpi/config.links:1.33 Wed Mar 3 09:08:43 2004 +++ libgcrypt/mpi/config.links Thu Dec 16 17:34:56 2004 @@ -260,8 +260,7 @@ mpi_sflags="-Wa,-mppc" path="power powerpc32" ;; - ppc60[234]*-*-* | \ - powerpc*-*-*) + ppc60[234]*-*-*) mpi_sflags="-Wa,-mppc" path="powerpc32" ;; @@ -270,7 +269,10 @@ mpi_sflags="-Wa,-mppc" path="powerpc64" ;; - + powerpc*-*-*) + mpi_sflags="-Wa,-mppc" + path="powerpc32" + ;; *) echo '/* No assembler modules configured */' >>./mpi/asm-syntax.h path="" From cvs at cvs.gnupg.org Thu Dec 16 19:32:13 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 16 19:32:25 2004 Subject: gnupg/util (ChangeLog srv.h) Message-ID: Date: Thursday, December 16, 2004 @ 19:36:42 Author: dshaw Path: /cvs/gnupg/gnupg/util Modified: ChangeLog srv.h * configure.ac: Check for arpa/nameser.h. * srv.h: Don't include arpa/nameser.h unless we have it. Include "types.h" for u16. -----------+ ChangeLog | 3 +++ srv.h | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.170 gnupg/util/ChangeLog:1.171 --- gnupg/util/ChangeLog:1.170 Thu Dec 16 06:16:09 2004 +++ gnupg/util/ChangeLog Thu Dec 16 19:36:42 2004 @@ -1,5 +1,8 @@ 2004-12-16 David Shaw + * srv.h: Don't include arpa/nameser.h unless we have it. Include + "types.h" for u16. + * secmem.c (secmem_init): Return a flag to indicate whether we got the lock. Index: gnupg/util/srv.h diff -u gnupg/util/srv.h:1.5 gnupg/util/srv.h:1.6 --- gnupg/util/srv.h:1.5 Fri Aug 29 01:29:32 2003 +++ gnupg/util/srv.h Thu Dec 16 19:36:42 2004 @@ -1,5 +1,5 @@ /* srv.h - * Copyright (C) 2003 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004 Free Software Foundation, Inc. * * This file is part of GNUPG. * @@ -25,9 +25,12 @@ #include #else #include +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #include #endif +#include "types.h" #ifndef MAXDNAME #define MAXDNAME 1025 From cvs at cvs.gnupg.org Thu Dec 16 19:41:19 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 16 19:41:22 2004 Subject: gnupg (ChangeLog configure.ac) Message-ID: Date: Thursday, December 16, 2004 @ 19:45:48 Author: dshaw Path: /cvs/gnupg/gnupg Modified: ChangeLog configure.ac * configure.ac: Check for arpa/nameser.h. --------------+ ChangeLog | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.223 gnupg/ChangeLog:1.224 --- gnupg/ChangeLog:1.223 Thu Dec 16 11:04:36 2004 +++ gnupg/ChangeLog Thu Dec 16 19:45:48 2004 @@ -1,3 +1,7 @@ +2004-12-16 David Shaw + + * configure.ac: Check for arpa/nameser.h. + 2004-12-16 Werner Koch Released 1.4.0. Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.116 gnupg/configure.ac:1.117 --- gnupg/configure.ac:1.116 Thu Dec 16 11:53:25 2004 +++ gnupg/configure.ac Thu Dec 16 19:45:48 2004 @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.116 $)dnl +dnlAC_REVISION($Revision: 1.117 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" @@ -771,7 +771,7 @@ dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(unistd.h langinfo.h termio.h locale.h getopt.h) +AC_CHECK_HEADERS([unistd.h langinfo.h termio.h locale.h getopt.h arpa/nameser.h]) # Note that we do not check for iconv here because this is done anyway # by the gettext checks and thus it allows us to disable the use of From cvs at cvs.gnupg.org Fri Dec 17 11:37:47 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 17 11:37:50 2004 Subject: dirmngr (8 files) Message-ID: Date: Friday, December 17, 2004 @ 11:42:18 Author: wk Path: /cvs/dirmngr/dirmngr Modified: ChangeLog NEWS TODO acinclude.m4 configure.ac m4/ksba.m4 src/ChangeLog src/Makefile.am * acinclude.m4: Updated for automake 1.9. Removed the LDAP test and replaced it by the one from gnupg 1.4. * Makefile.am (dirmngr_ldap_LDADD): Adjusted for new LDAP checks. -----------------+ ChangeLog | 7 + NEWS | 4 - TODO | 5 - acinclude.m4 | 4 - configure.ac | 201 +++++++++++++++++++----------------------------------- m4/ksba.m4 | 2 src/ChangeLog | 4 + src/Makefile.am | 6 - 8 files changed, 93 insertions(+), 140 deletions(-) Index: dirmngr/ChangeLog diff -u dirmngr/ChangeLog:1.80 dirmngr/ChangeLog:1.81 --- dirmngr/ChangeLog:1.80 Mon Dec 13 16:16:35 2004 +++ dirmngr/ChangeLog Fri Dec 17 11:42:18 2004 @@ -1,3 +1,10 @@ +2004-12-17 Werner Koch + + Released 0.9.0. + + * acinclude.m4: Updated for automake 1.9. Removed the LDAP test + and replaced it by the one from gnupg 1.4. + 2004-12-13 Werner Koch * configure.ac (AC_CHECK_TYPES): Check for sigset_t. Index: dirmngr/NEWS diff -u dirmngr/NEWS:1.31 dirmngr/NEWS:1.32 --- dirmngr/NEWS:1.31 Thu Dec 16 08:49:25 2004 +++ dirmngr/NEWS Fri Dec 17 11:42:18 2004 @@ -1,9 +1,9 @@ -Noteworthy changes in version 0.9.0 +Noteworthy changes in version 0.9.0 (2004-12-17) ------------------------------------------------ * New option --daemon to start dirmngr as a system daemon. This switches to the use of different directories and also does - CRl signing certificate validation on its own. + CRL signing certificate validation on its own. * New tool dirmngr-client. Index: dirmngr/TODO diff -u dirmngr/TODO:1.16 dirmngr/TODO:1.17 --- dirmngr/TODO:1.16 Wed Nov 24 13:25:53 2004 +++ dirmngr/TODO Fri Dec 17 11:42:18 2004 @@ -1,11 +1,6 @@ Things we might want to do -*- outline -*- -* Audit the code! - -* Write a useful README - * Map LDAP error codes - and use the LDAP autoconf tests from gnupg 1.3 * Optimize lookup ** Use the most likely server first. Index: dirmngr/acinclude.m4 diff -u dirmngr/acinclude.m4:1.4 dirmngr/acinclude.m4:1.5 --- dirmngr/acinclude.m4:1.4 Tue Nov 16 19:24:36 2004 +++ dirmngr/acinclude.m4 Fri Dec 17 11:42:18 2004 @@ -20,7 +20,7 @@ dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME) dnl Check whether a typedef exists and create a #define $2 if it exists dnl -AC_DEFUN(GNUPG_CHECK_TYPEDEF, +AC_DEFUN([GNUPG_CHECK_TYPEDEF], [ AC_MSG_CHECKING(for $1 typedef) AC_CACHE_VAL(gnupg_cv_typedef_$1, [AC_TRY_COMPILE([#define _GNU_SOURCE 1 @@ -40,7 +40,7 @@ # If the version is sufficient, HAVE_PTH will be set to yes. # # Taken form the m4 macros which come with Pth -AC_DEFUN(GNUPG_PTH_VERSION_CHECK, +AC_DEFUN([GNUPG_PTH_VERSION_CHECK], [ _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'` _req_version="ifelse([$1],,1.2.0,$1)" Index: dirmngr/configure.ac diff -u dirmngr/configure.ac:1.65 dirmngr/configure.ac:1.66 --- dirmngr/configure.ac:1.65 Mon Dec 13 16:16:35 2004 +++ dirmngr/configure.ac Fri Dec 17 11:42:18 2004 @@ -19,10 +19,10 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.57) -min_automake_version="1.7.6" +AC_PREREQ(2.59) +min_automake_version="1.9.3" -AC_INIT(dirmngr, 0.9.0-cvs, gpa-dev@gnupg.org) +AC_INIT(dirmngr, 0.9.0, gpa-dev@gnupg.org) NEED_GPG_ERROR_VERSION=0.7 @@ -48,7 +48,7 @@ have_libgcrypt=no have_libassuan=no have_ksba=no - +have_ldap=no AM_MAINTAINER_MODE @@ -199,133 +199,70 @@ # -# Do we need the resolver lib -# -AC_HAVE_LIBRARY(resolv) - - -# -# OpenLDAP libraries/includes -# -AC_DEFUN(AC_FIND_FILE, -[ -$3=NO -for i in $2; -do - for j in $1; - do - echo "configure: __oline__: $i/$j" >&AC_FD_CC - if test -r "$i/$j"; then - echo "taking that" >&AC_FD_CC - $3=$i - break 2 +# Must check for network library requirements before doing link tests +# for ldap, for example. If ldap libs are static (or dynamic and without +# ELF runtime link paths), then link will fail and LDAP support won't +# be detected. +# +AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname, + [NETLIBS="-lnsl $NETLIBS"])) +AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, + [NETLIBS="-lsocket $NETLIBS"])) + +# +# LDAP libraries/includes +# +# From gnupg 1.4: +# Try and link a LDAP test program to weed out unusable LDAP +# libraries. -lldap [-llber [-lresolv]] is for older OpenLDAPs. +# OpenLDAP, circa 1999, was terrible with creating weird dependencies. +# This seems to have all been resolved, so I'm simplifying this code +# significantly. If all else fails, the user can play +# guess-the-dependency by using something like ./configure +# LDAPLIBS="-Lfoo -lbar" +# +for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lwldap32"; do + _ldap_save_libs=$LIBS + LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" + + AC_MSG_CHECKING([whether LDAP via \"$MY_LDAPLIBS\" is present and sane]) + AC_TRY_LINK([ +#ifdef _WIN32 +#include +#include +#else +#include +#endif +],[ldap_open("foobar",1234);], + [gnupg_cv_func_ldap_init=yes],[gnupg_cv_func_ldap_init=no]) + AC_MSG_RESULT([$gnupg_cv_func_ldap_init]) + + if test "$gnupg_cv_func_ldap_init" = yes ; then + LDAPLIBS=$MY_LDAPLIBS + have_ldap=yes + + AC_CHECK_FUNCS(ldap_get_option ldap_set_option ldap_start_tls_s) + + if test "$ac_cv_func_ldap_get_option" != yes ; then + AC_MSG_CHECKING([whether LDAP supports ld_errno]) + AC_TRY_LINK([#include ],[LDAP *ldap; ldap->ld_errno;], + [gnupg_cv_func_ldap_ld_errno=yes], + [gnupg_cv_func_ldap_ld_errno=no]) + AC_MSG_RESULT([$gnupg_cv_func_ldap_ld_errno]) + + if test "$gnupg_cv_func_ldap_ld_errno" = yes ; then + AC_DEFINE(HAVE_LDAP_LD_ERRNO,1, + [Define if the LDAP library supports ld_errno]) + fi + fi fi - done -done -]) - -AC_MSG_CHECKING(for OpenLDAP) -AC_ARG_WITH(ldap, -[ --with-ldap-prefix=PATH Set path for LDAP files [default=check]], -[ case "$withval" in - yes) - with_ldap=CHECK - ;; - esac ], -[ with_ldap=CHECK ] -)dnl - -if test "x$with_ldap" = "xCHECK" ; then - with_ldap=NOTFOUND - search_incs="$kde_includes /usr/include /usr/local/include" - AC_FIND_FILE(ldap.h, $search_incs, ldap_incdir) - if test -r $ldap_incdir/ldap.h ; then - test "x$ldap_incdir" != "x/usr/include" && LDAP_INCS="-I$ldap_incdir" - with_ldap=FOUND - fi - if test $with_ldap = FOUND ; then - with_ldap=NOTFOUND - for ext in la so sl a ; do - AC_FIND_FILE(libldap.$ext, /usr/lib /usr/local/lib, - ldap_libdir) - if test -r $ldap_libdir/libldap.$ext ; then - if test "x$ldap_libdir" != "x/usr/lib" ; then - LDAP_LIBS="-L$ldap_libdir " - test "$USE_RPATH" = yes && LDAP_RPATH="-R $ldap_libdir" - fi - LDAP_LIBS="${LDAP_LIBS}-lldap -llber" - with_ldap=FOUND - break - fi - done - fi -fi + LIBS=$_ldap_save_libs -case "$with_ldap" in -no) AC_MSG_RESULT(no) ;; -NOTFOUND) AC_MSG_ERROR([[ -*** -*** libldap was not found. You may want to get it from -*** http://www.openldap.org -*** -]]) ;; -FOUND) - AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries]) - LDAP_SUBDIR="ldap" - AC_MSG_RESULT(Yes) - ;; -*) - msg="$with_ldap" - LDAP_ROOT="$with_ldap" - if test "x$LDAP_ROOT" != "x/usr" ; then - LDAP_INCS="-I${LDAP_ROOT}/include" - LDAP_LIBS="-L${LDAP_ROOT}/lib " - if test "$USE_RPATH" = "yes" ; then - LDAP_RPATH="-R ${LDAP_ROOT}/lib" - fi - fi - LDAP_LIBS="${LDAP_LIBS}-lldap -llber" - safe_LIBS="$LIBS" - safe_CFLAGS="$CFLAGS" - LIBS="$LIBS $all_libraries $LDAP_LIBS $KERBEROS_LIBS $X_EXTRA_LIBS" - CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KERBEROS_INCS" - AC_LANG_SAVE - AC_LANG_C - AC_TRY_LINK(dnl - [ - #include - #include - #if LDAP_VENDOR_VERSION < 20000 - #error OpenLDAP version too old, please upgrade to version 2 or higher - #endif - ], - [ - LDAP *ldap; - ], - , with_ldap=no - ) - AC_LANG_RESTORE - CFLAGS=$safe_CFLAGS - LIBS=$safe_LIBS - if test "$with_ldap" = "no" ; then - LDAP_INCS= - LDAP_LIBS= - LDAP_RPATH= - LDAP_SUBDIR= - AC_MSG_ERROR(OpenLDAP not found) - else - AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries]) - LDAP_SUBDIR="ldap" - AC_MSG_RESULT($msg) - fi - ;; -esac + if test $have_ldap = yes ; then break; fi +done +AC_SUBST(LDAPLIBS) -AC_SUBST(LDAP_INCS) -AC_SUBST(LDAP_LIBS) -AC_SUBST(LDAP_RPATH) -AC_SUBST(LDAP_SUBDIR) # Checks for header files. @@ -429,6 +366,16 @@ *** (at least version $NEED_KSBA_VERSION is required). ***]]) fi +if test "$have_ldap" = "no"; then + die=yes + AC_MSG_NOTICE([[ +*** +*** You need a LDAP library to build this program. +*** Check out +*** http://www.openldap.org +*** for a suitable implementation. +***]]) +fi if test "$die" = "yes"; then AC_MSG_ERROR([[ Index: dirmngr/m4/ksba.m4 diff -u dirmngr/m4/ksba.m4:1.1 dirmngr/m4/ksba.m4:1.2 --- dirmngr/m4/ksba.m4:1.1 Tue Nov 11 19:15:01 2003 +++ dirmngr/m4/ksba.m4 Fri Dec 17 11:42:18 2004 @@ -14,7 +14,7 @@ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) dnl Test for libksba and define KSBA_CFLAGS and KSBA_LIBS dnl -AC_DEFUN(AM_PATH_KSBA, +AC_DEFUN([AM_PATH_KSBA], [ AC_ARG_WITH(ksba-prefix, AC_HELP_STRING([--with-ksba-prefix=PFX], [prefix where KSBA is installed (optional)]), Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.37 dirmngr/src/ChangeLog:1.38 --- dirmngr/src/ChangeLog:1.37 Thu Dec 16 08:49:25 2004 +++ dirmngr/src/ChangeLog Fri Dec 17 11:42:18 2004 @@ -1,3 +1,7 @@ +2004-12-17 Werner Koch + + * Makefile.am (dirmngr_ldap_LDADD): Adjusted for new LDAP checks. + 2004-12-16 Werner Koch * ldap.c (ldap_wrapper): Peek on the output to detect empty output Index: dirmngr/src/Makefile.am diff -u dirmngr/src/Makefile.am:1.22 dirmngr/src/Makefile.am:1.23 --- dirmngr/src/Makefile.am:1.22 Wed Dec 1 17:11:14 2004 +++ dirmngr/src/Makefile.am Fri Dec 17 11:42:18 2004 @@ -50,10 +50,10 @@ dirmngr_ldap_SOURCES = dirmngr_ldap.c i18n.h util.h \ no-libgcrypt.c no-libgcrypt.h -dirmngr_ldap_CFLAGS = $(LDAP_INCS) $(GPG_ERROR_CFLAGS) -dirmngr_ldap_LDFLAGS = $(LDAP_RPATH) +dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) +dirmngr_ldap_LDFLAGS = dirmngr_ldap_LDADD = ../jnlib/libjnlib.a $(LIBOBJS) $(GPG_ERROR_LIBS) \ - $(LDAP_LIBS) + $(LDAPLIBS) dirmngr_client_SOURCES = dirmngr-client.c i18n.h util.h b64enc.c maperror.c \ From cvs at cvs.gnupg.org Fri Dec 17 12:06:49 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 17 12:06:53 2004 Subject: dirmngr (NEWS configure.ac) Message-ID: Date: Friday, December 17, 2004 @ 12:11:22 Author: wk Path: /cvs/dirmngr/dirmngr Modified: NEWS configure.ac post release updates --------------+ NEWS | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) Index: dirmngr/NEWS diff -u dirmngr/NEWS:1.32 dirmngr/NEWS:1.33 --- dirmngr/NEWS:1.32 Fri Dec 17 11:42:18 2004 +++ dirmngr/NEWS Fri Dec 17 12:11:22 2004 @@ -1,3 +1,8 @@ +Noteworthy changes in version 0.9.1 +------------------------------------------------ + + + Noteworthy changes in version 0.9.0 (2004-12-17) ------------------------------------------------ Index: dirmngr/configure.ac diff -u dirmngr/configure.ac:1.66 dirmngr/configure.ac:1.67 --- dirmngr/configure.ac:1.66 Fri Dec 17 11:42:18 2004 +++ dirmngr/configure.ac Fri Dec 17 12:11:22 2004 @@ -22,7 +22,7 @@ AC_PREREQ(2.59) min_automake_version="1.9.3" -AC_INIT(dirmngr, 0.9.0, gpa-dev@gnupg.org) +AC_INIT(dirmngr, 0.9.1-cvs, gpa-dev@gnupg.org) NEED_GPG_ERROR_VERSION=0.7 From cvs at cvs.gnupg.org Fri Dec 17 15:31:41 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 17 15:31:44 2004 Subject: GNUPG-1-9-BRANCH gnupg/sm (ChangeLog call-dirmngr.c gpgsm.h server.c) Message-ID: Date: Friday, December 17, 2004 @ 15:36:16 Author: wk Path: /cvs/gnupg/gnupg/sm Tag: GNUPG-1-9-BRANCH Modified: ChangeLog call-dirmngr.c gpgsm.h server.c * call-dirmngr.c (isvalid_status_cb, lookup_status_cb) (run_command_status_cb): Return cancel status if gpgsm_status returned an error. * server.c (gpgsm_status, gpgsm_status2) (gpgsm_status_with_err_code): Return an error code. (gpgsm_status2): Always call va_end(). ----------------+ ChangeLog | 10 ++++++++++ call-dirmngr.c | 9 ++++++--- gpgsm.h | 8 ++++---- server.c | 23 +++++++++++++---------- 4 files changed, 33 insertions(+), 17 deletions(-) Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.81 gnupg/sm/ChangeLog:1.101.2.82 --- gnupg/sm/ChangeLog:1.101.2.81 Wed Dec 15 15:38:37 2004 +++ gnupg/sm/ChangeLog Fri Dec 17 15:36:16 2004 @@ -1,3 +1,13 @@ +2004-12-17 Werner Koch + + * call-dirmngr.c (isvalid_status_cb, lookup_status_cb) + (run_command_status_cb): Return cancel status if gpgsm_status + returned an error. + + * server.c (gpgsm_status, gpgsm_status2) + (gpgsm_status_with_err_code): Return an error code. + (gpgsm_status2): Always call va_end(). + 2004-12-15 Werner Koch * call-dirmngr.c (lookup_status_cb): Send progress messages Index: gnupg/sm/call-dirmngr.c diff -u gnupg/sm/call-dirmngr.c:1.16.2.10 gnupg/sm/call-dirmngr.c:1.16.2.11 --- gnupg/sm/call-dirmngr.c:1.16.2.10 Wed Dec 15 15:38:37 2004 +++ gnupg/sm/call-dirmngr.c Fri Dec 17 15:36:16 2004 @@ -355,7 +355,8 @@ { for (line += 8; *line == ' '; line++) ; - gpgsm_status (parm->ctrl, STATUS_PROGRESS, line); + if (gpgsm_status (parm->ctrl, STATUS_PROGRESS, line)) + return ASSUAN_Canceled; } } else if (!strncmp (line, "ONLY_VALID_IF_CERT_VALID", 24) @@ -625,7 +626,8 @@ { for (line += 8; *line == ' '; line++) ; - gpgsm_status (parm->ctrl, STATUS_PROGRESS, line); + if (gpgsm_status (parm->ctrl, STATUS_PROGRESS, line)) + return ASSUAN_Canceled; } } else if (!strncmp (line, "TRUNCATED", 9) && (line[9]==' ' || !line[9])) @@ -760,7 +762,8 @@ { for (line += 8; *line == ' '; line++) ; - gpgsm_status (ctrl, STATUS_PROGRESS, line); + if (gpgsm_status (ctrl, STATUS_PROGRESS, line)) + return ASSUAN_Canceled; } } return 0; Index: gnupg/sm/gpgsm.h diff -u gnupg/sm/gpgsm.h:1.54.2.22 gnupg/sm/gpgsm.h:1.54.2.23 --- gnupg/sm/gpgsm.h:1.54.2.22 Tue Nov 23 18:09:51 2004 +++ gnupg/sm/gpgsm.h Fri Dec 17 15:36:16 2004 @@ -171,10 +171,10 @@ /*-- server.c --*/ void gpgsm_server (certlist_t default_recplist); -void gpgsm_status (ctrl_t ctrl, int no, const char *text); -void gpgsm_status2 (ctrl_t ctrl, int no, ...); -void gpgsm_status_with_err_code (ctrl_t ctrl, int no, const char *text, - gpg_err_code_t ec); +gpg_error_t gpgsm_status (ctrl_t ctrl, int no, const char *text); +gpg_error_t gpgsm_status2 (ctrl_t ctrl, int no, ...); +gpg_error_t gpgsm_status_with_err_code (ctrl_t ctrl, int no, const char *text, + gpg_err_code_t ec); /*-- fingerprint --*/ char *gpgsm_get_fingerprint (ksba_cert_t cert, int algo, Index: gnupg/sm/server.c diff -u gnupg/sm/server.c:1.45.2.10 gnupg/sm/server.c:1.45.2.11 --- gnupg/sm/server.c:1.45.2.10 Mon Aug 16 13:15:55 2004 +++ gnupg/sm/server.c Fri Dec 17 15:36:16 2004 @@ -964,18 +964,19 @@ } -void +gpg_error_t gpgsm_status2 (CTRL ctrl, int no, ...) { + gpg_error_t err = 0; va_list arg_ptr; const char *text; va_start (arg_ptr, no); - if (ctrl->no_server) + if (ctrl->no_server && ctrl->status_fd == -1) + ; /* No status wanted. */ + else if (ctrl->no_server) { - if (ctrl->status_fd == -1) - return; /* no status wanted */ if (!statusfp) { if (ctrl->status_fd == 1) @@ -1030,19 +1031,21 @@ *p++ = *text++; } *p = 0; - assuan_write_status (ctx, get_status_string (no), buf); + err = map_assuan_err (assuan_write_status (ctx, + get_status_string (no), buf)); } va_end (arg_ptr); + return err; } -void +gpg_error_t gpgsm_status (CTRL ctrl, int no, const char *text) { - gpgsm_status2 (ctrl, no, text, NULL); + return gpgsm_status2 (ctrl, no, text, NULL); } -void +gpg_error_t gpgsm_status_with_err_code (CTRL ctrl, int no, const char *text, gpg_err_code_t ec) { @@ -1050,9 +1053,9 @@ sprintf (buf, "%u", (unsigned int)ec); if (text) - gpgsm_status2 (ctrl, no, text, buf, NULL); + return gpgsm_status2 (ctrl, no, text, buf, NULL); else - gpgsm_status2 (ctrl, no, buf, NULL); + return gpgsm_status2 (ctrl, no, buf, NULL); } #if 0 From cvs at cvs.gnupg.org Fri Dec 17 16:11:37 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 17 16:11:42 2004 Subject: dirmngr/src (ChangeLog crlfetch.h dirmngr.c ldap.c) Message-ID: Date: Friday, December 17, 2004 @ 16:16:12 Author: wk Path: /cvs/dirmngr/dirmngr/src Modified: ChangeLog crlfetch.h dirmngr.c ldap.c * dirmngr.c (launch_ripper_thread): Renamed to launch_reaper_thread. (shutdown_reaper): New. Use it for --server and --daemon. * ldap.c (ldap_wrapper_wait_connections): New. ------------+ ChangeLog | 6 ++++++ crlfetch.h | 1 + dirmngr.c | 27 +++++++++++++++++---------- ldap.c | 12 +++++++++++- 4 files changed, 35 insertions(+), 11 deletions(-) Index: dirmngr/src/ChangeLog diff -u dirmngr/src/ChangeLog:1.38 dirmngr/src/ChangeLog:1.39 --- dirmngr/src/ChangeLog:1.38 Fri Dec 17 11:42:18 2004 +++ dirmngr/src/ChangeLog Fri Dec 17 16:16:12 2004 @@ -1,5 +1,11 @@ 2004-12-17 Werner Koch + * dirmngr.c (launch_ripper_thread): Renamed to launch_reaper_thread. + (shutdown_reaper): New. Use it for --server and --daemon. + * ldap.c (ldap_wrapper_wait_connections): New. + +2004-12-17 Werner Koch + * Makefile.am (dirmngr_ldap_LDADD): Adjusted for new LDAP checks. 2004-12-16 Werner Koch Index: dirmngr/src/crlfetch.h diff -u dirmngr/src/crlfetch.h:1.12 dirmngr/src/crlfetch.h:1.13 --- dirmngr/src/crlfetch.h:1.12 Fri Nov 19 16:27:28 2004 +++ dirmngr/src/crlfetch.h Fri Dec 17 16:16:12 2004 @@ -58,6 +58,7 @@ /*-- ldap.c --*/ void *ldap_wrapper_thread (void*); +void ldap_wrapper_wait_connections (void); void ldap_wrapper_release_context (ksba_reader_t reader); void ldap_wrapper_connection_cleanup (ctrl_t); Index: dirmngr/src/dirmngr.c diff -u dirmngr/src/dirmngr.c:1.53 dirmngr/src/dirmngr.c:1.54 --- dirmngr/src/dirmngr.c:1.53 Wed Dec 15 23:11:59 2004 +++ dirmngr/src/dirmngr.c Fri Dec 17 16:16:12 2004 @@ -339,9 +339,9 @@ } -/* Helper to start the ripper thread for the ldap wrapper. */ +/* Helper to start the reaper thread for the ldap wrapper. */ static void -launch_ripper_thread (void) +launch_reaper_thread (void) { static int done; pth_attr_t tattr; @@ -353,17 +353,22 @@ tattr = pth_attr_new(); pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0); pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 256*1024); - pth_attr_set (tattr, PTH_ATTR_NAME, "ldap-ripper"); + pth_attr_set (tattr, PTH_ATTR_NAME, "ldap-reaper"); if (!pth_spawn (tattr, ldap_wrapper_thread, NULL)) { - log_error (_("error spawning ldap wrapper ripper thread: %s\n"), + log_error (_("error spawning ldap wrapper reaper thread: %s\n"), strerror (errno) ); dirmngr_exit (1); } } - +/* Helper to stop the reaper thread for the ldap wrapper. */ +static void +shutdown_reaper (void) +{ + ldap_wrapper_wait_connections (); +} /* Handle options which are allowed to be reset after program start. Return true if the current option in PARGS could be handled and @@ -756,10 +761,11 @@ log_debug ("... okay\n"); } - launch_ripper_thread (); + launch_reaper_thread (); cert_cache_init (); crl_cache_init (); start_command_handler (-1); + shutdown_reaper (); } else if (cmd == aDaemon) { @@ -907,24 +913,25 @@ } } - launch_ripper_thread (); + launch_reaper_thread (); cert_cache_init (); crl_cache_init (); handle_connections (fd); close (fd); + shutdown_reaper (); } else if (cmd == aListCRLs) { /* Just list the CRL cache and exit. */ if (argc) wrong_args ("--list-crls"); - launch_ripper_thread (); + launch_reaper_thread (); crl_cache_init (); crl_cache_list (stdout); } else if (cmd == aLoadCRL) { - launch_ripper_thread (); + launch_reaper_thread (); cert_cache_init (); crl_cache_init (); if (!argc) @@ -946,7 +953,7 @@ memset (&ctrlbuf, 0, sizeof ctrlbuf); dirmngr_init_default_ctrl (&ctrlbuf); - launch_ripper_thread (); + launch_reaper_thread (); cert_cache_init (); crl_cache_init (); rc = crl_fetch (&ctrlbuf, argv[0], &reader); Index: dirmngr/src/ldap.c diff -u dirmngr/src/ldap.c:1.44 dirmngr/src/ldap.c:1.45 --- dirmngr/src/ldap.c:1.44 Thu Dec 16 08:49:25 2004 +++ dirmngr/src/ldap.c Fri Dec 17 16:16:12 2004 @@ -360,6 +360,17 @@ } + +/* Wait until all ldap wrappers have terminated. We assume that the + kill has already been sent to all of them. */ +void +ldap_wrapper_wait_connections () +{ + while (wrapper_list) + pth_yield (NULL); +} + + /* This function is to be used to release a context associated with the given reader object. */ void @@ -413,7 +424,6 @@ } } - /* This is the callback used by the ldap wrapper to feed the ksba reader with the wrappers stdout. See the description of ksba_reader_set_cb for details. */ From cvs at cvs.gnupg.org Fri Dec 17 19:47:00 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Dec 17 21:13:44 2004 Subject: gnupg/g10 (ChangeLog keyedit.c keylist.c passphrase.c) Message-ID: Date: Friday, December 17, 2004 @ 19:51:32 Author: wk Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyedit.c keylist.c passphrase.c * passphrase.c (agent_get_passphrase): Define NREAD locally as size_t or int. * keylist.c (list_keyblock_print): Make field width an int. * keyedit.c (show_key_with_all_names): Ditto. --------------+ ChangeLog | 8 ++++++++ keyedit.c | 2 +- keylist.c | 2 +- passphrase.c | 4 +++- 4 files changed, 13 insertions(+), 3 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.660 gnupg/g10/ChangeLog:1.661 --- gnupg/g10/ChangeLog:1.660 Thu Dec 16 06:16:08 2004 +++ gnupg/g10/ChangeLog Fri Dec 17 19:51:32 2004 @@ -1,3 +1,11 @@ +2004-12-17 Werner Koch + + * passphrase.c (agent_get_passphrase): Define NREAD locally as + size_t or int. + + * keylist.c (list_keyblock_print): Make field width an int. + * keyedit.c (show_key_with_all_names): Ditto. + 2004-12-16 David Shaw * g10.c (main): Add --require-secmem/--no-require-secmem to cause Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.160 gnupg/g10/keyedit.c:1.161 --- gnupg/g10/keyedit.c:1.160 Tue Dec 14 15:50:15 2004 +++ gnupg/g10/keyedit.c Fri Dec 17 19:51:32 2004 @@ -2344,7 +2344,7 @@ { if(opt.trust_model!=TM_ALWAYS) { - tty_printf("%*s",keystrlen()+13,""); + tty_printf("%*s", (int)keystrlen()+13,""); /* Ownertrust is only meaningful for the PGP or classic trust models */ if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC) Index: gnupg/g10/keylist.c diff -u gnupg/g10/keylist.c:1.91 gnupg/g10/keylist.c:1.92 --- gnupg/g10/keylist.c:1.91 Wed Dec 15 06:16:53 2004 +++ gnupg/g10/keylist.c Fri Dec 17 19:51:32 2004 @@ -787,7 +787,7 @@ printf("uid%*s%s ",indent,"",validity); } else - printf("uid%*s",keystrlen()+10,""); + printf("uid%*s", (int)keystrlen()+10,""); print_utf8_string( stdout, uid->name, uid->len ); putchar('\n'); Index: gnupg/g10/passphrase.c diff -u gnupg/g10/passphrase.c:1.72 gnupg/g10/passphrase.c:1.73 --- gnupg/g10/passphrase.c:1.72 Tue Dec 14 09:03:56 2004 +++ gnupg/g10/passphrase.c Fri Dec 17 19:51:32 2004 @@ -643,7 +643,6 @@ char *atext = NULL; char buf[50]; int fd = -1; - int nread; u32 reply; char *pw = NULL; PKT_public_key *pk = m_alloc_clear( sizeof *pk ); @@ -742,6 +741,8 @@ if (!prot) { /* old style protocol */ + size_t nread; + n = 4 + 20 + strlen (atext); u32tobuf (buf, n ); u32tobuf (buf+4, GPGA_PROT_GET_PASSPHRASE ); @@ -814,6 +815,7 @@ } else { /* The new Assuan protocol */ + int nread; char *line, *p; const unsigned char *s; int i; From cvs at cvs.gnupg.org Sat Dec 18 00:03:27 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Sat Dec 18 07:00:48 2004 Subject: gnupg (ChangeLog configure.ac) Message-ID: Date: Saturday, December 18, 2004 @ 00:07:59 Author: dshaw Path: /cvs/gnupg/gnupg Modified: ChangeLog configure.ac * configure.ac: Add a --with-ldap=DIR so people can add to the search path. --------------+ ChangeLog | 5 +++++ configure.ac | 46 ++++++++++++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 16 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.224 gnupg/ChangeLog:1.225 --- gnupg/ChangeLog:1.224 Thu Dec 16 19:45:48 2004 +++ gnupg/ChangeLog Sat Dec 18 00:07:59 2004 @@ -1,3 +1,8 @@ +2004-12-17 David Shaw + + * configure.ac: Add a --with-ldap=DIR so people can add to the + search path. + 2004-12-16 David Shaw * configure.ac: Check for arpa/nameser.h. Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.117 gnupg/configure.ac:1.118 --- gnupg/configure.ac:1.117 Thu Dec 16 19:45:48 2004 +++ gnupg/configure.ac Sat Dec 18 00:07:59 2004 @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.117 $)dnl +dnlAC_REVISION($Revision: 1.118 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" @@ -305,44 +305,47 @@ AC_MSG_RESULT($enableval) if test "$gnupg_cv_enable_keyserver_helpers" = yes ; then +dnl LDAP is defined only after we confirm the library is available later AC_MSG_CHECKING([whether LDAP keyserver support is requested]) AC_ARG_ENABLE(ldap, - [ --disable-ldap disable LDAP keyserver interface], - try_ldap=$enableval, try_ldap=yes) + AC_HELP_STRING([--disable-ldap],[disable LDAP keyserver interface only]), + try_ldap=$enableval, try_ldap=yes) AC_MSG_RESULT($try_ldap) AC_MSG_CHECKING([whether HKP keyserver support is requested]) AC_ARG_ENABLE(hkp, - [ --disable-hkp disable HKP keyserver interface], - try_hkp=$enableval, try_hkp=yes) + AC_HELP_STRING([--disable-hkp],[disable HKP keyserver interface only]), + try_hkp=$enableval, try_hkp=yes) AC_MSG_RESULT($try_hkp) AC_MSG_CHECKING([whether HTTP key fetching support is requested]) AC_ARG_ENABLE(http, AC_HELP_STRING([--disable-http],[disable HTTP key fetching interface]), - try_http=$enableval, try_http=yes) + try_http=$enableval, try_http=yes) AC_MSG_RESULT($try_http) - AC_MSG_CHECKING([whether Finger key fetching support is requested]) + AC_MSG_CHECKING([whether finger key fetching support is requested]) AC_ARG_ENABLE(finger, AC_HELP_STRING([--disable-finger], - [disable Finger key fetching interface]), - try_finger=$enableval, try_finger=yes) + [disable finger key fetching interface only]), + try_finger=$enableval, try_finger=yes) AC_MSG_RESULT($try_finger) AC_MSG_CHECKING([whether email keyserver support is requested]) AC_ARG_ENABLE(mailto, - [ --disable-mailto disable email keyserver interface], - try_mailto=$enableval, try_mailto=yes) + AC_HELP_STRING([--disable-mailto], + [disable email keyserver interface only]), + try_mailto=$enableval, try_mailto=yes) AC_MSG_RESULT($try_mailto) fi AC_MSG_CHECKING([whether keyserver exec-path is enabled]) AC_ARG_ENABLE(keyserver-path, - [ --disable-keyserver-path disable the exec-path option for keyserver helpers], - [if test "$enableval" = no ; then + AC_HELP_STRING([--disable-keyserver-path], + [disable the exec-path option for keyserver helpers]), + [if test "$enableval" = no ; then AC_DEFINE(DISABLE_KEYSERVER_PATH,1,[define to disable exec-path for keyserver helpers]) - fi],enableval=yes) + fi],enableval=yes) AC_MSG_RESULT($enableval) fi @@ -591,6 +594,16 @@ # LDAPLIBS="-Lfoo -lbar" if test "$try_ldap" = yes ; then + + AC_ARG_WITH(ldap, + AC_HELP_STRING([--with-ldap=DIR],[look for the LDAP library in DIR]), + [ + if test -d "$withval" ; then + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi + ]) + for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lwldap32"; do _ldap_save_libs=$LIBS LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" @@ -1040,8 +1053,9 @@ AC_MSG_CHECKING([whether regular expression support is requested]) AC_ARG_ENABLE(regex, -[ --disable-regex do not handle regular expressions in trust sigs], - use_regex=$enableval, use_regex=yes) + AC_HELP_STRING([--disable-regex], + [do not handle regular expressions in trust signatures]), + use_regex=$enableval, use_regex=yes) AC_MSG_RESULT($use_regex) if test "$use_regex" = yes ; then From cvs at cvs.gnupg.org Sat Dec 18 19:48:53 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Sat Dec 18 20:02:40 2004 Subject: GNUPG-1-9-BRANCH gnupg (11 files) Message-ID: Date: Saturday, December 18, 2004 @ 19:53:32 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: ChangeLog agent/ChangeLog agent/gpg-agent.c autogen.sh common/exechelp.c configure.ac jnlib/ChangeLog jnlib/w32-pth.c scd/ChangeLog scd/scdaemon.c sm/gpgsm.c * configure.ac (AH_BOTTOM): Define EXEEXT_S. * autogen.sh: Updated --build-w32 feature. * gpg-agent.c (main): Remove special Pth initialize. * w32-pth.c (pth_init): Reverse return values. Use TRUE and FALSE constants. (pth_kill, pth_mutex_acquire, pth_attr_set, pth_join, pth_cancel): Ditto. * scdaemon.c (main) [W32]: Remove special Pth initialize.. -------------------+ ChangeLog | 6 ++ agent/ChangeLog | 2 agent/gpg-agent.c | 6 -- autogen.sh | 98 +++++++++++++++++++++++----------------------- common/exechelp.c | 2 configure.ac | 12 +++-- jnlib/ChangeLog | 7 +++ jnlib/w32-pth.c | 110 +++++++++++++++++++++++++++++++++------------------- scd/ChangeLog | 2 scd/scdaemon.c | 6 -- sm/gpgsm.c | 1 11 files changed, 147 insertions(+), 105 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.131.2.61 gnupg/ChangeLog:1.131.2.62 --- gnupg/ChangeLog:1.131.2.61 Wed Dec 15 15:15:09 2004 +++ gnupg/ChangeLog Sat Dec 18 19:53:32 2004 @@ -1,3 +1,9 @@ +2004-12-18 Werner Koch + + * configure.ac (AH_BOTTOM): Define EXEEXT_S. + + * autogen.sh: Updated --build-w32 feature. + 2004-12-15 Werner Koch * Makefile.am (SUBDIRS) [W32]: Do not build in tests/. Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.47 gnupg/agent/ChangeLog:1.59.2.48 --- gnupg/agent/ChangeLog:1.59.2.47 Sat Dec 18 11:22:10 2004 +++ gnupg/agent/ChangeLog Sat Dec 18 19:53:32 2004 @@ -1,5 +1,7 @@ 2004-12-18 Werner Koch + * gpg-agent.c (main): Remove special Pth initialize. + * agent.h (map_assuan_err): Define in terms of map_assuan_err_with_source. Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.24 gnupg/agent/gpg-agent.c:1.31.2.25 --- gnupg/agent/gpg-agent.c:1.31.2.24 Wed Dec 15 15:15:09 2004 +++ gnupg/agent/gpg-agent.c Sat Dec 18 19:53:32 2004 @@ -179,9 +179,7 @@ static void handle_connections (int listen_fd); /* Pth wrapper function definitions. */ -#ifndef HAVE_W32_SYSTEM GCRY_THREAD_OPTION_PTH_IMPL; -#endif #endif /*USE_GNU_PTH*/ static void check_for_running_agent (void); @@ -439,16 +437,12 @@ /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ #ifdef USE_GNU_PTH -# ifdef HAVE_W32_SYSTEM - pth_init (); -# else /*!HAVE_W32_SYSTEM*/ err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } -# endif/*!HAVE_W32_SYSTEM*/ #endif /*USE_GNU_PTH*/ /* Check that the libraries are suitable. Do it here because Index: gnupg/autogen.sh diff -u gnupg/autogen.sh:1.2.4.6 gnupg/autogen.sh:1.2.4.7 --- gnupg/autogen.sh:1.2.4.6 Mon Apr 19 16:15:57 2004 +++ gnupg/autogen.sh Sat Dec 18 19:53:32 2004 @@ -40,64 +40,66 @@ DIE=no -if [ "$1" = "--build-w32" ]; then +# ***** W32 build script ******* +# Used to cross-compile for Windows. +if test "$1" = "--build-w32"; then + tmp=`dirname $0` + tsdir=`cd "$tmp"; pwd` shift - target=i386--mingw32 - if [ ! -f ./config.guess ]; then - echo "./config.guess not found" >&2 - exit 1 - fi - host=`./config.guess` - - if ! mingw32 --version >/dev/null; then - echo "We need at least version 0.3 of MingW32/CPD" >&2 + if [ ! -f $tsdir/scripts/config.guess ]; then + echo "$tsdir/scripts/config.guess not found" >&2 exit 1 fi + build=`$tsdir/scripts/config.guess` - if [ -f config.h ]; then - if grep HAVE_DOSISH_SYSTEM config.h | grep undef >/dev/null; then + [ -z "$w32root" ] && w32root="$HOME/w32root" + echo "Using $w32root as standard install directory" >&2 + + # See whether we have the Debian cross compiler package or the + # old mingw32/cpd system + if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then + host=i586-mingw32msvc + crossbindir=/usr/$host/bin + else + host=i386--mingw32 + if ! mingw32 --version >/dev/null; then + echo "We need at least version 0.3 of MingW32/CPD" >&2 + exit 1 + fi + crossbindir=`mingw32 --install-dir`/bin + # Old autoconf version required us to setup the environment + # with the proper tool names. + CC=`mingw32 --get-path gcc` + CPP=`mingw32 --get-path cpp` + AR=`mingw32 --get-path ar` + RANLIB=`mingw32 --get-path ranlib` + export CC CPP AR RANLIB + fi + + if [ -f "$tsdir/config.log" ]; then + if ! head $tsdir/config.log | grep "$host" >/dev/null; then echo "Pease run a 'make distclean' first" >&2 exit 1 fi fi - crossinstalldir=`mingw32 --install-dir` - crossbindir=`mingw32 --get-bindir 2>/dev/null` \ - || crossbindir="$crossinstalldir/bin" - crossdatadir=`mingw32 --get-datadir 2>/dev/null` \ - || crossdatadir="$crossinstalldir/share" - crosslibdir=`mingw32 --get-libdir 2>/dev/null` \ - || crosslibdir="$crossinstalldir/i386--mingw32/lib" - crossincdir=`mingw32 --get-includedir 2>/dev/null` \ - || crossincdir="$crossinstalldir/i386--mingw32/include" - CC=`mingw32 --get-path gcc` - CPP=`mingw32 --get-path cpp` - AR=`mingw32 --get-path ar` - RANLIB=`mingw32 --get-path ranlib` - export CC CPP AR RANLIB - - disable_foo_tests="" - if [ -n "$lib_config_files" ]; then - for i in $lib_config_files; do - j=`echo $i | tr '[a-z-]' '[A-Z_]'` - eval "$j=${crossbindir}/$i" - export $j - disable_foo_tests="$disable_foo_tests --disable-`echo $i| \ - sed 's,-config$,,'`-test" - if [ ! -f "${crossbindir}/$i" ]; then - echo "$i not installed for MingW32" >&2 - DIE=yes - fi - done - fi - [ $DIE = yes ] && exit 1 - - ./configure --host=${host} --target=${target} ${disable_foo_tests} \ - --bindir=${crossbindir} --libdir=${crosslibdir} \ - --datadir=${crossdatadir} --includedir=${crossincdir} \ - --enable-maintainer-mode $* - exit $? + ./configure --enable-maintainer-mode --prefix=${w32root} \ + --host=i586-mingw32msvc --build=${build} \ + --with-gpg-error-prefix=${w32root} \ + --with-ksba-prefix=${w32root} \ + --with-libgcrypt-prefix=${w32root} \ + --with-libassuan-prefix=${w32root} \ + --with-zlib=${w32root} \ + --with-pth-prefix=${w32root} + rc=$? + # Ugly hack to overcome a gettext problem. Someone should look into + # gettext to figure out why the po directory is not ignored as it used + # to be. + [ $rc = 0 ] && touch $tsdir/po/all + exit $rc fi +# ***** end W32 build script ******* + Index: gnupg/common/exechelp.c diff -u gnupg/common/exechelp.c:1.1.2.2 gnupg/common/exechelp.c:1.1.2.3 --- gnupg/common/exechelp.c:1.1.2.2 Wed Dec 15 15:15:09 2004 +++ gnupg/common/exechelp.c Sat Dec 18 19:53:32 2004 @@ -231,7 +231,7 @@ cr_flags = (CREATE_DEFAULT_ERROR_MODE | GetPriorityClass (GetCurrentProcess ()) | CREATE_SUSPENDED); - log_debug ("CreateProcess, path=`%s' cmdline=`%s'", pgmname, cmdline); + log_debug ("CreateProcess, path=`%s' cmdline=`%s'\n", pgmname, cmdline); if (!CreateProcess (pgmname, /* Program to start. */ cmdline, /* Command line arguments. */ &sec_attr, /* Process security attributes. */ Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.73 gnupg/configure.ac:1.36.2.74 --- gnupg/configure.ac:1.36.2.73 Wed Dec 15 15:15:09 2004 +++ gnupg/configure.ac Sat Dec 18 19:53:32 2004 @@ -255,11 +255,13 @@ #define EXTSEP_C '.' #define DIRSEP_S "\\" #define EXTSEP_S "." +#define EXEEXT_S ".exe" #else #define DIRSEP_C '/' #define EXTSEP_C '.' #define DIRSEP_S "/" #define EXTSEP_S "." +#define EXEEXT_S "" #endif /* This is the same as VERSION, but should be overridden if the @@ -283,20 +285,20 @@ /* Setup the hardwired names of modules. */ #ifndef GNUPG_DEFAULT_AGENT -#define GNUPG_DEFAULT_AGENT ( GNUPG_BINDIR DIRSEP_S "gpg-agent" ) +#define GNUPG_DEFAULT_AGENT ( GNUPG_BINDIR DIRSEP_S "gpg-agent" EXEEXT_S ) #endif #ifndef GNUPG_DEFAULT_PINENTRY -#define GNUPG_DEFAULT_PINENTRY ( GNUPG_BINDIR DIRSEP_S "pinentry" ) +#define GNUPG_DEFAULT_PINENTRY ( GNUPG_BINDIR DIRSEP_S "pinentry" EXEEXT_S ) #endif #ifndef GNUPG_DEFAULT_SCDAEMON -#define GNUPG_DEFAULT_SCDAEMON ( GNUPG_BINDIR DIRSEP_S "scdaemon" ) +#define GNUPG_DEFAULT_SCDAEMON ( GNUPG_BINDIR DIRSEP_S "scdaemon" EXEEXT_S ) #endif #ifndef GNUPG_DEFAULT_DIRMNGR -#define GNUPG_DEFAULT_DIRMNGR ( GNUPG_BINDIR DIRSEP_S "dirmngr" ) +#define GNUPG_DEFAULT_DIRMNGR ( GNUPG_BINDIR DIRSEP_S "dirmngr" EXEEXT_S ) #endif #ifndef GNUPG_DEFAULT_PROTECT_TOOL #define GNUPG_DEFAULT_PROTECT_TOOL \ - ( GNUPG_LIBEXECDIR DIRSEP_S "gpg-protect-tool" ) + ( GNUPG_LIBEXECDIR DIRSEP_S "gpg-protect-tool" EXEEXT_S ) #endif Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.27 gnupg/jnlib/ChangeLog:1.3.2.28 --- gnupg/jnlib/ChangeLog:1.3.2.27 Wed Dec 15 15:15:08 2004 +++ gnupg/jnlib/ChangeLog Sat Dec 18 19:53:32 2004 @@ -1,3 +1,10 @@ +2004-12-18 Werner Koch + + * w32-pth.c (pth_init): Reverse return values. Use TRUE and FALSE + constants. + (pth_kill, pth_mutex_acquire, pth_attr_set, pth_join, pth_cancel): + Ditto. + 2004-12-15 Werner Koch * logging.c [W32]: Don't include unavailable headers. Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.7 gnupg/jnlib/w32-pth.c:1.1.2.8 --- gnupg/jnlib/w32-pth.c:1.1.2.7 Tue Dec 14 20:20:36 2004 +++ gnupg/jnlib/w32-pth.c Sat Dec 18 19:53:32 2004 @@ -33,11 +33,24 @@ #include #include +#include "logging.h" /* For log_get_prefix () */ + /* We don't want to have any Windows specific code in the header, thus we use a macro which defaults to a compatible type in w32-pth.h. */ #define W32_PTH_HANDLE_INTERNAL HANDLE #include "w32-pth.h" +#ifndef FALSE +#define FALSE 0 +#endif +#ifndef TRUE +#define TRUE 1 +#endif +#if FALSE != 0 || TRUE != 1 +#error TRUE or FALSE defined to wrong values +#endif + + static int pth_initialized = 0; @@ -107,10 +120,12 @@ SECURITY_ATTRIBUTES sa; WSADATA wsadat; - fprintf (stderr, "pth_init: called.\n"); - pth_initialized = 1; + if (pth_initialized) + return TRUE; + + fprintf (stderr, "%s: pth_init: called.\n", log_get_prefix (NULL)); if (WSAStartup (0x202, &wsadat)) - abort (); + return FALSE; pth_signo = 0; InitializeCriticalSection (&pth_shd); if (pth_signo_ev) @@ -121,9 +136,11 @@ sa.nLength = sizeof sa; pth_signo_ev = CreateEvent (&sa, TRUE, FALSE, NULL); if (!pth_signo_ev) - abort (); + return FALSE; + + pth_initialized = 1; EnterCriticalSection (&pth_shd); - return 0; + return TRUE; } @@ -140,7 +157,7 @@ DeleteCriticalSection (&pth_shd); WSACleanup (); pth_initialized = 0; - return 0; + return TRUE; } @@ -160,7 +177,8 @@ { /* Fixme: I am not sure whether the same thread my enter a critical section twice. */ - fprintf (stderr, "enter_pth (%s)\n", function? function:""); +/* fprintf (stderr, "%s: enter_pth (%s)\n", + log_get_prefix (NULL), function? function:""); */ LeaveCriticalSection (&pth_shd); } @@ -169,7 +187,8 @@ leave_pth (const char *function) { EnterCriticalSection (&pth_shd); - fprintf (stderr, "leave_pth (%s)\n", function? function:""); +/* fprintf (stderr, "%s: leave_pth (%s)\n", + log_get_prefix (NULL), function? function:""); */ } @@ -234,7 +253,8 @@ { char strerr[256]; - fprintf (stderr, "pth_read(%d) failed read from file: %s\n", fd, + fprintf (stderr, "%s: pth_read(%d) failed read from file: %s\n", + log_get_prefix (NULL), fd, w32_strerror (strerr, sizeof strerr)); n = -1; } @@ -273,7 +293,8 @@ n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); if (!n) { - fprintf (stderr, "pth_write(%d) failed in write: %s\n", fd, + fprintf (stderr, "%s: pth_write(%d) failed in write: %s\n", + log_get_prefix (NULL), fd, w32_strerror (strerr, sizeof strerr)); n = -1; } @@ -437,7 +458,7 @@ if (!hd || !hd->mx) { leave_pth (__FUNCTION__); - return -1; + return FALSE; } #if 0 @@ -488,7 +509,7 @@ hd->mx_state |= PTH_MUTEX_LOCKED; leave_pth (__FUNCTION__); - return 0; + return TRUE; } @@ -513,7 +534,7 @@ hd->mx_state = PTH_MUTEX_INITIALIZED; leave_pth (__FUNCTION__); - return 0; + return TRUE; } @@ -537,7 +558,7 @@ if (hd->name) free (hd->name); free (hd); - return 0; + return TRUE; } @@ -547,7 +568,7 @@ va_list args; char * str; int val; - int rc = 0; + int rc = TRUE; implicit_init (); @@ -559,7 +580,8 @@ if (val) { hd->flags |= PTH_ATTR_JOINABLE; - fprintf (stderr, "pth_attr_set: PTH_ATTR_JOINABLE\n"); + fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_JOINABLE\n", + log_get_prefix (NULL)); } break; @@ -569,7 +591,8 @@ { hd->flags |= PTH_ATTR_STACK_SIZE; hd->stack_size = val; - fprintf (stderr, "pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", val); + fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", + log_get_prefix (NULL), val); } break; @@ -581,14 +604,15 @@ { hd->name = strdup (str); if (!hd->name) - return -1; + return FALSE; hd->flags |= PTH_ATTR_NAME; - fprintf (stderr, "pth_attr_set: PTH_ATTR_NAME %s\n", hd->name); + fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_NAME %s\n", + log_get_prefix (NULL), hd->name); } break; default: - rc = -1; + rc = FALSE; break; } va_end (args); @@ -627,12 +651,14 @@ FIXME: We should no use th W32's Thread handle directly but keep our own thread control structure. CTX may be used for that. */ - fprintf (stderr, "do_pth_spawn creating thread ...\n"); + fprintf (stderr, "%s: do_pth_spawn creating thread ...\n", + log_get_prefix (NULL)); th = CreateThread (&sa, hd->stack_size, (LPTHREAD_START_ROUTINE)launch_thread, ctx, CREATE_SUSPENDED, &tid); ctx->th = th; - fprintf (stderr, "do_pth_spawn created thread %p\n", th); + fprintf (stderr, "%s: do_pth_spawn created thread %p\n", + log_get_prefix (NULL),th); if (!th) free (ctx); else @@ -660,7 +686,7 @@ int pth_join (pth_t hd, void **value) { - return 0; + return TRUE; } @@ -675,7 +701,7 @@ WaitForSingleObject (hd, 1000); TerminateThread (hd, 0); leave_pth (__FUNCTION__); - return 0; + return TRUE; } @@ -689,7 +715,7 @@ enter_pth (__FUNCTION__); TerminateThread (hd, 0); leave_pth (__FUNCTION__); - return 0; + return TRUE; } @@ -759,7 +785,7 @@ case CTRL_BREAK_EVENT: pth_signo = SIGTERM; break; } SetEvent (pth_signo_ev); - fprintf (stderr, "sig_handler=%d\n", pth_signo); + fprintf (stderr, "%s: sig_handler=%d\n", log_get_prefix (NULL), pth_signo); return TRUE; } @@ -771,7 +797,7 @@ pth_event_t ev; int rc; - fprintf (stderr, "pth_event spec=%lu\n", spec); + fprintf (stderr, "%s: pth_event spec=%lu\n", log_get_prefix (NULL), spec); ev = calloc (1, sizeof *ev); if (!ev) return NULL; @@ -783,7 +809,8 @@ ev->u_type = PTH_EVENT_SIGS; ev->val = va_arg (arg, int *); rc = SetConsoleCtrlHandler (sig_handler, TRUE); - fprintf (stderr, "pth_event: sigs rc=%d\n", rc); + fprintf (stderr, "%s: pth_event: sigs rc=%d\n", + log_get_prefix (NULL), rc); } else if (spec & PTH_EVENT_FD) { @@ -794,7 +821,8 @@ ev->u_type = PTH_EVENT_FD; va_arg (arg, pth_key_t); ev->u.fd = va_arg (arg, int); - fprintf (stderr, "pth_event: fd=%d\n", ev->u.fd); + fprintf (stderr, "%s: pth_event: fd=%d\n", + log_get_prefix (NULL), ev->u.fd); } else if (spec & PTH_EVENT_TIME) { @@ -908,7 +936,8 @@ while (1) { n = select (fd+1, &r, &w, NULL, &tv); - fprintf (stderr, "wait_for_fd=%d fd %d (ec=%d)\n", n, fd,(int)WSAGetLastError ()); + fprintf (stderr, "%s: wait_for_fd=%d fd %d (ec=%d)\n", + log_get_prefix (NULL), n, fd,(int)WSAGetLastError ()); if (n == -1) break; if (!n) @@ -1005,7 +1034,8 @@ if (sigpresent (ev->u.sig, pth_signo) && WaitForSingleObject (pth_signo_ev, 0) == WAIT_OBJECT_0) { - fprintf (stderr, "pth_event_occurred: sig signaled.\n"); + fprintf (stderr, "%s: pth_event_occurred: sig signaled.\n", + log_get_prefix (NULL)); (*ev->val) = pth_signo; ret = 1; } @@ -1080,7 +1110,7 @@ free (ev); } - return 0; + return TRUE; } int @@ -1134,11 +1164,13 @@ sa.lpSecurityDescriptor = NULL; sa.nLength = sizeof sa; - fprintf (stderr, "spawn_helper_thread creating thread ...\n"); + fprintf (stderr, "%s: spawn_helper_thread creating thread ...\n", + log_get_prefix (NULL)); th = CreateThread (&sa, 32*1024, (LPTHREAD_START_ROUTINE)func, arg, 0, &tid); - fprintf (stderr, "spawn_helper_thread created thread %p\n", th); + fprintf (stderr, "%s: spawn_helper_thread created thread %p\n", + log_get_prefix (NULL), th); return th; } @@ -1163,7 +1195,7 @@ pth_event_t ev = ctx; wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); - fprintf (stderr, "wait_fd_thread: exit.\n"); + fprintf (stderr, "%s: wait_fd_thread: exit.\n", log_get_prefix (NULL)); SetEvent (ev->hd); ExitThread (0); return NULL; @@ -1177,7 +1209,7 @@ int n = ev->u.tv.tv_sec*1000; Sleep (n); SetEvent (ev->hd); - fprintf (stderr, "wait_timer_thread: exit.\n"); + fprintf (stderr, "%s: wait_timer_thread: exit.\n", log_get_prefix (NULL)); ExitThread (0); return NULL; } @@ -1199,7 +1231,7 @@ if (n > MAXIMUM_WAIT_OBJECTS/2) return -1; - fprintf (stderr, "pth_wait: cnt %lu\n", n); + fprintf (stderr, "%s: pth_wait: cnt %lu\n", log_get_prefix (NULL), n); for (tmp = ev; tmp; tmp = tmp->next) { switch (tmp->u_type) @@ -1233,10 +1265,10 @@ break; } } - fprintf (stderr, "pth_wait: set %d\n", pos); + fprintf (stderr, "%s: pth_wait: set %d\n", log_get_prefix (NULL), pos); n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); free_helper_threads (waitbuf, hdidx, i); - fprintf (stderr, "pth_wait: n %ld\n", n); + fprintf (stderr, "%s: pth_wait: n %ld\n", log_get_prefix (NULL), n); if (n != WAIT_TIMEOUT) return 1; Index: gnupg/scd/ChangeLog diff -u gnupg/scd/ChangeLog:1.25.2.61 gnupg/scd/ChangeLog:1.25.2.62 --- gnupg/scd/ChangeLog:1.25.2.61 Sat Dec 18 11:22:09 2004 +++ gnupg/scd/ChangeLog Sat Dec 18 19:53:31 2004 @@ -1,5 +1,7 @@ 2004-12-18 Werner Koch + * scdaemon.c (main) [W32]: Remove special Pth initialize.. + * scdaemon.h (map_assuan_err): Define in terms of map_assuan_err_with_source. Index: gnupg/scd/scdaemon.c diff -u gnupg/scd/scdaemon.c:1.12.2.21 gnupg/scd/scdaemon.c:1.12.2.22 --- gnupg/scd/scdaemon.c:1.12.2.21 Wed Dec 15 15:15:08 2004 +++ gnupg/scd/scdaemon.c Sat Dec 18 19:53:31 2004 @@ -158,10 +158,8 @@ #ifndef HAVE_OPENSC #ifdef USE_GNU_PTH -#ifndef HAVE_W32_SYSTEM /* Pth wrapper function definitions. */ GCRY_THREAD_OPTION_PTH_IMPL; -#endif static void *ticker_thread (void *arg); #endif /*USE_GNU_PTH*/ @@ -353,16 +351,12 @@ Note that this will also do the pth_init. */ #ifndef HAVE_OPENSC #ifdef USE_GNU_PTH -# ifdef HAVE_W32_SYSTEM - pth_init (); -# else /*!HAVE_W32_SYSTEM*/ err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } -# endif /*!HAVE_W32_SYSTEM*/ #endif /*USE_GNU_PTH*/ #endif /*!HAVE_OPENSC*/ Index: gnupg/sm/gpgsm.c diff -u gnupg/sm/gpgsm.c:1.67.2.34 gnupg/sm/gpgsm.c:1.67.2.35 --- gnupg/sm/gpgsm.c:1.67.2.34 Wed Dec 15 15:15:08 2004 +++ gnupg/sm/gpgsm.c Sat Dec 18 19:53:31 2004 @@ -740,6 +740,7 @@ } #ifdef HAVE_W32_SYSTEM + /* For W32 we need pth. */ pth_init (); #endif From cvs at cvs.gnupg.org Sat Dec 18 11:17:33 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Sat Dec 18 20:02:46 2004 Subject: GNUPG-1-9-BRANCH gnupg (18 files) Message-ID: Date: Saturday, December 18, 2004 @ 11:22:10 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: agent/ChangeLog agent/agent.h common/ChangeLog common/asshelp.c common/asshelp.h common/maperror.c common/util.h g10/ChangeLog g10/Makefile.am g10/call-agent.c g10/gpg.h kbx/ChangeLog kbx/keybox-defs.h scd/ChangeLog scd/scdaemon.h sm/ChangeLog sm/call-agent.c sm/gpgsm.h Avoid the " map_to_assuan_status called with no error source" diagnostic. -------------------+ agent/ChangeLog | 5 +++++ agent/agent.h | 2 ++ common/ChangeLog | 7 +++++++ common/asshelp.c | 16 +++++++++------- common/asshelp.h | 1 + common/maperror.c | 4 ++-- common/util.h | 2 +- g10/ChangeLog | 9 +++++++++ g10/Makefile.am | 2 +- g10/call-agent.c | 2 ++ g10/gpg.h | 2 ++ kbx/ChangeLog | 5 +++++ kbx/keybox-defs.h | 4 +++- scd/ChangeLog | 5 +++++ scd/scdaemon.h | 3 +++ sm/ChangeLog | 7 +++++++ sm/call-agent.c | 2 +- sm/gpgsm.h | 3 +++ 18 files changed, 68 insertions(+), 13 deletions(-) Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.46 gnupg/agent/ChangeLog:1.59.2.47 --- gnupg/agent/ChangeLog:1.59.2.46 Fri Dec 17 21:41:50 2004 +++ gnupg/agent/ChangeLog Sat Dec 18 11:22:10 2004 @@ -1,3 +1,8 @@ +2004-12-18 Werner Koch + + * agent.h (map_assuan_err): Define in terms of + map_assuan_err_with_source. + 2004-12-17 Moritz Schulte * query.c: Undo change from 2004-12-05. Index: gnupg/agent/agent.h diff -u gnupg/agent/agent.h:1.32.2.8 gnupg/agent/agent.h:1.32.2.9 --- gnupg/agent/agent.h:1.32.2.8 Sun Sep 26 23:48:13 2004 +++ gnupg/agent/agent.h Sat Dec 18 11:22:10 2004 @@ -26,6 +26,8 @@ #endif #define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GPGAGENT #include +#define map_assuan_err(a) \ + map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a)) #include #include Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.34 gnupg/common/ChangeLog:1.30.2.35 --- gnupg/common/ChangeLog:1.30.2.34 Wed Dec 15 15:15:09 2004 +++ gnupg/common/ChangeLog Sat Dec 18 11:22:10 2004 @@ -1,3 +1,10 @@ +2004-12-18 Werner Koch + + * maperror.c (map_assuan_err): Renamed to .. + (map_assuan_err_with_source): .. this and add arg SOURCE.c + * asshelp.c (send_pinentry_environment, send_one_option): Add arg + ERRSOURCE. + 2004-12-15 Werner Koch * sysutils.h [W32]: Prototypes for registry functions. Index: gnupg/common/asshelp.c diff -u gnupg/common/asshelp.c:1.1.2.3 gnupg/common/asshelp.c:1.1.2.4 --- gnupg/common/asshelp.c:1.1.2.3 Wed Dec 15 15:15:09 2004 +++ gnupg/common/asshelp.c Sat Dec 18 11:22:10 2004 @@ -34,7 +34,8 @@ static gpg_error_t -send_one_option (assuan_context_t ctx, const char *name, const char *value) +send_one_option (assuan_context_t ctx, gpg_err_source_t errsource, + const char *name, const char *value) { gpg_error_t err; char *optstr; @@ -48,7 +49,7 @@ assuan_error_t ae; ae = assuan_transact (ctx, optstr, NULL, NULL, NULL, NULL, NULL, NULL); - err = ae? map_assuan_err (ae) : 0; + err = ae? map_assuan_err_with_source (errsource, ae) : 0; free (optstr); } @@ -61,6 +62,7 @@ defaults taken from the current locale. */ gpg_error_t send_pinentry_environment (assuan_context_t ctx, + gpg_err_source_t errsource, const char *opt_display, const char *opt_ttyname, const char *opt_ttytype, @@ -78,7 +80,7 @@ dft_display = getenv ("DISPLAY"); if (opt_display || dft_display) { - err = send_one_option (ctx, "display", + err = send_one_option (ctx, errsource, "display", opt_display ? opt_display : dft_display); if (err) return err; @@ -93,7 +95,7 @@ } if (opt_ttyname || dft_ttyname) { - err = send_one_option (ctx, "ttyname", + err = send_one_option (ctx, errsource, "ttyname", opt_ttyname ? opt_ttyname : dft_ttyname); if (err) return err; @@ -103,7 +105,7 @@ dft_ttytype = getenv ("TERM"); if (opt_ttytype || (dft_ttyname && dft_ttytype)) { - err = send_one_option (ctx, "ttytype", + err = send_one_option (ctx, errsource, "ttytype", opt_ttyname ? opt_ttytype : dft_ttytype); if (err) return err; @@ -122,7 +124,7 @@ #endif if (opt_lc_ctype || (dft_ttyname && dft_lc)) { - err = send_one_option (ctx, "lc-ctype", + err = send_one_option (ctx, errsource, "lc-ctype", opt_lc_ctype ? opt_lc_ctype : dft_lc); } #if defined(HAVE_SETLOCALE) && defined(LC_CTYPE) @@ -148,7 +150,7 @@ #endif if (opt_lc_messages || (dft_ttyname && dft_lc)) { - err = send_one_option (ctx, "display", + err = send_one_option (ctx, errsource, "display", opt_lc_messages ? opt_lc_messages : dft_lc); } #if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES) Index: gnupg/common/asshelp.h diff -u gnupg/common/asshelp.h:1.1.2.1 gnupg/common/asshelp.h:1.1.2.2 --- gnupg/common/asshelp.h:1.1.2.1 Sat Mar 6 21:11:17 2004 +++ gnupg/common/asshelp.h Sat Dec 18 11:22:10 2004 @@ -26,6 +26,7 @@ gpg_error_t send_pinentry_environment (assuan_context_t ctx, + gpg_err_source_t errsource, const char *opt_display, const char *opt_ttyname, const char *opt_ttytype, Index: gnupg/common/maperror.c diff -u gnupg/common/maperror.c:1.18.2.5 gnupg/common/maperror.c:1.18.2.6 --- gnupg/common/maperror.c:1.18.2.5 Tue Jul 20 20:41:49 2004 +++ gnupg/common/maperror.c Sat Dec 18 11:22:10 2004 @@ -38,7 +38,7 @@ simple: All errors with a gpg_err_source of UNKNOWN are genuine Assuan codes all others are passed verbatim through. */ gpg_error_t -map_assuan_err (int err) +map_assuan_err_with_source (int err, int source) { gpg_err_code_t ec; @@ -77,7 +77,7 @@ ec = err < 100? GPG_ERR_ASSUAN_SERVER_FAULT : GPG_ERR_ASSUAN; break; } - return gpg_err_make (GPG_ERR_SOURCE_UNKNOWN, ec); + return gpg_err_make (source, ec); } /* Map GPG_xERR_xx error codes to Assuan status codes */ Index: gnupg/common/util.h diff -u gnupg/common/util.h:1.12.2.11 gnupg/common/util.h:1.12.2.12 --- gnupg/common/util.h:1.12.2.11 Wed Dec 15 15:15:09 2004 +++ gnupg/common/util.h Sat Dec 18 11:22:10 2004 @@ -61,7 +61,7 @@ /*-- maperror.c --*/ int map_kbx_err (int err); -gpg_error_t map_assuan_err (int err); +gpg_error_t map_assuan_err_with_source (int source, int err); int map_to_assuan_status (int rc); /*-- gettime.c --*/ Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.372.2.52 gnupg/g10/ChangeLog:1.372.2.53 --- gnupg/g10/ChangeLog:1.372.2.52 Fri Oct 22 18:03:04 2004 +++ gnupg/g10/ChangeLog Sat Dec 18 11:22:09 2004 @@ -1,3 +1,12 @@ +2004-12-18 Werner Koch + + * gpg.h (map_assuan_err): Define in terms of + map_assuan_err_with_source. + +2004-12-15 Werner Koch + + * Makefile.am (LDADD): Remove ZLIBS. + 2004-10-22 Werner Koch * g10.c (main): Display a bit fat warning that this gpg should not Index: gnupg/g10/Makefile.am diff -u gnupg/g10/Makefile.am:1.75.2.10 gnupg/g10/Makefile.am:1.75.2.11 --- gnupg/g10/Makefile.am:1.75.2.10 Thu Sep 30 16:34:30 2004 +++ gnupg/g10/Makefile.am Sat Dec 18 11:22:09 2004 @@ -108,7 +108,7 @@ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ @W32LIBS@ +LDADD = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error Index: gnupg/g10/call-agent.c diff -u gnupg/g10/call-agent.c:1.1.2.16 gnupg/g10/call-agent.c:1.1.2.17 --- gnupg/g10/call-agent.c:1.1.2.16 Wed Dec 15 15:15:08 2004 +++ gnupg/g10/call-agent.c Sat Dec 18 11:22:09 2004 @@ -171,7 +171,9 @@ if (rc) return map_assuan_err (rc); +#ifdef __GNUC__ #warning put this code into common/asshelp.c +#endif dft_display = getenv ("DISPLAY"); if (opt.display || dft_display) Index: gnupg/g10/gpg.h diff -u gnupg/g10/gpg.h:1.1.2.2 gnupg/g10/gpg.h:1.1.2.3 --- gnupg/g10/gpg.h:1.1.2.2 Wed Jun 18 21:55:55 2003 +++ gnupg/g10/gpg.h Sat Dec 18 11:22:09 2004 @@ -29,6 +29,8 @@ #error GPG_ERR_SOURCE_DEFAULT already defined #endif #define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GPG +#define map_assuan_err(a) \ + map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a)) #include Index: gnupg/kbx/ChangeLog diff -u gnupg/kbx/ChangeLog:1.15.2.10 gnupg/kbx/ChangeLog:1.15.2.11 --- gnupg/kbx/ChangeLog:1.15.2.10 Tue Dec 7 19:07:30 2004 +++ gnupg/kbx/ChangeLog Sat Dec 18 11:22:09 2004 @@ -1,3 +1,8 @@ +2004-12-18 Werner Koch + + * keybox-defs.h (map_assuan_err): Define in terms of + map_assuan_err_with_source. + 2004-12-07 Werner Koch * keybox-init.c (keybox_release): Close the file pointer. Index: gnupg/kbx/keybox-defs.h diff -u gnupg/kbx/keybox-defs.h:1.6.2.8 gnupg/kbx/keybox-defs.h:1.6.2.9 --- gnupg/kbx/keybox-defs.h:1.6.2.8 Thu Dec 2 08:48:08 2004 +++ gnupg/kbx/keybox-defs.h Sat Dec 18 11:22:09 2004 @@ -25,8 +25,10 @@ #error GPG_ERR_SOURCE_DEFAULT already defined #endif #define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KEYBOX - #include +#define map_assuan_err(a) \ + map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a)) + #include /* off_t */ /* We include the type defintions from jnlib instead of defining our Index: gnupg/scd/ChangeLog diff -u gnupg/scd/ChangeLog:1.25.2.60 gnupg/scd/ChangeLog:1.25.2.61 --- gnupg/scd/ChangeLog:1.25.2.60 Wed Dec 15 15:15:08 2004 +++ gnupg/scd/ChangeLog Sat Dec 18 11:22:09 2004 @@ -1,3 +1,8 @@ +2004-12-18 Werner Koch + + * scdaemon.h (map_assuan_err): Define in terms of + map_assuan_err_with_source. + 2004-12-15 Werner Koch * scdaemon.c [W32]: Various hacks to make it run under W32. Index: gnupg/scd/scdaemon.h diff -u gnupg/scd/scdaemon.h:1.12.2.9 gnupg/scd/scdaemon.h:1.12.2.10 --- gnupg/scd/scdaemon.h:1.12.2.9 Thu Aug 5 11:24:35 2004 +++ gnupg/scd/scdaemon.h Sat Dec 18 11:22:09 2004 @@ -26,6 +26,9 @@ #endif #define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_SCD #include +#define map_assuan_err(a) \ + map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a)) + #include #include Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.82 gnupg/sm/ChangeLog:1.101.2.83 --- gnupg/sm/ChangeLog:1.101.2.82 Fri Dec 17 15:36:16 2004 +++ gnupg/sm/ChangeLog Sat Dec 18 11:22:09 2004 @@ -1,3 +1,10 @@ +2004-12-18 Werner Koch + + * gpgsm.h (map_assuan_err): Define in terms of + map_assuan_err_with_source. + * call-agent.c (start_agent): Pass error source to + send_pinentry_environment. + 2004-12-17 Werner Koch * call-dirmngr.c (isvalid_status_cb, lookup_status_cb) Index: gnupg/sm/call-agent.c diff -u gnupg/sm/call-agent.c:1.35.2.8 gnupg/sm/call-agent.c:1.35.2.9 --- gnupg/sm/call-agent.c:1.35.2.8 Mon Dec 13 16:49:56 2004 +++ gnupg/sm/call-agent.c Sat Dec 18 11:22:09 2004 @@ -168,7 +168,7 @@ if (rc) return map_assuan_err (rc); - return send_pinentry_environment (agent_ctx, + return send_pinentry_environment (agent_ctx, GPG_ERR_SOURCE_DEFAULT, opt.display, opt.ttyname, opt.ttytype, opt.lc_ctype, opt.lc_messages); } Index: gnupg/sm/gpgsm.h diff -u gnupg/sm/gpgsm.h:1.54.2.23 gnupg/sm/gpgsm.h:1.54.2.24 --- gnupg/sm/gpgsm.h:1.54.2.23 Fri Dec 17 15:36:16 2004 +++ gnupg/sm/gpgsm.h Sat Dec 18 11:22:09 2004 @@ -26,6 +26,9 @@ #endif #define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GPGSM #include +#define map_assuan_err(a) \ + map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a)) + #include #include "../common/util.h" From cvs at cvs.gnupg.org Fri Dec 17 21:37:18 2004 From: cvs at cvs.gnupg.org (cvs user mo) Date: Sat Dec 18 20:26:33 2004 Subject: GNUPG-1-9-BRANCH gnupg/agent (ChangeLog query.c) Message-ID: Date: Friday, December 17, 2004 @ 21:41:50 Author: mo Path: /cvs/gnupg/gnupg/agent Tag: GNUPG-1-9-BRANCH Modified: ChangeLog query.c 2004-12-17 Moritz Schulte * query.c: Undo change from 2004-12-05. -----------+ ChangeLog | 4 ++++ query.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.45 gnupg/agent/ChangeLog:1.59.2.46 --- gnupg/agent/ChangeLog:1.59.2.45 Wed Dec 15 15:15:09 2004 +++ gnupg/agent/ChangeLog Fri Dec 17 21:41:50 2004 @@ -1,3 +1,7 @@ +2004-12-17 Moritz Schulte + + * query.c: Undo change from 2004-12-05. + 2004-12-15 Werner Koch * gpg-agent.c [W32]: Various hacks to make it work. Index: gnupg/agent/query.c diff -u gnupg/agent/query.c:1.23.2.5 gnupg/agent/query.c:1.23.2.6 --- gnupg/agent/query.c:1.23.2.5 Sun Dec 5 16:36:49 2004 +++ gnupg/agent/query.c Fri Dec 17 21:41:50 2004 @@ -152,7 +152,7 @@ pgmname++; argv[0] = pgmname; - if (ctrl && ctrl->display && !opt.keep_display) + if (ctrl->display && !opt.keep_display) { argv[1] = "--display"; argv[2] = ctrl->display; @@ -189,7 +189,7 @@ NULL, NULL, NULL, NULL, NULL, NULL); if (rc) return unlock_pinentry (map_assuan_err (rc)); - if (ctrl && ctrl->ttyname) + if (ctrl->ttyname) { char *optstr; if (asprintf (&optstr, "OPTION ttyname=%s", ctrl->ttyname) < 0 ) @@ -200,7 +200,7 @@ if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl && ctrl->ttytype) + if (ctrl->ttytype) { char *optstr; if (asprintf (&optstr, "OPTION ttytype=%s", ctrl->ttytype) < 0 ) @@ -210,7 +210,7 @@ if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl && ctrl->lc_ctype) + if (ctrl->lc_ctype) { char *optstr; if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 ) @@ -220,7 +220,7 @@ if (rc) return unlock_pinentry (map_assuan_err (rc)); } - if (ctrl && ctrl->lc_messages) + if (ctrl->lc_messages) { char *optstr; if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 ) From cvs at cvs.gnupg.org Sat Dec 18 12:01:15 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Sat Dec 18 21:29:01 2004 Subject: LIBGCRYPT-1-2-BRANCH libgcrypt (ChangeLog autogen.sh) Message-ID: Date: Saturday, December 18, 2004 @ 12:05:54 Author: wk Path: /cvs/libgcrypt/libgcrypt Tag: LIBGCRYPT-1-2-BRANCH Modified: ChangeLog autogen.sh Added option --build-w32 to run W32 cross compiling configure. ------------+ ChangeLog | 5 +++++ autogen.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 3 deletions(-) Index: libgcrypt/ChangeLog diff -u libgcrypt/ChangeLog:1.158.2.1 libgcrypt/ChangeLog:1.158.2.2 --- libgcrypt/ChangeLog:1.158.2.1 Mon Aug 9 12:36:26 2004 +++ libgcrypt/ChangeLog Sat Dec 18 12:05:54 2004 @@ -1,3 +1,8 @@ +2004-12-18 Werner Koch + + * autogen.sh: Added option --build-w32 to run W32 cross compiling + configure. + 2004-08-09 Moritz Schulte * THANKS: Updated. Index: libgcrypt/autogen.sh diff -u libgcrypt/autogen.sh:1.3.2.1 libgcrypt/autogen.sh:1.3.2.2 --- libgcrypt/autogen.sh:1.3.2.1 Mon Aug 9 12:40:40 2004 +++ libgcrypt/autogen.sh Sat Dec 18 12:05:54 2004 @@ -1,7 +1,7 @@ #! /bin/sh # Run this to generate all the initial makefiles, etc. # -# Copyright (C) 2003 g10 Code GmbH +# Copyright (C) 2003, 2004 g10 Code GmbH # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -28,6 +28,61 @@ return 1 } +DIE=no + + +# Used to cross-compile for Windows. +if test "$1" = "--build-w32"; then + tmp=`dirname $0` + tsdir=`cd "$tmp"; pwd` + shift + if [ ! -f $tsdir/config.guess ]; then + echo "$tsdir/config.guess not found" >&2 + exit 1 + fi + build=`$tsdir/config.guess` + + [ -z "$w32root" ] && w32root="$HOME/w32root" + echo "Using $w32root as standard install directory" >&2 + + # See whether we have the Debian cross compiler package or the + # old mingw32/cpd system + if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then + host=i586-mingw32msvc + crossbindir=/usr/$host/bin + else + host=i386--mingw32 + if ! mingw32 --version >/dev/null; then + echo "We need at least version 0.3 of MingW32/CPD" >&2 + exit 1 + fi + crossbindir=`mingw32 --install-dir`/bin + # Old autoconf version required us to setup the environment + # with the proper tool names. + CC=`mingw32 --get-path gcc` + CPP=`mingw32 --get-path cpp` + AR=`mingw32 --get-path ar` + RANLIB=`mingw32 --get-path ranlib` + export CC CPP AR RANLIB + fi + + if [ -f "$tsdir/config.log" ]; then + if ! head $tsdir/config.log | grep "$host" >/dev/null; then + echo "Pease run a 'make distclean' first" >&2 + exit 1 + fi + fi + + ./configure --enable-maintainer-mode --prefix=${w32root} \ + --host=i586-mingw32msvc --build=${build} \ + --with-gpg-error-prefix=${w32root} \ + --disable-shared + + exit $? +fi + + + # Grep the required versions from configure.ac autoconf_vers=`sed -n '/^AC_PREREQ(/ { @@ -65,8 +120,6 @@ #GETTEXT=${GETTEXT_PREFIX}${GETTEXT:-gettext}${GETTEXT_SUFFIX} #MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX} -DIE=no - if check_version $AUTOCONF $autoconf_vers_num $autoconf_vers ; then check_version $AUTOHEADER $autoconf_vers_num $autoconf_vers autoconf From cvs at cvs.gnupg.org Sat Dec 18 12:06:10 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Sat Dec 18 22:05:47 2004 Subject: libgpg-error (ChangeLog autogen.sh) Message-ID: Date: Saturday, December 18, 2004 @ 12:06:10 Author: werner Path: /cvs/gnupg/libgpg-error Modified: ChangeLog autogen.sh Add option --build-w32. ------------+ ChangeLog | 4 ++++ autogen.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 2 deletions(-) From cvs at cvs.gnupg.org Sat Dec 18 18:12:17 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Sat Dec 18 22:34:36 2004 Subject: libassuan (ChangeLog autogen.sh build-w32.sh) Message-ID: Date: Saturday, December 18, 2004 @ 18:12:17 Author: werner Path: /cvs/gnupg/libassuan Modified: ChangeLog autogen.sh Removed: build-w32.sh * autogen.sh: Add Option --build-w32. * assuan-logging.c (_assuan_w32_strerror): New. * assuan-defs.h (w32_strerror): new. * assuan-pipe-connect.c (assuan_pipe_connect2, fix_signals): Factored signal code out to new function. (build_w32_commandline, create_inheritable_pipe): New. Taken from gnupg 1.9. (assuan_pipe_connect2) [W32]: Implemented for W32. --------------+ ChangeLog | 4 +++ autogen.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- build-w32.sh | 10 --------- 3 files changed, 61 insertions(+), 12 deletions(-) From cvs at cvs.gnupg.org Sat Dec 18 18:12:17 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Sat Dec 18 23:09:10 2004 Subject: libassuan/src (6 files) Message-ID: Date: Saturday, December 18, 2004 @ 18:12:17 Author: werner Path: /cvs/gnupg/libassuan/src Modified: ChangeLog assuan-defs.h assuan-logging.c assuan-pipe-connect.c assuan-socket-connect.c assuan-util.c * autogen.sh: Add Option --build-w32. * assuan-logging.c (_assuan_w32_strerror): New. * assuan-defs.h (w32_strerror): new. * assuan-pipe-connect.c (assuan_pipe_connect2, fix_signals): Factored signal code out to new function. (build_w32_commandline, create_inheritable_pipe): New. Taken from gnupg 1.9. (assuan_pipe_connect2) [W32]: Implemented for W32. -------------------------+ ChangeLog | 15 ++ assuan-defs.h | 7 assuan-logging.c | 24 +++ assuan-pipe-connect.c | 324 ++++++++++++++++++++++++++++++++++++++++++---- assuan-socket-connect.c | 18 ++ assuan-util.c | 3 6 files changed, 363 insertions(+), 28 deletions(-) From cvs at cvs.gnupg.org Sat Dec 18 23:34:50 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Sat Dec 18 23:35:15 2004 Subject: gnupg (ChangeLog configure.ac) Message-ID: Date: Saturday, December 18, 2004 @ 23:39:31 Author: dshaw Path: /cvs/gnupg/gnupg Modified: ChangeLog configure.ac Oddly commit missed this one. * configure.ac: Call the new GNUPG_CHECK_READLINE macro for readline stuff. --------------+ ChangeLog | 5 +++++ configure.ac | 18 ++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.225 gnupg/ChangeLog:1.226 --- gnupg/ChangeLog:1.225 Sat Dec 18 00:07:59 2004 +++ gnupg/ChangeLog Sat Dec 18 23:39:31 2004 @@ -1,3 +1,8 @@ +2004-12-18 David Shaw + + * configure.ac: Call the new GNUPG_CHECK_READLINE macro for + readline stuff. + 2004-12-17 David Shaw * configure.ac: Add a --with-ldap=DIR so people can add to the Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.118 gnupg/configure.ac:1.119 --- gnupg/configure.ac:1.118 Sat Dec 18 00:07:59 2004 +++ gnupg/configure.ac Sat Dec 18 23:39:31 2004 @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.118 $)dnl +dnlAC_REVISION($Revision: 1.119 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" @@ -116,14 +116,6 @@ card_support=$enableval, card_support=yes) AC_MSG_RESULT($card_support) -AC_MSG_CHECKING([whether readline support is requested]) -AC_ARG_WITH(readline, - AC_HELP_STRING([--without-readline], - [do not support fancy command line editing]), - [readline_support="$withval"], [readline_support=yes]) -case "$readline_support" in yes);; no);; *)readline_support=yes;; esac -AC_MSG_RESULT($readline_support) - AC_MSG_CHECKING([whether the new iconv based code is requested]) AC_ARG_ENABLE(gnupg-iconv, AC_HELP_STRING([--disable-gnupg-iconv], @@ -1176,14 +1168,8 @@ AC_SUBST(LIBUSB_LIBS) AC_CHECK_FUNCS(usb_get_busses) -# # Check for readline support -# -if test "$readline_support" = yes ; then - AC_CHECK_LIB(readline, add_history) - AC_CHECK_HEADERS([readline/readline.h]) -fi - +GNUPG_CHECK_READLINE # Allow users to append something to the version string without # flagging it as development version. The user version parts is From cvs at cvs.gnupg.org Sat Dec 18 23:19:11 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Sun Dec 19 00:22:00 2004 Subject: gnupg (9 files) Message-ID: Date: Saturday, December 18, 2004 @ 23:23:49 Author: dshaw Path: /cvs/gnupg/gnupg Added: m4/readline.m4 Modified: g10/ChangeLog g10/Makefile.am g10/signal.c m4/ChangeLog tools/ChangeLog tools/Makefile.am util/ChangeLog util/ttyio.c Readline fix to be robust against platforms where readline has its own dependencies. We play guess-the-depedency for a while, and try termcap, curses, and ncurses. -------------------+ g10/ChangeLog | 7 ++++++ g10/Makefile.am | 2 - g10/signal.c | 4 +-- m4/ChangeLog | 4 +++ m4/readline.m4 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/ChangeLog | 4 +++ tools/Makefile.am | 7 +++--- util/ChangeLog | 5 ++++ util/ttyio.c | 8 +++---- 9 files changed, 87 insertions(+), 10 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.661 gnupg/g10/ChangeLog:1.662 --- gnupg/g10/ChangeLog:1.661 Fri Dec 17 19:51:32 2004 +++ gnupg/g10/ChangeLog Sat Dec 18 23:23:48 2004 @@ -1,3 +1,10 @@ +2004-12-18 David Shaw + + * signal.c: Use only HAVE_LIBREADLINE to detect readline + availability. + + * Makefile.am: Link with readline where necessary. + 2004-12-17 Werner Koch * passphrase.c (agent_get_passphrase): Define NREAD locally as Index: gnupg/g10/Makefile.am diff -u gnupg/g10/Makefile.am:1.87 gnupg/g10/Makefile.am:1.88 --- gnupg/g10/Makefile.am:1.87 Thu Oct 28 20:57:50 2004 +++ gnupg/g10/Makefile.am Sat Dec 18 23:23:48 2004 @@ -132,7 +132,7 @@ # ks-db.h \ # $(common_source) -LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ +LDADD = $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@ gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@ $(PROGRAMS): $(needed_libs) Index: gnupg/g10/signal.c diff -u gnupg/g10/signal.c:1.19 gnupg/g10/signal.c:1.20 --- gnupg/g10/signal.c:1.19 Tue Sep 28 16:50:05 2004 +++ gnupg/g10/signal.c Sat Dec 18 23:23:48 2004 @@ -27,7 +27,7 @@ #include #include #include -#ifdef HAVE_READLINE_READLINE_H +#ifdef HAVE_LIBREADLINE #include #include #endif @@ -83,7 +83,7 @@ secmem_term(); -#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE) +#ifdef HAVE_LIBREADLINE rl_free_line_state (); rl_cleanup_after_signal (); #endif Index: gnupg/m4/ChangeLog diff -u gnupg/m4/ChangeLog:1.3 gnupg/m4/ChangeLog:1.4 --- gnupg/m4/ChangeLog:1.3 Tue Jul 27 17:11:53 2004 +++ gnupg/m4/ChangeLog Sat Dec 18 23:23:49 2004 @@ -1,3 +1,7 @@ +2004-12-18 David Shaw + + * readline.m4: New. + 2004-07-27 gettextize * gettext.m4: Upgrade to gettext-0.14.1. Index: gnupg/m4/readline.m4 diff -u /dev/null gnupg/m4/readline.m4:1.1 --- /dev/null Sat Dec 18 23:23:49 2004 +++ gnupg/m4/readline.m4 Sat Dec 18 23:23:49 2004 @@ -0,0 +1,56 @@ +dnl Check for readline and dependencies +dnl Copyright (C) 2004 Free Software Foundation, Inc. +dnl +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl Defines HAVE_LIBREADLINE to 1 if a working readline setup is +dnl found, and sets @LIBREADLINE@ to the necessary libraries. + +AC_DEFUN([GNUPG_CHECK_READLINE], +[ + AC_ARG_WITH(readline, + AC_HELP_STRING([--with-readline=DIR], + [look for the readline library in DIR]), + [_do_readline=$withval],[_do_readline=yes]) + + if test "$_do_readline" != "no" ; then + if test -d "$withval" ; then + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi + + for _termcap in "" "-ltermcap" "-lcurses" "-lncurses" ; do + _readline_save_libs=$LIBS + _combo="-lreadline${_termcap:+ $_termcap}" + LIBS="$LIBS $_combo" + + AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane]) + + AC_LINK_IFELSE(AC_LANG_PROGRAM([ +#include +#include +#include +],[add_history("foobar");]),_found_readline=yes,_found_readline=no) + + AC_MSG_RESULT([$_found_readline]) + + LIBS=$_readline_save_libs + + if test $_found_readline = yes ; then + AC_DEFINE(HAVE_LIBREADLINE,1, + [Define to 1 if you have a fully functional readline library.]) + AC_SUBST(LIBREADLINE,$_combo) + break + fi + done + + unset _termcap + unset _readline_save_libs + unset _combo + unset _found_readline + fi +])dnl Index: gnupg/tools/ChangeLog diff -u gnupg/tools/ChangeLog:1.31 gnupg/tools/ChangeLog:1.32 --- gnupg/tools/ChangeLog:1.31 Thu Oct 28 20:57:50 2004 +++ gnupg/tools/ChangeLog Sat Dec 18 23:23:49 2004 @@ -1,3 +1,7 @@ +2004-12-18 David Shaw + + * Makefile.am: Link with readline where needed. + 2004-10-28 Werner Koch * Makefile.am (other_libs): New. Also include LIBICONV. Noted by Index: gnupg/tools/Makefile.am diff -u gnupg/tools/Makefile.am:1.32 gnupg/tools/Makefile.am:1.33 --- gnupg/tools/Makefile.am:1.32 Thu Oct 28 20:57:50 2004 +++ gnupg/tools/Makefile.am Sat Dec 18 23:23:49 2004 @@ -1,4 +1,5 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2003, +# 2004 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -28,7 +29,7 @@ gpgsplit_LDADD = $(needed_libs) $(other_libs) @ZLIBS@ mpicalc_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ -bftest_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ @DLLIBS@ @NETLIBS@ -shmtest_LDADD = $(needed_libs) $(other_libs) +bftest_LDADD = $(needed_libs) $(other_libs) @W32LIBS@ @DLLIBS@ @NETLIBS@ @LIBREADLINE@ +shmtest_LDADD = $(needed_libs) $(other_libs) @LIBREADLINE@ gpgsplit mpicalc bftest shmtest: $(needed_libs) Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.171 gnupg/util/ChangeLog:1.172 --- gnupg/util/ChangeLog:1.171 Thu Dec 16 19:36:42 2004 +++ gnupg/util/ChangeLog Sat Dec 18 23:23:49 2004 @@ -1,3 +1,8 @@ +2004-12-18 David Shaw + + * ttyio.c: Use only HAVE_LIBREADLINE to detect readline + availability. + 2004-12-16 David Shaw * srv.h: Don't include arpa/nameser.h unless we have it. Include Index: gnupg/util/ttyio.c diff -u gnupg/util/ttyio.c:1.33 gnupg/util/ttyio.c:1.34 --- gnupg/util/ttyio.c:1.33 Wed Nov 3 21:03:46 2004 +++ gnupg/util/ttyio.c Sat Dec 18 23:23:49 2004 @@ -46,7 +46,7 @@ #endif #include #include -#ifdef HAVE_READLINE_READLINE_H +#ifdef HAVE_LIBREADLINE #include #include #endif @@ -162,7 +162,7 @@ tty_get_ttyname (), strerror(errno) ); exit(2); } -#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE) +#ifdef HAVE_LIBREADLINE rl_catch_signals = 0; rl_instream = rl_outstream = ttyfp; #endif @@ -512,7 +512,7 @@ char * tty_get( const char *prompt ) { -#if defined(HAVE_READLINE_READLINE_H) && defined(HAVE_LIBREADLINE) +#ifdef HAVE_LIBREADLINE if (!batchmode && !no_terminal) { char *line; char *buf; @@ -544,7 +544,7 @@ return buf; } else -#endif /* HAVE_READLINE_READLINE_H && HAVE_LIBREADLINE */ +#endif /* HAVE_LIBREADLINE */ return do_get( prompt, 0 ); } From cvs at cvs.gnupg.org Sat Dec 18 19:52:09 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Sun Dec 19 01:31:49 2004 Subject: libassuan/src (assuan-connect.c assuan-pipe-connect.c) Message-ID: Date: Saturday, December 18, 2004 @ 19:52:06 Author: werner Path: /cvs/gnupg/libassuan/src Modified: assuan-connect.c assuan-pipe-connect.c More W32 fixes -----------------------+ assuan-connect.c | 2 +- assuan-pipe-connect.c | 36 ++++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) From cvs at cvs.gnupg.org Sun Dec 19 05:25:38 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Sun Dec 19 05:38:46 2004 Subject: gnupg/g10 (ChangeLog keyedit.c) Message-ID: Date: Sunday, December 19, 2004 @ 05:30:16 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyedit.c * keyedit.c (menu_revkey): Rename to menu_revsubkey. (menu_revkey): New. Revoke a whole key. (keyedit_menu): Call it here for when 'revkey' is used without any subkeys selected. This is to be consistent with the other functions which are "selected part if selected, whole key if not". -----------+ ChangeLog | 6 ++++ keyedit.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 77 insertions(+), 19 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.662 gnupg/g10/ChangeLog:1.663 --- gnupg/g10/ChangeLog:1.662 Sat Dec 18 23:23:48 2004 +++ gnupg/g10/ChangeLog Sun Dec 19 05:30:16 2004 @@ -1,5 +1,11 @@ 2004-12-18 David Shaw + * keyedit.c (menu_revkey): Rename to menu_revsubkey. + (menu_revkey): New. Revoke a whole key. + (keyedit_menu): Call it here for when 'revkey' is used without any + subkeys selected. This is to be consistent with the other + functions which are "selected part if selected, whole key if not". + * signal.c: Use only HAVE_LIBREADLINE to detect readline availability. Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.161 gnupg/g10/keyedit.c:1.162 --- gnupg/g10/keyedit.c:1.161 Fri Dec 17 19:51:32 2004 +++ gnupg/g10/keyedit.c Sun Dec 19 05:30:16 2004 @@ -69,6 +69,7 @@ static int menu_revsig( KBNODE keyblock ); static int menu_revuid( KBNODE keyblock, KBNODE sec_keyblock ); static int menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock ); +static int menu_revsubkey( KBNODE pub_keyblock, KBNODE sec_keyblock ); static int enable_disable_key( KBNODE keyblock, int disable ); static void menu_showphoto( KBNODE keyblock ); @@ -1748,25 +1749,37 @@ } break; - case cmdREVKEY: { - int n1; + case cmdREVKEY: + { + int n1; - if( !(n1=count_selected_keys( keyblock )) ) - tty_printf(_("You must select at least one key.\n")); - else if( sec_keyblock && !cpr_get_answer_is_yes( - "keyedit.revoke.subkey.okay", - n1 > 1? - _("Do you really want to revoke the selected keys? (y/N) "): - _("Do you really want to revoke this key? (y/N) ") - )) - ; - else { - if( menu_revkey( keyblock, sec_keyblock ) ) { - modified = 1; - /*sec_modified = 1;*/ + if( !(n1=count_selected_keys( keyblock )) ) + { + if(cpr_get_answer_is_yes("keyedit.revoke.subkey.okay", + _("Do you really want to revoke" + " the entire key? (y/N) "))) + { + if(menu_revkey(keyblock,sec_keyblock)) + modified=1; + + redisplay=1; } - redisplay = 1; } + else if(cpr_get_answer_is_yes("keyedit.revoke.subkey.okay", + n1 > 1? + _("Do you really want to revoke" + " the selected subkeys? (y/N) "): + _("Do you really want to revoke" + " this subkey? (y/N) "))) + { + if( menu_revsubkey( keyblock, sec_keyblock ) ) + modified = 1; + + redisplay = 1; + } + + if(modified) + merge_keys_and_selfsig( keyblock ); } break; @@ -4068,13 +4081,52 @@ } /**************** - * Revoke some of the secondary keys. - * Hmmm: Should we add a revocation to the secret keyring too? - * Does its all make sense to duplicate most of the information? + * Revoke the whole key. */ static int menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock ) { + PKT_public_key *pk=pub_keyblock->pkt->pkt.public_key; + PKT_secret_key *sk; + int rc,changed = 0; + struct revocation_reason_info *reason; + PACKET *pkt; + PKT_signature *sig; + + reason = ask_revocation_reason( 1, 0, 0 ); + /* user decided to cancel */ + if( !reason ) + return 0; + + sk = copy_secret_key( NULL, sec_keyblock->pkt->pkt.secret_key ); + rc = make_keysig_packet( &sig, pk, NULL, NULL, sk, + 0x20, 0, opt.force_v4_certs?4:0, 0, 0, + revocation_reason_build_cb, reason ); + free_secret_key(sk); + if( rc ) + { + log_error(_("signing failed: %s\n"), g10_errstr(rc)); + goto scram; + } + + changed = 1; /* we changed the keyblock */ + + pkt = m_alloc_clear( sizeof *pkt ); + pkt->pkttype = PKT_SIGNATURE; + pkt->pkt.signature = sig; + insert_kbnode( pub_keyblock, new_kbnode(pkt), 0 ); + commit_kbnode( &pub_keyblock ); + + /* TODO: set update_trust here? */ + + scram: + release_revocation_reason_info( reason ); + return changed; +} + +static int +menu_revsubkey( KBNODE pub_keyblock, KBNODE sec_keyblock ) +{ PKT_public_key *mainpk; KBNODE node; int changed = 0; From cvs at cvs.gnupg.org Sun Dec 19 06:15:25 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 20 11:02:05 2004 Subject: gnupg/g10 (ChangeLog keyedit.c keygen.c) Message-ID: Date: Sunday, December 19, 2004 @ 06:20:07 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyedit.c keygen.c * keygen.c (keygen_get_std_prefs): Set reference count when creating the temporary user ID. * keyedit.c (keyedit_menu): Merge updpref and setpref. Keep updpref as an invisible alias. Add invisible alias for revphoto. Fix small memory leak when using "setpref" (not all of the uid was freed). (menu_revkey): Trigger a trust rebuild after revoking a key. Don't allow revoking an already-revoked whole key. (menu_revsubkey): Don't allow revoking an already-revoked subkey. -----------+ ChangeLog | 13 ++++++++++ keyedit.c | 74 +++++++++++++++++++++++++++++++++++++----------------------- keygen.c | 2 + 3 files changed, 61 insertions(+), 28 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.663 gnupg/g10/ChangeLog:1.664 --- gnupg/g10/ChangeLog:1.663 Sun Dec 19 05:30:16 2004 +++ gnupg/g10/ChangeLog Sun Dec 19 06:20:07 2004 @@ -1,3 +1,16 @@ +2004-12-19 David Shaw + + * keygen.c (keygen_get_std_prefs): Set reference count when + creating the temporary user ID. + + * keyedit.c (keyedit_menu): Merge updpref and setpref. Keep + updpref as an invisible alias. Add invisible alias for revphoto. + Fix small memory leak when using "setpref" (not all of the uid was + freed). + (menu_revkey): Trigger a trust rebuild after revoking a key. + Don't allow revoking an already-revoked whole key. + (menu_revsubkey): Don't allow revoking an already-revoked subkey. + 2004-12-18 David Shaw * keyedit.c (menu_revkey): Rename to menu_revsubkey. Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.162 gnupg/g10/keyedit.c:1.163 --- gnupg/g10/keyedit.c:1.162 Sun Dec 19 05:30:16 2004 +++ gnupg/g10/keyedit.c Sun Dec 19 06:20:07 2004 @@ -1272,8 +1272,8 @@ cmdSAVE, cmdADDUID, cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY, cmdADDREVOKER, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, cmdEXPIRE, cmdENABLEKEY, cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF, - cmdUPDPREF, cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST, - cmdCHKTRUST, cmdADDCARDKEY, cmdKEYTOCARD, + cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST, cmdCHKTRUST, + cmdADDCARDKEY, cmdKEYTOCARD, cmdNOP }; static struct { @@ -1298,7 +1298,8 @@ { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") }, { "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL }, /* "lsign" will never match since "sign" comes first and it is a - tail match. It is here so it shows up in the help menu. */ + tail match. It is just here so it shows up in the help + menu. */ { "lsign" , cmdNOP , 0, N_("sign the key locally") }, { "debug" , cmdDEBUG , 0, NULL }, { "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") }, @@ -1321,12 +1322,15 @@ { "pref" , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")}, { "showpref", cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") }, { "setpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") }, - { "updpref" , cmdUPDPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("updated preferences") }, + /* Alias */ + { "updpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")}, { "passwd" , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") }, { "trust" , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") }, { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") }, { "revuid" , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") }, + /* Alias */ + { "revphoto", cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") }, { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") }, { "enable" , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") }, @@ -1784,13 +1788,14 @@ break; case cmdEXPIRE: - if( menu_expire( keyblock, sec_keyblock ) ) { + if( menu_expire( keyblock, sec_keyblock ) ) + { merge_keys_and_selfsig( sec_keyblock ); merge_keys_and_selfsig( keyblock ); sec_modified = 1; modified = 1; redisplay = 1; - } + } break; case cmdPRIMARY: @@ -1835,30 +1840,30 @@ break; case cmdSETPREF: - keygen_set_std_prefs ( !*arg_string? "default" : arg_string, 0); - break; + { + PKT_user_id *tempuid; - case cmdUPDPREF: - { - PKT_user_id *temp=keygen_get_std_prefs(); + keygen_set_std_prefs(!*arg_string?"default" : arg_string, 0); + + tempuid=keygen_get_std_prefs(); tty_printf(_("Set preference list to:\n")); - show_prefs(temp,NULL,1); - m_free(temp); - } - if (cpr_get_answer_is_yes ("keyedit.updpref.okay", - count_selected_uids (keyblock)? - _("Really update the preferences" - " for the selected user IDs? (y/N) "): - _("Really update the preferences? (y/N) "))) - { + show_prefs(tempuid,NULL,1); + free_user_id(tempuid); - if ( menu_set_preferences (keyblock, sec_keyblock) ) - { - merge_keys_and_selfsig (keyblock); - modified = 1; - redisplay = 1; - } - } + if(cpr_get_answer_is_yes("keyedit.setpref.okay", + count_selected_uids (keyblock)? + _("Really update the preferences" + " for the selected user IDs? (y/N) "): + _("Really update the preferences? (y/N) "))) + { + if ( menu_set_preferences (keyblock, sec_keyblock) ) + { + merge_keys_and_selfsig (keyblock); + modified = 1; + redisplay = 1; + } + } + } break; case cmdPREFKS: @@ -4093,6 +4098,12 @@ PACKET *pkt; PKT_signature *sig; + if(pk->is_revoked) + { + tty_printf(_("Key %s is already revoked.\n"),keystr_from_pk(pk)); + return 0; + } + reason = ask_revocation_reason( 1, 0, 0 ); /* user decided to cancel */ if( !reason ) @@ -4117,7 +4128,7 @@ insert_kbnode( pub_keyblock, new_kbnode(pkt), 0 ); commit_kbnode( &pub_keyblock ); - /* TODO: set update_trust here? */ + update_trust=1; scram: release_revocation_reason_info( reason ); @@ -4149,6 +4160,13 @@ PKT_public_key *subpk = node->pkt->pkt.public_key; struct sign_attrib attrib; + if(subpk->is_revoked) + { + tty_printf(_("Subkey %s is already revoked.\n"), + keystr_from_pk(subpk)); + continue; + } + memset( &attrib, 0, sizeof attrib ); attrib.reason = reason; Index: gnupg/g10/keygen.c diff -u gnupg/g10/keygen.c:1.137 gnupg/g10/keygen.c:1.138 --- gnupg/g10/keygen.c:1.137 Thu Dec 9 16:49:47 2004 +++ gnupg/g10/keygen.c Sun Dec 19 06:20:07 2004 @@ -510,6 +510,8 @@ if(!prefs_initialized) keygen_set_std_prefs(NULL,0); + uid->ref=1; + uid->prefs=m_alloc((sizeof(prefitem_t *)* (nsym_prefs+nhash_prefs+nzip_prefs+1))); From cvs at cvs.gnupg.org Sun Dec 19 14:34:57 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Mon Dec 20 11:02:17 2004 Subject: libassuan/src (ChangeLog assuan-pipe-server.c) Message-ID: Date: Sunday, December 19, 2004 @ 14:34:57 Author: werner Path: /cvs/gnupg/libassuan/src Modified: ChangeLog assuan-pipe-server.c (assuan_init_pipe_server) [W32]: Map file descriptors using _get_osfhandle. ----------------------+ ChangeLog | 5 +++++ assuan-pipe-server.c | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) From cvs at cvs.gnupg.org Sun Dec 19 14:08:25 2004 From: cvs at cvs.gnupg.org (cvs user mo) Date: Mon Dec 20 11:02:23 2004 Subject: libassuan/src (ChangeLog assuan-pipe-connect.c) Message-ID: Date: Sunday, December 19, 2004 @ 14:08:25 Author: mo Path: /cvs/gnupg/libassuan/src Modified: ChangeLog assuan-pipe-connect.c 2004-12-19 Moritz Schulte * assuan-pipe-connect.c (assuan_pipe_connect2): Removed "`" character at beginning of line 532. -----------------------+ ChangeLog | 5 +++++ assuan-pipe-connect.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) From cvs at cvs.gnupg.org Sun Dec 19 14:33:40 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 11:02:26 2004 Subject: GNUPG-1-9-BRANCH gnupg (6 files) Message-ID: Date: Sunday, December 19, 2004 @ 14:38:24 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: agent/gpg-agent.c common/ChangeLog common/maperror.c jnlib/ChangeLog jnlib/w32-pth.c sm/keylist.c * maperror.c (map_assuan_err_with_source): Oops, args were swapped. * w32-pth.c (pth_init): Enable debugging depending on env var. -------------------+ agent/gpg-agent.c | 6 ++++++ common/ChangeLog | 4 ++++ common/maperror.c | 2 +- jnlib/ChangeLog | 4 ++++ jnlib/w32-pth.c | 26 +++++++++++++++++++------- sm/keylist.c | 4 ++-- 6 files changed, 36 insertions(+), 10 deletions(-) Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.25 gnupg/agent/gpg-agent.c:1.31.2.26 --- gnupg/agent/gpg-agent.c:1.31.2.25 Sat Dec 18 19:53:32 2004 +++ gnupg/agent/gpg-agent.c Sun Dec 19 14:38:24 2004 @@ -437,14 +437,20 @@ /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ #ifdef USE_GNU_PTH +#ifdef HAVE_W32_SYSTEM + /* For W32 we need pth. */ + pth_init (); +#else err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } +#endif #endif /*USE_GNU_PTH*/ + /* Check that the libraries are suitable. Do it here because the option parsing may need services of the library. */ if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.35 gnupg/common/ChangeLog:1.30.2.36 --- gnupg/common/ChangeLog:1.30.2.35 Sat Dec 18 11:22:10 2004 +++ gnupg/common/ChangeLog Sun Dec 19 14:38:24 2004 @@ -1,3 +1,7 @@ +2004-12-19 Werner Koch + + * maperror.c (map_assuan_err_with_source): Oops, args were swapped. + 2004-12-18 Werner Koch * maperror.c (map_assuan_err): Renamed to .. Index: gnupg/common/maperror.c diff -u gnupg/common/maperror.c:1.18.2.6 gnupg/common/maperror.c:1.18.2.7 --- gnupg/common/maperror.c:1.18.2.6 Sat Dec 18 11:22:10 2004 +++ gnupg/common/maperror.c Sun Dec 19 14:38:24 2004 @@ -38,7 +38,7 @@ simple: All errors with a gpg_err_source of UNKNOWN are genuine Assuan codes all others are passed verbatim through. */ gpg_error_t -map_assuan_err_with_source (int err, int source) +map_assuan_err_with_source (int source, int err) { gpg_err_code_t ec; Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.28 gnupg/jnlib/ChangeLog:1.3.2.29 --- gnupg/jnlib/ChangeLog:1.3.2.28 Sat Dec 18 19:53:32 2004 +++ gnupg/jnlib/ChangeLog Sun Dec 19 14:38:24 2004 @@ -1,3 +1,7 @@ +2004-12-19 Werner Koch + + * w32-pth.c (pth_init): Enable debugging depending on env var. + 2004-12-18 Werner Koch * w32-pth.c (pth_init): Reverse return values. Use TRUE and FALSE Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.8 gnupg/jnlib/w32-pth.c:1.1.2.9 --- gnupg/jnlib/w32-pth.c:1.1.2.8 Sat Dec 18 19:53:32 2004 +++ gnupg/jnlib/w32-pth.c Sun Dec 19 14:38:24 2004 @@ -40,6 +40,9 @@ #define W32_PTH_HANDLE_INTERNAL HANDLE #include "w32-pth.h" +#define DEBUG_ENTER_LEAVE 1 /* Set to 1 to enable full debugging. */ + + #ifndef FALSE #define FALSE 0 #endif @@ -51,12 +54,15 @@ #endif +/* States whether trhis module has been initialized. */ +static int pth_initialized; -static int pth_initialized = 0; +/* Controls whether debugging is enabled. */ +static int debug_enter_leave; /* Variables to support event handling. */ -static int pth_signo = 0; -static HANDLE pth_signo_ev = NULL; +static int pth_signo; +static HANDLE pth_signo_ev; /* Mutex to make sure only one thread is running. */ static CRITICAL_SECTION pth_shd; @@ -124,6 +130,8 @@ return TRUE; fprintf (stderr, "%s: pth_init: called.\n", log_get_prefix (NULL)); + debug_enter_leave = !!getenv ("DEBUG_PTH"); + if (WSAStartup (0x202, &wsadat)) return FALSE; pth_signo = 0; @@ -177,8 +185,9 @@ { /* Fixme: I am not sure whether the same thread my enter a critical section twice. */ -/* fprintf (stderr, "%s: enter_pth (%s)\n", - log_get_prefix (NULL), function? function:""); */ + if (debug_enter_leave) + fprintf (stderr, "%s: enter_pth (%s)\n", + log_get_prefix (NULL), function? function:""); LeaveCriticalSection (&pth_shd); } @@ -187,8 +196,9 @@ leave_pth (const char *function) { EnterCriticalSection (&pth_shd); -/* fprintf (stderr, "%s: leave_pth (%s)\n", - log_get_prefix (NULL), function? function:""); */ + if (debug_enter_leave) + fprintf (stderr, "%s: leave_pth (%s)\n", + log_get_prefix (NULL), function? function:""); } @@ -296,6 +306,8 @@ fprintf (stderr, "%s: pth_write(%d) failed in write: %s\n", log_get_prefix (NULL), fd, w32_strerror (strerr, sizeof strerr)); + fprintf (stderr, "--> fd = %d, handle = %p, size = %lu\n", + fd, (HANDLE)fd, size); n = -1; } else Index: gnupg/sm/keylist.c diff -u gnupg/sm/keylist.c:1.25.2.18 gnupg/sm/keylist.c:1.25.2.19 --- gnupg/sm/keylist.c:1.25.2.18 Thu Sep 30 15:24:31 2004 +++ gnupg/sm/keylist.c Sun Dec 19 14:38:24 2004 @@ -1149,8 +1149,8 @@ char *p = gpgsm_get_keygrip_hexstring (cert); if (p) { - rc = gpgsm_agent_havekey (ctrl, p); - if (!rc) + rc = gpgsm_agent_havekey (ctrl, p); + if (!rc) have_secret = 1; else if ( gpg_err_code (rc) != GPG_ERR_NO_SECKEY) goto leave; From cvs at cvs.gnupg.org Sun Dec 19 18:39:33 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 11:02:30 2004 Subject: GNUPG-1-9-BRANCH gnupg (9 files) Message-ID: Date: Sunday, December 19, 2004 @ 18:44:20 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: agent/ChangeLog agent/agent.h agent/call-scd.c agent/gpg-agent.c agent/query.c jnlib/ChangeLog jnlib/w32-pth.c jnlib/w32-pth.h scd/scdaemon.c * query.c (initialize_module_query): * call-scd.c (initialize_module_call_scd): New. * w32-pth.c (pth_init): Enable debugging depending on env var. (pth_self): New. (pth_mutex_release, pth_mutex_acquire): Implemented directly using the W32 API. -------------------+ agent/ChangeLog | 6 ++ agent/agent.h | 2 agent/call-scd.c | 21 +++++++- agent/gpg-agent.c | 4 + agent/query.c | 21 +++++++- jnlib/ChangeLog | 3 + jnlib/w32-pth.c | 131 +++++++++++++++++++++++----------------------------- jnlib/w32-pth.h | 12 +--- scd/scdaemon.c | 5 + 9 files changed, 123 insertions(+), 82 deletions(-) Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.48 gnupg/agent/ChangeLog:1.59.2.49 --- gnupg/agent/ChangeLog:1.59.2.48 Sat Dec 18 19:53:32 2004 +++ gnupg/agent/ChangeLog Sun Dec 19 18:44:20 2004 @@ -1,3 +1,9 @@ +2004-12-19 Werner Koch + + * query.c (initialize_module_query): + + * call-scd.c (initialize_module_call_scd): New. + 2004-12-18 Werner Koch * gpg-agent.c (main): Remove special Pth initialize. Index: gnupg/agent/agent.h diff -u gnupg/agent/agent.h:1.32.2.9 gnupg/agent/agent.h:1.32.2.10 --- gnupg/agent/agent.h:1.32.2.9 Sat Dec 18 11:22:10 2004 +++ gnupg/agent/agent.h Sun Dec 19 18:44:20 2004 @@ -145,6 +145,7 @@ int agent_key_available (const unsigned char *grip); /*-- query.c --*/ +void initialize_module_query (void); int agent_askpin (ctrl_t ctrl, const char *desc_text, const char *inital_errtext, struct pin_entry_info_s *pininfo); @@ -212,6 +213,7 @@ /*-- call-scd.c --*/ +void initialize_module_call_scd (void); int agent_reset_scd (ctrl_t ctrl); int agent_card_learn (ctrl_t ctrl, void (*kpinfo_cb)(void*, const char *), Index: gnupg/agent/call-scd.c diff -u gnupg/agent/call-scd.c:1.13.2.6 gnupg/agent/call-scd.c:1.13.2.7 --- gnupg/agent/call-scd.c:1.13.2.6 Wed Dec 15 15:15:09 2004 +++ gnupg/agent/call-scd.c Sun Dec 19 18:44:20 2004 @@ -52,7 +52,7 @@ static ASSUAN_CONTEXT scd_ctx = NULL; #ifdef USE_GNU_PTH -static pth_mutex_t scd_lock = PTH_MUTEX_INIT; +static pth_mutex_t scd_lock; #endif /* We need to keep track of the connection currently using the SCD. For a pipe server this is all a NOP because the connection will @@ -153,6 +153,23 @@ +/* This function must be called once to initialize this module. This + has to be done before a second thread is spawned. We can't do the + static initialization because Pth emulation code might not be able + to do a static init; in particualr, it is not possible for W32. */ +void +initialize_module_call_scd (void) +{ +#ifdef USE_GNU_PTH + static int initialized; + + if (!initialized) + if (pth_mutex_init (&scd_lock)) + initialized = 1; +#endif /*USE_GNU_PTH*/ +} + + static int unlock_scd (int rc) { @@ -163,7 +180,7 @@ if (!rc) rc = gpg_error (GPG_ERR_INTERNAL); } -#endif +#endif /*USE_GNU_PTH*/ return rc; } Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.26 gnupg/agent/gpg-agent.c:1.31.2.27 --- gnupg/agent/gpg-agent.c:1.31.2.26 Sun Dec 19 14:38:24 2004 +++ gnupg/agent/gpg-agent.c Sun Dec 19 18:44:20 2004 @@ -627,6 +627,10 @@ exit (1); } + initialize_module_query (); + initialize_module_call_scd (); + + /* Try to create missing directories. */ create_directories (); if (debug_wait && pipe_server) Index: gnupg/agent/query.c diff -u gnupg/agent/query.c:1.23.2.6 gnupg/agent/query.c:1.23.2.7 --- gnupg/agent/query.c:1.23.2.6 Fri Dec 17 21:41:50 2004 +++ gnupg/agent/query.c Sun Dec 19 18:44:20 2004 @@ -51,7 +51,7 @@ static ASSUAN_CONTEXT entry_ctx = NULL; #ifdef USE_GNU_PTH -static pth_mutex_t entry_lock = PTH_MUTEX_INIT; +static pth_mutex_t entry_lock; #endif /* data to be passed to our callbacks */ @@ -64,6 +64,25 @@ +/* This function must be called once to initialize this module. This + has to be done before a second thread is spawned. We can't do the + static initialization because Pth emulation code might not be able + to do a static init; in particualr, it is not possible for W32. */ +void +initialize_module_query (void) +{ +#ifdef USE_GNU_PTH + static int initialized; + + if (!initialized) + if (pth_mutex_init (&entry_lock)) + initialized = 1; +#endif /*USE_GNU_PTH*/ +} + + + + /* Unlock the pinentry so that another thread can start one and disconnect that pinentry - we do this after the unlock so that a stalled pinentry does not block other threads. Fixme: We should Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.29 gnupg/jnlib/ChangeLog:1.3.2.30 --- gnupg/jnlib/ChangeLog:1.3.2.29 Sun Dec 19 14:38:24 2004 +++ gnupg/jnlib/ChangeLog Sun Dec 19 18:44:20 2004 @@ -1,6 +1,9 @@ 2004-12-19 Werner Koch * w32-pth.c (pth_init): Enable debugging depending on env var. + (pth_self): New. + (pth_mutex_release, pth_mutex_acquire): Implemented directly using + the W32 API. 2004-12-18 Werner Koch Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.9 gnupg/jnlib/w32-pth.c:1.1.2.10 --- gnupg/jnlib/w32-pth.c:1.1.2.9 Sun Dec 19 14:38:24 2004 +++ gnupg/jnlib/w32-pth.c Sun Dec 19 18:44:20 2004 @@ -68,7 +68,6 @@ static CRITICAL_SECTION pth_shd; - struct pth_event_s { struct pth_event_s * next; @@ -306,8 +305,6 @@ fprintf (stderr, "%s: pth_write(%d) failed in write: %s\n", log_get_prefix (NULL), fd, w32_strerror (strerr, sizeof strerr)); - fprintf (stderr, "--> fd = %d, handle = %p, size = %lu\n", - fd, (HANDLE)fd, size); n = -1; } else @@ -444,107 +441,94 @@ int -pth_mutex_release (pth_mutex_t *hd) +pth_mutex_release (pth_mutex_t *mutex) { - if (!hd) - return -1; + int rc; + implicit_init (); enter_pth (__FUNCTION__); - if (hd->mx) + + if (!ReleaseMutex (*mutex)) { - CloseHandle (hd->mx); - hd->mx = NULL; + char strerr[256]; + + fprintf (stderr, "%s: pth_release_mutex %p failed: %s\n", + log_get_prefix (NULL), *mutex, + w32_strerror (strerr, sizeof strerr)); + rc = FALSE; } - free (hd); + else + rc = TRUE; + leave_pth (__FUNCTION__); - return 0; + return rc; } int -pth_mutex_acquire (pth_mutex_t *hd, int tryonly, pth_event_t ev_extra) +pth_mutex_acquire (pth_mutex_t *mutex, int tryonly, pth_event_t ev_extra) { + int code; + int rc; + implicit_init (); enter_pth (__FUNCTION__); - if (!hd || !hd->mx) - { - leave_pth (__FUNCTION__); - return FALSE; - } - -#if 0 - /* still not locked, so simply acquire mutex? */ - if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) - { - mutex->mx_state |= PTH_MUTEX_LOCKED; - mutex->mx_count = 1; - pth_ring_append(&(pth_current->mutexring), &(mutex->mx_node)); - pth_debug1("pth_mutex_acquire: immediately locking mutex"); - return 0; - } - - /* already locked by caller? */ - if (mutex->mx_count >= 1 && mutex->mx_owner == pth_current) - { - /* recursive lock */ - mutex->mx_count++; - pth_debug1("pth_mutex_acquire: recursive locking"); - return 0; - } - - if (tryonly) - { - leave_pth (__FUNCTION__); - return -1; - } - - for (;;) + /* FIXME: ev_extra is not yet supported. */ + + code = WaitForSingleObject (*mutex, INFINITE); + switch (code) { - ev = pth_event(PTH_EVENT_MUTEX|PTH_MODE_STATIC, &ev_key, mutex); - if (ev_extra != NULL) - pth_event_concat (ev, ev_extra, NULL); - pth_wait (ev); - if (ev_extra != NULL) + case WAIT_FAILED: { - pth_event_isolate (ev); - if (do_pth_event_status(ev) == PTH_STATUS_PENDING) - { - leave_pth (__FUNCTION__); - return -1; - } + char strerr[256]; + + fprintf (stderr, "%s: pth_mutex_acquire for %p failed: %s\n", + log_get_prefix (NULL), *mutex, + w32_strerror (strerr, sizeof strerr)); } - if (!(mutex->mx_state & PTH_MUTEX_LOCKED)) + rc = FALSE; + break; + + case WAIT_OBJECT_0: + rc = TRUE; + break; + + default: + fprintf (stderr, "%s: WaitForSingleObject returned unexpected " + "code %d for mutex %p\n", + log_get_prefix (NULL), code, *mutex); + rc = FALSE; break; } -#endif - hd->mx_state |= PTH_MUTEX_LOCKED; leave_pth (__FUNCTION__); - return TRUE; + return rc; } + int -pth_mutex_init (pth_mutex_t *hd) +pth_mutex_init (pth_mutex_t *mutex) { SECURITY_ATTRIBUTES sa; implicit_init (); enter_pth (__FUNCTION__); - if (hd->mx) - { - ReleaseMutex (hd->mx); - CloseHandle (hd->mx); - } memset (&sa, 0, sizeof sa); sa.bInheritHandle = TRUE; sa.lpSecurityDescriptor = NULL; sa.nLength = sizeof sa; - hd->mx = CreateMutex (&sa, FALSE, NULL); - hd->mx_state = PTH_MUTEX_INITIALIZED; - + *mutex = CreateMutex (&sa, FALSE, NULL); + if (!*mutex) + { + free (*mutex); + *mutex = NULL; + leave_pth (__FUNCTION__); + return FALSE; + } + leave_pth (__FUNCTION__); return TRUE; } @@ -695,6 +679,12 @@ } +pth_t +pth_self (void) +{ + return GetCurrentThread (); +} + int pth_join (pth_t hd, void **value) { @@ -1271,9 +1261,6 @@ case PTH_EVENT_MUTEX: fprintf (stderr, "pth_wait: add mutex event.\n"); - hdidx[i++] = pos; - waitbuf[pos++] = tmp->u.mx->mx; - /* XXX: Use SetEvent(hd->ev) */ break; } } Index: gnupg/jnlib/w32-pth.h diff -u gnupg/jnlib/w32-pth.h:1.1.2.5 gnupg/jnlib/w32-pth.h:1.1.2.6 --- gnupg/jnlib/w32-pth.h:1.1.2.5 Tue Dec 14 12:25:04 2004 +++ gnupg/jnlib/w32-pth.h Sun Dec 19 18:44:20 2004 @@ -53,7 +53,9 @@ /* Mutex values. */ #define PTH_MUTEX_INITIALIZED (1<<0) #define PTH_MUTEX_LOCKED (1<<1) -#define PTH_MUTEX_INIT {PTH_MUTEX_INITIALIZED} + +/* Note: We can't do static initialization, thus we don't define the + initializer PTH_MUTEX_INIT. */ #define PTH_KEY_INIT (1<<0) @@ -158,12 +160,7 @@ /* The Mutex object. */ -struct pth_mutex_s -{ - unsigned mx_state; - W32_PTH_HANDLE_INTERNAL mx; -}; -typedef struct pth_mutex_s pth_mutex_t; +typedef W32_PTH_HANDLE_INTERNAL pth_mutex_t; /* The Event object. */ @@ -214,6 +211,7 @@ int pth_attr_set (pth_attr_t hd, int field, ...); pth_t pth_spawn (pth_attr_t hd, void *(*func)(void *), void *arg); +pth_t pth_self (void); int pth_join (pth_t hd, void **value); int pth_abort (pth_t hd); void pth_exit (void *value); Index: gnupg/scd/scdaemon.c diff -u gnupg/scd/scdaemon.c:1.12.2.22 gnupg/scd/scdaemon.c:1.12.2.23 --- gnupg/scd/scdaemon.c:1.12.2.22 Sat Dec 18 19:53:31 2004 +++ gnupg/scd/scdaemon.c Sun Dec 19 18:44:20 2004 @@ -351,12 +351,17 @@ Note that this will also do the pth_init. */ #ifndef HAVE_OPENSC #ifdef USE_GNU_PTH +#ifdef HAVE_W32_SYSTEM + /* For W32 we need pth. */ + pth_init (); +#else err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } +#endif #endif /*USE_GNU_PTH*/ #endif /*!HAVE_OPENSC*/ From cvs at cvs.gnupg.org Sun Dec 19 18:41:02 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 11:02:37 2004 Subject: GNUPG-1-9-BRANCH gnupg/agent (ChangeLog) Message-ID: Date: Sunday, December 19, 2004 @ 18:45:50 Author: wk Path: /cvs/gnupg/gnupg/agent Tag: GNUPG-1-9-BRANCH Modified: ChangeLog * query.c (initialize_module_query): New. * call-scd.c (initialize_module_call_scd): New. * gpg-agent.c (main): Call them. -----------+ ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.49 gnupg/agent/ChangeLog:1.59.2.50 --- gnupg/agent/ChangeLog:1.59.2.49 Sun Dec 19 18:44:20 2004 +++ gnupg/agent/ChangeLog Sun Dec 19 18:45:50 2004 @@ -1,9 +1,9 @@ 2004-12-19 Werner Koch - * query.c (initialize_module_query): - + * query.c (initialize_module_query): New. * call-scd.c (initialize_module_call_scd): New. - + * gpg-agent.c (main): Call them. + 2004-12-18 Werner Koch * gpg-agent.c (main): Remove special Pth initialize. From cvs at cvs.gnupg.org Mon Dec 20 06:14:23 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Mon Dec 20 11:02:59 2004 Subject: gnupg/g10 (8 files) Message-ID: Date: Monday, December 20, 2004 @ 06:19:09 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog g10.c getkey.c keyedit.c keygen.c options.h passphrase.c textfilter.c * keyedit.c (keyedit_menu): Invisible alias "passwd" as "password". * passphrase.c: Don't check for __CYGWIN__, so it is treated as a unix-like system. * options.h, g10.c (main), textfilter.c (standard): Use new option --rfc2440-text to determine whether to filter "\t\r\n" or just "\r\n" before canonicalizing text line endings. Default to "\t\r\n". --------------+ ChangeLog | 13 +++++++++++++ g10.c | 16 ++++++++++++---- getkey.c | 2 +- keyedit.c | 30 ++++++++++++++++-------------- keygen.c | 2 +- options.h | 3 ++- passphrase.c | 4 ++-- textfilter.c | 23 ++++++++++++++--------- 8 files changed, 61 insertions(+), 32 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.664 gnupg/g10/ChangeLog:1.665 --- gnupg/g10/ChangeLog:1.664 Sun Dec 19 06:20:07 2004 +++ gnupg/g10/ChangeLog Mon Dec 20 06:19:09 2004 @@ -1,3 +1,16 @@ +2004-12-20 David Shaw + + * keyedit.c (keyedit_menu): Invisible alias "passwd" as + "password". + + * passphrase.c: Don't check for __CYGWIN__, so it is treated as a + unix-like system. + + * options.h, g10.c (main), textfilter.c (standard): Use new option + --rfc2440-text to determine whether to filter "\t\r\n" or + just "\r\n" before canonicalizing text line endings. Default to + "\t\r\n". + 2004-12-19 David Shaw * keygen.c (keygen_get_std_prefs): Set reference count when Index: gnupg/g10/g10.c diff -u gnupg/g10/g10.c:1.294 gnupg/g10/g10.c:1.295 --- gnupg/g10/g10.c:1.294 Thu Dec 16 06:16:08 2004 +++ gnupg/g10/g10.c Mon Dec 20 06:19:09 2004 @@ -201,6 +201,8 @@ oPGP6, oPGP7, oPGP8, + oRFC2440Text, + oNoRFC2440Text, oCipherAlgo, oDigestAlgo, oCertDigestAlgo, @@ -507,6 +509,8 @@ { oPGP6, "pgp6", 0, "@"}, { oPGP7, "pgp7", 0, "@"}, { oPGP8, "pgp8", 0, "@"}, + { oRFC2440Text, "rfc2440-text", 0, "@"}, + { oNoRFC2440Text, "no-rfc2440-text", 0, "@"}, { oS2KMode, "s2k-mode", 1, "@"}, { oS2KDigest, "s2k-digest-algo", 2, "@"}, { oS2KCipher, "s2k-cipher-algo", 2, "@"}, @@ -1668,6 +1672,7 @@ opt.min_cert_level=2; set_screen_dimensions(); opt.keyid_format=KF_SHORT; + opt.rfc2440_text=1; #if defined (_WIN32) set_homedir ( read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" )); @@ -2090,17 +2095,18 @@ opt.force_v4_certs = 0; opt.escape_from = 1; break; - case oRFC2440: case oOpenPGP: - /* TODO: When 2440bis becomes a RFC, these may need - changing. */ + case oRFC2440: + /* TODO: When 2440bis becomes a RFC, set new values for + oOpenPGP. */ + opt.rfc2440_text=1; opt.compliance = CO_RFC2440; opt.allow_non_selfsigned_uid = 1; opt.allow_freeform_uid = 1; opt.pgp2_workarounds = 0; opt.escape_from = 0; opt.force_v3_sigs = 0; - opt.compress_keys = 0; /* not mandated but we do it */ + opt.compress_keys = 0; /* not mandated, but we do it */ opt.compress_sigs = 0; /* ditto. */ opt.not_dash_escaped = 0; opt.def_cipher_algo = 0; @@ -2117,6 +2123,8 @@ case oPGP8: opt.compliance = CO_PGP8; break; case oGnuPG: opt.compliance = CO_GNUPG; break; case oCompressSigs: opt.compress_sigs = 1; break; + case oRFC2440Text: opt.rfc2440_text=1; break; + case oNoRFC2440Text: opt.rfc2440_text=0; break; case oRunAsShmCP: #ifndef __riscos__ # ifndef USE_SHM_COPROCESSING Index: gnupg/g10/getkey.c diff -u gnupg/g10/getkey.c:1.121 gnupg/g10/getkey.c:1.122 --- gnupg/g10/getkey.c:1.121 Mon Nov 29 22:21:52 2004 +++ gnupg/g10/getkey.c Mon Dec 20 06:19:09 2004 @@ -2417,7 +2417,7 @@ { char *tempkeystr= m_strdup(keystr_from_pk(latest_key->pkt->pkt.public_key)); - log_info(_("using secondary key %s instead of primary key %s\n"), + log_info(_("using subkey %s instead of primary key %s\n"), tempkeystr, keystr_from_pk(keyblock->pkt->pkt.public_key)); m_free(tempkeystr); } Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.163 gnupg/g10/keyedit.c:1.164 --- gnupg/g10/keyedit.c:1.163 Sun Dec 19 06:20:07 2004 +++ gnupg/g10/keyedit.c Mon Dec 20 06:19:09 2004 @@ -1292,31 +1292,31 @@ { "list" , cmdLIST , 0, N_("list key and user IDs") }, { "l" , cmdLIST , 0, NULL }, { "uid" , cmdSELUID , 0, N_("select user ID N") }, - { "key" , cmdSELKEY , 0, N_("select secondary key N") }, + { "key" , cmdSELKEY , 0, N_("select subkey N") }, { "check" , cmdCHECK , 0, N_("list signatures") }, { "c" , cmdCHECK , 0, NULL }, - { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") }, + { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign selected user IDs") }, { "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL }, /* "lsign" will never match since "sign" comes first and it is a tail match. It is just here so it shows up in the help menu. */ - { "lsign" , cmdNOP , 0, N_("sign the key locally") }, + { "lsign" , cmdNOP , 0, N_("sign selected user IDs locally") }, { "debug" , cmdDEBUG , 0, NULL }, { "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") }, { "addphoto", cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") }, { "deluid" , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") }, /* delphoto is really deluid in disguise */ { "delphoto", cmdDELUID , KEYEDIT_NOT_SK, NULL }, - { "addkey" , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a secondary key") }, + { "addkey" , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a subkey") }, #ifdef ENABLE_CARD_SUPPORT { "addcardkey", cmdADDCARDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a key to a smartcard") }, { "keytocard", cmdKEYTOCARD , KEYEDIT_NEED_SK|KEYEDIT_ONLY_SK, N_("move a key to a smartcard")}, #endif /*ENABLE_CARD_SUPPORT*/ - { "delkey" , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete a secondary key") }, + { "delkey" , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete selected subkeys") }, { "addrevoker",cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") }, { "delsig" , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") }, - { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expire date") }, - { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag user ID as primary")}, + { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expiration date") }, + { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag a user ID as primary")}, { "toggle" , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") }, { "t" , cmdTOGGLE , KEYEDIT_NEED_SK, NULL }, { "pref" , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")}, @@ -1326,14 +1326,16 @@ { "updpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")}, { "passwd" , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") }, + /* Alias */ + { "password", cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, { "trust" , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") }, { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") }, - { "revuid" , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") }, + { "revuid" , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke selected user IDs") }, /* Alias */ { "revphoto", cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, - { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") }, - { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") }, - { "enable" , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") }, + { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke selected subkeys") }, + { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable key") }, + { "enable" , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable key") }, { "showphoto",cmdSHOWPHOTO , 0, N_("show photo ID") }, { NULL, cmdNONE, 0, NULL } }; @@ -3136,11 +3138,11 @@ n1 = count_selected_keys( pub_keyblock ); if( n1 > 1 ) { - tty_printf(_("Please select at most one secondary key.\n")); + tty_printf(_("Please select at most one subkey.\n")); return 0; } else if( n1 ) - tty_printf(_("Changing expiration time for a secondary key.\n")); + tty_printf(_("Changing expiration time for a subkey.\n")); else { tty_printf(_("Changing expiration time for the primary key.\n")); @@ -3683,7 +3685,7 @@ } } if( !node ) { - tty_printf(_("No secondary key with index %d\n"), idx ); + tty_printf(_("No subkey with index %d\n"), idx ); return 0; } } Index: gnupg/g10/keygen.c diff -u gnupg/g10/keygen.c:1.138 gnupg/g10/keygen.c:1.139 --- gnupg/g10/keygen.c:1.138 Sun Dec 19 06:20:07 2004 +++ gnupg/g10/keygen.c Mon Dec 20 06:19:09 2004 @@ -2952,7 +2952,7 @@ tty_printf(_("Note that this key cannot be used for " "encryption. You may want to use\n" "the command \"--edit-key\" to generate a " - "secondary key for this purpose.\n") ); + "subkey for this purpose.\n") ); } } } Index: gnupg/g10/options.h diff -u gnupg/g10/options.h:1.130 gnupg/g10/options.h:1.131 --- gnupg/g10/options.h:1.130 Sat Dec 11 05:47:33 2004 +++ gnupg/g10/options.h Mon Dec 20 06:19:09 2004 @@ -187,11 +187,12 @@ int no_homedir_creation; struct groupitem *grouplist; int strict; - int mangle_dos_filenames; + int mangle_dos_filenames; int enable_progress_filter; unsigned int screen_columns; unsigned int screen_lines; byte *show_subpackets; + int rfc2440_text; #ifdef ENABLE_CARD_SUPPORT const char *ctapi_driver; /* Library to access the ctAPI. */ Index: gnupg/g10/passphrase.c diff -u gnupg/g10/passphrase.c:1.73 gnupg/g10/passphrase.c:1.74 --- gnupg/g10/passphrase.c:1.73 Fri Dec 17 19:51:32 2004 +++ gnupg/g10/passphrase.c Mon Dec 20 06:19:09 2004 @@ -30,8 +30,8 @@ #include #include #endif -#if defined (_WIN32) || defined (__CYGWIN32__) -# include +#if defined (_WIN32) +#include #endif #include #ifdef HAVE_LOCALE_H Index: gnupg/g10/textfilter.c diff -u gnupg/g10/textfilter.c:1.17 gnupg/g10/textfilter.c:1.18 --- gnupg/g10/textfilter.c:1.17 Sat Dec 11 05:47:33 2004 +++ gnupg/g10/textfilter.c Mon Dec 20 06:19:09 2004 @@ -97,15 +97,20 @@ /* The story behind this is that 2440 says that textmode hashes should canonicalize line endings to CRLF and remove spaces and tabs. 2440bis-12 says to just canonicalize to - CRLF. So, we default to the 2440bis-12 behavior, but - revert to the strict 2440 behavior if the user specifies - --rfc2440. In practical terms this makes no difference to - any signatures in the real world except for a textmode - detached signature. PGP always used the 2440bis-12 (1991) - behavior (ignoring 2440 itself), so this actually makes us - compatible with PGP textmode detached signatures for the - first time. */ - if(RFC2440) + CRLF. 1.4.0 was released using the bis-12 behavior, but it + was discovered that many mail clients do not canonicalize + PGP/MIME signature text appropriately (and were relying on + GnuPG to handle trailing spaces). So, we default to the + 2440 behavior, but use the 2440bis-12 behavior if the user + specifies --no-rfc2440-text. The default will be changed + at some point in the future when the mail clients have been + upgraded. Aside from PGP/MIME and broken mail clients, + this makes no difference to any signatures in the real + world except for a textmode detached signature. PGP always + used the 2440bis-12 behavior (ignoring 2440 itself), so + this actually makes us compatible with PGP textmode + detached signatures for the first time. */ + if(opt.rfc2440_text) tfx->buffer_len=trim_trailing_chars(tfx->buffer,tfx->buffer_len, " \t\r\n"); else From cvs at cvs.gnupg.org Mon Dec 20 09:28:34 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 11:03:03 2004 Subject: GNUPG-1-9-BRANCH gnupg (9 files) Message-ID: Date: Monday, December 20, 2004 @ 09:32:56 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: agent/ChangeLog agent/agent.h agent/call-scd.c agent/command.c agent/genkey.c agent/pkdecrypt.c agent/pksign.c common/ChangeLog common/membuf.c * call-scd.c (init_membuf, put_membuf, get_membuf): Removed. We now use the identical implementation from ../common/membuf.c. * pksign.c (agent_pksign): Changed arg OUTFP to OUTBUF and use membuf functions to return the value. * pkdecrypt.c (agent_pkdecrypt): Ditto. * genkey.c (agent_genkey): Ditto. * command.c (cmd_pksign, cmd_pkdecrypt, cmd_genkey): Replaced assuan_get_data_fp() by a the membuf scheme. (clear_outbuf, write_and_clear_outbuf): New. * membuf.c (put_membuf): Wipe out buffer after a failed realloc. -------------------+ agent/ChangeLog | 13 ++++++++ agent/agent.h | 7 ++-- agent/call-scd.c | 79 +++------------------------------------------------- agent/command.c | 64 +++++++++++++++++++++++++++++++++++++++--- agent/genkey.c | 18 +++-------- agent/pkdecrypt.c | 22 +++++++------- agent/pksign.c | 8 +---- common/ChangeLog | 4 ++ common/membuf.c | 5 +++ 9 files changed, 112 insertions(+), 108 deletions(-) Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.50 gnupg/agent/ChangeLog:1.59.2.51 --- gnupg/agent/ChangeLog:1.59.2.50 Sun Dec 19 18:45:50 2004 +++ gnupg/agent/ChangeLog Mon Dec 20 09:32:56 2004 @@ -1,3 +1,16 @@ +2004-12-20 Werner Koch + + * call-scd.c (init_membuf, put_membuf, get_membuf): Removed. We + now use the identical implementation from ../common/membuf.c. + + * pksign.c (agent_pksign): Changed arg OUTFP to OUTBUF and use + membuf functions to return the value. + * pkdecrypt.c (agent_pkdecrypt): Ditto. + * genkey.c (agent_genkey): Ditto. + * command.c (cmd_pksign, cmd_pkdecrypt, cmd_genkey): Replaced + assuan_get_data_fp() by a the membuf scheme. + (clear_outbuf, write_and_clear_outbuf): New. + 2004-12-19 Werner Koch * query.c (initialize_module_query): New. Index: gnupg/agent/agent.h diff -u gnupg/agent/agent.h:1.32.2.10 gnupg/agent/agent.h:1.32.2.11 --- gnupg/agent/agent.h:1.32.2.10 Sun Dec 19 18:44:20 2004 +++ gnupg/agent/agent.h Mon Dec 20 09:32:56 2004 @@ -33,6 +33,7 @@ #include #include "../common/util.h" #include "../common/errors.h" +#include "membuf.h" /* Convenience function to be used instead of returning the old GNUPG_Out_Of_Core. */ @@ -166,16 +167,16 @@ int agent_pksign_do (CTRL ctrl, const char *desc_text, gcry_sexp_t *signature_sexp, int ignore_cache); int agent_pksign (ctrl_t ctrl, const char *desc_text, - FILE *outfp, int ignore_cache); + membuf_t *outbuf, int ignore_cache); /*-- pkdecrypt.c --*/ int agent_pkdecrypt (ctrl_t ctrl, const char *desc_text, const unsigned char *ciphertext, size_t ciphertextlen, - FILE *outfp); + membuf_t *outbuf); /*-- genkey.c --*/ int agent_genkey (ctrl_t ctrl, - const char *keyparam, size_t keyparmlen, FILE *outfp); + const char *keyparam, size_t keyparmlen, membuf_t *outbuf); int agent_protect_and_store (ctrl_t ctrl, gcry_sexp_t s_skey); /*-- protect.c --*/ Index: gnupg/agent/call-scd.c diff -u gnupg/agent/call-scd.c:1.13.2.7 gnupg/agent/call-scd.c:1.13.2.8 --- gnupg/agent/call-scd.c:1.13.2.7 Sun Dec 19 18:44:20 2004 +++ gnupg/agent/call-scd.c Mon Dec 20 09:32:56 2004 @@ -82,75 +82,6 @@ void *getpin_cb_arg; }; -struct membuf { - size_t len; - size_t size; - char *buf; - int out_of_core; -}; - - - -/* A simple implementation of a dynamic buffer. Use init_membuf() to - create a buffer, put_membuf to append bytes and get_membuf to - release and return the buffer. Allocation errors are detected but - only returned at the final get_membuf(), this helps not to clutter - the code with out of core checks. */ - -static void -init_membuf (struct membuf *mb, int initiallen) -{ - mb->len = 0; - mb->size = initiallen; - mb->out_of_core = 0; - mb->buf = xtrymalloc (initiallen); - if (!mb->buf) - mb->out_of_core = 1; -} - -static void -put_membuf (struct membuf *mb, const void *buf, size_t len) -{ - if (mb->out_of_core) - return; - - if (mb->len + len >= mb->size) - { - char *p; - - mb->size += len + 1024; - p = xtryrealloc (mb->buf, mb->size); - if (!p) - { - mb->out_of_core = 1; - return; - } - mb->buf = p; - } - memcpy (mb->buf + mb->len, buf, len); - mb->len += len; -} - -static void * -get_membuf (struct membuf *mb, size_t *len) -{ - char *p; - - if (mb->out_of_core) - { - xfree (mb->buf); - mb->buf = NULL; - return NULL; - } - - p = mb->buf; - *len = mb->len; - mb->buf = NULL; - mb->out_of_core = 1; /* don't allow a reuse */ - return p; -} - - /* This function must be called once to initialize this module. This @@ -468,7 +399,7 @@ static AssuanError membuf_data_cb (void *opaque, const void *buffer, size_t length) { - struct membuf *data = opaque; + membuf_t *data = opaque; if (buffer) put_membuf (data, buffer, length); @@ -519,7 +450,7 @@ { int rc, i; char *p, line[ASSUAN_LINELENGTH]; - struct membuf data; + membuf_t data; struct inq_needpin_s inqparm; size_t len; unsigned char *sigbuf; @@ -591,7 +522,7 @@ { int rc, i; char *p, line[ASSUAN_LINELENGTH]; - struct membuf data; + membuf_t data; struct inq_needpin_s inqparm; size_t len; @@ -643,7 +574,7 @@ { int rc; char line[ASSUAN_LINELENGTH]; - struct membuf data; + membuf_t data; size_t len; *r_buf = NULL; @@ -679,7 +610,7 @@ { int rc; char line[ASSUAN_LINELENGTH]; - struct membuf data; + membuf_t data; size_t len, buflen; *r_buf = NULL; Index: gnupg/agent/command.c diff -u gnupg/agent/command.c:1.25.2.7 gnupg/agent/command.c:1.25.2.8 --- gnupg/agent/command.c:1.25.2.7 Sun Sep 26 23:48:13 2004 +++ gnupg/agent/command.c Mon Dec 20 09:32:56 2004 @@ -50,7 +50,7 @@ ASSUAN_CONTEXT assuan_ctx; int message_fd; int use_cache_for_signing; - char *keydesc; /* Allocated description fro the next key + char *keydesc; /* Allocated description for the next key operation. */ }; @@ -58,6 +58,41 @@ +/* Release the memory buffer MB but first wipe out the used memory. */ +static void +clear_outbuf (membuf_t *mb) +{ + void *p; + size_t n; + + p = get_membuf (mb, &n); + if (p) + { + memset (p, 0, n); + xfree (p); + } +} + + +/* Write the content of memory buffer MB as assuan data to CTX and + wipe the buffer out afterwards. */ +static gpg_error_t +write_and_clear_outbuf (assuan_context_t ctx, membuf_t *mb) +{ + assuan_error_t ae; + void *p; + size_t n; + + p = get_membuf (mb, &n); + if (!p) + return gpg_error (GPG_ERR_ENOMEM); + ae = assuan_send_data (ctx, p, n); + memset (p, 0, n); + xfree (p); + return map_assuan_err (ae); +} + + static void reset_notify (ASSUAN_CONTEXT ctx) { @@ -369,14 +404,21 @@ int rc; int ignore_cache = 0; ctrl_t ctrl = assuan_get_pointer (ctx); + membuf_t outbuf; if (opt.ignore_cache_for_signing) ignore_cache = 1; else if (!ctrl->server_local->use_cache_for_signing) ignore_cache = 1; + init_membuf (&outbuf, 512); + rc = agent_pksign (ctrl, ctrl->server_local->keydesc, - assuan_get_data_fp (ctx), ignore_cache); + &outbuf, ignore_cache); + if (rc) + clear_outbuf (&outbuf); + else + rc = write_and_clear_outbuf (ctx, &outbuf); if (rc) log_error ("command pksign failed: %s\n", gpg_strerror (rc)); xfree (ctrl->server_local->keydesc); @@ -395,6 +437,7 @@ ctrl_t ctrl = assuan_get_pointer (ctx); unsigned char *value; size_t valuelen; + membuf_t outbuf; /* First inquire the data to decrypt */ rc = assuan_inquire (ctx, "CIPHERTEXT", @@ -402,10 +445,16 @@ if (rc) return rc; + init_membuf (&outbuf, 512); + rc = agent_pkdecrypt (ctrl, ctrl->server_local->keydesc, - value, valuelen, assuan_get_data_fp (ctx)); + value, valuelen, &outbuf); xfree (value); if (rc) + clear_outbuf (&outbuf); + else + rc = write_and_clear_outbuf (ctx, &outbuf); + if (rc) log_error ("command pkdecrypt failed: %s\n", gpg_strerror (rc)); xfree (ctrl->server_local->keydesc); ctrl->server_local->keydesc = NULL; @@ -434,15 +483,22 @@ int rc; unsigned char *value; size_t valuelen; + membuf_t outbuf; /* First inquire the parameters */ rc = assuan_inquire (ctx, "KEYPARAM", &value, &valuelen, MAXLEN_KEYPARAM); if (rc) return rc; - rc = agent_genkey (ctrl, value, valuelen, assuan_get_data_fp (ctx)); + init_membuf (&outbuf, 512); + + rc = agent_genkey (ctrl, value, valuelen, &outbuf); xfree (value); if (rc) + clear_outbuf (&outbuf); + else + rc = write_and_clear_outbuf (ctx, &outbuf); + if (rc) log_error ("command genkey failed: %s\n", gpg_strerror (rc)); return map_to_assuan_status (rc); } Index: gnupg/agent/genkey.c diff -u gnupg/agent/genkey.c:1.10.2.2 gnupg/agent/genkey.c:1.10.2.3 --- gnupg/agent/genkey.c:1.10.2.2 Sat Feb 21 14:05:22 2004 +++ gnupg/agent/genkey.c Mon Dec 20 09:32:56 2004 @@ -88,7 +88,7 @@ KEYPARAM */ int agent_genkey (CTRL ctrl, const char *keyparam, size_t keyparamlen, - FILE *outfp) + membuf_t *outbuf) { gcry_sexp_t s_keyparam, s_key, s_private, s_public; struct pin_entry_info_s *pi, *pi2; @@ -171,7 +171,8 @@ gcry_sexp_release (s_key); s_key = NULL; /* store the secret key */ - log_debug ("storing private key\n"); + if (DBG_CRYPTO) + log_debug ("storing private key\n"); rc = store_key (s_private, pi? pi->pin:NULL, 0); xfree (pi); pi = NULL; gcry_sexp_release (s_private); @@ -182,7 +183,8 @@ } /* return the public key */ - log_debug ("returning public key\n"); + if (DBG_CRYPTO) + log_debug ("returning public key\n"); len = gcry_sexp_sprint (s_public, GCRYSEXP_FMT_CANON, NULL, 0); assert (len); buf = xtrymalloc (len); @@ -195,15 +197,7 @@ } len = gcry_sexp_sprint (s_public, GCRYSEXP_FMT_CANON, buf, len); assert (len); - if (fwrite (buf, len, 1, outfp) != 1) - { - gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno)); - log_error ("error writing public key: %s\n", strerror (errno)); - gcry_sexp_release (s_private); - gcry_sexp_release (s_public); - xfree (buf); - return tmperr; - } + put_membuf (outbuf, buf, len); gcry_sexp_release (s_public); xfree (buf); Index: gnupg/agent/pkdecrypt.c diff -u gnupg/agent/pkdecrypt.c:1.8.2.4 gnupg/agent/pkdecrypt.c:1.8.2.5 --- gnupg/agent/pkdecrypt.c:1.8.2.4 Fri Feb 13 18:06:33 2004 +++ gnupg/agent/pkdecrypt.c Mon Dec 20 09:32:56 2004 @@ -37,7 +37,7 @@ int agent_pkdecrypt (CTRL ctrl, const char *desc_text, const unsigned char *ciphertext, size_t ciphertextlen, - FILE *outfp) + membuf_t *outbuf) { gcry_sexp_t s_skey = NULL, s_cipher = NULL, s_plain = NULL; unsigned char *shadow_info = NULL; @@ -88,11 +88,16 @@ log_error ("smartcard decryption failed: %s\n", gpg_strerror (rc)); goto leave; } - /* FIXME: don't use buffering and change the protocol to return - a complete S-expression and not just a part. */ - fprintf (outfp, "%u:", (unsigned int)len); - fwrite (buf, 1, len, outfp); - putc (0, outfp); + /* FIXME: Change the protocol to return a complete S-expression + and not just a part. */ + { + char tmpbuf[50]; + + sprintf (tmpbuf, "%u:", (unsigned int)len); + put_membuf (outbuf, tmpbuf, strlen (tmpbuf)); + put_membuf (outbuf, buf, len); + put_membuf (outbuf, "", 1); + } } else { /* No smartcard, but a private key */ @@ -119,10 +124,7 @@ buf = xmalloc (len); len = gcry_sexp_sprint (s_plain, GCRYSEXP_FMT_CANON, buf, len); assert (len); - /* FIXME: we must make sure that no buffering takes place or we are - in full control of the buffer memory (easy to do) - should go - into assuan. */ - fwrite (buf, 1, len, outfp); + put_membuf (outbuf, buf, len); } Index: gnupg/agent/pksign.c diff -u gnupg/agent/pksign.c:1.12.2.9 gnupg/agent/pksign.c:1.12.2.10 --- gnupg/agent/pksign.c:1.12.2.9 Sun Sep 26 23:48:13 2004 +++ gnupg/agent/pksign.c Mon Dec 20 09:32:56 2004 @@ -176,7 +176,8 @@ /* SIGN whatever information we have accumulated in CTRL and write it back to OUTFP. */ int -agent_pksign (CTRL ctrl, const char *desc_text, FILE *outfp, int ignore_cache) +agent_pksign (CTRL ctrl, const char *desc_text, + membuf_t *outbuf, int ignore_cache) { gcry_sexp_t s_sig = NULL; char *buf = NULL; @@ -193,10 +194,7 @@ len = gcry_sexp_sprint (s_sig, GCRYSEXP_FMT_CANON, buf, len); assert (len); - /* FIXME: we must make sure that no buffering takes place or we are - in full control of the buffer memory (easy to do) - should go - into assuan. */ - fwrite (buf, 1, len, outfp); + put_membuf (outbuf, buf, len); leave: gcry_sexp_release (s_sig); Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.36 gnupg/common/ChangeLog:1.30.2.37 --- gnupg/common/ChangeLog:1.30.2.36 Sun Dec 19 14:38:24 2004 +++ gnupg/common/ChangeLog Mon Dec 20 09:32:55 2004 @@ -1,3 +1,7 @@ +2004-12-20 Werner Koch + + * membuf.c (put_membuf): Wipe out buffer after a failed realloc. + 2004-12-19 Werner Koch * maperror.c (map_assuan_err_with_source): Oops, args were swapped. Index: gnupg/common/membuf.c diff -u gnupg/common/membuf.c:1.1 gnupg/common/membuf.c:1.1.2.1 --- gnupg/common/membuf.c:1.1 Thu Jun 5 09:13:47 2003 +++ gnupg/common/membuf.c Mon Dec 20 09:32:55 2004 @@ -60,6 +60,11 @@ if (!p) { mb->out_of_core = errno; + /* Wipe out what we already accumulated. This is required + in case we are storing sensitive data here. The membuf + API does not provide another way to cleanup after an + error. */ + memset (mb->buf, 0, mb->len); return; } mb->buf = p; From cvs at cvs.gnupg.org Mon Dec 20 09:50:12 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 11:03:06 2004 Subject: gnupg/util (ChangeLog iobuf.c strgutil.c) Message-ID: Date: Monday, December 20, 2004 @ 09:55:03 Author: wk Path: /cvs/gnupg/gnupg/util Modified: ChangeLog iobuf.c strgutil.c (handle_iconv_error): Turn diagnostics into warnings so that gpg does not return with failure. (native_to_utf8, utf8_to_native): Ditto. ------------+ ChangeLog | 11 +++++++++++ iobuf.c | 2 +- strgutil.c | 8 ++++---- 3 files changed, 16 insertions(+), 5 deletions(-) Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.172 gnupg/util/ChangeLog:1.173 --- gnupg/util/ChangeLog:1.172 Sat Dec 18 23:23:49 2004 +++ gnupg/util/ChangeLog Mon Dec 20 09:55:03 2004 @@ -1,3 +1,14 @@ +2004-12-20 Werner Koch + + * strgutil.c (handle_iconv_error): Turn diagnostics into warnings + so that gpg does not return with failure. + (native_to_utf8, utf8_to_native): Ditto. + +2004-12-16 Werner Koch + + * iobuf.c (fd_cache_strcmp) [W32]: Casting is a Bad Thing. Cast to + an unsigned char pointer and to an unsigned integer. + 2004-12-18 David Shaw * ttyio.c: Use only HAVE_LIBREADLINE to detect readline Index: gnupg/util/iobuf.c diff -u gnupg/util/iobuf.c:1.71 gnupg/util/iobuf.c:1.72 --- gnupg/util/iobuf.c:1.71 Mon Dec 6 11:32:20 2004 +++ gnupg/util/iobuf.c Mon Dec 20 09:55:03 2004 @@ -146,7 +146,7 @@ || (*a == '\\' && *b == '/')) ) break; } - return *(const unsigned *)a - *(const unsigned *)b; + return *(const unsigned char *)a - *(const unsigned char *)b; #else return strcmp (a, b); #endif Index: gnupg/util/strgutil.c diff -u gnupg/util/strgutil.c:1.45 gnupg/util/strgutil.c:1.46 --- gnupg/util/strgutil.c:1.45 Wed Nov 3 21:03:46 2004 +++ gnupg/util/strgutil.c Mon Dec 20 09:55:03 2004 @@ -451,10 +451,10 @@ handle_iconv_error (const char *to, const char *from, int use_fallback) { if (errno == EINVAL) - log_error (_("conversion from `%s' to `%s' not available\n"), + log_info (_("conversion from `%s' to `%s' not available\n"), from, to); else - log_error (_("iconv_open failed: %s\n"), strerror (errno)); + log_info (_("iconv_open failed: %s\n"), strerror (errno)); if (use_fallback) { @@ -645,7 +645,7 @@ if ( iconv (cd, (ICONV_CONST char **)&inptr, &inbytes, &outptr, &outbytes) == (size_t)-1) { - log_error (_("conversion from `%s' to `%s' failed: %s\n"), + log_info (_("conversion from `%s' to `%s' failed: %s\n"), active_charset_name, "utf-8", strerror (errno)); /* We don't do any conversion at all but use the strings as is. */ strcpy (buffer, string); @@ -919,7 +919,7 @@ outbuf = outptr = m_alloc (outbytes); if ( iconv (cd, (ICONV_CONST char **)&inptr, &inbytes, &outptr, &outbytes) == (size_t)-1) { - log_error (_("conversion from `%s' to `%s' failed: %s\n"), + log_info (_("conversion from `%s' to `%s' failed: %s\n"), "utf-8", active_charset_name, strerror (errno)); /* Didn't worked out. Temporary disable the use of * iconv and fall back to our old code. */ From cvs at cvs.gnupg.org Mon Dec 20 11:00:30 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 11:03:18 2004 Subject: gnupg (6 files) Message-ID: Date: Monday, December 20, 2004 @ 11:05:20 Author: wk Path: /cvs/gnupg/gnupg Modified: ChangeLog THANKS g10/ChangeLog g10/seckey-cert.c mpi/ChangeLog mpi/mpicoder.c * seckey-cert.c (do_check): Handle case when checksum was okay but passphrase still wrong. Roman Pavlik found such a case. * mpicoder.c (mpi_read_from_buffer): Don't abort in case of an invalid MPI but print a message and return NULL. Use log_info and not log_error. -------------------+ ChangeLog | 5 +++++ THANKS | 1 + g10/ChangeLog | 5 +++++ g10/seckey-cert.c | 19 +++++++++++++++++-- mpi/ChangeLog | 6 ++++++ mpi/mpicoder.c | 21 +++++++++++++++------ 6 files changed, 49 insertions(+), 8 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.226 gnupg/ChangeLog:1.227 --- gnupg/ChangeLog:1.226 Sat Dec 18 23:39:31 2004 +++ gnupg/ChangeLog Mon Dec 20 11:05:20 2004 @@ -14,6 +14,11 @@ 2004-12-16 Werner Koch + * THANKS: Added John Clizbe for help testing the 1.4.0a W32 + binary. + +2004-12-16 Werner Koch + Released 1.4.0. 2004-12-14 Werner Koch Index: gnupg/THANKS diff -u gnupg/THANKS:1.78 gnupg/THANKS:1.79 --- gnupg/THANKS:1.78 Thu Dec 16 11:28:50 2004 +++ gnupg/THANKS Mon Dec 20 11:05:20 2004 @@ -101,6 +101,7 @@ Joachim Backes backes@rhrk.uni-kl.de Joe Rhett jrhett@isite.net John A. Martin jam@jamux.com +John Clizbe JPClizbe@comcast.net Johnny Teveßen j.tevessen@gmx.de Jörg Schilling schilling@fokus.gmd.de Jos Backus Jos.Backus@nl.origin-it.com Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.665 gnupg/g10/ChangeLog:1.666 --- gnupg/g10/ChangeLog:1.665 Mon Dec 20 06:19:09 2004 +++ gnupg/g10/ChangeLog Mon Dec 20 11:05:20 2004 @@ -1,3 +1,8 @@ +2004-12-20 Werner Koch + + * seckey-cert.c (do_check): Handle case when checksum was okay but + passphrase still wrong. Roman Pavlik found such a case. + 2004-12-20 David Shaw * keyedit.c (keyedit_menu): Invisible alias "passwd" as Index: gnupg/g10/seckey-cert.c diff -u gnupg/g10/seckey-cert.c:1.74 gnupg/g10/seckey-cert.c:1.75 --- gnupg/g10/seckey-cert.c:1.74 Thu Jul 15 23:16:54 2004 +++ gnupg/g10/seckey-cert.c Mon Dec 20 11:05:20 2004 @@ -147,12 +147,20 @@ } } - /* must check it here otherwise the mpi_read_xx would fail + /* Must check it here otherwise the mpi_read_xx would fail because the length may have an arbitrary value */ if( sk->csum == csum ) { for( ; i < pubkey_get_nskey(sk->pubkey_algo); i++ ) { nbytes = ndata; sk->skey[i] = mpi_read_from_buffer(p, &nbytes, 1 ); + if (!sk->skey[i]) + { + /* Checksum was okay, but not correctly + decrypted. */ + sk->csum = 0; + csum = 1; + break; + } ndata -= nbytes; p += nbytes; } @@ -179,8 +187,15 @@ csum += checksum (buffer, ndata); mpi_free (sk->skey[i]); sk->skey[i] = mpi_read_from_buffer (buffer, &ndata, 1); - assert (sk->skey[i]); m_free (buffer); + if (!sk->skey[i]) + { + /* Checksum was okay, but not correctly + decrypted. */ + sk->csum = 0; + csum = 1; + break; + } /* csum += checksum_mpi (sk->skey[i]); */ } } Index: gnupg/mpi/ChangeLog diff -u gnupg/mpi/ChangeLog:1.79 gnupg/mpi/ChangeLog:1.80 --- gnupg/mpi/ChangeLog:1.79 Tue Oct 26 21:33:41 2004 +++ gnupg/mpi/ChangeLog Mon Dec 20 11:05:20 2004 @@ -1,3 +1,9 @@ +2004-12-20 Werner Koch + + * mpicoder.c (mpi_read_from_buffer): Don't abort in case of an + invalid MPI but print a message and return NULL. Use log_info and + not log_error. + 2004-10-26 Werner Koch * config.links: Use HOST instead of TARGET. Index: gnupg/mpi/mpicoder.c diff -u gnupg/mpi/mpicoder.c:1.32 gnupg/mpi/mpicoder.c:1.33 --- gnupg/mpi/mpicoder.c:1.32 Thu Sep 30 06:07:23 2004 +++ gnupg/mpi/mpicoder.c Mon Dec 20 11:05:20 2004 @@ -125,7 +125,7 @@ MPI -mpi_read_from_buffer(byte *buffer, unsigned *ret_nread, int secure) +mpi_read_from_buffer(byte *buffer, unsigned int *ret_nread, int secure) { int i, j; unsigned nbits, nbytes, nlimbs, nread=0; @@ -136,7 +136,7 @@ goto leave; nbits = buffer[0] << 8 | buffer[1]; if( nbits > MAX_EXTERN_MPI_BITS ) { - log_error("mpi too large (%u bits)\n", nbits); + log_info ("mpi too large (%u bits)\n", nbits); goto leave; } buffer += 2; @@ -154,10 +154,19 @@ for( ; j > 0; j-- ) { a = 0; for(; i < BYTES_PER_MPI_LIMB; i++ ) { - if( ++nread > *ret_nread ) - log_bug("mpi larger than buffer\n"); - a <<= 8; - a |= *buffer++; + if( ++nread > *ret_nread ) { + /* This (as well as the above error condition) may + happen if we use this function to parse a decrypted + MPI which didn't turn out to be a real MPI - possible + because the supplied key was wrong but the OpenPGP + checksum didn't caught it. */ + log_info ("mpi larger than buffer\n"); + mpi_free (val); + val = MPI_NULL; + goto leave; + } + a <<= 8; + a |= *buffer++; } i = 0; val->d[j-1] = a; From cvs at cvs.gnupg.org Mon Dec 20 12:31:54 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 12:31:58 2004 Subject: GNUPG-1-9-BRANCH gnupg/jnlib (ChangeLog w32-pth.c) Message-ID: Date: Monday, December 20, 2004 @ 12:36:46 Author: wk Path: /cvs/gnupg/gnupg/jnlib Tag: GNUPG-1-9-BRANCH Modified: ChangeLog w32-pth.c (do_pth_event_free): The events are hold in a ring buffer. Adjust for that. (do_pth_event_body): Ditto. (pth_event_isolate): Ditto. (do_pth_wait): Ditto. (_pth_event_count): Renamed to .. (event_count): .. and adjusted as above. (pth_init): Define 3 debug levels and change all debug calls to make use of them. This makes the moule now silent. -----------+ ChangeLog | 12 ++ w32-pth.c | 258 ++++++++++++++++++++++++++++++++++++------------------------ 2 files changed, 169 insertions(+), 101 deletions(-) Index: gnupg/jnlib/ChangeLog diff -u gnupg/jnlib/ChangeLog:1.3.2.30 gnupg/jnlib/ChangeLog:1.3.2.31 --- gnupg/jnlib/ChangeLog:1.3.2.30 Sun Dec 19 18:44:20 2004 +++ gnupg/jnlib/ChangeLog Mon Dec 20 12:36:46 2004 @@ -1,3 +1,15 @@ +2004-12-20 Werner Koch + + * w32-pth.c (do_pth_event_free): The events are hold in a ring + buffer. Adjust for that. + (do_pth_event_body): Ditto. + (pth_event_isolate): Ditto. + (do_pth_wait): Ditto. + (_pth_event_count): Renamed to .. + (event_count): .. and adjusted as above. + (pth_init): Define 3 debug levels and change all debug calls to + make use of them. This makes the moule now silent. + 2004-12-19 Werner Koch * w32-pth.c (pth_init): Enable debugging depending on env var. Index: gnupg/jnlib/w32-pth.c diff -u gnupg/jnlib/w32-pth.c:1.1.2.10 gnupg/jnlib/w32-pth.c:1.1.2.11 --- gnupg/jnlib/w32-pth.c:1.1.2.10 Sun Dec 19 18:44:20 2004 +++ gnupg/jnlib/w32-pth.c Mon Dec 20 12:36:46 2004 @@ -40,8 +40,6 @@ #define W32_PTH_HANDLE_INTERNAL HANDLE #include "w32-pth.h" -#define DEBUG_ENTER_LEAVE 1 /* Set to 1 to enable full debugging. */ - #ifndef FALSE #define FALSE 0 @@ -54,11 +52,14 @@ #endif -/* States whether trhis module has been initialized. */ +/* States whether this module has been initialized. */ static int pth_initialized; -/* Controls whether debugging is enabled. */ -static int debug_enter_leave; +/* Keeps the current debug level. Define marcos to test them. */ +static int debug_level; +#define DBG_ERROR (debug_level >= 1) +#define DBG_INFO (debug_level >= 2) +#define DBG_CALLS (debug_level >= 3) /* Variables to support event handling. */ static int pth_signo; @@ -67,7 +68,7 @@ /* Mutex to make sure only one thread is running. */ static CRITICAL_SECTION pth_shd; - +/* Events are store in a double linked event ring. */ struct pth_event_s { struct pth_event_s * next; @@ -124,12 +125,14 @@ { SECURITY_ATTRIBUTES sa; WSADATA wsadat; + const char *s; if (pth_initialized) return TRUE; - fprintf (stderr, "%s: pth_init: called.\n", log_get_prefix (NULL)); - debug_enter_leave = !!getenv ("DEBUG_PTH"); + debug_level = (s=getenv ("DEBUG_PTH"))? atoi (s):0; + if (debug_level) + fprintf (stderr, "%s: pth_init: called.\n", log_get_prefix (NULL)); if (WSAStartup (0x202, &wsadat)) return FALSE; @@ -184,7 +187,7 @@ { /* Fixme: I am not sure whether the same thread my enter a critical section twice. */ - if (debug_enter_leave) + if (DBG_CALLS) fprintf (stderr, "%s: enter_pth (%s)\n", log_get_prefix (NULL), function? function:""); LeaveCriticalSection (&pth_shd); @@ -195,7 +198,7 @@ leave_pth (const char *function) { EnterCriticalSection (&pth_shd); - if (debug_enter_leave) + if (DBG_CALLS) fprintf (stderr, "%s: leave_pth (%s)\n", log_get_prefix (NULL), function? function:""); } @@ -262,9 +265,10 @@ { char strerr[256]; - fprintf (stderr, "%s: pth_read(%d) failed read from file: %s\n", - log_get_prefix (NULL), fd, - w32_strerror (strerr, sizeof strerr)); + if (DBG_ERROR) + fprintf (stderr, "%s: pth_read(%d) failed read from file: %s\n", + log_get_prefix (NULL), fd, + w32_strerror (strerr, sizeof strerr)); n = -1; } else @@ -302,9 +306,10 @@ n = WriteFile ((HANDLE)fd, buffer, size, &nwrite, NULL); if (!n) { - fprintf (stderr, "%s: pth_write(%d) failed in write: %s\n", - log_get_prefix (NULL), fd, - w32_strerror (strerr, sizeof strerr)); + if (DBG_ERROR) + fprintf (stderr, "%s: pth_write(%d) failed in write: %s\n", + log_get_prefix (NULL), fd, + w32_strerror (strerr, sizeof strerr)); n = -1; } else @@ -395,21 +400,21 @@ (WSAGetLastError () == WSAEINPROGRESS || WSAGetLastError () == WSAEWOULDBLOCK)) { - if (ev == NULL) + if (!ev) { ev = do_pth_event (PTH_EVENT_FD|PTH_UNTIL_FD_READABLE| PTH_MODE_STATIC, &ev_key, fd); - if (ev == NULL) + if (!ev) { leave_pth (__FUNCTION__); return -1; } - if (ev_extra != NULL) + if (ev_extra) pth_event_concat (ev, ev_extra, NULL); } /* Wait until accept has a chance. */ do_pth_wait (ev); - if (ev_extra != NULL) + if (ev_extra) { pth_event_isolate (ev); if (do_pth_event_status (ev) != PTH_STATUS_OCCURRED) @@ -452,9 +457,10 @@ { char strerr[256]; - fprintf (stderr, "%s: pth_release_mutex %p failed: %s\n", - log_get_prefix (NULL), *mutex, - w32_strerror (strerr, sizeof strerr)); + if (DBG_ERROR) + fprintf (stderr, "%s: pth_release_mutex %p failed: %s\n", + log_get_prefix (NULL), *mutex, + w32_strerror (strerr, sizeof strerr)); rc = FALSE; } else @@ -483,9 +489,10 @@ { char strerr[256]; - fprintf (stderr, "%s: pth_mutex_acquire for %p failed: %s\n", - log_get_prefix (NULL), *mutex, - w32_strerror (strerr, sizeof strerr)); + if (DBG_ERROR) + fprintf (stderr, "%s: pth_mutex_acquire for %p failed: %s\n", + log_get_prefix (NULL), *mutex, + w32_strerror (strerr, sizeof strerr)); } rc = FALSE; break; @@ -495,9 +502,10 @@ break; default: - fprintf (stderr, "%s: WaitForSingleObject returned unexpected " - "code %d for mutex %p\n", - log_get_prefix (NULL), code, *mutex); + if (DBG_ERROR) + fprintf (stderr, "%s: WaitForSingleObject returned unexpected " + "code %d for mutex %p\n", + log_get_prefix (NULL), code, *mutex); rc = FALSE; break; } @@ -576,8 +584,9 @@ if (val) { hd->flags |= PTH_ATTR_JOINABLE; - fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_JOINABLE\n", - log_get_prefix (NULL)); + if (DBG_INFO) + fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_JOINABLE\n", + log_get_prefix (NULL)); } break; @@ -587,8 +596,9 @@ { hd->flags |= PTH_ATTR_STACK_SIZE; hd->stack_size = val; - fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", - log_get_prefix (NULL), val); + if (DBG_INFO) + fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_STACK_SIZE %d\n", + log_get_prefix (NULL), val); } break; @@ -602,8 +612,9 @@ if (!hd->name) return FALSE; hd->flags |= PTH_ATTR_NAME; - fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_NAME %s\n", - log_get_prefix (NULL), hd->name); + if (DBG_INFO) + fprintf (stderr, "%s: pth_attr_set: PTH_ATTR_NAME %s\n", + log_get_prefix (NULL), hd->name); } break; @@ -647,14 +658,16 @@ FIXME: We should no use th W32's Thread handle directly but keep our own thread control structure. CTX may be used for that. */ - fprintf (stderr, "%s: do_pth_spawn creating thread ...\n", - log_get_prefix (NULL)); + if (DBG_INFO) + fprintf (stderr, "%s: do_pth_spawn creating thread ...\n", + log_get_prefix (NULL)); th = CreateThread (&sa, hd->stack_size, (LPTHREAD_START_ROUTINE)launch_thread, ctx, CREATE_SUSPENDED, &tid); ctx->th = th; - fprintf (stderr, "%s: do_pth_spawn created thread %p\n", - log_get_prefix (NULL),th); + if (DBG_INFO) + fprintf (stderr, "%s: do_pth_spawn created thread %p\n", + log_get_prefix (NULL),th); if (!th) free (ctx); else @@ -787,7 +800,8 @@ case CTRL_BREAK_EVENT: pth_signo = SIGTERM; break; } SetEvent (pth_signo_ev); - fprintf (stderr, "%s: sig_handler=%d\n", log_get_prefix (NULL), pth_signo); + if (DBG_INFO) + fprintf (stderr, "%s: sig_handler=%d\n", log_get_prefix (NULL), pth_signo); return TRUE; } @@ -799,7 +813,8 @@ pth_event_t ev; int rc; - fprintf (stderr, "%s: pth_event spec=%lu\n", log_get_prefix (NULL), spec); + if (DBG_INFO) + fprintf (stderr, "%s: pth_event spec=%lu\n", log_get_prefix (NULL), spec); ev = calloc (1, sizeof *ev); if (!ev) return NULL; @@ -811,8 +826,9 @@ ev->u_type = PTH_EVENT_SIGS; ev->val = va_arg (arg, int *); rc = SetConsoleCtrlHandler (sig_handler, TRUE); - fprintf (stderr, "%s: pth_event: sigs rc=%d\n", - log_get_prefix (NULL), rc); + if (DBG_INFO) + fprintf (stderr, "%s: pth_event: sigs rc=%d\n", + log_get_prefix (NULL), rc); } else if (spec & PTH_EVENT_FD) { @@ -823,8 +839,9 @@ ev->u_type = PTH_EVENT_FD; va_arg (arg, pth_key_t); ev->u.fd = va_arg (arg, int); - fprintf (stderr, "%s: pth_event: fd=%d\n", - log_get_prefix (NULL), ev->u.fd); + if (DBG_INFO) + fprintf (stderr, "%s: pth_event: fd=%d\n", + log_get_prefix (NULL), ev->u.fd); } else if (spec & PTH_EVENT_TIME) { @@ -854,6 +871,8 @@ free (ev); return NULL; } + ev->next = ev; + ev->prev = ev; return ev; } @@ -938,8 +957,9 @@ while (1) { n = select (fd+1, &r, &w, NULL, &tv); - fprintf (stderr, "%s: wait_for_fd=%d fd %d (ec=%d)\n", - log_get_prefix (NULL), n, fd,(int)WSAGetLastError ()); + if (DBG_INFO) + fprintf (stderr, "%s: wait_for_fd=%d fd %d (ec=%d)\n", + log_get_prefix (NULL), n, fd,(int)WSAGetLastError ()); if (n == -1) break; if (!n) @@ -1036,8 +1056,9 @@ if (sigpresent (ev->u.sig, pth_signo) && WaitForSingleObject (pth_signo_ev, 0) == WAIT_OBJECT_0) { - fprintf (stderr, "%s: pth_event_occurred: sig signaled.\n", - log_get_prefix (NULL)); + if (DBG_INFO) + fprintf (stderr, "%s: pth_event_occurred: sig signaled.\n", + log_get_prefix (NULL)); (*ev->val) = pth_signo; ret = 1; } @@ -1090,18 +1111,21 @@ static int do_pth_event_free (pth_event_t ev, int mode) { - pth_event_t n; + if (!ev) + return FALSE; if (mode == PTH_FREE_ALL) { - while (ev) + pth_event_t cur = ev; + do { - n = ev->next; - CloseHandle (ev->hd); - ev->hd = NULL; - free (ev); - ev = n; + pth_event_t next = cur->next; + CloseHandle (cur->hd); + cur->hd = NULL; + free (cur); + cur = next; } + while (cur != ev); } else if (mode == PTH_FREE_THIS) { @@ -1111,6 +1135,8 @@ ev->hd = NULL; free (ev); } + else + return FALSE; return TRUE; } @@ -1131,24 +1157,39 @@ pth_event_t pth_event_isolate (pth_event_t ev) { - pth_event_t ring = NULL; + pth_event_t ring; if (!ev) return NULL; + if (ev->next == ev && ev->prev == ev) + return NULL; /* Only one event. */ + + ring = ev->next; + ev->prev->next = ev->next; + ev->next->prev = ev->prev; + ev->prev = ev; + ev->next = ev; return ring; } static int -_pth_event_count (pth_event_t ev) +event_count (pth_event_t ev) { - pth_event_t p; - int cnt=0; + pth_event_t r; + int cnt = 0; + + if (ev) + { + r = ev; + do + { + cnt++; + r = r->next; + } + while (r != ev); + } - if (!ev) - return 0; - for (p = ev; p; p = p->next) - cnt++; return cnt; } @@ -1166,13 +1207,15 @@ sa.lpSecurityDescriptor = NULL; sa.nLength = sizeof sa; - fprintf (stderr, "%s: spawn_helper_thread creating thread ...\n", - log_get_prefix (NULL)); + if (DBG_INFO) + fprintf (stderr, "%s: spawn_helper_thread creating thread ...\n", + log_get_prefix (NULL)); th = CreateThread (&sa, 32*1024, (LPTHREAD_START_ROUTINE)func, arg, 0, &tid); - fprintf (stderr, "%s: spawn_helper_thread created thread %p\n", - log_get_prefix (NULL), th); + if (DBG_INFO) + fprintf (stderr, "%s: spawn_helper_thread created thread %p\n", + log_get_prefix (NULL), th); return th; } @@ -1197,7 +1240,8 @@ pth_event_t ev = ctx; wait_for_fd (ev->u.fd, ev->flags & PTH_UNTIL_FD_READABLE, 3600); - fprintf (stderr, "%s: wait_fd_thread: exit.\n", log_get_prefix (NULL)); + if (DBG_INFO) + fprintf (stderr, "%s: wait_fd_thread: exit.\n", log_get_prefix (NULL)); SetEvent (ev->hd); ExitThread (0); return NULL; @@ -1211,7 +1255,8 @@ int n = ev->u.tv.tv_sec*1000; Sleep (n); SetEvent (ev->hd); - fprintf (stderr, "%s: wait_timer_thread: exit.\n", log_get_prefix (NULL)); + if (DBG_INFO) + fprintf (stderr, "%s: wait_timer_thread: exit.\n", log_get_prefix (NULL)); ExitThread (0); return NULL; } @@ -1223,51 +1268,62 @@ HANDLE waitbuf[MAXIMUM_WAIT_OBJECTS/2]; int hdidx[MAXIMUM_WAIT_OBJECTS/2]; DWORD n = 0; - pth_event_t tmp; int pos=0, i=0; if (!ev) return 0; - n =_pth_event_count (ev); + n = event_count (ev); if (n > MAXIMUM_WAIT_OBJECTS/2) return -1; - fprintf (stderr, "%s: pth_wait: cnt %lu\n", log_get_prefix (NULL), n); - for (tmp = ev; tmp; tmp = tmp->next) + if (DBG_INFO) + fprintf (stderr, "%s: pth_wait: cnt %lu\n", log_get_prefix (NULL), n); + if (ev) { - switch (tmp->u_type) + pth_event_t r = ev; + do { - case 0: - waitbuf[pos++] = tmp->hd; - break; - - case PTH_EVENT_SIGS: - waitbuf[pos++] = pth_signo_ev; - fprintf (stderr, "pth_wait: add signal event.\n"); - break; - - case PTH_EVENT_FD: - fprintf (stderr, "pth_wait: spawn event wait thread.\n"); - hdidx[i++] = pos; - waitbuf[pos++] = spawn_helper_thread (wait_fd_thread, tmp); - break; - - case PTH_EVENT_TIME: - fprintf (stderr, "pth_wait: spawn event timer thread.\n"); - hdidx[i++] = pos; - waitbuf[pos++] = spawn_helper_thread (wait_timer_thread, tmp); - break; - - case PTH_EVENT_MUTEX: - fprintf (stderr, "pth_wait: add mutex event.\n"); - break; + switch (r->u_type) + { + case 0: + waitbuf[pos++] = r->hd; + break; + + case PTH_EVENT_SIGS: + waitbuf[pos++] = pth_signo_ev; + if (DBG_INFO) + fprintf (stderr, "pth_wait: add signal event.\n"); + break; + + case PTH_EVENT_FD: + if (DBG_INFO) + fprintf (stderr, "pth_wait: spawn event wait thread.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = spawn_helper_thread (wait_fd_thread, r); + break; + + case PTH_EVENT_TIME: + if (DBG_INFO) + fprintf (stderr, "pth_wait: spawn event timer thread.\n"); + hdidx[i++] = pos; + waitbuf[pos++] = spawn_helper_thread (wait_timer_thread, r); + break; + + case PTH_EVENT_MUTEX: + if (DBG_INFO) + fprintf (stderr, "pth_wait: ignoring mutex event.\n"); + break; + } } + while ( r != ev ); } - fprintf (stderr, "%s: pth_wait: set %d\n", log_get_prefix (NULL), pos); + if (DBG_INFO) + fprintf (stderr, "%s: pth_wait: set %d\n", log_get_prefix (NULL), pos); n = WaitForMultipleObjects (pos, waitbuf, FALSE, INFINITE); free_helper_threads (waitbuf, hdidx, i); - fprintf (stderr, "%s: pth_wait: n %ld\n", log_get_prefix (NULL), n); + if (DBG_INFO) + fprintf (stderr, "%s: pth_wait: n %ld\n", log_get_prefix (NULL), n); if (n != WAIT_TIMEOUT) return 1; From cvs at cvs.gnupg.org Mon Dec 20 17:03:02 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Mon Dec 20 17:03:09 2004 Subject: libassuan/src (ChangeLog assuan-socket-connect.c) Message-ID: Date: Monday, December 20, 2004 @ 17:03:02 Author: werner Path: /cvs/gnupg/libassuan/src Modified: ChangeLog assuan-socket-connect.c (assuan_socket_connect): Allow for a drive letter in the path. -------------------------+ ChangeLog | 5 +++++ assuan-socket-connect.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) From cvs at cvs.gnupg.org Mon Dec 20 17:12:32 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 17:12:36 2004 Subject: GNUPG-1-9-BRANCH gnupg (18 files) Message-ID: Date: Monday, December 20, 2004 @ 17:17:25 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: ChangeLog NEWS TODO agent/ChangeLog agent/gpg-agent.c agent/protect-tool.c common/ChangeLog common/mkdtemp.c common/sysutils.h common/util.h configure.ac doc/gpg-agent.texi doc/gpgsm.texi doc/scdaemon.texi sm/ChangeLog sm/call-agent.c sm/call-dirmngr.c sm/import.c * configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all directories default to c:/gnupg. Require libassuan 0.6.9. * gpg-agent.c (main) [W32]: Now that Mutexes work we can remove the pth_init kludge. (main): Add new options --[no-]use-standard-socket. (check_for_running_agent): Check whether it is running on the standard socket. * sysutils.h [W32]: Define sleep. * util.h: Add prototype for mkdtemp. * call-agent.c (start_agent): Before starting a pipe server start to connect to a server on the standard socket. Use PATHSEP * call-dirmngr.c (start_dirmngr): Use PATHSEP. * import.c: Include unistd.h for dup and close. ----------------------+ ChangeLog | 5 + NEWS | 6 + TODO | 7 + agent/ChangeLog | 6 + agent/gpg-agent.c | 181 ++++++++++++++++++++++++++++++------------------- agent/protect-tool.c | 14 ++- common/ChangeLog | 3 common/mkdtemp.c | 3 common/sysutils.h | 8 ++ common/util.h | 4 + configure.ac | 16 ++-- doc/gpg-agent.texi | 29 +++++++ doc/gpgsm.texi | 10 ++ doc/scdaemon.texi | 9 ++ sm/ChangeLog | 8 ++ sm/call-agent.c | 72 +++++++++++-------- sm/call-dirmngr.c | 2 sm/import.c | 1 18 files changed, 270 insertions(+), 114 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.131.2.62 gnupg/ChangeLog:1.131.2.63 --- gnupg/ChangeLog:1.131.2.62 Sat Dec 18 19:53:32 2004 +++ gnupg/ChangeLog Mon Dec 20 17:17:25 2004 @@ -1,3 +1,8 @@ +2004-12-20 Werner Koch + + * configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all + directories default to c:/gnupg. Require libassuan 0.6.9. + 2004-12-18 Werner Koch * configure.ac (AH_BOTTOM): Define EXEEXT_S. Index: gnupg/NEWS diff -u gnupg/NEWS:1.165.2.60 gnupg/NEWS:1.165.2.61 --- gnupg/NEWS:1.165.2.60 Mon Dec 6 14:49:14 2004 +++ gnupg/NEWS Mon Dec 20 17:17:25 2004 @@ -1,6 +1,12 @@ Noteworthy changes in version 1.9.14 ------------------------------------------------- + * [gpg-agent] New option --use-standard-socket to allow the use of a + fixed socket. gpgsm falls back to this socket if GPG_AGENT_INFO + has not been set. + + * Ported to MS Windows. + Noteworthy changes in version 1.9.13 (2004-12-03) ------------------------------------------------- Index: gnupg/TODO diff -u gnupg/TODO:1.165.2.33 gnupg/TODO:1.165.2.34 --- gnupg/TODO:1.165.2.33 Tue Nov 23 18:09:51 2004 +++ gnupg/TODO Mon Dec 20 17:17:24 2004 @@ -95,3 +95,10 @@ This needs support in libksba/src/cert.c as well as in sm/*.c. Need test certs as well. Same goes for CRL authorityKeyIdentifier. + +* Windows port +** gpgsm's LISTKEYS does not yet work + Fix is to change everything to libestream +** Signals are not support + This means we can't reread a configuration + Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.51 gnupg/agent/ChangeLog:1.59.2.52 --- gnupg/agent/ChangeLog:1.59.2.51 Mon Dec 20 09:32:56 2004 +++ gnupg/agent/ChangeLog Mon Dec 20 17:17:24 2004 @@ -1,5 +1,11 @@ 2004-12-20 Werner Koch + * gpg-agent.c (main) [W32]: Now that Mutexes work we can remove + the pth_init kludge. + (main): Add new options --[no-]use-standard-socket. + (check_for_running_agent): Check whether it is running on the + standard socket. + * call-scd.c (init_membuf, put_membuf, get_membuf): Removed. We now use the identical implementation from ../common/membuf.c. Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.27 gnupg/agent/gpg-agent.c:1.31.2.28 --- gnupg/agent/gpg-agent.c:1.31.2.27 Sun Dec 19 18:44:20 2004 +++ gnupg/agent/gpg-agent.c Mon Dec 20 17:17:24 2004 @@ -84,13 +84,14 @@ oDisablePth, oDefCacheTTL, oMaxCacheTTL, + oUseStandardSocket, + oNoUseStandardSocket, oIgnoreCacheForSigning, oAllowMarkTrusted, oKeepTTY, - oKeepDISPLAY, - -aTest }; + oKeepDISPLAY +}; @@ -115,6 +116,9 @@ { oNoGrab, "no-grab" ,0, N_("do not grab keyboard and mouse")}, { oLogFile, "log-file" ,2, N_("use a log file for the server")}, { oDisablePth, "disable-pth", 0, N_("do not allow multiple connections")}, + { oUseStandardSocket, "use-standard-socket", 0, + N_("use a standard location for the socket")}, + { oNoUseStandardSocket, "no-use-standard-socket", 0, "@"}, { oPinentryProgram, "pinentry-program", 2 , N_("|PGM|use PGM as the PIN-Entry program") }, @@ -154,7 +158,7 @@ static int maybe_setuid = 1; /* Name of the communication socket */ -static char socket_name[128]; +static char *socket_name; /* Default values for options passed to the pinentry. */ static char *default_display; @@ -177,12 +181,11 @@ static void create_directories (void); #ifdef USE_GNU_PTH static void handle_connections (int listen_fd); - /* Pth wrapper function definitions. */ GCRY_THREAD_OPTION_PTH_IMPL; - #endif /*USE_GNU_PTH*/ -static void check_for_running_agent (void); + +static int check_for_running_agent (int); @@ -293,7 +296,7 @@ static void cleanup (void) { - if (*socket_name) + if (socket_name && *socket_name) { char *p; @@ -419,6 +422,7 @@ int debug_wait = 0; int disable_pth = 0; int gpgconf_list = 0; + int standard_socket = 0; gpg_error_t err; @@ -437,17 +441,12 @@ /* Libgcrypt requires us to register the threading model first. Note that this will also do the pth_init. */ #ifdef USE_GNU_PTH -#ifdef HAVE_W32_SYSTEM - /* For W32 we need pth. */ - pth_init (); -#else err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } -#endif #endif /*USE_GNU_PTH*/ @@ -468,18 +467,28 @@ may_coredump = disable_core_dumps (); + /* Set default options. */ parse_rereadable_options (NULL, 0); /* Reset them to default values. */ - +#ifdef HAVE_W32_SYSTEM + standard_socket = 1; /* Under Windows we always use a standard + socket. */ +#endif + shell = getenv ("SHELL"); if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") ) csh_style = 1; - + + opt.homedir = getenv("GNUPGHOME"); +#ifdef HAVE_W32_SYSTEM + if (!opt.homedir || !*opt.homedir) + opt.homedir = read_w32_registry_string (NULL, + "Software\\GNU\\GnuPG", "HomeDir"); +#endif /*HAVE_W32_SYSTEM*/ if (!opt.homedir || !*opt.homedir) opt.homedir = GNUPG_DEFAULT_HOMEDIR; - - /* check whether we have a config file on the commandline */ + /* Check whether we have a config file on the commandline */ orig_argc = argc; orig_argv = argv; pargs.argc = &argc; @@ -509,7 +518,6 @@ Now we are now working under our real uid */ - if (default_config) configname = make_filename (opt.homedir, "gpg-agent.conf", NULL ); @@ -584,6 +592,9 @@ case oLCmessages: default_lc_messages = xstrdup (pargs.r.ret_str); break; + case oUseStandardSocket: standard_socket = 1; break; + case oNoUseStandardSocket: standard_socket = 0; break; + case oKeepTTY: opt.keep_tty = 1; break; case oKeepDISPLAY: opt.keep_display = 1; break; @@ -695,7 +706,7 @@ if (!pipe_server && !is_daemon) { log_set_prefix (NULL, JNLIB_LOG_WITH_PREFIX); - check_for_running_agent (); + check_for_running_agent (0); agent_exit (0); } @@ -736,6 +747,7 @@ else { /* Regular server mode */ int fd; + int rc; pid_t pid; int len; struct sockaddr_un serv_addr; @@ -750,28 +762,28 @@ unsetenv ("DISPLAY"); #endif - *socket_name = 0; - snprintf (socket_name, DIM(socket_name)-1, - "/tmp/gpg-XXXXXX/S.gpg-agent"); - socket_name[DIM(socket_name)-1] = 0; - p = strrchr (socket_name, '/'); - if (!p) - BUG (); - *p = 0;; - -#ifndef HAVE_W32_SYSTEM - if (!mkdtemp(socket_name)) + /* Create the socket name . */ + if (standard_socket) + socket_name = make_filename (opt.homedir, "S.gpg-agent", NULL); + else { - log_error ("can't create directory `%s': %s\n", - socket_name, strerror(errno) ); - exit (1); + socket_name = xstrdup ("/tmp/gpg-XXXXXX/S.gpg-agent"); + p = strrchr (socket_name, '/'); + if (!p) + BUG (); + *p = 0;; + if (!mkdtemp(socket_name)) + { + log_error (_("can't create directory `%s': %s\n"), + socket_name, strerror(errno) ); + exit (1); + } + *p = '/'; } -#endif - *p = '/'; - if (strchr (socket_name, ':') ) + if (strchr (socket_name, PATHSEP_C) ) { - log_error ("colons are not allowed in the socket name\n"); + log_error ("`%s' are not allowed in the socket name\n", PATHSEP_S); exit (1); } if (strlen (socket_name)+1 >= sizeof serv_addr.sun_path ) @@ -797,13 +809,22 @@ len = (offsetof (struct sockaddr_un, sun_path) + strlen(serv_addr.sun_path) + 1); - if ( #ifdef HAVE_W32_SYSTEM - _w32_sock_bind + rc = _w32_sock_bind (fd, (struct sockaddr*)&serv_addr, len); + if (rc == -1 && standard_socket) + { + remove (socket_name); + rc = bind (fd, (struct sockaddr*)&serv_addr, len); + } #else - bind + rc = bind (fd, (struct sockaddr*)&serv_addr, len); + if (rc == -1 && standard_socket && errno == EADDRINUSE) + { + remove (socket_name); + rc = bind (fd, (struct sockaddr*)&serv_addr, len); + } #endif - (fd, (struct sockaddr*)&serv_addr, len) == -1) + if (rc == -1) { log_error ("error binding socket to `%s': %s\n", serv_addr.sun_path, strerror (errno) ); @@ -823,7 +844,10 @@ fflush (NULL); -#ifndef HAVE_W32_SYSTEM +#ifdef HAVE_W32_SYSTEM + pid = getpid (); + printf ("set GPG_AGENT_INFO=%s;%lu;1\n", socket_name, (ulong)pid); +#else /*!HAVE_W32_SYSTEM*/ pid = fork (); if (pid == (pid_t)-1) { @@ -1286,53 +1310,72 @@ /* Figure out whether an agent is available and running. Prints an - error if not. */ -static void -check_for_running_agent () + error if not. Usually started with MODE 0. */ +static int +check_for_running_agent (int mode) { int rc; char *infostr, *p; assuan_context_t ctx; int prot, pid; - infostr = getenv ("GPG_AGENT_INFO"); - if (!infostr || !*infostr) + if (!mode) { - log_error (_("no gpg-agent running in this session\n")); - return; - } + infostr = getenv ("GPG_AGENT_INFO"); + if (!infostr || !*infostr) + { + if (!check_for_running_agent (1)) + return 0; /* Okay, its running on the standard socket. */ + log_error (_("no gpg-agent running in this session\n")); + return -1; + } + + infostr = xstrdup (infostr); + if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr) + { + xfree (infostr); + if (!check_for_running_agent (1)) + return 0; /* Okay, its running on the standard socket. */ + log_error (_("malformed GPG_AGENT_INFO environment variable\n")); + return -1; + } - infostr = xstrdup (infostr); - if ( !(p = strchr (infostr, ':')) || p == infostr) + *p++ = 0; + pid = atoi (p); + while (*p && *p != PATHSEP_C) + p++; + prot = *p? atoi (p+1) : 0; + if (prot != 1) + { + xfree (infostr); + log_error (_("gpg-agent protocol version %d is not supported\n"), + prot); + if (!check_for_running_agent (1)) + return 0; /* Okay, its running on the standard socket. */ + return -1; + } + } + else /* MODE != 0 */ { - log_error (_("malformed GPG_AGENT_INFO environment variable\n")); - xfree (infostr); - return; + infostr = make_filename (opt.homedir, "S.gpg-agent", NULL); } - *p++ = 0; - pid = atoi (p); - while (*p && *p != ':') - p++; - prot = *p? atoi (p+1) : 0; - if (prot != 1) - { - log_error (_("gpg-agent protocol version %d is not supported\n"), - prot); - xfree (infostr); - return; - } rc = assuan_socket_connect (&ctx, infostr, pid); xfree (infostr); if (rc) { - log_error ("can't connect to the agent: %s\n", assuan_strerror (rc)); - return; + if (!mode && !check_for_running_agent (1)) + return 0; /* Okay, its running on the standard socket. */ + + if (!mode) + log_error ("can't connect to the agent: %s\n", assuan_strerror (rc)); + return -1; } if (!opt.quiet) log_info ("gpg-agent running and available\n"); assuan_disconnect (ctx); + return 0; } Index: gnupg/agent/protect-tool.c diff -u gnupg/agent/protect-tool.c:1.15.2.11 gnupg/agent/protect-tool.c:1.15.2.12 --- gnupg/agent/protect-tool.c:1.15.2.11 Wed Dec 15 15:15:09 2004 +++ gnupg/agent/protect-tool.c Mon Dec 20 17:17:24 2004 @@ -44,6 +44,8 @@ #include "minip12.h" #include "simple-pwquery.h" #include "i18n.h" +#include "sysutils.h" + enum cmd_and_opt_values { aNull = 0, @@ -1065,12 +1067,12 @@ gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0); -#ifdef HAVE_W32_SYSTEM - opt_homedir = read_w32_registry_string ( NULL, - "Software\\GNU\\GnuPG", "HomeDir" ); -#else /*!HAVE_W32_SYSTEM*/ opt_homedir = getenv ("GNUPGHOME"); -#endif /*!HAVE_W32_SYSTEM*/ +#ifdef HAVE_W32_SYSTEM + if (!opt_homedir || !*opt_homedir) + opt_homedir = read_w32_registry_string (NULL, + "Software\\GNU\\GnuPG", "HomeDir"); +#endif /*HAVE_W32_SYSTEM*/ if (!opt_homedir || !*opt_homedir) opt_homedir = GNUPG_DEFAULT_HOMEDIR; @@ -1162,7 +1164,9 @@ char *pw; int err; const char *desc; +#ifdef HAVE_LANGINFO_CODESET char *orig_codeset = NULL; +#endif int error_msgno; Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.37 gnupg/common/ChangeLog:1.30.2.38 --- gnupg/common/ChangeLog:1.30.2.37 Mon Dec 20 09:32:55 2004 +++ gnupg/common/ChangeLog Mon Dec 20 17:17:24 2004 @@ -1,5 +1,8 @@ 2004-12-20 Werner Koch + * sysutils.h [W32]: Define sleep. + * util.h: Add prototype for mkdtemp. + * membuf.c (put_membuf): Wipe out buffer after a failed realloc. 2004-12-19 Werner Koch Index: gnupg/common/mkdtemp.c diff -u gnupg/common/mkdtemp.c:1.2.2.1 gnupg/common/mkdtemp.c:1.2.2.2 --- gnupg/common/mkdtemp.c:1.2.2.1 Mon Nov 17 13:20:11 2003 +++ gnupg/common/mkdtemp.c Mon Dec 20 17:17:24 2004 @@ -35,7 +35,8 @@ # define mkdir(a,b) mkdir(a) #endif -char *mkdtemp(char *template) +char * +mkdtemp (char *template) { int attempts,idx,count=0; unsigned char *ch; Index: gnupg/common/sysutils.h diff -u gnupg/common/sysutils.h:1.1.2.2 gnupg/common/sysutils.h:1.1.2.3 --- gnupg/common/sysutils.h:1.1.2.2 Wed Dec 15 15:15:09 2004 +++ gnupg/common/sysutils.h Mon Dec 20 17:17:24 2004 @@ -28,11 +28,19 @@ int check_permissions (const char *path,int extension,int checkonly); #ifdef HAVE_W32_SYSTEM +/* Windows declares sleep as obsolete, but provides a definition for + _sleep but non for the still existing sleep. */ +#define sleep(a) _sleep ((a)) + /*-- w32reg.c --*/ char *read_w32_registry_string( const char *root, const char *dir, const char *name ); int write_w32_registry_string(const char *root, const char *dir, const char *name, const char *value); + #endif /*HAVE_W32_SYSTEM*/ + + + #endif /*GNUPG_COMMON_SYSUTILS_H*/ Index: gnupg/common/util.h diff -u gnupg/common/util.h:1.12.2.12 gnupg/common/util.h:1.12.2.13 --- gnupg/common/util.h:1.12.2.12 Sat Dec 18 11:22:10 2004 +++ gnupg/common/util.h Mon Dec 20 17:17:24 2004 @@ -150,6 +150,10 @@ #ifndef HAVE_TTYNAME char *ttyname (int fd); #endif +#ifndef HAVE_MKDTEMP +char *mkdtemp (char *template); +#endif + /*-- some macros to replace ctype ones and avoid locale problems --*/ #define spacep(p) (*(p) == ' ' || *(p) == '\t') Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.74 gnupg/configure.ac:1.36.2.75 --- gnupg/configure.ac:1.36.2.74 Sat Dec 18 19:53:32 2004 +++ gnupg/configure.ac Mon Dec 20 17:17:24 2004 @@ -34,7 +34,7 @@ NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.1.94 -NEED_LIBASSUAN_VERSION=0.6.6 +NEED_LIBASSUAN_VERSION=0.6.9 NEED_KSBA_VERSION=0.9.7 @@ -252,15 +252,19 @@ than one character because the code assumes strlen()==1 */ #ifdef HAVE_DOSISH_SYSTEM #define DIRSEP_C '\\' -#define EXTSEP_C '.' #define DIRSEP_S "\\" +#define EXTSEP_C '.' #define EXTSEP_S "." +#define PATHSEP_C ';' +#define PATHSEP_S ";" #define EXEEXT_S ".exe" #else #define DIRSEP_C '/' -#define EXTSEP_C '.' #define DIRSEP_S "/" +#define EXTSEP_C '.' #define EXTSEP_S "." +#define PATHSEP_C ':' +#define PATHSEP_S ":" #define EXEEXT_S "" #endif @@ -278,9 +282,9 @@ comply with the GNU coding standards. */ #ifdef HAVE_DRIVE_LETTERS #define GNUPG_BINDIR "c:\\gnupg" -#define GNUPG_LIBEXECDIR "c:\\lib\\gnupg" -#define GNUPG_LIBDIR "c:\\lib\\gnupg" -#define GNUPG_DATADIR "c:\\lib\\gnupg" +#define GNUPG_LIBEXECDIR "c:\\gnupg" +#define GNUPG_LIBDIR "c:\\gnupg" +#define GNUPG_DATADIR "c:\\gnupg" #endif /* Setup the hardwired names of modules. */ Index: gnupg/doc/gpg-agent.texi diff -u gnupg/doc/gpg-agent.texi:1.1.2.12 gnupg/doc/gpg-agent.texi:1.1.2.13 --- gnupg/doc/gpg-agent.texi:1.1.2.12 Tue Nov 23 18:09:51 2004 +++ gnupg/doc/gpg-agent.texi Mon Dec 20 17:17:24 2004 @@ -43,7 +43,7 @@ @end smallexample @noindent -You should aleways add the following lines to your @code{.bashrc} or +You should always add the following lines to your @code{.bashrc} or whatever initialization file is used for all shell invocations: @smallexample @@ -53,7 +53,8 @@ @noindent It is important that this environment variable always reflects the -output of the @code{tty} command. +output of the @code{tty} command. For W32 systems this option is not +required. Please make sure that a proper pinentry program has been installed under the default filename (which is system dependant) or use the @@ -129,6 +130,15 @@ @file{gpg-agent.conf} and expected in the @file{.gnupg} directory directly below the home directory of the user. +@item --homedir @var{dir} +@opindex homedir +Set the name of the home directory to @var{dir}. If his option is not +used, the home directory defaults to @file{~/.gnupg}. It is only +recognized when given on the command line. It also overrides any home +directory stated through the environment variable @var{GNUPGHOME} or +(on W32 systems) by means on the Registry entry +@var{HKCU\Software\GNU\GnuPG:HomeDir}. + @item -v @item --verbose @opindex v @@ -279,6 +289,21 @@ installation dependend and can be shown with the @code{--version} command. +@item --use-standard-socket +@itemx --no-use-standard-socket +@opindex use-standard-socket +@opindex no-use-standard-socket +By enabling this option @command{gpg-agent} will listen on the socket +named @file{S.gpg-agent}, located in the home directory, and not create +a random socket below a temporary directory. Tools connecting to +@command{gpg-agent} should first try to connect to the socket given in +environment variable @var{GPG_AGENT_INFO} and the fall back to this +socket. This option may not be used if the home directory is mounted as +a remote file system. + +@noindent +Note, that as of now, W32 systems default to this option. + @item --display @var{string} @itemx --ttyname @var{string} Index: gnupg/doc/gpgsm.texi diff -u gnupg/doc/gpgsm.texi:1.1.2.18 gnupg/doc/gpgsm.texi:1.1.2.19 --- gnupg/doc/gpgsm.texi:1.1.2.18 Tue Nov 23 18:09:51 2004 +++ gnupg/doc/gpgsm.texi Mon Dec 20 17:17:24 2004 @@ -236,6 +236,16 @@ @file{gpgsm.conf} and expected in the @file{.gnupg} directory directly below the home directory of the user. +@item --homedir @var{dir} +@opindex homedir +Set the name of the home directory to @var{dir}. If his option is not +used, the home directory defaults to @file{~/.gnupg}. It is only +recognized when given on the command line. It also overrides any home +directory stated through the environment variable @var{GNUPGHOME} or +(on W32 systems) by means on the Registry entry +@var{HKCU\Software\GNU\GnuPG:HomeDir}. + + @item -v @item --verbose @opindex v Index: gnupg/doc/scdaemon.texi diff -u gnupg/doc/scdaemon.texi:1.1.2.10 gnupg/doc/scdaemon.texi:1.1.2.11 --- gnupg/doc/scdaemon.texi:1.1.2.10 Wed Oct 20 10:54:45 2004 +++ gnupg/doc/scdaemon.texi Mon Dec 20 17:17:24 2004 @@ -81,6 +81,15 @@ @file{scdaemon.conf} and expected in the @file{.gnupg} directory directly below the home directory of the user. +@item --homedir @var{dir} +@opindex homedir +Set the name of the home directory to @var{dir}. If his option is not +used, the home directory defaults to @file{~/.gnupg}. It is only +recognized when given on the command line. It also overrides any home +directory stated through the environment variable @var{GNUPGHOME} or +(on W32 systems) by means on the Registry entry +@var{HKCU\Software\GNU\GnuPG:HomeDir}. + @item -v @item --verbose @opindex v Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.83 gnupg/sm/ChangeLog:1.101.2.84 --- gnupg/sm/ChangeLog:1.101.2.83 Sat Dec 18 11:22:09 2004 +++ gnupg/sm/ChangeLog Mon Dec 20 17:17:24 2004 @@ -1,3 +1,11 @@ +2004-12-20 Werner Koch + + * call-agent.c (start_agent): Before starting a pipe server start + to connect to a server on the standard socket. Use PATHSEP + * call-dirmngr.c (start_dirmngr): Use PATHSEP. + + * import.c: Include unistd.h for dup and close. + 2004-12-18 Werner Koch * gpgsm.h (map_assuan_err): Define in terms of Index: gnupg/sm/call-agent.c diff -u gnupg/sm/call-agent.c:1.35.2.9 gnupg/sm/call-agent.c:1.35.2.10 --- gnupg/sm/call-agent.c:1.35.2.9 Sat Dec 18 11:22:09 2004 +++ gnupg/sm/call-agent.c Mon Dec 20 17:17:24 2004 @@ -81,41 +81,53 @@ { const char *pgmname; const char *argv[3]; + char *sockname; int no_close_list[3]; int i; - if (opt.verbose) - log_info (_("no running gpg-agent - starting one\n")); - - gpgsm_status (ctrl, STATUS_PROGRESS, "starting_agent ? 0 0"); + /* First check whether we can connect at the standard + socket. */ + sockname = make_filename (opt.homedir, "S.gpg-agent", NULL); + rc = assuan_socket_connect (&ctx, sockname, 0); + xfree (sockname); - if (fflush (NULL)) + if (rc) { - gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno)); - log_error ("error flushing pending output: %s\n", strerror (errno)); - return tmperr; + /* With no success start a new server. */ + if (opt.verbose) + log_info (_("no running gpg-agent - starting one\n")); + + gpgsm_status (ctrl, STATUS_PROGRESS, "starting_agent ? 0 0"); + + if (fflush (NULL)) + { + gpg_error_t tmperr = gpg_error (gpg_err_code_from_errno (errno)); + log_error ("error flushing pending output: %s\n", + strerror (errno)); + return tmperr; + } + + if (!opt.agent_program || !*opt.agent_program) + opt.agent_program = GNUPG_DEFAULT_AGENT; + if ( !(pgmname = strrchr (opt.agent_program, '/'))) + pgmname = opt.agent_program; + else + pgmname++; + + argv[0] = pgmname; + argv[1] = "--server"; + argv[2] = NULL; + + i=0; + if (log_get_fd () != -1) + no_close_list[i++] = log_get_fd (); + no_close_list[i++] = fileno (stderr); + no_close_list[i] = -1; + + /* Connect to the agent and perform initial handshaking. */ + rc = assuan_pipe_connect (&ctx, opt.agent_program, (char**)argv, + no_close_list); } - - if (!opt.agent_program || !*opt.agent_program) - opt.agent_program = GNUPG_DEFAULT_AGENT; - if ( !(pgmname = strrchr (opt.agent_program, '/'))) - pgmname = opt.agent_program; - else - pgmname++; - - argv[0] = pgmname; - argv[1] = "--server"; - argv[2] = NULL; - - i=0; - if (log_get_fd () != -1) - no_close_list[i++] = log_get_fd (); - no_close_list[i++] = fileno (stderr); - no_close_list[i] = -1; - - /* Connect to the agent and perform initial handshaking. */ - rc = assuan_pipe_connect (&ctx, opt.agent_program, (char**)argv, - no_close_list); } else { @@ -123,7 +135,7 @@ int pid; infostr = xstrdup (infostr); - if ( !(p = strchr (infostr, ':')) || p == infostr) + if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr) { log_error (_("malformed GPG_AGENT_INFO environment variable\n")); xfree (infostr); Index: gnupg/sm/call-dirmngr.c diff -u gnupg/sm/call-dirmngr.c:1.16.2.11 gnupg/sm/call-dirmngr.c:1.16.2.12 --- gnupg/sm/call-dirmngr.c:1.16.2.11 Fri Dec 17 15:36:16 2004 +++ gnupg/sm/call-dirmngr.c Mon Dec 20 17:17:24 2004 @@ -209,7 +209,7 @@ infostr = xstrdup (infostr); if (!try_default && *infostr) { - if ( !(p = strchr (infostr, ':')) || p == infostr) + if ( !(p = strchr (infostr, PATHSEP_C)) || p == infostr) { log_error (_("malformed DIRMNGR_INFO environment variable\n")); xfree (infostr); Index: gnupg/sm/import.c diff -u gnupg/sm/import.c:1.22.2.15 gnupg/sm/import.c:1.22.2.16 --- gnupg/sm/import.c:1.22.2.15 Mon Dec 6 19:28:56 2004 +++ gnupg/sm/import.c Mon Dec 20 17:17:24 2004 @@ -25,6 +25,7 @@ #include #include #include +#include #include "gpgsm.h" #include From cvs at cvs.gnupg.org Mon Dec 20 19:10:05 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 20 19:10:09 2004 Subject: gnupg/g10 (ChangeLog keygen.c) Message-ID: Date: Monday, December 20, 2004 @ 19:14:57 Author: wk Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keygen.c (ask_expire_interval): For better translations chnage 2 strings. -----------+ ChangeLog | 3 +++ keygen.c | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.666 gnupg/g10/ChangeLog:1.667 --- gnupg/g10/ChangeLog:1.666 Mon Dec 20 11:05:20 2004 +++ gnupg/g10/ChangeLog Mon Dec 20 19:14:57 2004 @@ -1,5 +1,8 @@ 2004-12-20 Werner Koch + * keygen.c (ask_expire_interval): For better translations chnage 2 + strings. + * seckey-cert.c (do_check): Handle case when checksum was okay but passphrase still wrong. Roman Pavlik found such a case. Index: gnupg/g10/keygen.c diff -u gnupg/g10/keygen.c:1.139 gnupg/g10/keygen.c:1.140 --- gnupg/g10/keygen.c:1.139 Mon Dec 20 06:19:09 2004 +++ gnupg/g10/keygen.c Mon Dec 20 19:14:57 2004 @@ -1570,18 +1570,21 @@ } if( !valid_days ) { - tty_printf(_("%s does not expire at all\n"), - object==0?"Key":"Signature"); + tty_printf((object==0) + ? _("Key does not expire at all\n") : + : _("Signature does not expire at all\n")); interval = 0; } else { interval = valid_days * 86400L; - /* print the date when the key expires */ - tty_printf(_("%s expires at %s\n"), - object==0?"Key":"Signature", + + tty_printf(object==0 + ? _("Key expires at %s\n") + : _("Signature expires at %s\n"), asctimestamp((ulong)(curtime + interval) ) ); - /* FIXME: This check yields warning on alhas: - write a configure check and to this check here only for 32 bit machines */ + /* FIXME: This check yields warning on alhas: Write a + configure check and to this check here only for 32 bit + machines */ if( (time_t)((ulong)(curtime+interval)) < 0 ) tty_printf(_("Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n")); From cvs at cvs.gnupg.org Tue Dec 21 02:18:06 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Tue Dec 21 02:18:17 2004 Subject: gnupg/g10 (ChangeLog keygen.c) Message-ID: Date: Tuesday, December 21, 2004 @ 02:18:06 Author: marcus Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keygen.c 2004-12-21 Marcus Brinkmann * keygen.c (ask_expire_interval): Fix buglet in last change. -----------+ ChangeLog | 6 +++++- keygen.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) From cvs at cvs.gnupg.org Tue Dec 21 05:14:10 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Tue Dec 21 05:14:14 2004 Subject: gnupg/g10 (ChangeLog keyedit.c keylist.c) Message-ID: Date: Tuesday, December 21, 2004 @ 05:19:03 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyedit.c keylist.c * keylist.c (list_keyblock_print): Secret key listings should always show everything (expired UIDs, revoked subkeys, etc, etc). * keyedit.c (keyedit_menu): Add additional help for the "sign" flags. -----------+ ChangeLog | 8 ++++++++ keyedit.c | 37 ++++++++++++++++++++++--------------- keylist.c | 2 +- 3 files changed, 31 insertions(+), 16 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.667 gnupg/g10/ChangeLog:1.668 --- gnupg/g10/ChangeLog:1.667 Mon Dec 20 19:14:57 2004 +++ gnupg/g10/ChangeLog Tue Dec 21 05:19:03 2004 @@ -1,3 +1,11 @@ +2004-12-20 David Shaw + + * keylist.c (list_keyblock_print): Secret key listings should + always show everything (expired UIDs, revoked subkeys, etc, etc). + + * keyedit.c (keyedit_menu): Add additional help for the "sign" + flags. + 2004-12-20 Werner Koch * keygen.c (ask_expire_interval): For better translations chnage 2 Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.164 gnupg/g10/keyedit.c:1.165 --- gnupg/g10/keyedit.c:1.164 Mon Dec 20 06:19:09 2004 +++ gnupg/g10/keyedit.c Tue Dec 21 05:19:03 2004 @@ -1288,14 +1288,14 @@ { "save" , cmdSAVE , 0, N_("save and quit") }, { "help" , cmdHELP , 0, N_("show this help") }, { "?" , cmdHELP , 0, NULL }, - { "fpr" , cmdFPR , 0, N_("show fingerprint") }, + { "fpr" , cmdFPR , 0, N_("show key fingerprint") }, { "list" , cmdLIST , 0, N_("list key and user IDs") }, { "l" , cmdLIST , 0, NULL }, { "uid" , cmdSELUID , 0, N_("select user ID N") }, { "key" , cmdSELKEY , 0, N_("select subkey N") }, - { "check" , cmdCHECK , 0, N_("list signatures") }, + { "check" , cmdCHECK , 0, N_("check signatures") }, { "c" , cmdCHECK , 0, NULL }, - { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign selected user IDs") }, + { "sign" , cmdSIGN , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign selected user IDs [* see below for related commands]") }, { "s" , cmdSIGN , KEYEDIT_NOT_SK, NULL }, /* "lsign" will never match since "sign" comes first and it is a tail match. It is just here so it shows up in the help @@ -1304,7 +1304,7 @@ { "debug" , cmdDEBUG , 0, NULL }, { "adduid" , cmdADDUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") }, { "addphoto", cmdADDPHOTO , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") }, - { "deluid" , cmdDELUID , KEYEDIT_NOT_SK, N_("delete user ID") }, + { "deluid" , cmdDELUID , KEYEDIT_NOT_SK, N_("delete selected user IDs") }, /* delphoto is really deluid in disguise */ { "delphoto", cmdDELUID , KEYEDIT_NOT_SK, NULL }, { "addkey" , cmdADDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a subkey") }, @@ -1314,29 +1314,29 @@ #endif /*ENABLE_CARD_SUPPORT*/ { "delkey" , cmdDELKEY , KEYEDIT_NOT_SK, N_("delete selected subkeys") }, { "addrevoker",cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") }, - { "delsig" , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures") }, - { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expiration date") }, - { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag a user ID as primary")}, - { "toggle" , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") }, + { "delsig" , cmdDELSIG , KEYEDIT_NOT_SK, N_("delete signatures from the selected user IDs") }, + { "expire" , cmdEXPIRE , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expiration date for the key or selected subkeys") }, + { "primary" , cmdPRIMARY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag the selected user ID as primary")}, + { "toggle" , cmdTOGGLE , KEYEDIT_NEED_SK, N_("toggle between the secret and public key listings") }, { "t" , cmdTOGGLE , KEYEDIT_NEED_SK, NULL }, { "pref" , cmdPREF , KEYEDIT_NOT_SK, N_("list preferences (expert)")}, { "showpref", cmdSHOWPREF , KEYEDIT_NOT_SK, N_("list preferences (verbose)") }, - { "setpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") }, + { "setpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list for the selected user IDs") }, /* Alias */ { "updpref" , cmdSETPREF , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, - { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")}, + { "keyserver",cmdPREFKS , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL for the selected user IDs")}, { "passwd" , cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") }, /* Alias */ { "password", cmdPASSWD , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, { "trust" , cmdTRUST , KEYEDIT_NOT_SK, N_("change the ownertrust") }, - { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures") }, + { "revsig" , cmdREVSIG , KEYEDIT_NOT_SK, N_("revoke signatures on the selected user IDs") }, { "revuid" , cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke selected user IDs") }, /* Alias */ { "revphoto", cmdREVUID , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, NULL }, - { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke selected subkeys") }, - { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable key") }, + { "revkey" , cmdREVKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke key or selected subkeys") }, { "enable" , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable key") }, - { "showphoto",cmdSHOWPHOTO , 0, N_("show photo ID") }, + { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable key") }, + { "showphoto",cmdSHOWPHOTO , 0, N_("show selected photo IDs") }, { NULL, cmdNONE, 0, NULL } }; enum cmdids cmd = 0; @@ -1506,8 +1506,15 @@ if((cmds[i].flags & KEYEDIT_NEED_SK) && !sec_keyblock ) ; /* skip if we do not have the secret key */ else if( cmds[i].desc ) - tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) ); + tty_printf("%-11s %s\n", cmds[i].name, _(cmds[i].desc) ); } + + tty_printf("\n"); + tty_printf(_( +"* The `sign' command may be prefixed with `l' for local signatures (lsign),\n" +" a `t' for trust signatures (tsign), a `nr' for non-revocable signatures\n" +" (nrsign), or any combination thereof (ltsign, tnrsign, etc).\n")); + break; case cmdLIST: Index: gnupg/g10/keylist.c diff -u gnupg/g10/keylist.c:1.92 gnupg/g10/keylist.c:1.93 --- gnupg/g10/keylist.c:1.92 Fri Dec 17 19:51:32 2004 +++ gnupg/g10/keylist.c Tue Dec 21 05:19:03 2004 @@ -760,7 +760,7 @@ if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) { PKT_user_id *uid=node->pkt->pkt.user_id; - if((uid->is_expired || uid->is_revoked) + if(pk && (uid->is_expired || uid->is_revoked) && !(opt.list_options&LIST_SHOW_UNUSABLE_UIDS)) { skip_sigs=1; From cvs at cvs.gnupg.org Tue Dec 21 09:37:34 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Tue Dec 21 09:37:46 2004 Subject: gpgme/assuan (ChangeLog assuan-connect.c assuan-pipe-connect.c) Message-ID: Date: Tuesday, December 21, 2004 @ 09:42:31 Author: marcus Path: /cvs/gpgme/gpgme/assuan Modified: ChangeLog assuan-connect.c assuan-pipe-connect.c 2004-12-16 Marcus Brinkmann * assuan-pipe-connect.c (do_finish): Do not wait for child to finish. (assuan_pipe_connect): Use double-fork approach. * assuan-connect.c (assuan_disconnect): Do not write BYE to the status line. -----------------------+ ChangeLog | 7 ++ assuan-connect.c | 4 + assuan-pipe-connect.c | 137 +++++++++++++++++++++++++++--------------------- 3 files changed, 90 insertions(+), 58 deletions(-) Index: gpgme/assuan/ChangeLog diff -u gpgme/assuan/ChangeLog:1.23 gpgme/assuan/ChangeLog:1.24 --- gpgme/assuan/ChangeLog:1.23 Tue Dec 7 22:13:36 2004 +++ gpgme/assuan/ChangeLog Tue Dec 21 09:42:31 2004 @@ -1,3 +1,10 @@ +2004-12-16 Marcus Brinkmann + + * assuan-pipe-connect.c (do_finish): Do not wait for child to finish. + (assuan_pipe_connect): Use double-fork approach. + * assuan-connect.c (assuan_disconnect): Do not write BYE to the + status line. + 2004-12-07 Marcus Brinkmann * README.1st: Add copyright notice. Index: gpgme/assuan/assuan-connect.c diff -u gpgme/assuan/assuan-connect.c:1.7 gpgme/assuan/assuan-connect.c:1.8 --- gpgme/assuan/assuan-connect.c:1.7 Sat Feb 1 19:52:56 2003 +++ gpgme/assuan/assuan-connect.c Tue Dec 21 09:42:31 2004 @@ -39,7 +39,11 @@ { if (ctx) { +#if 0 + /* This may not work if the pipe is full and the other end is + blocked. */ assuan_write_line (ctx, "BYE"); +#endif ctx->finish_handler (ctx); ctx->deinit_handler (ctx); ctx->deinit_handler = NULL; Index: gpgme/assuan/assuan-pipe-connect.c diff -u gpgme/assuan/assuan-pipe-connect.c:1.5 gpgme/assuan/assuan-pipe-connect.c:1.6 --- gpgme/assuan/assuan-pipe-connect.c:1.5 Mon Oct 6 18:17:12 2003 +++ gpgme/assuan/assuan-pipe-connect.c Tue Dec 21 09:42:31 2004 @@ -80,8 +80,11 @@ } if (ctx->pid != -1) { +#if 0 + /* This is already done by the double fork. */ waitpid (ctx->pid, NULL, 0); /* FIXME Check return value. */ ctx->pid = -1; +#endif } return 0; } @@ -155,6 +158,8 @@ (*ctx)->deinit_handler = do_deinit; (*ctx)->finish_handler = do_finish; + /* FIXME: Use _gpgme_io_spawn. The PID stored here is actually + soon useless. */ (*ctx)->pid = fork (); if ((*ctx)->pid < 0) { @@ -168,82 +173,98 @@ if ((*ctx)->pid == 0) { - int i, n; - char errbuf[512]; - int *fdp; + /* Intermediate child to prevent zombie processes. */ + pid_t pid; - /* Dup handles to stdin/stdout. */ - if (rp[1] != STDOUT_FILENO) + if ((pid = fork ()) == 0) { - if (dup2 (rp[1], STDOUT_FILENO) == -1) + /* Child. */ + + int i, n; + char errbuf[512]; + int *fdp; + + /* Dup handles to stdin/stdout. */ + if (rp[1] != STDOUT_FILENO) { - LOG ("dup2 failed in child: %s\n", strerror (errno)); - _exit (4); + if (dup2 (rp[1], STDOUT_FILENO) == -1) + { + LOG ("dup2 failed in child: %s\n", strerror (errno)); + _exit (4); + } } - } - if (wp[0] != STDIN_FILENO) - { - if (dup2 (wp[0], STDIN_FILENO) == -1) + if (wp[0] != STDIN_FILENO) { - LOG ("dup2 failed in child: %s\n", strerror (errno)); - _exit (4); + if (dup2 (wp[0], STDIN_FILENO) == -1) + { + LOG ("dup2 failed in child: %s\n", strerror (errno)); + _exit (4); + } } - } - - /* Dup stderr to /dev/null unless it is in the list of FDs to be - passed to the child. */ - fdp = fd_child_list; - if (fdp) - { - for (; *fdp != -1 && *fdp != STDERR_FILENO; fdp++) - ; - } - if (!fdp || *fdp == -1) - { - int fd = open ("/dev/null", O_WRONLY); - if (fd == -1) + + /* Dup stderr to /dev/null unless it is in the list of FDs to be + passed to the child. */ + fdp = fd_child_list; + if (fdp) { - LOG ("can't open `/dev/null': %s\n", strerror (errno)); - _exit (4); + for (; *fdp != -1 && *fdp != STDERR_FILENO; fdp++) + ; } - if (dup2 (fd, STDERR_FILENO) == -1) + if (!fdp || *fdp == -1) { - LOG ("dup2(dev/null, 2) failed: %s\n", strerror (errno)); - _exit (4); + int fd = open ("/dev/null", O_WRONLY); + if (fd == -1) + { + LOG ("can't open `/dev/null': %s\n", strerror (errno)); + _exit (4); + } + if (dup2 (fd, STDERR_FILENO) == -1) + { + LOG ("dup2(dev/null, 2) failed: %s\n", strerror (errno)); + _exit (4); + } } - } - /* Close all files which will not be duped and are not in the - fd_child_list. */ - n = sysconf (_SC_OPEN_MAX); - if (n < 0) - n = MAX_OPEN_FDS; - for (i=0; i < n; i++) - { - if ( i == STDIN_FILENO || i == STDOUT_FILENO || i == STDERR_FILENO) - continue; - fdp = fd_child_list; - if (fdp) + /* Close all files which will not be duped and are not in the + fd_child_list. */ + n = sysconf (_SC_OPEN_MAX); + if (n < 0) + n = MAX_OPEN_FDS; + for (i=0; i < n; i++) { - while (*fdp != -1 && *fdp != i) - fdp++; + if ( i == STDIN_FILENO || i == STDOUT_FILENO || i == STDERR_FILENO) + continue; + fdp = fd_child_list; + if (fdp) + { + while (*fdp != -1 && *fdp != i) + fdp++; + } + + if (!(fdp && *fdp != -1)) + close(i); } - if (!(fdp && *fdp != -1)) - close(i); - } - errno = 0; + errno = 0; - execv (name, argv); - /* oops - use the pipe to tell the parent about it */ - snprintf (errbuf, sizeof(errbuf)-1, "ERR %d can't exec `%s': %.50s\n", - ASSUAN_Problem_Starting_Server, name, strerror (errno)); - errbuf[sizeof(errbuf)-1] = 0; - writen (1, errbuf, strlen (errbuf)); - _exit (4); + execv (name, argv); + /* oops - use the pipe to tell the parent about it */ + snprintf (errbuf, sizeof(errbuf)-1, "ERR %d can't exec `%s': %.50s\n", + ASSUAN_Problem_Starting_Server, name, strerror (errno)); + errbuf[sizeof(errbuf)-1] = 0; + writen (1, errbuf, strlen (errbuf)); + _exit (4); + } /* End child. */ + if (pid == -1) + _exit (1); + else + _exit (0); } + waitpid ((*ctx)->pid, NULL, 0); + (*ctx)->pid = -1; + close (rp[1]); close (wp[0]); From cvs at cvs.gnupg.org Tue Dec 21 09:39:29 2004 From: cvs at cvs.gnupg.org (cvs user marcus) Date: Tue Dec 21 09:39:32 2004 Subject: gpgme-1-0-branch gpgme/assuan (ChangeLog assuan-connect.c assuan-pipe-connect.c) Message-ID: Date: Tuesday, December 21, 2004 @ 09:44:27 Author: marcus Path: /cvs/gpgme/gpgme/assuan Tag: gpgme-1-0-branch Modified: ChangeLog assuan-connect.c assuan-pipe-connect.c 2004-12-16 Marcus Brinkmann * assuan-pipe-connect.c (do_finish): Do not wait for child to finish. (assuan_pipe_connect): Use double-fork approach. * assuan-connect.c (assuan_disconnect): Do not write BYE to the status line. -----------------------+ ChangeLog | 7 ++ assuan-connect.c | 4 + assuan-pipe-connect.c | 137 +++++++++++++++++++++++++++--------------------- 3 files changed, 90 insertions(+), 58 deletions(-) Index: gpgme/assuan/ChangeLog diff -u gpgme/assuan/ChangeLog:1.22.2.1 gpgme/assuan/ChangeLog:1.22.2.2 --- gpgme/assuan/ChangeLog:1.22.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/assuan/ChangeLog Tue Dec 21 09:44:27 2004 @@ -1,3 +1,10 @@ +2004-12-16 Marcus Brinkmann + + * assuan-pipe-connect.c (do_finish): Do not wait for child to finish. + (assuan_pipe_connect): Use double-fork approach. + * assuan-connect.c (assuan_disconnect): Do not write BYE to the + status line. + 2004-12-07 Marcus Brinkmann * README.1st: Add copyright notice. Index: gpgme/assuan/assuan-connect.c diff -u gpgme/assuan/assuan-connect.c:1.7 gpgme/assuan/assuan-connect.c:1.7.2.1 --- gpgme/assuan/assuan-connect.c:1.7 Sat Feb 1 19:52:56 2003 +++ gpgme/assuan/assuan-connect.c Tue Dec 21 09:44:27 2004 @@ -39,7 +39,11 @@ { if (ctx) { +#if 0 + /* This may not work if the pipe is full and the other end is + blocked. */ assuan_write_line (ctx, "BYE"); +#endif ctx->finish_handler (ctx); ctx->deinit_handler (ctx); ctx->deinit_handler = NULL; Index: gpgme/assuan/assuan-pipe-connect.c diff -u gpgme/assuan/assuan-pipe-connect.c:1.5 gpgme/assuan/assuan-pipe-connect.c:1.5.2.1 --- gpgme/assuan/assuan-pipe-connect.c:1.5 Mon Oct 6 18:17:12 2003 +++ gpgme/assuan/assuan-pipe-connect.c Tue Dec 21 09:44:27 2004 @@ -80,8 +80,11 @@ } if (ctx->pid != -1) { +#if 0 + /* This is already done by the double fork. */ waitpid (ctx->pid, NULL, 0); /* FIXME Check return value. */ ctx->pid = -1; +#endif } return 0; } @@ -155,6 +158,8 @@ (*ctx)->deinit_handler = do_deinit; (*ctx)->finish_handler = do_finish; + /* FIXME: Use _gpgme_io_spawn. The PID stored here is actually + soon useless. */ (*ctx)->pid = fork (); if ((*ctx)->pid < 0) { @@ -168,82 +173,98 @@ if ((*ctx)->pid == 0) { - int i, n; - char errbuf[512]; - int *fdp; + /* Intermediate child to prevent zombie processes. */ + pid_t pid; - /* Dup handles to stdin/stdout. */ - if (rp[1] != STDOUT_FILENO) + if ((pid = fork ()) == 0) { - if (dup2 (rp[1], STDOUT_FILENO) == -1) + /* Child. */ + + int i, n; + char errbuf[512]; + int *fdp; + + /* Dup handles to stdin/stdout. */ + if (rp[1] != STDOUT_FILENO) { - LOG ("dup2 failed in child: %s\n", strerror (errno)); - _exit (4); + if (dup2 (rp[1], STDOUT_FILENO) == -1) + { + LOG ("dup2 failed in child: %s\n", strerror (errno)); + _exit (4); + } } - } - if (wp[0] != STDIN_FILENO) - { - if (dup2 (wp[0], STDIN_FILENO) == -1) + if (wp[0] != STDIN_FILENO) { - LOG ("dup2 failed in child: %s\n", strerror (errno)); - _exit (4); + if (dup2 (wp[0], STDIN_FILENO) == -1) + { + LOG ("dup2 failed in child: %s\n", strerror (errno)); + _exit (4); + } } - } - - /* Dup stderr to /dev/null unless it is in the list of FDs to be - passed to the child. */ - fdp = fd_child_list; - if (fdp) - { - for (; *fdp != -1 && *fdp != STDERR_FILENO; fdp++) - ; - } - if (!fdp || *fdp == -1) - { - int fd = open ("/dev/null", O_WRONLY); - if (fd == -1) + + /* Dup stderr to /dev/null unless it is in the list of FDs to be + passed to the child. */ + fdp = fd_child_list; + if (fdp) { - LOG ("can't open `/dev/null': %s\n", strerror (errno)); - _exit (4); + for (; *fdp != -1 && *fdp != STDERR_FILENO; fdp++) + ; } - if (dup2 (fd, STDERR_FILENO) == -1) + if (!fdp || *fdp == -1) { - LOG ("dup2(dev/null, 2) failed: %s\n", strerror (errno)); - _exit (4); + int fd = open ("/dev/null", O_WRONLY); + if (fd == -1) + { + LOG ("can't open `/dev/null': %s\n", strerror (errno)); + _exit (4); + } + if (dup2 (fd, STDERR_FILENO) == -1) + { + LOG ("dup2(dev/null, 2) failed: %s\n", strerror (errno)); + _exit (4); + } } - } - /* Close all files which will not be duped and are not in the - fd_child_list. */ - n = sysconf (_SC_OPEN_MAX); - if (n < 0) - n = MAX_OPEN_FDS; - for (i=0; i < n; i++) - { - if ( i == STDIN_FILENO || i == STDOUT_FILENO || i == STDERR_FILENO) - continue; - fdp = fd_child_list; - if (fdp) + /* Close all files which will not be duped and are not in the + fd_child_list. */ + n = sysconf (_SC_OPEN_MAX); + if (n < 0) + n = MAX_OPEN_FDS; + for (i=0; i < n; i++) { - while (*fdp != -1 && *fdp != i) - fdp++; + if ( i == STDIN_FILENO || i == STDOUT_FILENO || i == STDERR_FILENO) + continue; + fdp = fd_child_list; + if (fdp) + { + while (*fdp != -1 && *fdp != i) + fdp++; + } + + if (!(fdp && *fdp != -1)) + close(i); } - if (!(fdp && *fdp != -1)) - close(i); - } - errno = 0; + errno = 0; - execv (name, argv); - /* oops - use the pipe to tell the parent about it */ - snprintf (errbuf, sizeof(errbuf)-1, "ERR %d can't exec `%s': %.50s\n", - ASSUAN_Problem_Starting_Server, name, strerror (errno)); - errbuf[sizeof(errbuf)-1] = 0; - writen (1, errbuf, strlen (errbuf)); - _exit (4); + execv (name, argv); + /* oops - use the pipe to tell the parent about it */ + snprintf (errbuf, sizeof(errbuf)-1, "ERR %d can't exec `%s': %.50s\n", + ASSUAN_Problem_Starting_Server, name, strerror (errno)); + errbuf[sizeof(errbuf)-1] = 0; + writen (1, errbuf, strlen (errbuf)); + _exit (4); + } /* End child. */ + if (pid == -1) + _exit (1); + else + _exit (0); } + waitpid ((*ctx)->pid, NULL, 0); + (*ctx)->pid = -1; + close (rp[1]); close (wp[0]); From cvs at cvs.gnupg.org Tue Dec 21 10:58:04 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 21 10:58:31 2004 Subject: GNUPG-1-9-BRANCH gnupg (18 files) Message-ID: Date: Tuesday, December 21, 2004 @ 11:03:00 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: common/homedir.c Modified: TODO agent/ChangeLog agent/gpg-agent.c agent/protect-tool.c common/ChangeLog common/Makefile.am common/signal.c common/simple-gettext.c common/util.h g10/ChangeLog g10/g10.c g10/gpgv.c scd/ChangeLog scd/command.c scd/scdaemon.c sm/ChangeLog sm/gpgsm.c * gpg-agent.c (main): Use default_homedir(). * protect-tool.c (main): Ditto. * signal.c (got_fatal_signal, got_usr_signal) (got_fatal_signal) [DOSISH]: Don't build. * simple-gettext.c: Include sysutils.h * homedir.c: New. * Makefile.am (libcommon_a_SOURCES): Add it. (EXTRA_DIST): Removed mkerror and mkerrtok. * gpgv.c, g10.c (main): Use default_hoemdir (). * scdaemon.c (main): Use default_homedir(). * gpgsm.c (main): Use default_homedir(). -------------------------+ TODO | 2 ++ agent/ChangeLog | 6 ++++++ agent/gpg-agent.c | 9 +-------- agent/protect-tool.c | 11 ++--------- common/ChangeLog | 10 ++++++++++ common/Makefile.am | 3 +-- common/homedir.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ common/signal.c | 14 ++++++++++---- common/simple-gettext.c | 2 +- common/util.h | 4 ++++ g10/ChangeLog | 4 ++++ g10/g10.c | 11 ++--------- g10/gpgv.c | 11 ++--------- scd/ChangeLog | 4 ++++ scd/command.c | 4 +--- scd/scdaemon.c | 14 ++------------ sm/ChangeLog | 4 ++++ sm/gpgsm.c | 11 ++--------- 18 files changed, 102 insertions(+), 66 deletions(-) Index: gnupg/TODO diff -u gnupg/TODO:1.165.2.34 gnupg/TODO:1.165.2.35 --- gnupg/TODO:1.165.2.34 Mon Dec 20 17:17:24 2004 +++ gnupg/TODO Tue Dec 21 11:03:00 2004 @@ -101,4 +101,6 @@ Fix is to change everything to libestream ** Signals are not support This means we can't reread a configuration +** No card status notifications. + Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.52 gnupg/agent/ChangeLog:1.59.2.53 --- gnupg/agent/ChangeLog:1.59.2.52 Mon Dec 20 17:17:24 2004 +++ gnupg/agent/ChangeLog Tue Dec 21 11:03:00 2004 @@ -1,3 +1,9 @@ +2004-12-21 Werner Koch + + * gpg-agent.c (main): Use default_homedir(). + * protect-tool.c (main): Ditto. + + 2004-12-20 Werner Koch * gpg-agent.c (main) [W32]: Now that Mutexes work we can remove Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.28 gnupg/agent/gpg-agent.c:1.31.2.29 --- gnupg/agent/gpg-agent.c:1.31.2.28 Mon Dec 20 17:17:24 2004 +++ gnupg/agent/gpg-agent.c Tue Dec 21 11:03:00 2004 @@ -478,15 +478,8 @@ if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") ) csh_style = 1; + opt.homedir = default_homedir (); - opt.homedir = getenv("GNUPGHOME"); -#ifdef HAVE_W32_SYSTEM - if (!opt.homedir || !*opt.homedir) - opt.homedir = read_w32_registry_string (NULL, - "Software\\GNU\\GnuPG", "HomeDir"); -#endif /*HAVE_W32_SYSTEM*/ - if (!opt.homedir || !*opt.homedir) - opt.homedir = GNUPG_DEFAULT_HOMEDIR; /* Check whether we have a config file on the commandline */ orig_argc = argc; Index: gnupg/agent/protect-tool.c diff -u gnupg/agent/protect-tool.c:1.15.2.12 gnupg/agent/protect-tool.c:1.15.2.13 --- gnupg/agent/protect-tool.c:1.15.2.12 Mon Dec 20 17:17:24 2004 +++ gnupg/agent/protect-tool.c Tue Dec 21 11:03:00 2004 @@ -84,7 +84,7 @@ }; -static char *opt_homedir; +static const char *opt_homedir; static int opt_armor; static int opt_store; static int opt_force; @@ -1067,14 +1067,7 @@ gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0); - opt_homedir = getenv ("GNUPGHOME"); -#ifdef HAVE_W32_SYSTEM - if (!opt_homedir || !*opt_homedir) - opt_homedir = read_w32_registry_string (NULL, - "Software\\GNU\\GnuPG", "HomeDir"); -#endif /*HAVE_W32_SYSTEM*/ - if (!opt_homedir || !*opt_homedir) - opt_homedir = GNUPG_DEFAULT_HOMEDIR; + opt_homedir = default_homedir (); pargs.argc = &argc; Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.38 gnupg/common/ChangeLog:1.30.2.39 --- gnupg/common/ChangeLog:1.30.2.38 Mon Dec 20 17:17:24 2004 +++ gnupg/common/ChangeLog Tue Dec 21 11:03:00 2004 @@ -1,3 +1,13 @@ +2004-12-21 Werner Koch + + * signal.c (got_fatal_signal, got_usr_signal) + (got_fatal_signal) [DOSISH]: Don't build. + * simple-gettext.c: Include sysutils.h + + * homedir.c: New. + * Makefile.am (libcommon_a_SOURCES): Add it. + (EXTRA_DIST): Removed mkerror and mkerrtok. + 2004-12-20 Werner Koch * sysutils.h [W32]: Define sleep. Index: gnupg/common/Makefile.am diff -u gnupg/common/Makefile.am:1.15.2.10 gnupg/common/Makefile.am:1.15.2.11 --- gnupg/common/Makefile.am:1.15.2.10 Mon Dec 6 19:28:56 2004 +++ gnupg/common/Makefile.am Tue Dec 21 11:03:00 2004 @@ -19,8 +19,6 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = mkerrors mkerrtok - noinst_LIBRARIES = libcommon.a libsimple-pwquery.a AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) @@ -31,6 +29,7 @@ sexp-parse.h \ maperror.c \ sysutils.c sysutils.h \ + homedir.c \ gettime.c \ yesno.c \ b64enc.c \ Index: gnupg/common/homedir.c diff -u /dev/null gnupg/common/homedir.c:1.1.2.1 --- /dev/null Tue Dec 21 11:03:00 2004 +++ gnupg/common/homedir.c Tue Dec 21 11:03:00 2004 @@ -0,0 +1,44 @@ +/* homedir.c - Setup the home directory. + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include +#include +#include + +#include "util.h" +#include "sysutils.h" + +/* Set up the default home directory. The usual --homedir option + should be parsed later. */ +const char * +default_homedir (void) +{ + const char *dir; + + dir = getenv("GNUPGHOME"); +#ifdef HAVE_W32_SYSTEM + if (!dir || !*dir) + dir = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG", "HomeDir"); +#endif /*HAVE_W32_SYSTEM*/ + if (!dir || !*dir) + dir = GNUPG_DEFAULT_HOMEDIR; + + return dir; +} Index: gnupg/common/signal.c diff -u gnupg/common/signal.c:1.2 gnupg/common/signal.c:1.2.2.1 --- gnupg/common/signal.c:1.2 Thu Jan 9 13:53:52 2003 +++ gnupg/common/signal.c Tue Dec 21 11:03:00 2004 @@ -30,15 +30,17 @@ #include "util.h" +#ifndef HAVE_DOSISH_SYSTEM static volatile int caught_fatal_sig; static volatile int caught_sigusr1; +#endif static void (*cleanup_fnc)(void); +#ifndef HAVE_DOSISH_SYSTEM static void init_one_signal (int sig, RETSIGTYPE (*handler)(int), int check_ign ) { -#ifndef HAVE_DOSISH_SYSTEM # ifdef HAVE_SIGACTION struct sigaction oact, nact; @@ -64,9 +66,10 @@ signal (sig, SIG_IGN); } # endif -#endif /*!HAVE_DOSISH_SYSTEM*/ } +#endif /*!HAVE_DOSISH_SYSTEM*/ +#ifndef HAVE_DOSISH_SYSTEM static const char * get_signal_name( int signum ) { @@ -76,7 +79,9 @@ return "some signal"; #endif } +#endif /*!HAVE_DOSISH_SYSTEM*/ +#ifndef HAVE_DOSISH_SYSTEM static RETSIGTYPE got_fatal_signal (int sig) { @@ -106,14 +111,15 @@ #endif /* __riscos__ */ raise( sig ); } +#endif /*!HAVE_DOSISH_SYSTEM*/ - +#ifndef HAVE_DOSISH_SYSTEM static RETSIGTYPE got_usr_signal (int sig) { caught_sigusr1 = 1; } - +#endif /*!HAVE_DOSISH_SYSTEM*/ void gnupg_init_signals (int mode, void (*fast_cleanup)(void)) Index: gnupg/common/simple-gettext.c diff -u gnupg/common/simple-gettext.c:1.1.2.1 gnupg/common/simple-gettext.c:1.1.2.2 --- gnupg/common/simple-gettext.c:1.1.2.1 Thu Dec 2 08:48:09 2004 +++ gnupg/common/simple-gettext.c Tue Dec 21 11:03:00 2004 @@ -40,7 +40,7 @@ #include #include "util.h" - +#include "sysutils.h" /* The magic number of the GNU message catalog format. */ #define MAGIC 0x950412de Index: gnupg/common/util.h diff -u gnupg/common/util.h:1.12.2.13 gnupg/common/util.h:1.12.2.14 --- gnupg/common/util.h:1.12.2.13 Mon Dec 20 17:17:24 2004 +++ gnupg/common/util.h Tue Dec 21 11:03:00 2004 @@ -121,6 +121,10 @@ gpg_error_t b64enc_finish (struct b64state *state); +/*-- homedir. c --*/ +const char *default_homedir (void); + + /*-- miscellaneous.c --*/ /* Same as asprintf but return an allocated buffer suitable to be Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.372.2.53 gnupg/g10/ChangeLog:1.372.2.54 --- gnupg/g10/ChangeLog:1.372.2.53 Sat Dec 18 11:22:09 2004 +++ gnupg/g10/ChangeLog Tue Dec 21 11:03:00 2004 @@ -1,3 +1,7 @@ +2004-12-21 Werner Koch + + * gpgv.c, g10.c (main): Use default_hoemdir (). + 2004-12-18 Werner Koch * gpg.h (map_assuan_err): Define in terms of Index: gnupg/g10/g10.c diff -u gnupg/g10/g10.c:1.202.2.18 gnupg/g10/g10.c:1.202.2.19 --- gnupg/g10/g10.c:1.202.2.18 Fri Oct 22 18:03:03 2004 +++ gnupg/g10/g10.c Tue Dec 21 11:03:00 2004 @@ -1264,16 +1264,9 @@ opt.mangle_dos_filenames = 1; opt.use_agent = 1; -#if defined (_WIN32) - set_homedir ( read_w32_registry_string( NULL, - "Software\\GNU\\GnuPG", "HomeDir" )); -#else - set_homedir ( getenv("GNUPGHOME") ); -#endif - if( !*opt.homedir ) - set_homedir ( GNUPG_DEFAULT_HOMEDIR ); + set_homedir ( default_homedir () ); - /* check whether we have a config file on the commandline */ + /* Check whether we have a config file on the commandline */ orig_argc = argc; orig_argv = argv; pargs.argc = &argc; Index: gnupg/g10/gpgv.c diff -u gnupg/g10/gpgv.c:1.12.2.7 gnupg/g10/gpgv.c:1.12.2.8 --- gnupg/g10/gpgv.c:1.12.2.7 Thu Sep 30 23:37:09 2004 +++ gnupg/g10/gpgv.c Tue Dec 21 11:02:59 2004 @@ -150,15 +150,8 @@ opt.trust_model = TM_ALWAYS; opt.batch = 1; -#if defined (_WIN32) - opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", - "HomeDir" ); -#else - opt.homedir = getenv("GNUPGHOME"); -#endif - if( !opt.homedir || !*opt.homedir ) { - opt.homedir = GNUPG_DEFAULT_HOMEDIR; - } + opt.homedir = default_homedir (); + tty_no_terminal(1); tty_batchmode(1); disable_dotlock(); Index: gnupg/scd/ChangeLog diff -u gnupg/scd/ChangeLog:1.25.2.62 gnupg/scd/ChangeLog:1.25.2.63 --- gnupg/scd/ChangeLog:1.25.2.62 Sat Dec 18 19:53:31 2004 +++ gnupg/scd/ChangeLog Tue Dec 21 11:02:59 2004 @@ -1,3 +1,7 @@ +2004-12-21 Werner Koch + + * scdaemon.c (main): Use default_homedir(). + 2004-12-18 Werner Koch * scdaemon.c (main) [W32]: Remove special Pth initialize.. Index: gnupg/scd/command.c diff -u gnupg/scd/command.c:1.19.2.14 gnupg/scd/command.c:1.19.2.15 --- gnupg/scd/command.c:1.19.2.14 Wed Dec 15 15:15:08 2004 +++ gnupg/scd/command.c Tue Dec 21 11:02:59 2004 @@ -1261,9 +1261,7 @@ log_info ("client pid is %d, sending signal %d\n", pid, signo); -#ifdef HAVE_W32_SYSTEM -#warning Need to implement a notification service -#else +#ifndef HAVE_W32_SYSTEM if (pid != (pid_t)(-1) && pid && signo > 0) kill (pid, signo); #endif Index: gnupg/scd/scdaemon.c diff -u gnupg/scd/scdaemon.c:1.12.2.23 gnupg/scd/scdaemon.c:1.12.2.24 --- gnupg/scd/scdaemon.c:1.12.2.23 Sun Dec 19 18:44:20 2004 +++ gnupg/scd/scdaemon.c Tue Dec 21 11:02:59 2004 @@ -351,17 +351,12 @@ Note that this will also do the pth_init. */ #ifndef HAVE_OPENSC #ifdef USE_GNU_PTH -#ifdef HAVE_W32_SYSTEM - /* For W32 we need pth. */ - pth_init (); -#else err = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth); if (err) { log_fatal ("can't register GNU Pth with Libgcrypt: %s\n", gpg_strerror (err)); } -#endif #endif /*USE_GNU_PTH*/ #endif /*!HAVE_OPENSC*/ @@ -392,14 +387,9 @@ if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") ) csh_style = 1; - /* FIXME: Using this homedir option does only make sense when not - running as a system service. We might want to check for this by - looking at the uid or ebtter use an explict option for this */ - opt.homedir = getenv("GNUPGHOME"); - if (!opt.homedir || !*opt.homedir) - opt.homedir = GNUPG_DEFAULT_HOMEDIR; + opt.homedir = default_homedir (); - /* check whether we have a config file on the commandline */ + /* Check whether we have a config file on the commandline */ orig_argc = argc; orig_argv = argv; pargs.argc = &argc; Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.84 gnupg/sm/ChangeLog:1.101.2.85 --- gnupg/sm/ChangeLog:1.101.2.84 Mon Dec 20 17:17:24 2004 +++ gnupg/sm/ChangeLog Tue Dec 21 11:02:59 2004 @@ -1,3 +1,7 @@ +2004-12-21 Werner Koch + + * gpgsm.c (main): Use default_homedir(). + 2004-12-20 Werner Koch * call-agent.c (start_agent): Before starting a pipe server start Index: gnupg/sm/gpgsm.c diff -u gnupg/sm/gpgsm.c:1.67.2.35 gnupg/sm/gpgsm.c:1.67.2.36 --- gnupg/sm/gpgsm.c:1.67.2.35 Sat Dec 18 19:53:31 2004 +++ gnupg/sm/gpgsm.c Tue Dec 21 11:02:59 2004 @@ -756,16 +756,9 @@ opt.def_cipher_algoid = "1.2.840.113549.3.7"; /*des-EDE3-CBC*/ -#ifdef HAVE_W32_SYSTEM - opt.homedir = read_w32_registry_string ( NULL, - "Software\\GNU\\GnuPG", "HomeDir" ); -#else - opt.homedir = getenv ("GNUPGHOME"); -#endif - if (!opt.homedir || !*opt.homedir ) - opt.homedir = GNUPG_DEFAULT_HOMEDIR; + opt.homedir = default_homedir (); - /* first check whether we have a config file on the commandline */ + /* First check whether we have a config file on the commandline */ orig_argc = argc; orig_argv = argv; pargs.argc = &argc; From cvs at cvs.gnupg.org Tue Dec 21 13:39:43 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 21 13:39:47 2004 Subject: GNUPG-1-9-BRANCH gnupg/common (ChangeLog homedir.c) Message-ID: Date: Tuesday, December 21, 2004 @ 13:44:42 Author: wk Path: /cvs/gnupg/gnupg/common Tag: GNUPG-1-9-BRANCH Modified: ChangeLog homedir.c * homedir.c: New. Use CSIDL_APPDATA for W32 as the default home directory. -----------+ ChangeLog | 3 ++- homedir.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.39 gnupg/common/ChangeLog:1.30.2.40 --- gnupg/common/ChangeLog:1.30.2.39 Tue Dec 21 11:03:00 2004 +++ gnupg/common/ChangeLog Tue Dec 21 13:44:42 2004 @@ -4,7 +4,8 @@ (got_fatal_signal) [DOSISH]: Don't build. * simple-gettext.c: Include sysutils.h - * homedir.c: New. + * homedir.c: New. Use CSIDL_APPDATA for W32 as the default home + directory. * Makefile.am (libcommon_a_SOURCES): Add it. (EXTRA_DIST): Removed mkerror and mkerrtok. Index: gnupg/common/homedir.c diff -u gnupg/common/homedir.c:1.1.2.1 gnupg/common/homedir.c:1.1.2.2 --- gnupg/common/homedir.c:1.1.2.1 Tue Dec 21 11:03:00 2004 +++ gnupg/common/homedir.c Tue Dec 21 13:44:42 2004 @@ -21,6 +21,22 @@ #include #include #include +#include + +#ifdef HAVE_W32_SYSTEM +#include +#ifndef CSIDL_APPDATA +#define CSIDL_APPDATA 0x001a +#endif +#ifndef CSIDL_LOCAL_APPDATA +#define CSIDL_LOCAL_APPDATA 0x001c +#endif +#ifndef CSIDL_FLAG_CREATE +#define CSIDL_FLAG_CREATE 0x8000 +#endif +#endif /*HAVE_W32_SYSTEM*/ + + #include "util.h" #include "sysutils.h" @@ -36,6 +52,30 @@ #ifdef HAVE_W32_SYSTEM if (!dir || !*dir) dir = read_w32_registry_string (NULL, "Software\\GNU\\GnuPG", "HomeDir"); + if (!dir || !*dir) + { + char path[MAX_PATH]; + + /* fixme: It might be better to use LOCAL_APPDATA because this + is defined as "non roaming" and thus more likely to be kept + locally. For private keys this is desired. However, given + that many users copy private keys anyway forth and back, + using a system roaming serives might be better than to let + them do it manually. A security conscious user will anyway + use the registry entry to have better control. */ + if (SHGetFolderPath(NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE, + NULL, 0, path) >= 0) + { + char *tmp = xmalloc (strlen (path) + 6 +1); + strcpy (stpcpy (tmp, path), "\\gnupg"); + dir = tmp; + + /* Try to create the directory if it does not yet + exists. */ + if (access (dir, F_OK)) + CreateDirectory (dir, NULL); + } + } #endif /*HAVE_W32_SYSTEM*/ if (!dir || !*dir) dir = GNUPG_DEFAULT_HOMEDIR; From cvs at cvs.gnupg.org Tue Dec 21 16:44:58 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Tue Dec 21 16:45:02 2004 Subject: gnupg/g10 (ChangeLog keyedit.c keygen.c) Message-ID: Date: Tuesday, December 21, 2004 @ 16:49:56 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyedit.c keygen.c * keyedit.c (menu_set_keyserver_url): Make sure we only operate on the chosen selfsig so we don't accidentally promote an older selfsig to chosen. Discovered by Simon Josefsson and 'Todd'. * keygen.c (ask_expire_interval): Fix typo. -----------+ ChangeLog | 8 ++++++++ keyedit.c | 3 ++- keygen.c | 7 ++++--- 3 files changed, 14 insertions(+), 4 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.668 gnupg/g10/ChangeLog:1.669 --- gnupg/g10/ChangeLog:1.668 Tue Dec 21 05:19:03 2004 +++ gnupg/g10/ChangeLog Tue Dec 21 16:49:56 2004 @@ -1,3 +1,11 @@ +2004-12-21 David Shaw + + * keyedit.c (menu_set_keyserver_url): Make sure we only operate on + the chosen selfsig so we don't accidentally promote an older + selfsig to chosen. Discovered by Simon Josefsson and 'Todd'. + + * keygen.c (ask_expire_interval): Fix typo. + 2004-12-20 David Shaw * keylist.c (list_keyblock_print): Secret key listings should Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.165 gnupg/g10/keyedit.c:1.166 --- gnupg/g10/keyedit.c:1.165 Tue Dec 21 05:19:03 2004 +++ gnupg/g10/keyedit.c Tue Dec 21 16:49:56 2004 @@ -3558,7 +3558,8 @@ { PKT_signature *sig = node->pkt->pkt.signature; if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] - && (uid && (sig->sig_class&~3) == 0x10) ) + && (uid && (sig->sig_class&~3) == 0x10) + && sig->flags.chosen_selfsig) { char *user=utf8_to_native(uid->name,strlen(uid->name),0); if( sig->version < 4 ) Index: gnupg/g10/keygen.c diff -u gnupg/g10/keygen.c:1.140 gnupg/g10/keygen.c:1.141 --- gnupg/g10/keygen.c:1.140 Mon Dec 20 19:14:57 2004 +++ gnupg/g10/keygen.c Tue Dec 21 16:49:56 2004 @@ -1569,12 +1569,13 @@ continue; } - if( !valid_days ) { + if( !valid_days ) + { tty_printf((object==0) - ? _("Key does not expire at all\n") : + ? _("Key does not expire at all\n") : _("Signature does not expire at all\n")); interval = 0; - } + } else { interval = valid_days * 86400L; From cvs at cvs.gnupg.org Tue Dec 21 21:42:04 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 21 21:42:09 2004 Subject: GNUPG-1-9-BRANCH gnupg/doc (ChangeLog tools.texi) Message-ID: Date: Tuesday, December 21, 2004 @ 21:47:04 Author: wk Path: /cvs/gnupg/gnupg/doc Tag: GNUPG-1-9-BRANCH Modified: ChangeLog tools.texi (gpg-preset-passphrase): New section. ------------+ ChangeLog | 2 tools.texi | 514 ++++------------------------------------------------------- 2 files changed, 43 insertions(+), 473 deletions(-) Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.39.2.20 gnupg/doc/ChangeLog:1.39.2.21 --- gnupg/doc/ChangeLog:1.39.2.20 Tue Dec 21 20:05:15 2004 +++ gnupg/doc/ChangeLog Tue Dec 21 21:47:04 2004 @@ -1,5 +1,7 @@ 2004-12-21 Werner Koch + * tools.texi (gpg-preset-passphrase): New section. + * gnupg-badge-openpgp.eps, gnupg-badge-openpgp.jpg: New * gnupg.texi: Add a logo. * sysnotes.texi: New. Index: gnupg/doc/tools.texi diff -u gnupg/doc/tools.texi:1.1.2.5 gnupg/doc/tools.texi:1.1.2.6 --- gnupg/doc/tools.texi:1.1.2.5 Tue Dec 21 20:05:15 2004 +++ gnupg/doc/tools.texi Tue Dec 21 21:47:04 2004 @@ -600,498 +600,66 @@ @node gpg-preset-passphrase @section Put a passphrase into the cache. -XXXX -The @command{gpgconf} is a utility to automatically and reasonable -safely query and modify configuration files in the @file{.gnupg} home -directory. It is designed not to be invoked manually by the user, but -automatically by graphical user interfaces (GUI).@footnote{Please note -that currently no locking is done, so concurrent access should be -avoided. There are some precautions to avoid corruption with -concurrent usage, but results may be inconsistent and some changes may -get lost. The stateless design makes it difficult to provide more -guarantees.} - -@command{gpgconf} provides access to the configuration of one or more -components of the GnuPG system. These components correspond more or -less to the programs that exist in the GnuPG framework, like GnuPG, -GPGSM, DirMngr, etc. But this is not a strict one-to-one -relationship. Not all configuration options are available through -@command{gpgconf}. @command{gpgconf} provides a generic and abstract -method to access the most important configuration options that can -feasibly be controlled via such a mechanism. - -@command{gpgconf} can be used to gather and change the options -available in each component, and can also provide their default -values. @command{gpgconf} will give detailed type information that -can be used to restrict the user's input without making an attempt to -commit the changes. - -@command{gpgconf} provides the backend of a configuration editor. The -configuration editor would usually be a graphical user interface -program, that allows to display the current options, their default -values, and allows the user to make changes to the options. These -changes can then be made active with @command{gpgconf} again. Such a -program that uses @command{gpgconf} in this way will be called GUI -throughout this section. +The @command{gpg-preset-passphrase} is a utility to seed the internal +cache of a running @command{gpg-agent} with passphrases. This is mainly +useful for unatteneded machines, where a pinentry may not be used and +the passphrases for the to be used keys should be given at machine +startup. + +Passphrases set with this utility don't expire unless the +@option{--forget} option is used to explicitly clear them from the cache +--- or @command{gpg-agent} is either restarted or reloaded (by sending a +SIGHUP to it). It is necessary to allow this passphrase presetting by +starting @command{gpg-agent} with the +@option{--allow-preset-passphrase}. @menu -* Invoking gpgconf:: List of all commands and options. -* Format conventions:: Formatting conventions relevant for all commands. -* Listing components:: List all gpgconf components. -* Listing options:: List all options of a component. -* Changing options:: Changing options of a component. +* Invoking gpg-preset-passphrase:: List of all commands and options. @end menu -@node Invoking gpgconf -@subsection Invoking gpgconf +@node Invoking gpg-preset-passphrase +@subsection List of all commands and options. -One of the following commands must be given: +@noindent +@command{gpg-preset-passphrase} is invoked this way: + +@example +gpg-preset-passphrase [options] [command] @var{keygrip} +@end example + +@var{keygrip} is a 40 character string of hexadecimal characters +identifying the key for which the passphrase should be set or cleared. +This @emph{keygrip} is listed along with the key when running the +command: @code{gpgsm --dump-secret-keys}. One of the following commands +must be given: @table @gnupgtabopt -@item --list-components -List all components. This is the default command used if none is -specified. +@item --preset +Preset a passphrase. This is what you usually will +use. @command{gpg-preset-passphrase} will then read the passphrase form +@code{stdin}. -@item --list-options @var{component} -List all options of the component @var{component}. +@item --forget +Clear the passphrase for the given keygrip from the cache. -@item --change-options @var{component} -Change the options of the component @var{component}. @end table The following options may be used: @table @gnupgtabopt -@c FIXME: Not yet supported. -@c @item -o @var{file} -@c @itemx --output @var{file} -@c Use @var{file} as output file. - @item -v @itemx --verbose -Outputs additional information while running. Specifically, this -extends numerical field values by human-readable descriptions. - -@c FIXME: Not yet supported. -@c @item -n -@c @itemx --dry-run -@c Do not actually change anything. Useful together with -@c @code{--change-options} for testing purposes. - -@item -r -@itemx --runtime -Only used together with @code{--change-options}. If one of the -modified options can be changed in a running daemon process, signal -the running daemon to ask it to reparse its configuration file after -changing. - -This means that the changes will take effect at run-time, as far as -this is possible. Otherwise, they will take effect at the next start -of the respective backend programs. -@end table - - -@node Format conventions -@subsection Format conventions - -Some lines in the output of @command{gpgconf} contain a list of -colon-separated fields. The following conventions apply: - -@itemize @bullet -@item -The GUI program is required to strip off trailing newline and/or -carriage return characters from the output. - -@item -@command{gpgconf} will never leave out fields. If a certain version -provides a certain field, this field will always be present in all -@command{gpgconf} versions from that time on. - -@item -Future versions of @command{gpgconf} might append fields to the list. -New fields will always be separated from the previously last field by -a colon separator. The GUI should be prepared to parse the last field -it knows about up until a colon or end of line. - -@item -Not all fields are defined under all conditions. You are required to -ignore the content of undefined fields. -@end itemize - -There are several standard types for the content of a field: - -@table @asis -@item verbatim -Some fields contain strings that are not escaped in any way. Such -fields are described to be used @emph{verbatim}. These fields will -never contain a colon character (for obvious reasons). No de-escaping -or other formatting is required to use the field content. This is for -easy parsing of the output, when it is known that the content can -never contain any special characters. - -@item percent-escaped -Some fields contain strings that are described to be -@emph{percent-escaped}. Such strings need to be de-escaped before -their content can be presented to the user. A percent-escaped string -is de-escaped by replacing all occurences of @code{%XY} by the byte -that has the hexadecimal value @code{XY}. @code{X} and @code{Y} are -from the set @code{0-9a-f}. - -@item localised -Some fields contain strings that are described to be @emph{localised}. -Such strings are translated to the active language and formatted in -the active character set. - -@item @w{unsigned number} -Some fields contain an @emph{unsigned number}. This number will -always fit into a 32-bit unsigned integer variable. The number may be -followed by a space, followed by a human readable description of that -value (if the verbose option is used). You should ignore everything -in the field that follows the number. - -@item @w{signed number} -Some fields contain a @emph{signed number}. This number will always -fit into a 32-bit signed integer variable. The number may be followed -by a space, followed by a human readable description of that value (if -the verbose option is used). You should ignore everything in the -field that follows the number. - -@item option -Some fields contain an @emph{option} argument. The format of an -option argument depends on the type of the option and on some flags: - -@table @asis -@item no argument -The simplest case is that the option does not take an argument at all -(@var{type} @code{0}). Then the option argument is an unsigned number -that specifies how often the option occurs. If the @code{list} flag -is not set, then the only valid number is @code{1}. Options that do -not take an argument never have the @code{default} or @code{optional -arg} flag set. - -@item number -If the option takes a number argument (@var{alt-type} is @code{2} or -@code{3}), and it can only occur once (@code{list} flag is not set), -then the option argument is either empty (only allowed if the argument -is optional), or it is a number. A number is a string that begins -with an optional minus character, followed by one or more digits. The -number must fit into an integer variable (unsigned or signed, -depending on @var{alt-type}). - -@item number list -If the option takes a number argument and it can occur more than once, -then the option argument is either empty, or it is a comma-separated -list of numbers as described above. - -@item string -If the option takes a string argument (@var{alt-type} is 1), and it -can only occur once (@code{list} flag is not set) then the option -argument is either empty (only allowed if the argument is optional), -or it starts with a double quote character (@code{"}) followed by a -percent-escaped string that is the argument value. Note that there is -only a leading double quote character, no trailing one. The double -quote character is only needed to be able to differentiate between no -value and the empty string as value. - -@item string list -If the option takes a number argument and it can occur more than once, -then the option argument is either empty, or it is a comma-separated -list of string arguments as described above. -@end table -@end table - -The active language and character set are currently determined from -the locale environment of the @command{gpgconf} program. - -@c FIXME: Document the active language and active character set. Allow -@c to change it via the command line? +@opindex verbose +Outputs additional information while running. - -@node Listing components -@subsection Listing components - -The command @code{--list-components} will list all components that can -be configured with @command{gpgconf}. Usually, one component will -correspond to one GnuPG-related program and contain the options of -that programs configuration file that can be modified using -@command{gpgconf}. However, this is not necessarily the case. A -component might also be a group of selected options from several -programs, or contain entirely virtual options that have a special -effect rather than changing exactly one option in one configuration -file. - -A component is a set of configuration options that semantically belong -together. Furthermore, several changes to a component can be made in -an atomic way with a single operation. The GUI could for example -provide a menu with one entry for each component, or a window with one -tabulator sheet per component. - -The command argument @code{--list-components} lists all available -components, one per line. The format of each line is: - -@code{@var{name}:@var{description}} - -@table @var -@item name -This field contains a name tag of the component. The name tag is used -to specify the component in all communication with @command{gpgconf}. -The name tag is to be used @emph{verbatim}. It is thus not in any -escaped format. - -@item description -The @emph{string} in this field contains a human-readable description -of the component. It can be displayed to the user of the GUI for -informational purposes. It is @emph{percent-escaped} and -@emph{localized}. -@end table - -Example: -@example -$ gpgconf --list-components -gpg:GPG for OpenPGP -gpg-agent:GPG Agent -scdaemon:Smartcard Daemon -gpgsm:GPG for S/MIME -dirmngr:Directory Manager -@end example - - -@node Listing options -@subsection Listing options - -Every component contains one or more options. Options may be gathered -into option groups to allow the GUI to give visual hints to the user -about which options are related. - -The command argument @code{@w{--list-options @var{component}}} lists -all options (and the groups they belong to) in the component -@var{component}, one per line. @var{component} must be the string in -the field @var{name} in the output of the @code{--list-components} -command. - -There is one line for each option and each group. First come all -options that are not in any group. Then comes a line describing a -group. Then come all options that belong into each group. Then comes -the next group and so on. There does not need to be any group (and in -this case the output will stop after the last non-grouped option). - -The format of each line is: - -@code{@var{name}:@var{flags}:@var{level}:@var{description}:@var{type}:@var{alt-type}:@var{argname}:@var{default}:@var{argdef}:@var{value}} - -@table @var -@item name -This field contains a name tag for the group or option. The name tag -is used to specify the group or option in all communication with -@command{gpgconf}. The name tag is to be used @emph{verbatim}. It is -thus not in any escaped format. - -@item flags -The flags field contains an @emph{unsigned number}. Its value is the -OR-wise combination of the following flag values: - -@table @code -@item group (1) -If this flag is set, this is a line describing a group and not an -option. +@item -P @var{string} +@itemx --passphrase @var{string} +@opindex passphrase +Instead of reading the passphrase from @code{stdin}, use the supplied +@var{string} as passphrase. Note that this makes the passphrase visible +for other users. @end table -The following flag values are only defined for options (that is, if -the @code{group} flag is not used). - -@table @code -@item optional arg (2) -If this flag is set, the argument is optional. This is never set for -@var{type} @code{0} (none) options. - -@item list (4) -If this flag is set, the option can be given multiple times. - -@item runtime (8) -If this flag is set, the option can be changed at runtime. - -@item default (16) -If this flag is set, a default value is available. - -@item default desc (32) -If this flag is set, a (runtime) default is available. This and the -@code{default} flag are mutually exclusive. - -@item no arg desc (64) -If this flag is set, and the @code{optional arg} flag is set, then the -option has a special meaning if no argument is given. -@end table - -@item level -This field is defined for options and for groups. It contains an -@emph{unsigned number} that specifies the expert level under which -this group or option should be displayed. The following expert levels -are defined for options (they have analogous meaning for groups): - -@table @code -@item basic (0) -This option should always be offered to the user. - -@item advanced (1) -This option may be offered to advanced users. - -@item expert (2) -This option should only be offered to expert users. - -@item invisible (3) -This option should normally never be displayed, not even to expert -users. - -@item internal (4) -This option is for internal use only. Ignore it. -@end table - -The level of a group will always be the lowest level of all options it -contains. - -@item description -This field is defined for options and groups. The @emph{string} in -this field contains a human-readable description of the option or -group. It can be displayed to the user of the GUI for informational -purposes. It is @emph{percent-escaped} and @emph{localized}. - -@item type -This field is only defined for options. It contains an @emph{unsigned -number} that specifies the type of the option's argument, if any. The -following types are defined: - -Basic types: - -@table @code -@item none (0) -No argument allowed. - -@item string (1) -An @emph{unformatted string}. - -@item int32 (2) -A @emph{signed number}. - -@item uint32 (3) -An @emph{unsigned number}. -@end table - -Complex types: - -@table @code -@item pathname (32) -A @emph{string} that describes the pathname of a file. The file does -not necessarily need to exist. - -@item ldap server (33) -A @emph{string} that describes an LDAP server in the format: - -@code{@var{hostname}:@var{port}:@var{username}:@var{password}:@var{base_dn}} -@end table - -More types will be added in the future. Please see the @var{alt-type} -field for information on how to cope with unknown types. - -@item alt-type -This field is identical to @var{type}, except that only the types -@code{0} to @code{31} are allowed. The GUI is expected to present the -user the option in the format specified by @var{type}. But if the -argument type @var{type} is not supported by the GUI, it can still -display the option in the more generic basic type @var{alt-type}. The -GUI must support all the defined basic types to be able to display all -options. More basic types may be added in future versions. If the -GUI encounters a basic type it doesn't support, it should report an -error and abort the operation. - -@item argname -This field is only defined for options with an argument type -@var{type} that is not @code{0}. In this case it may contain a -@emph{percent-escaped} and @emph{localised string} that gives a short -name for the argument. The field may also be empty, though, in which -case a short name is not known. - -@item default -This field is defined only for options. Its format is that of an -@emph{option argument} (@xref{Format conventions}, for details). If -the default value is empty, then no default is known. Otherwise, the -value specifies the default value for this option. Note that this -field is also meaningful if the option itself does not take a real -argument. - -@item argdef -This field is defined only for options for which the @code{optional -arg} flag is set. If the @code{no arg desc} flag is not set, its -format is that of an @emph{option argument} (@xref{Format -conventions}, for details). If the default value is empty, then no -default is known. Otherwise, the value specifies the default value -for this option. If the @code{no arg desc} flag is set, the field is -either empty or contains a description of the effect of this option if -no argument is given. Note that this field is also meaningful if the -option itself does not take a real argument. - -@item value -This field is defined only for options. Its format is that of an -@emph{option argument}. If it is empty, then the option is not -explicitely set in the current configuration, and the default applies -(if any). Otherwise, it contains the current value of the option. -Note that this field is also meaningful if the option itself does not -take a real argument. -@end table - - -@node Changing options -@subsection Changing options - -The command @w{@code{--change-options @var{component}}} will attempt -to change the options of the component @var{component} to the -specified values. @var{component} must be the string in the field -@var{name} in the output of the @code{--list-components} command. You -have to provide the options that shall be changed in the following -format on standard input: - -@code{@var{name}:@var{flags}:@var{new-value}} - -@table @var -@item name -This is the name of the option to change. @var{name} must be the -string in the field @var{name} in the output of the -@code{--list-options} command. - -@item flags -The flags field contains an @emph{unsigned number}. Its value is the -OR-wise combination of the following flag values: - -@table @code -@item default (16) -If this flag is set, the option is deleted and the default value is -used instead (if applicable). -@end table - -@item new-value -The new value for the option. This field is only defined if the -@code{default} flag is not set. The format is that of an @emph{option -argument}. If it is empty (or the field is omitted), the default -argument is used (only allowed if the argument is optional for this -option). Otherwise, the option will be set to the specified value. -@end table - -Examples: - -To set the force option, which is of basic type @code{none (0)}: - -@example -$ echo 'force:0:1' | gpgconf --change-options dirmngr -@end example - -To delete the force option: - -@example -$ echo 'force:16:' | gpgconf --change-options dirmngr -@end example - -The @code{--runtime} option can influence when the changes take -effect. - From cvs at cvs.gnupg.org Tue Dec 21 21:42:40 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 21 21:42:43 2004 Subject: GNUPG-1-9-BRANCH gnupg (preset-passphrase.c) Message-ID: Date: Tuesday, December 21, 2004 @ 21:47:40 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: preset-passphrase.c Adding the tool itself. ---------------------+ preset-passphrase.c | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 290 insertions(+) Index: gnupg/preset-passphrase.c diff -u /dev/null gnupg/preset-passphrase.c:1.1.2.1 --- /dev/null Tue Dec 21 21:47:40 2004 +++ gnupg/preset-passphrase.c Tue Dec 21 21:47:40 2004 @@ -0,0 +1,290 @@ +/* preset-passphrase.c - A tool to preset a passphrase. + * Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef HAVE_LOCALE_H +#include +#endif +#ifdef HAVE_LANGINFO_CODESET +#include +#endif +#ifdef HAVE_DOSISH_SYSTEM +#include /* for setmode() */ +#endif + +#define JNLIB_NEED_LOG_LOGV +#include "agent.h" +#include "minip12.h" +#include "simple-pwquery.h" +#include "i18n.h" +#include "sysutils.h" + + +enum cmd_and_opt_values +{ aNull = 0, + oVerbose = 'v', + oPassphrase = 'P', + + oPreset = 'c', + oForget = 'f', + + oNoVerbose = 500, + + oHomedir, + +aTest }; + +struct rsa_secret_key_s + { + gcry_mpi_t n; /* public modulus */ + gcry_mpi_t e; /* public exponent */ + gcry_mpi_t d; /* exponent */ + gcry_mpi_t p; /* prime p. */ + gcry_mpi_t q; /* prime q. */ + gcry_mpi_t u; /* inverse of p mod q. */ + }; + + +static char *opt_homedir; +static const char *opt_passphrase; + +static ARGPARSE_OPTS opts[] = { + + { 301, NULL, 0, N_("@Options:\n ") }, + + { oVerbose, "verbose", 0, "verbose" }, + { oPassphrase, "passphrase", 2, "|STRING|use passphrase STRING" }, + { oPreset, "preset", 256, "preset passphrase"}, + { oForget, "forget", 256, "forget passphrase"}, + + { oHomedir, "homedir", 2, "@" }, + {0} +}; + +static const char * +my_strusage (int level) +{ + const char *p; + switch (level) + { + case 11: p = "gpg-preset-passphrase (GnuPG)"; + break; + case 13: p = VERSION; break; + case 17: p = PRINTABLE_OS_NAME; break; + case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); + break; + case 1: + case 40: p = _("Usage: gpg-preset-passphrase [options] KEYID (-h for help)\n"); + break; + case 41: p = _("Syntax: gpg-preset-passphrase [options] KEYID\n" + "Password cache maintenance\n"); + break; + + default: p = NULL; + } + return p; +} + + + +static void +i18n_init (void) +{ +#ifdef USE_SIMPLE_GETTEXT + set_gettext_file( PACKAGE_GT ); +#else +#ifdef ENABLE_NLS + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE_GT, LOCALEDIR); + textdomain (PACKAGE_GT); +#endif +#endif +} + + +static gpg_error_t +map_spwq_error (int err) +{ + switch (err) + { + case 0: + return 0; + case SPWQ_OUT_OF_CORE: + return gpg_error_from_errno (ENOMEM); + case SPWQ_IO_ERROR: + return gpg_error_from_errno (EIO); + case SPWQ_PROTOCOL_ERROR: + return gpg_error (GPG_ERR_PROTOCOL_VIOLATION); + case SPWQ_ERR_RESPONSE: + return gpg_error (GPG_ERR_INV_RESPONSE); + case SPWQ_NO_AGENT: + return gpg_error (GPG_ERR_NO_AGENT); + case SPWQ_SYS_ERROR: + return gpg_error_from_errno (errno); + case SPWQ_GENERAL_ERROR: + default: + return gpg_error (GPG_ERR_GENERAL); + } +} + + +static void +preset_passphrase (const char *keygrip) +{ + int rc; + char *line; + /* FIXME: Use secure memory. */ + char passphrase[500]; + + rc = read (0, passphrase, sizeof (passphrase) - 1); + if (rc < 0) + { + log_error ("reading passphrase failed %s\n", + gpg_strerror (gpg_error_from_errno (errno))); + return; + } + passphrase[rc] = '\0'; + line = strchr (passphrase, '\n'); + if (line) + { + line--; + if (line > passphrase && line[-1] == '\r') + line--; + *line = '\0'; + } + + /* FIXME: How to handle empty passwords? */ + + rc = asprintf (&line, "PRESET_PASSPHRASE %s -1 %s\n", keygrip, passphrase); + if (rc < 0) + { + log_error ("caching passphrase failed %s\n", + gpg_strerror (gpg_error_from_errno (errno))); + return; + } + wipememory (passphrase, sizeof (passphrase)); + + rc = map_spwq_error (simple_query (line)); + if (rc) + { + log_error ("caching passphrase failed %s\n", gpg_strerror (rc)); + return; + } + + wipememory (line, strlen (line)); + free (line); +} + + +static void +forget_passphrase (const char *keygrip) +{ + int rc; + char *line; + + rc = asprintf (&line, "CLEAR_PASSPHRASE %s\n", keygrip); + if (rc < 0) + { + log_error ("clearing passphrase failed %s\n", + gpg_strerror (gpg_error_from_errno (errno))); + return; + } + free (line); +} + + +int +main (int argc, char **argv) +{ + ARGPARSE_ARGS pargs; + int cmd = 0; + const char *keygrip = NULL; + + set_strusage (my_strusage); + log_set_prefix ("gpg-preset-passphrase", 1); + + /* Try to auto set the character set. */ + set_native_charset (NULL); + + i18n_init (); + + opt_homedir = getenv ("GNUPGHOME"); +#ifdef HAVE_W32_SYSTEM + if (!opt_homedir || !*opt_homedir) + opt_homedir = read_w32_registry_string (NULL, + "Software\\GNU\\GnuPG", "HomeDir"); +#endif /*HAVE_W32_SYSTEM*/ + if (!opt_homedir || !*opt_homedir) + opt_homedir = GNUPG_DEFAULT_HOMEDIR; + + + pargs.argc = &argc; + pargs.argv = &argv; + pargs.flags= 1; /* (do not remove the args) */ + while (arg_parse (&pargs, opts) ) + { + switch (pargs.r_opt) + { + case oVerbose: opt.verbose++; break; + case oHomedir: opt_homedir = pargs.r.ret_str; break; + + case oPreset: cmd = oPreset; break; + case oForget: cmd = oForget; break; + case oPassphrase: opt_passphrase = pargs.r.ret_str; break; + + default : pargs.err = 2; break; + } + } + if (log_get_errorcount(0)) + exit(2); + + if (argc == 1) + keygrip = *argv; + else + usage (1); + + if (cmd == oPreset) + preset_passphrase (keygrip); + else if (cmd == oForget) + forget_passphrase (keygrip); + else + usage (1); + + agent_exit (0); + return 8; /*NOTREACHED*/ +} + + +void +agent_exit (int rc) +{ + rc = rc? rc : log_get_errorcount(0)? 2 : 0; + exit (rc); +} From cvs at cvs.gnupg.org Wed Dec 22 00:34:57 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 00:35:00 2004 Subject: gnupg (5 files) Message-ID: Date: Wednesday, December 22, 2004 @ 00:39:57 Author: dshaw Path: /cvs/gnupg/gnupg Added: keyserver/gpgkeys_ftp.c m4/libcurl.m4 Modified: keyserver/ChangeLog keyserver/Makefile.am m4/ChangeLog FTP keyserver support via gpgkeys_ftp. This is currently off by default. -------------------------+ keyserver/ChangeLog | 6 keyserver/Makefile.am | 15 +- keyserver/gpgkeys_ftp.c | 343 ++++++++++++++++++++++++++++++++++++++++++++++ m4/ChangeLog | 4 m4/libcurl.m4 | 41 +++++ 5 files changed, 402 insertions(+), 7 deletions(-) Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.93 gnupg/keyserver/ChangeLog:1.94 --- gnupg/keyserver/ChangeLog:1.93 Tue Dec 14 08:49:26 2004 +++ gnupg/keyserver/ChangeLog Wed Dec 22 00:39:57 2004 @@ -1,3 +1,9 @@ +2004-12-21 David Shaw + + * gpgkeys_ftp.c: New. + + * Makefile.am: Build it if requested. + 2004-12-14 Werner Koch * Makefile.am (install-exec-hook, uninstall-hook): Removed. For Index: gnupg/keyserver/Makefile.am diff -u gnupg/keyserver/Makefile.am:1.21 gnupg/keyserver/Makefile.am:1.22 --- gnupg/keyserver/Makefile.am:1.21 Tue Dec 14 08:49:26 2004 +++ gnupg/keyserver/Makefile.am Wed Dec 22 00:39:57 2004 @@ -19,11 +19,11 @@ ## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger +EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_ftp EXTRA_SCRIPTS = gpgkeys_mailto libexecdir = @libexecdir@/@PACKAGE@ -libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_HTTP@ @GPGKEYS_FINGER@ +libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_HTTP@ @GPGKEYS_FINGER@ @GPGKEYS_FTP@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test @@ -31,12 +31,13 @@ gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h +gpgkeys_ftp_SOURCES = gpgkeys_ftp.c ksutil.c ksutil.h other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) -gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ -gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ -gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ +gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ +gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ +gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ - - +gpgkeys_ftp_CPPFLAGS = @LIBCURL_INCLUDES@ +gpgkeys_ftp_LDADD = @LIBCURL@ @GETOPT@ Index: gnupg/keyserver/gpgkeys_ftp.c diff -u /dev/null gnupg/keyserver/gpgkeys_ftp.c:1.1 --- /dev/null Wed Dec 22 00:39:57 2004 +++ gnupg/keyserver/gpgkeys_ftp.c Wed Dec 22 00:39:57 2004 @@ -0,0 +1,343 @@ +/* gpgkeys_ftp.c - fetch a key via FTP + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include +#include +#include +#include +#include +#include +#ifdef HAVE_GETOPT_H +#include +#endif +#include +#include "keyserver.h" +#include "ksutil.h" + +extern char *optarg; +extern int optind; + +#define GET 0 +#define MAX_LINE 80 +#define MAX_PATH 1023 +#define MAX_HOST 79 +#define MAX_PORT 9 +#define MAX_URL (3+3+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50) + +#define STRINGIFY(x) #x +#define MKSTRING(x) STRINGIFY(x) + +static int verbose=0; +static char host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'}; +static FILE *input=NULL,*output=NULL,*console=NULL; +static CURL *curl; +static char request[MAX_URL]={'\0'}; + +static int +get_key(char *getkey) +{ + CURLcode res; + char errorbuffer[CURL_ERROR_SIZE]; + + if(strncmp(getkey,"0x",2)==0) + getkey+=2; + + fprintf(output,"KEY 0x%s BEGIN\n",getkey); + + sprintf(request,"ftp://%s%s%s%s%s",host,port[0]?":":"", + port[0]?port:"",path[0]?"":"/",path); + + curl_easy_setopt(curl,CURLOPT_URL,request); + curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,fwrite); + curl_easy_setopt(curl,CURLOPT_WRITEDATA,output); + curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errorbuffer); + + if(verbose>2) + { + curl_easy_setopt(curl,CURLOPT_STDERR,console); + curl_easy_setopt(curl,CURLOPT_VERBOSE,TRUE); + } + + res=curl_easy_perform(curl); + if(res!=0) + { + fprintf(console,"gpgkeys: FTP fetch error %d: %s\n",res,errorbuffer); + fprintf(output,"KEY 0x%s FAILED %d\n",getkey, + (res==CURLE_FTP_COULDNT_RETR_FILE)?KEYSERVER_KEY_NOT_FOUND: + KEYSERVER_INTERNAL_ERROR); + } + else + fprintf(output,"KEY 0x%s END\n",getkey); + + return KEYSERVER_OK; +} + +static void +show_help (FILE *fp) +{ + fprintf (fp,"-h\thelp\n"); + fprintf (fp,"-V\tversion\n"); + fprintf (fp,"-o\toutput to this file\n"); +} + +int +main(int argc,char *argv[]) +{ + int arg,action=-1,ret=KEYSERVER_INTERNAL_ERROR; + char line[MAX_LINE]; + char *thekey=NULL; + unsigned int timeout=DEFAULT_KEYSERVER_TIMEOUT; + + console=stderr; + + /* Kludge to implement standard GNU options. */ + if (argc > 1 && !strcmp (argv[1], "--version")) + { + fputs ("gpgkeys_ftp (GnuPG) " VERSION"\n", stdout); + return 0; + } + else if (argc > 1 && !strcmp (argv[1], "--help")) + { + show_help (stdout); + return 0; + } + + while((arg=getopt(argc,argv,"hVo:"))!=-1) + switch(arg) + { + default: + case 'h': + show_help (console); + return KEYSERVER_OK; + + case 'V': + fprintf(stdout,"%d\n%s\n",KEYSERVER_PROTO_VERSION,VERSION); + return KEYSERVER_OK; + + case 'o': + output=fopen(optarg,"w"); + if(output==NULL) + { + fprintf(console,"gpgkeys: Cannot open output file `%s': %s\n", + optarg,strerror(errno)); + return KEYSERVER_INTERNAL_ERROR; + } + + break; + } + + if(argc>optind) + { + input=fopen(argv[optind],"r"); + if(input==NULL) + { + fprintf(console,"gpgkeys: Cannot open input file `%s': %s\n", + argv[optind],strerror(errno)); + return KEYSERVER_INTERNAL_ERROR; + } + } + + if(input==NULL) + input=stdin; + + if(output==NULL) + output=stdout; + + /* Get the command and info block */ + + while(fgets(line,MAX_LINE,input)!=NULL) + { + int version; + char commandstr[7]; + char optionstr[256]; + char hash; + + if(line[0]=='\n') + break; + + if(sscanf(line,"%c",&hash)==1 && hash=='#') + continue; + + if(sscanf(line,"COMMAND %6s\n",commandstr)==1) + { + commandstr[6]='\0'; + + if(strcasecmp(commandstr,"get")==0) + action=GET; + + continue; + } + + if(sscanf(line,"HOST %" MKSTRING(MAX_HOST) "s\n",host)==1) + { + host[MAX_HOST]='\0'; + continue; + } + + if(sscanf(line,"PORT %" MKSTRING(MAX_PORT) "s\n",port)==1) + { + port[MAX_PORT]='\0'; + continue; + } + + if(sscanf(line,"PATH %" MKSTRING(MAX_PATH) "s\n",path)==1) + { + path[MAX_PATH]='\0'; + continue; + } + + if(sscanf(line,"VERSION %d\n",&version)==1) + { + if(version!=KEYSERVER_PROTO_VERSION) + { + ret=KEYSERVER_VERSION_ERROR; + goto fail; + } + + continue; + } + + if(sscanf(line,"OPTION %255s\n",optionstr)==1) + { + int no=0; + char *start=&optionstr[0]; + + optionstr[255]='\0'; + + if(strncasecmp(optionstr,"no-",3)==0) + { + no=1; + start=&optionstr[3]; + } + + if(strcasecmp(start,"verbose")==0) + { + if(no) + verbose--; + else + verbose++; + } + else if(strncasecmp(start,"timeout",7)==0) + { + if(no) + timeout=0; + else + timeout=atoi(&start[8]); + } + + continue; + } + } + + if(timeout && register_timeout()==-1) + { + fprintf(console,"gpgkeys: unable to register timeout handler\n"); + return KEYSERVER_INTERNAL_ERROR; + } + + curl_global_init(CURL_GLOBAL_DEFAULT); + curl=curl_easy_init(); + if(!curl) + { + fprintf(console,"gpgkeys: unable to initialize curl\n"); + ret=KEYSERVER_INTERNAL_ERROR; + goto fail; + } + + /* If it's a GET or a SEARCH, the next thing to come in is the + keyids. If it's a SEND, then there are no keyids. */ + + if(action==GET) + { + /* Eat the rest of the file */ + for(;;) + { + if(fgets(line,MAX_LINE,input)==NULL) + break; + else + { + if(line[0]=='\n' || line[0]=='\0') + break; + + if(!thekey) + { + thekey=strdup(line); + if(!thekey) + { + fprintf(console,"gpgkeys: out of memory while " + "building key list\n"); + ret=KEYSERVER_NO_MEMORY; + goto fail; + } + + /* Trim the trailing \n */ + thekey[strlen(line)-1]='\0'; + } + } + } + } + else + { + fprintf(console, + "gpgkeys: this keyserver type only supports key retrieval\n"); + goto fail; + } + + if(!thekey || !host[0]) + { + fprintf(console,"gpgkeys: invalid keyserver instructions\n"); + goto fail; + } + + /* Send the response */ + + fprintf(output,"VERSION %d\n",KEYSERVER_PROTO_VERSION); + fprintf(output,"PROGRAM %s\n\n",VERSION); + + if(verbose>1) + { + fprintf(console,"Host:\t\t%s\n",host); + if(port[0]) + fprintf(console,"Port:\t\t%s\n",port); + if(path[0]) + fprintf(console,"Path:\t\t%s\n",path); + fprintf(console,"Command:\tGET\n"); + } + + set_timeout(timeout); + + ret=get_key(thekey); + + curl_easy_cleanup(curl); + + fail: + + free(thekey); + + if(input!=stdin) + fclose(input); + + if(output!=stdout) + fclose(output); + + curl_global_cleanup(); + + return ret; +} Index: gnupg/m4/ChangeLog diff -u gnupg/m4/ChangeLog:1.4 gnupg/m4/ChangeLog:1.5 --- gnupg/m4/ChangeLog:1.4 Sat Dec 18 23:23:49 2004 +++ gnupg/m4/ChangeLog Wed Dec 22 00:39:57 2004 @@ -1,3 +1,7 @@ +2004-12-21 David Shaw + + * libcurl.m4: New. + 2004-12-18 David Shaw * readline.m4: New. Index: gnupg/m4/libcurl.m4 diff -u /dev/null gnupg/m4/libcurl.m4:1.1 --- /dev/null Wed Dec 22 00:39:57 2004 +++ gnupg/m4/libcurl.m4 Wed Dec 22 00:39:57 2004 @@ -0,0 +1,41 @@ +dnl Check for libcurl and dependencies +dnl Copyright (C) 2004 Free Software Foundation, Inc. +dnl +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl Defines HAVE_LIBCURL to 1 if a working curl setup is found, and sets +dnl @LIBCURL@ and @LIBCURL_INCLUDES@ to the necessary values. +dnl $have_libcurl is set to yes or no so other things in configure can +dnl make use of it. + +AC_DEFUN([GNUPG_CHECK_LIBCURL], +[ + AC_ARG_WITH(libcurl, + AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]), + [_do_libcurl=$withval],[_do_libcurl=yes]) + + if test "$_do_libcurl" != "no" ; then + if test -d "$withval" ; then + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi + + AC_MSG_CHECKING([for libcurl]) + + if eval curl-config --version 2>/dev/null >/dev/null; then + AC_SUBST([LIBCURL_INCLUDES],[`curl-config --cflags`]) + AC_SUBST([LIBCURL],[`curl-config --libs`]) + have_libcurl=yes + else + have_libcurl=no + fi + + AC_MSG_RESULT([$have_libcurl]) + + unset _do_libcurl + fi +])dnl From cvs at cvs.gnupg.org Wed Dec 22 00:35:51 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 00:35:54 2004 Subject: gnupg (ChangeLog configure.ac) Message-ID: Date: Wednesday, December 22, 2004 @ 00:40:51 Author: dshaw Path: /cvs/gnupg/gnupg Modified: ChangeLog configure.ac As always, CVS leaves out the local directory? --------------+ ChangeLog | 5 +++++ configure.ac | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.227 gnupg/ChangeLog:1.228 --- gnupg/ChangeLog:1.227 Mon Dec 20 11:05:20 2004 +++ gnupg/ChangeLog Wed Dec 22 00:40:51 2004 @@ -1,3 +1,8 @@ +2004-12-21 David Shaw + + * configure.ac: Add check for --enable-ftp. It is disabled by + default for now. + 2004-12-18 David Shaw * configure.ac: Call the new GNUPG_CHECK_READLINE macro for Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.119 gnupg/configure.ac:1.120 --- gnupg/configure.ac:1.119 Sat Dec 18 23:39:31 2004 +++ gnupg/configure.ac Wed Dec 22 00:40:51 2004 @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.119 $)dnl +dnlAC_REVISION($Revision: 1.120 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" @@ -323,6 +323,13 @@ try_finger=$enableval, try_finger=yes) AC_MSG_RESULT($try_finger) + AC_MSG_CHECKING([whether ftp key fetching support is requested]) + AC_ARG_ENABLE(ftp, + AC_HELP_STRING([--enable-ftp], + [enable ftp key fetching interface only]), + try_ftp=$enableval, try_ftp=no) + AC_MSG_RESULT($try_ftp) + AC_MSG_CHECKING([whether email keyserver support is requested]) AC_ARG_ENABLE(mailto, AC_HELP_STRING([--disable-mailto], @@ -641,6 +648,14 @@ AC_SUBST(LDAPLIBS) AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "") +if test "$try_ftp" = yes ; then + GNUPG_CHECK_LIBCURL + + if test x"$have_libcurl" = xyes ; then + AC_SUBST(GPGKEYS_FTP,"gpgkeys_ftp$EXEEXT") + fi +fi + dnl This isn't necessarily sendmail itself, but anything that gives a dnl sendmail-ish interface to the outside world. That includes qmail, dnl postfix, etc. Basically, anything that can handle "sendmail -t". From cvs at cvs.gnupg.org Wed Dec 22 00:39:05 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 00:39:08 2004 Subject: gnupg/scripts (ChangeLog autogen.sh) Message-ID: Date: Wednesday, December 22, 2004 @ 00:44:07 Author: dshaw Path: /cvs/gnupg/gnupg/scripts Modified: ChangeLog autogen.sh * autogen.sh: automake needs --add-missing for conditional CPPFLAGS build in keyserver/Makefile.am. ------------+ ChangeLog | 5 +++++ autogen.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) Index: gnupg/scripts/ChangeLog diff -u gnupg/scripts/ChangeLog:1.58 gnupg/scripts/ChangeLog:1.59 --- gnupg/scripts/ChangeLog:1.58 Tue Dec 7 20:00:15 2004 +++ gnupg/scripts/ChangeLog Wed Dec 22 00:44:06 2004 @@ -1,3 +1,8 @@ +2004-12-21 David Shaw + + * autogen.sh: automake needs --add-missing for conditional + CPPFLAGS build in keyserver/Makefile.am. + 2004-11-26 Werner Koch * autogen.sh (gettext_vers_num): Fix aclocal test. Index: gnupg/scripts/autogen.sh diff -u gnupg/scripts/autogen.sh:1.25 gnupg/scripts/autogen.sh:1.26 --- gnupg/scripts/autogen.sh:1.25 Tue Dec 7 20:00:15 2004 +++ gnupg/scripts/autogen.sh Wed Dec 22 00:44:06 2004 @@ -273,8 +273,8 @@ $ACLOCAL -I m4 $ACLOCAL_FLAGS echo "Running autoheader..." $AUTOHEADER -echo "Running automake --gnu ..." -$AUTOMAKE --gnu; +echo "Running automake --gnu --add-missing..." +$AUTOMAKE --gnu --add-missing; echo "Running autoconf..." $AUTOCONF From cvs at cvs.gnupg.org Wed Dec 22 06:18:19 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 06:18:23 2004 Subject: gnupg/keyserver (ChangeLog gpgkeys_ftp.c) Message-ID: Date: Wednesday, December 22, 2004 @ 06:23:22 Author: dshaw Path: /cvs/gnupg/gnupg/keyserver Modified: ChangeLog gpgkeys_ftp.c * gpgkeys_ftp.c (main, get_key): Use auth data as passed by gpg. Use CURLOPT_FILE instead of CURLOPT_WRITEDATA (same option, but backwards compatible). ---------------+ ChangeLog | 6 ++++++ gpgkeys_ftp.c | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.94 gnupg/keyserver/ChangeLog:1.95 --- gnupg/keyserver/ChangeLog:1.94 Wed Dec 22 00:39:57 2004 +++ gnupg/keyserver/ChangeLog Wed Dec 22 06:23:22 2004 @@ -1,3 +1,9 @@ +2004-12-22 David Shaw + + * gpgkeys_ftp.c (main, get_key): Use auth data as passed by gpg. + Use CURLOPT_FILE instead of CURLOPT_WRITEDATA (same option, but + backwards compatible). + 2004-12-21 David Shaw * gpgkeys_ftp.c: New. Index: gnupg/keyserver/gpgkeys_ftp.c diff -u gnupg/keyserver/gpgkeys_ftp.c:1.1 gnupg/keyserver/gpgkeys_ftp.c:1.2 --- gnupg/keyserver/gpgkeys_ftp.c:1.1 Wed Dec 22 00:39:57 2004 +++ gnupg/keyserver/gpgkeys_ftp.c Wed Dec 22 06:23:22 2004 @@ -37,15 +37,16 @@ #define GET 0 #define MAX_LINE 80 #define MAX_PATH 1023 +#define MAX_AUTH 127 #define MAX_HOST 79 #define MAX_PORT 9 -#define MAX_URL (3+3+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50) +#define MAX_URL (3+3+MAX_AUTH+1+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50) #define STRINGIFY(x) #x #define MKSTRING(x) STRINGIFY(x) static int verbose=0; -static char host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'}; +static char auth[MAX_AUTH+1],host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'}; static FILE *input=NULL,*output=NULL,*console=NULL; static CURL *curl; static char request[MAX_URL]={'\0'}; @@ -61,12 +62,12 @@ fprintf(output,"KEY 0x%s BEGIN\n",getkey); - sprintf(request,"ftp://%s%s%s%s%s",host,port[0]?":":"", - port[0]?port:"",path[0]?"":"/",path); + sprintf(request,"ftp://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"", + host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); curl_easy_setopt(curl,CURLOPT_URL,request); curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,fwrite); - curl_easy_setopt(curl,CURLOPT_WRITEDATA,output); + curl_easy_setopt(curl,CURLOPT_FILE,output); curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errorbuffer); if(verbose>2) @@ -132,7 +133,7 @@ return KEYSERVER_OK; case 'o': - output=fopen(optarg,"w"); + output=fopen(optarg,"wb"); if(output==NULL) { fprintf(console,"gpgkeys: Cannot open output file `%s': %s\n", @@ -185,6 +186,12 @@ continue; } + if(sscanf(line,"AUTH %" MKSTRING(MAX_AUTH) "s\n",auth)==1) + { + host[MAX_AUTH]='\0'; + continue; + } + if(sscanf(line,"HOST %" MKSTRING(MAX_HOST) "s\n",host)==1) { host[MAX_HOST]='\0'; From cvs at cvs.gnupg.org Wed Dec 22 17:58:25 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 17:58:30 2004 Subject: gnupg/m4 (ChangeLog libcurl.m4) Message-ID: Date: Wednesday, December 22, 2004 @ 18:03:27 Author: dshaw Path: /cvs/gnupg/gnupg/m4 Modified: ChangeLog libcurl.m4 * libcurl.m4: Be much more strict with libcurl by trying to compile and link a test program that uses the features that we need. ------------+ ChangeLog | 6 ++++++ libcurl.m4 | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) Index: gnupg/m4/ChangeLog diff -u gnupg/m4/ChangeLog:1.5 gnupg/m4/ChangeLog:1.6 --- gnupg/m4/ChangeLog:1.5 Wed Dec 22 00:39:57 2004 +++ gnupg/m4/ChangeLog Wed Dec 22 18:03:27 2004 @@ -1,3 +1,9 @@ +2004-12-22 David Shaw + + * libcurl.m4: Be much more strict with libcurl by trying to + compile and link a test program that uses the features that we + need. + 2004-12-21 David Shaw * libcurl.m4: New. Index: gnupg/m4/libcurl.m4 diff -u gnupg/m4/libcurl.m4:1.1 gnupg/m4/libcurl.m4:1.2 --- gnupg/m4/libcurl.m4:1.1 Wed Dec 22 00:39:57 2004 +++ gnupg/m4/libcurl.m4 Wed Dec 22 18:03:27 2004 @@ -16,7 +16,7 @@ [ AC_ARG_WITH(libcurl, AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]), - [_do_libcurl=$withval],[_do_libcurl=yes]) + [_do_libcurl=$withval],[_do_libcurl=no]) if test "$_do_libcurl" != "no" ; then if test -d "$withval" ; then @@ -36,6 +36,37 @@ AC_MSG_RESULT([$have_libcurl]) + AC_MSG_CHECKING([whether libcurl is modern enough]) + + _libcurl_save_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBCURL_INCLUDES" + _libcurl_save_ldflags=$LDFLAGS + LDFLAGS="$LDFLAGS $LIBCURL" + + AC_LINK_IFELSE(AC_LANG_PROGRAM([#include ],[ +int x; +x=CURL_ERROR_SIZE; +curl_easy_setopt(NULL,CURLOPT_URL,NULL); +x=CURLOPT_WRITEFUNCTION; +x=CURLOPT_FILE; +/* x=CURLOPT_WRITEDATA; */ +x=CURLOPT_ERRORBUFFER; +x=CURLOPT_STDERR; +x=CURLOPT_VERBOSE; +]),,have_libcurl=no) + + CPPFLAGS=$_libcurl_save_cppflags + LDFLAGS=$_libcurl_save_ldflags + + AC_MSG_RESULT([$have_libcurl]) + + if test $have_libcurl = yes ; then + AC_DEFINE(HAVE_LIBCURL,1, + [Define to 1 if you have a fully functional curl library.]) + fi + unset _do_libcurl + unset _libcurl_save_cppflags + unset _libcurl_save_ldflags fi ])dnl From cvs at cvs.gnupg.org Wed Dec 22 18:02:34 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 18:02:37 2004 Subject: gnupg (ChangeLog configure.ac) Message-ID: Date: Wednesday, December 22, 2004 @ 18:07:39 Author: dshaw Path: /cvs/gnupg/gnupg Modified: ChangeLog configure.ac * configure.ac: --enable-ftp is on by default, --with-libcurl is off by default. If we have neither of --enable-ftp or --enable-http, don't even check for curl. --------------+ ChangeLog | 6 ++++++ configure.ac | 28 +++++++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.228 gnupg/ChangeLog:1.229 --- gnupg/ChangeLog:1.228 Wed Dec 22 00:40:51 2004 +++ gnupg/ChangeLog Wed Dec 22 18:07:39 2004 @@ -1,3 +1,9 @@ +2004-12-22 David Shaw + + * configure.ac: --enable-ftp is on by default, --with-libcurl is + off by default. If we have neither of --enable-ftp or + --enable-http, don't even check for curl. + 2004-12-21 David Shaw * configure.ac: Add check for --enable-ftp. It is disabled by Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.120 gnupg/configure.ac:1.121 --- gnupg/configure.ac:1.120 Wed Dec 22 00:40:51 2004 +++ gnupg/configure.ac Wed Dec 22 18:07:39 2004 @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.120 $)dnl +dnlAC_REVISION($Revision: 1.121 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" @@ -325,9 +325,9 @@ AC_MSG_CHECKING([whether ftp key fetching support is requested]) AC_ARG_ENABLE(ftp, - AC_HELP_STRING([--enable-ftp], - [enable ftp key fetching interface only]), - try_ftp=$enableval, try_ftp=no) + AC_HELP_STRING([--disable-ftp], + [disable ftp key fetching interface only]), + try_ftp=$enableval, try_ftp=yes) AC_MSG_RESULT($try_ftp) AC_MSG_CHECKING([whether email keyserver support is requested]) @@ -526,12 +526,17 @@ if test x"$try_http" = xyes ; then AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT") + AC_DEFINE(HTTP_SUPPORT,1,[Define to include HTTP support]) fi if test x"$try_finger" = xyes ; then AC_SUBST(GPGKEYS_FINGER,"gpgkeys_finger$EXEEXT") fi +if test x"$try_ftp" = xyes ; then + AC_DEFINE(FTP_SUPPORT,1,[Define to include FTP support]) +fi + dnl Must check for network library requirements before doing link tests dnl for ldap, for example. If ldap libs are static (or dynamic and without dnl ELF runtime link paths), then link will fail and LDAP support won't @@ -648,12 +653,17 @@ AC_SUBST(LDAPLIBS) AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "") -if test "$try_ftp" = yes ; then - GNUPG_CHECK_LIBCURL +dnl If we have neither FTP or HTTP defined, then don't bother to check +dnl for curl. - if test x"$have_libcurl" = xyes ; then - AC_SUBST(GPGKEYS_FTP,"gpgkeys_ftp$EXEEXT") - fi +if test "$try_ftp" = yes || test "$try_http" = yes ; then + GNUPG_CHECK_LIBCURL +fi + +AM_CONDITIONAL(HAVE_LIBCURL, test "$have_libcurl" = "yes") + +if test x"$have_libcurl" = xyes ; then + AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT") fi dnl This isn't necessarily sendmail itself, but anything that gives a From cvs at cvs.gnupg.org Wed Dec 22 18:07:17 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 18:07:20 2004 Subject: gnupg/keyserver (ChangeLog Makefile.am gpgkeys_curl.c gpgkeys_ftp.c) Message-ID: Date: Wednesday, December 22, 2004 @ 18:12:23 Author: dshaw Path: /cvs/gnupg/gnupg/keyserver Added: gpgkeys_curl.c Modified: ChangeLog Makefile.am Removed: gpgkeys_ftp.c * Makefile.am: Build gpgkeys_http or gpgkeys_curl as needed. * gpgkeys_curl.c (main, get_key): Minor tweaks to work with either FTP or HTTP. * gpgkeys_ftp.c: renamed to gpgkeys_curl.c. ----------------+ ChangeLog | 7 Makefile.am | 16 +- gpgkeys_curl.c | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ gpgkeys_ftp.c | 350 ------------------------------------------------- 4 files changed, 405 insertions(+), 355 deletions(-) Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.95 gnupg/keyserver/ChangeLog:1.96 --- gnupg/keyserver/ChangeLog:1.95 Wed Dec 22 06:23:22 2004 +++ gnupg/keyserver/ChangeLog Wed Dec 22 18:12:23 2004 @@ -1,5 +1,12 @@ 2004-12-22 David Shaw + * Makefile.am: Build gpgkeys_http or gpgkeys_curl as needed. + + * gpgkeys_curl.c (main, get_key): Minor tweaks to work with either + FTP or HTTP. + + * gpgkeys_ftp.c: renamed to gpgkeys_curl.c. + * gpgkeys_ftp.c (main, get_key): Use auth data as passed by gpg. Use CURLOPT_FILE instead of CURLOPT_WRITEDATA (same option, but backwards compatible). Index: gnupg/keyserver/Makefile.am diff -u gnupg/keyserver/Makefile.am:1.22 gnupg/keyserver/Makefile.am:1.23 --- gnupg/keyserver/Makefile.am:1.22 Wed Dec 22 00:39:57 2004 +++ gnupg/keyserver/Makefile.am Wed Dec 22 18:12:23 2004 @@ -19,19 +19,25 @@ ## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_ftp +EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_curl EXTRA_SCRIPTS = gpgkeys_mailto libexecdir = @libexecdir@/@PACKAGE@ -libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_HTTP@ @GPGKEYS_FINGER@ @GPGKEYS_FTP@ +libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test +if HAVE_LIBCURL +libexec_PROGRAMS += @GPGKEYS_CURL@ +else +libexec_PROGRAMS += @GPGKEYS_HTTP@ +endif + gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h -gpgkeys_ftp_SOURCES = gpgkeys_ftp.c ksutil.c ksutil.h +gpgkeys_curl_SOURCES = gpgkeys_curl.c ksutil.c ksutil.h other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) @@ -39,5 +45,5 @@ gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ -gpgkeys_ftp_CPPFLAGS = @LIBCURL_INCLUDES@ -gpgkeys_ftp_LDADD = @LIBCURL@ @GETOPT@ +gpgkeys_curl_CPPFLAGS = @LIBCURL_INCLUDES@ +gpgkeys_curl_LDADD = @LIBCURL@ @GETOPT@ Index: gnupg/keyserver/gpgkeys_curl.c diff -u /dev/null gnupg/keyserver/gpgkeys_curl.c:1.1 --- /dev/null Wed Dec 22 18:12:23 2004 +++ gnupg/keyserver/gpgkeys_curl.c Wed Dec 22 18:12:23 2004 @@ -0,0 +1,387 @@ +/* gpgkeys_curl.c - fetch a key via libcurl + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include +#include +#include +#include +#include +#include +#ifdef HAVE_GETOPT_H +#include +#endif +#include +#include "keyserver.h" +#include "ksutil.h" + +extern char *optarg; +extern int optind; + +#define GET 0 +#define MAX_SCHEME 20 +#define MAX_LINE 80 +#define MAX_PATH 1023 +#define MAX_AUTH 127 +#define MAX_HOST 79 +#define MAX_PORT 9 +#define MAX_URL (MAX_SCHEME+3+MAX_AUTH+1+1+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50) + +#define STRINGIFY(x) #x +#define MKSTRING(x) STRINGIFY(x) + +static int verbose=0; +static char scheme[MAX_SCHEME+1],auth[MAX_AUTH+1],host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'}; +static FILE *input=NULL,*output=NULL,*console=NULL; +static CURL *curl; +static char request[MAX_URL]={'\0'}; + +static int +curl_err_to_gpg_err(CURLcode error) +{ + switch(error) + { + case CURLE_FTP_COULDNT_RETR_FILE: return KEYSERVER_KEY_NOT_FOUND; + default: return KEYSERVER_INTERNAL_ERROR; + } +} + +static int +get_key(char *getkey) +{ + CURLcode res; + char errorbuffer[CURL_ERROR_SIZE]; + + if(strncmp(getkey,"0x",2)==0) + getkey+=2; + + fprintf(output,"KEY 0x%s BEGIN\n",getkey); + + sprintf(request,"%s://%s%s%s%s%s%s%s",scheme,auth[0]?auth:"",auth[0]?"@":"", + host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); + + curl_easy_setopt(curl,CURLOPT_URL,request); + curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,fwrite); + curl_easy_setopt(curl,CURLOPT_FILE,output); + curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errorbuffer); + + if(verbose>1) + { + curl_easy_setopt(curl,CURLOPT_STDERR,console); + curl_easy_setopt(curl,CURLOPT_VERBOSE,TRUE); + } + + res=curl_easy_perform(curl); + if(res!=0) + { + fprintf(console,"gpgkeys: %s fetch error %d: %s\n",scheme, + res,errorbuffer); + fprintf(output,"KEY 0x%s FAILED %d\n",getkey,curl_err_to_gpg_err(res)); + } + else + fprintf(output,"KEY 0x%s END\n",getkey); + + return KEYSERVER_OK; +} + +static void +show_help (FILE *fp) +{ + fprintf (fp,"-h\thelp\n"); + fprintf (fp,"-V\tversion\n"); + fprintf (fp,"-o\toutput to this file\n"); +} + +int +main(int argc,char *argv[]) +{ + int arg,action=-1,ret=KEYSERVER_INTERNAL_ERROR; + char line[MAX_LINE]; + char *thekey=NULL; + unsigned int timeout=DEFAULT_KEYSERVER_TIMEOUT; + + console=stderr; + + /* Kludge to implement standard GNU options. */ + if (argc > 1 && !strcmp (argv[1], "--version")) + { + fputs ("gpgkeys_curl (GnuPG) " VERSION"\n", stdout); + return 0; + } + else if (argc > 1 && !strcmp (argv[1], "--help")) + { + show_help (stdout); + return 0; + } + + while((arg=getopt(argc,argv,"hVo:"))!=-1) + switch(arg) + { + default: + case 'h': + show_help (console); + return KEYSERVER_OK; + + case 'V': + fprintf(stdout,"%d\n%s\n",KEYSERVER_PROTO_VERSION,VERSION); + return KEYSERVER_OK; + + case 'o': + output=fopen(optarg,"wb"); + if(output==NULL) + { + fprintf(console,"gpgkeys: Cannot open output file `%s': %s\n", + optarg,strerror(errno)); + return KEYSERVER_INTERNAL_ERROR; + } + + break; + } + + if(argc>optind) + { + input=fopen(argv[optind],"r"); + if(input==NULL) + { + fprintf(console,"gpgkeys: Cannot open input file `%s': %s\n", + argv[optind],strerror(errno)); + return KEYSERVER_INTERNAL_ERROR; + } + } + + if(input==NULL) + input=stdin; + + if(output==NULL) + output=stdout; + + /* Get the command and info block */ + + while(fgets(line,MAX_LINE,input)!=NULL) + { + int version; + char commandstr[7]; + char optionstr[256]; + char hash; + + if(line[0]=='\n') + break; + + if(sscanf(line,"%c",&hash)==1 && hash=='#') + continue; + + if(sscanf(line,"COMMAND %6s\n",commandstr)==1) + { + commandstr[6]='\0'; + + if(strcasecmp(commandstr,"get")==0) + action=GET; + + continue; + } + + if(sscanf(line,"SCHEME %" MKSTRING(MAX_SCHEME) "s\n",scheme)==1) + { + scheme[MAX_SCHEME]='\0'; + continue; + } + + if(sscanf(line,"AUTH %" MKSTRING(MAX_AUTH) "s\n",auth)==1) + { + auth[MAX_AUTH]='\0'; + continue; + } + + if(sscanf(line,"HOST %" MKSTRING(MAX_HOST) "s\n",host)==1) + { + host[MAX_HOST]='\0'; + continue; + } + + if(sscanf(line,"PORT %" MKSTRING(MAX_PORT) "s\n",port)==1) + { + port[MAX_PORT]='\0'; + continue; + } + + if(sscanf(line,"PATH %" MKSTRING(MAX_PATH) "s\n",path)==1) + { + path[MAX_PATH]='\0'; + continue; + } + + if(sscanf(line,"VERSION %d\n",&version)==1) + { + if(version!=KEYSERVER_PROTO_VERSION) + { + ret=KEYSERVER_VERSION_ERROR; + goto fail; + } + + continue; + } + + if(sscanf(line,"OPTION %255s\n",optionstr)==1) + { + int no=0; + char *start=&optionstr[0]; + + optionstr[255]='\0'; + + if(strncasecmp(optionstr,"no-",3)==0) + { + no=1; + start=&optionstr[3]; + } + + if(strcasecmp(start,"verbose")==0) + { + if(no) + verbose--; + else + verbose++; + } + else if(strncasecmp(start,"timeout",7)==0) + { + if(no) + timeout=0; + else + timeout=atoi(&start[8]); + } + + continue; + } + } + + if(scheme[0]=='\0') + { + fprintf(console,"gpgkeys: no scheme supplied!\n"); + return KEYSERVER_SCHEME_NOT_FOUND; + } +#ifndef HTTP_SUPPORT + else if(strcasecmp(scheme,"http")==0) + { + fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme); + return KEYSERVER_SCHEME_NOT_FOUND; + } +#endif /* HTTP_SUPPORT */ +#ifndef FTP_SUPPORT + else if(strcasecmp(scheme,"ftp")==0) + { + fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme); + return KEYSERVER_SCHEME_NOT_FOUND; + } +#endif /* FTP_SUPPORT */ + + if(timeout && register_timeout()==-1) + { + fprintf(console,"gpgkeys: unable to register timeout handler\n"); + return KEYSERVER_INTERNAL_ERROR; + } + + curl_global_init(CURL_GLOBAL_DEFAULT); + curl=curl_easy_init(); + if(!curl) + { + fprintf(console,"gpgkeys: unable to initialize curl\n"); + ret=KEYSERVER_INTERNAL_ERROR; + goto fail; + } + + /* If it's a GET or a SEARCH, the next thing to come in is the + keyids. If it's a SEND, then there are no keyids. */ + + if(action==GET) + { + /* Eat the rest of the file */ + for(;;) + { + if(fgets(line,MAX_LINE,input)==NULL) + break; + else + { + if(line[0]=='\n' || line[0]=='\0') + break; + + if(!thekey) + { + thekey=strdup(line); + if(!thekey) + { + fprintf(console,"gpgkeys: out of memory while " + "building key list\n"); + ret=KEYSERVER_NO_MEMORY; + goto fail; + } + + /* Trim the trailing \n */ + thekey[strlen(line)-1]='\0'; + } + } + } + } + else + { + fprintf(console, + "gpgkeys: this keyserver type only supports key retrieval\n"); + goto fail; + } + + if(!thekey || !host[0]) + { + fprintf(console,"gpgkeys: invalid keyserver instructions\n"); + goto fail; + } + + /* Send the response */ + + fprintf(output,"VERSION %d\n",KEYSERVER_PROTO_VERSION); + fprintf(output,"PROGRAM %s\n\n",VERSION); + + if(verbose) + { + fprintf(console,"Scheme:\t\t%s\n",scheme); + fprintf(console,"Host:\t\t%s\n",host); + if(port[0]) + fprintf(console,"Port:\t\t%s\n",port); + if(path[0]) + fprintf(console,"Path:\t\t%s\n",path); + fprintf(console,"Command:\tGET\n"); + } + + set_timeout(timeout); + + ret=get_key(thekey); + + curl_easy_cleanup(curl); + + fail: + + free(thekey); + + if(input!=stdin) + fclose(input); + + if(output!=stdout) + fclose(output); + + curl_global_cleanup(); + + return ret; +} Index: gnupg/keyserver/gpgkeys_ftp.c diff -u gnupg/keyserver/gpgkeys_ftp.c:1.2 gnupg/keyserver/gpgkeys_ftp.c:removed --- gnupg/keyserver/gpgkeys_ftp.c:1.2 Wed Dec 22 06:23:22 2004 +++ gnupg/keyserver/gpgkeys_ftp.c Wed Dec 22 18:12:23 2004 @@ -1,350 +0,0 @@ -/* gpgkeys_ftp.c - fetch a key via FTP - * Copyright (C) 2004 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GnuPG 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - -#include -#include -#include -#include -#include -#include -#ifdef HAVE_GETOPT_H -#include -#endif -#include -#include "keyserver.h" -#include "ksutil.h" - -extern char *optarg; -extern int optind; - -#define GET 0 -#define MAX_LINE 80 -#define MAX_PATH 1023 -#define MAX_AUTH 127 -#define MAX_HOST 79 -#define MAX_PORT 9 -#define MAX_URL (3+3+MAX_AUTH+1+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50) - -#define STRINGIFY(x) #x -#define MKSTRING(x) STRINGIFY(x) - -static int verbose=0; -static char auth[MAX_AUTH+1],host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'}; -static FILE *input=NULL,*output=NULL,*console=NULL; -static CURL *curl; -static char request[MAX_URL]={'\0'}; - -static int -get_key(char *getkey) -{ - CURLcode res; - char errorbuffer[CURL_ERROR_SIZE]; - - if(strncmp(getkey,"0x",2)==0) - getkey+=2; - - fprintf(output,"KEY 0x%s BEGIN\n",getkey); - - sprintf(request,"ftp://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"", - host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); - - curl_easy_setopt(curl,CURLOPT_URL,request); - curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,fwrite); - curl_easy_setopt(curl,CURLOPT_FILE,output); - curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errorbuffer); - - if(verbose>2) - { - curl_easy_setopt(curl,CURLOPT_STDERR,console); - curl_easy_setopt(curl,CURLOPT_VERBOSE,TRUE); - } - - res=curl_easy_perform(curl); - if(res!=0) - { - fprintf(console,"gpgkeys: FTP fetch error %d: %s\n",res,errorbuffer); - fprintf(output,"KEY 0x%s FAILED %d\n",getkey, - (res==CURLE_FTP_COULDNT_RETR_FILE)?KEYSERVER_KEY_NOT_FOUND: - KEYSERVER_INTERNAL_ERROR); - } - else - fprintf(output,"KEY 0x%s END\n",getkey); - - return KEYSERVER_OK; -} - -static void -show_help (FILE *fp) -{ - fprintf (fp,"-h\thelp\n"); - fprintf (fp,"-V\tversion\n"); - fprintf (fp,"-o\toutput to this file\n"); -} - -int -main(int argc,char *argv[]) -{ - int arg,action=-1,ret=KEYSERVER_INTERNAL_ERROR; - char line[MAX_LINE]; - char *thekey=NULL; - unsigned int timeout=DEFAULT_KEYSERVER_TIMEOUT; - - console=stderr; - - /* Kludge to implement standard GNU options. */ - if (argc > 1 && !strcmp (argv[1], "--version")) - { - fputs ("gpgkeys_ftp (GnuPG) " VERSION"\n", stdout); - return 0; - } - else if (argc > 1 && !strcmp (argv[1], "--help")) - { - show_help (stdout); - return 0; - } - - while((arg=getopt(argc,argv,"hVo:"))!=-1) - switch(arg) - { - default: - case 'h': - show_help (console); - return KEYSERVER_OK; - - case 'V': - fprintf(stdout,"%d\n%s\n",KEYSERVER_PROTO_VERSION,VERSION); - return KEYSERVER_OK; - - case 'o': - output=fopen(optarg,"wb"); - if(output==NULL) - { - fprintf(console,"gpgkeys: Cannot open output file `%s': %s\n", - optarg,strerror(errno)); - return KEYSERVER_INTERNAL_ERROR; - } - - break; - } - - if(argc>optind) - { - input=fopen(argv[optind],"r"); - if(input==NULL) - { - fprintf(console,"gpgkeys: Cannot open input file `%s': %s\n", - argv[optind],strerror(errno)); - return KEYSERVER_INTERNAL_ERROR; - } - } - - if(input==NULL) - input=stdin; - - if(output==NULL) - output=stdout; - - /* Get the command and info block */ - - while(fgets(line,MAX_LINE,input)!=NULL) - { - int version; - char commandstr[7]; - char optionstr[256]; - char hash; - - if(line[0]=='\n') - break; - - if(sscanf(line,"%c",&hash)==1 && hash=='#') - continue; - - if(sscanf(line,"COMMAND %6s\n",commandstr)==1) - { - commandstr[6]='\0'; - - if(strcasecmp(commandstr,"get")==0) - action=GET; - - continue; - } - - if(sscanf(line,"AUTH %" MKSTRING(MAX_AUTH) "s\n",auth)==1) - { - host[MAX_AUTH]='\0'; - continue; - } - - if(sscanf(line,"HOST %" MKSTRING(MAX_HOST) "s\n",host)==1) - { - host[MAX_HOST]='\0'; - continue; - } - - if(sscanf(line,"PORT %" MKSTRING(MAX_PORT) "s\n",port)==1) - { - port[MAX_PORT]='\0'; - continue; - } - - if(sscanf(line,"PATH %" MKSTRING(MAX_PATH) "s\n",path)==1) - { - path[MAX_PATH]='\0'; - continue; - } - - if(sscanf(line,"VERSION %d\n",&version)==1) - { - if(version!=KEYSERVER_PROTO_VERSION) - { - ret=KEYSERVER_VERSION_ERROR; - goto fail; - } - - continue; - } - - if(sscanf(line,"OPTION %255s\n",optionstr)==1) - { - int no=0; - char *start=&optionstr[0]; - - optionstr[255]='\0'; - - if(strncasecmp(optionstr,"no-",3)==0) - { - no=1; - start=&optionstr[3]; - } - - if(strcasecmp(start,"verbose")==0) - { - if(no) - verbose--; - else - verbose++; - } - else if(strncasecmp(start,"timeout",7)==0) - { - if(no) - timeout=0; - else - timeout=atoi(&start[8]); - } - - continue; - } - } - - if(timeout && register_timeout()==-1) - { - fprintf(console,"gpgkeys: unable to register timeout handler\n"); - return KEYSERVER_INTERNAL_ERROR; - } - - curl_global_init(CURL_GLOBAL_DEFAULT); - curl=curl_easy_init(); - if(!curl) - { - fprintf(console,"gpgkeys: unable to initialize curl\n"); - ret=KEYSERVER_INTERNAL_ERROR; - goto fail; - } - - /* If it's a GET or a SEARCH, the next thing to come in is the - keyids. If it's a SEND, then there are no keyids. */ - - if(action==GET) - { - /* Eat the rest of the file */ - for(;;) - { - if(fgets(line,MAX_LINE,input)==NULL) - break; - else - { - if(line[0]=='\n' || line[0]=='\0') - break; - - if(!thekey) - { - thekey=strdup(line); - if(!thekey) - { - fprintf(console,"gpgkeys: out of memory while " - "building key list\n"); - ret=KEYSERVER_NO_MEMORY; - goto fail; - } - - /* Trim the trailing \n */ - thekey[strlen(line)-1]='\0'; - } - } - } - } - else - { - fprintf(console, - "gpgkeys: this keyserver type only supports key retrieval\n"); - goto fail; - } - - if(!thekey || !host[0]) - { - fprintf(console,"gpgkeys: invalid keyserver instructions\n"); - goto fail; - } - - /* Send the response */ - - fprintf(output,"VERSION %d\n",KEYSERVER_PROTO_VERSION); - fprintf(output,"PROGRAM %s\n\n",VERSION); - - if(verbose>1) - { - fprintf(console,"Host:\t\t%s\n",host); - if(port[0]) - fprintf(console,"Port:\t\t%s\n",port); - if(path[0]) - fprintf(console,"Path:\t\t%s\n",path); - fprintf(console,"Command:\tGET\n"); - } - - set_timeout(timeout); - - ret=get_key(thekey); - - curl_easy_cleanup(curl); - - fail: - - free(thekey); - - if(input!=stdin) - fclose(input); - - if(output!=stdout) - fclose(output); - - curl_global_cleanup(); - - return ret; -} From cvs at cvs.gnupg.org Wed Dec 22 18:19:07 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 22 18:19:13 2004 Subject: GNUPG-1-9-BRANCH gnupg/doc (6 files) Message-ID: Date: Wednesday, December 22, 2004 @ 18:24:13 Author: wk Path: /cvs/gnupg/gnupg/doc Tag: GNUPG-1-9-BRANCH Modified: ChangeLog assuan.texi contrib.texi glossary.texi gnupg.texi tools.texi * gnupg.texi: Reordered. * contrib.texi: Updated. ---------------+ ChangeLog | 5 +++++ assuan.texi | 18 +++++++++++------- contrib.texi | 54 ++++++++++++++++++------------------------------------ glossary.texi | 6 ++++++ gnupg.texi | 17 ++++++----------- tools.texi | 22 ++++++++++++---------- 6 files changed, 58 insertions(+), 64 deletions(-) Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.39.2.21 gnupg/doc/ChangeLog:1.39.2.22 --- gnupg/doc/ChangeLog:1.39.2.21 Tue Dec 21 21:47:04 2004 +++ gnupg/doc/ChangeLog Wed Dec 22 18:24:13 2004 @@ -1,3 +1,8 @@ +2004-12-22 Werner Koch + + * gnupg.texi: Reordered. + * contrib.texi: Updated. + 2004-12-21 Werner Koch * tools.texi (gpg-preset-passphrase): New section. Index: gnupg/doc/assuan.texi diff -u gnupg/doc/assuan.texi:1.1.2.2 gnupg/doc/assuan.texi:1.1.2.3 --- gnupg/doc/assuan.texi:1.1.2.2 Wed Feb 4 20:13:14 2004 +++ gnupg/doc/assuan.texi Wed Dec 22 18:24:13 2004 @@ -3,14 +3,15 @@ @c For copying conditions, see the file gnupg.texi. @node Assuan -@chapter Description of the Assuan protocol. +@appendix Description of the Assuan protocol. +@cindex Assuan, IPC The architecture of the modular GnuPG system is based on a couple of highly specialized modules which make up a network of client server communication. A common framework for intermodule communication is therefore needed and should be implemented in a library. -Goals: +@appendixsubsec Goals @itemize @bullet @item Common framework for module communication @@ -22,7 +23,7 @@ @end itemize -Design criteria: +@appendixsubsec Design criteria @itemize @bullet @item Client Server with back channel @@ -36,8 +37,10 @@ @item Subliminal channels are not an issue @end itemize -Implementation: +@appendixsubsec Implementation + +@noindent The implementation is line based with a maximum line size of 1000 octects. The default IPC mechanism are Unix Domain Sockets. @@ -57,7 +60,7 @@ All textual messages are assumed to be in UTF-8 unless otherwise noted. -Server responses: +@appendixsubsec Server responses @table @code @item OK [] @@ -98,7 +101,7 @@ length limit is to allow for easier multiplexing of multiple channels). -Client requests: +@appendixsubsec Client requests The server waits for client requests after he sent an Okay or Error. The client should not issue a request in other cases with the @@ -171,7 +174,8 @@ @end table -Error Codes: + +@appendixsubsec Error Codes Here we keep a list of error codes used in any Assuan based protocol. The format is the string @code{ERR}, white space, the error Index: gnupg/doc/contrib.texi diff -u gnupg/doc/contrib.texi:1.1.2.3 gnupg/doc/contrib.texi:1.1.2.4 --- gnupg/doc/contrib.texi:1.1.2.3 Thu Sep 30 01:05:37 2004 +++ gnupg/doc/contrib.texi Wed Dec 22 18:24:13 2004 @@ -10,42 +10,7 @@ them the project would not have been nearly as successful as it has been. Any omissions in this list are accidental. Feel free to contact the maintainer if you have been left out or some of your contributions -are not listed. Please keep this list in alphabetical order. - -@itemize @bullet - -@item -Bernhard Herzog did extensive testing and tracked down a lot of bugs. - -@item -Bernhard Reiter made sure that we met the specifications and the -deadlines. He did extensive testing and came up with a lot of suggestions. - -@item -Jan-Oliver Wagner made sure that we met the specifications and the -deadlines. He did extensive testing and came up with a lot of suggestions. - -@item -Karl-Heinz Zimmer had to struggle with all the bugs and misconceptions -while working on Kmail integration. - -@item -Marcus Brinkman cleaned up the Assuan code and fixed bugs all over the place. - -@item -Steffen Hansen had a hard time to write the dirmngr due to -underspecified interfaces. - -@item -Thomas Koester did extensive testing and tracked down a lot of bugs. - -@item -Werner Koch designed the system and wrote most of the original code. - -@end itemize - -We'd also like to thank these folks who have contributed a lot of time -and energy working on GnuPG over the years: +are not listed. David Shaw, Matthew Skala, Michael Roth, Niklas Hernaeus, Nils Ellmenreich, Rémi Guyomarch, Stefan Bellon, Timo Schulz and Werner @@ -60,6 +25,23 @@ and maintains the GNU Privacy Handbook. David Scribner is the current FAQ editor. Lorenzo Cappelletti maintains the web site. +The new modularized architecture of gnupg 1.9 as well as the X.509/CMS +part has been developed as part of the Ägypten project. Direct +contributors to this project are: Bernhard Herzog, who did extensive +testing and tracked down a lot of bugs. Bernhard Reiter, who made sure +that we met the specifications and the deadlines. He did extensive +testing and came up with a lot of suggestions. Jan-Oliver Wagner made +sure that we met the specifications and the deadlines. He also did +extensive testing and came up with a lot of suggestions. Karl-Heinz +Zimmer and Marc Mutz had to struggle with all the bugs and +misconceptions while working on KDE integration. Marcus Brinkman +extended GPGME, cleaned up the Assuan code and fixed bugs all over the +place. Moritz Schulte took over Libgcrypt maintenance and developed it +into a stable an useful library. Steffen Hansen had a hard time to +write the dirmngr due to underspecified interfaces. Thomas Koester did +extensive testing and tracked down a lot of bugs. Werner Koch designed +the system and wrote most of the code. + The following people helped greatly by suggesting improvements, testing, fixing bugs, providing resources and doing other important tasks: Adam Mitchell, Albert Chin, Alec Habig, Allan Clark, Anand Index: gnupg/doc/glossary.texi diff -u gnupg/doc/glossary.texi:1.1.2.1 gnupg/doc/glossary.texi:1.1.2.2 --- gnupg/doc/glossary.texi:1.1.2.1 Tue Jun 29 09:16:40 2004 +++ gnupg/doc/glossary.texi Wed Dec 22 18:24:13 2004 @@ -16,6 +16,12 @@ The @emph{Certificate Revocation List} is a list containing certificates revoked by the issuer. +@item Keygrip + This term is used by GnuPG to describe a 20 byte hash value used +to identify a certain key without referencing to a concrete protocol. +It is used internally to access a private key. Usually it is shown and +entered as a 40 character hexadecimal formatted string. + @item OCSP The @emph{Online Certificate Status Protocol} is used as an alternative to a @acronym{CRL}. It is described in @code{RFC 2560}. Index: gnupg/doc/gnupg.texi diff -u gnupg/doc/gnupg.texi:1.1.2.7 gnupg/doc/gnupg.texi:1.1.2.8 --- gnupg/doc/gnupg.texi:1.1.2.7 Tue Dec 21 20:05:15 2004 +++ gnupg/doc/gnupg.texi Wed Dec 22 18:24:13 2004 @@ -107,7 +107,7 @@ @top Introduction @cindex introduction -This manual documents how to use the GNU Privay Guard system as well as +This manual documents how to use the GNU Privacy Guard system as well as the administration and the architecture. @menu @@ -116,21 +116,15 @@ * Invoking GPG-AGENT:: How to launch the secret key daemon. * Invoking SCDAEMON:: How to handle Smartcards. -Developer information +* Helper Tools:: Description of small helper tools -* Assuan:: Description of the Assuan protocol. * System Notes:: Notes pertaining to certain OSes. - -Miscellaneous - -* Helper Tools:: Description of small helper tools * Debugging:: How to solve problems +* Assuan:: Description of the Assuan protocol. * Copying:: GNU General Public License says how you can copy and share GnuPG * Contributors:: People who have contributed to GnuPG. -Indices - * Glossary:: Short descrition of used terms. * Option Index:: Index to command line options. * Index:: Index of concepts and symbol names. @@ -141,12 +135,13 @@ @include gpg-agent.texi @include scdaemon.texi -@include assuan.texi +@include tools.texi + @include sysnotes.texi -@include tools.texi @include debugging.texi +@include assuan.texi @include gpl.texi @include contrib.texi Index: gnupg/doc/tools.texi diff -u gnupg/doc/tools.texi:1.1.2.6 gnupg/doc/tools.texi:1.1.2.7 --- gnupg/doc/tools.texi:1.1.2.6 Tue Dec 21 21:47:04 2004 +++ gnupg/doc/tools.texi Wed Dec 22 18:24:13 2004 @@ -601,10 +601,10 @@ @section Put a passphrase into the cache. The @command{gpg-preset-passphrase} is a utility to seed the internal -cache of a running @command{gpg-agent} with passphrases. This is mainly -useful for unatteneded machines, where a pinentry may not be used and -the passphrases for the to be used keys should be given at machine -startup. +cache of a running @command{gpg-agent} with passphrases. It is mainly +useful for unattended machines, where the usual @command{pinentry} tool +may not be used and the passphrases for the to be used keys are given at +machine startup. Passphrases set with this utility don't expire unless the @option{--forget} option is used to explicitly clear them from the cache @@ -630,28 +630,29 @@ @var{keygrip} is a 40 character string of hexadecimal characters identifying the key for which the passphrase should be set or cleared. -This @emph{keygrip} is listed along with the key when running the -command: @code{gpgsm --dump-secret-keys}. One of the following commands +This keygrip is listed along with the key when running the command: +@code{gpgsm --dump-secret-keys}. One of the following command options must be given: @table @gnupgtabopt @item --preset Preset a passphrase. This is what you usually will -use. @command{gpg-preset-passphrase} will then read the passphrase form +use. @command{gpg-preset-passphrase} will then read the passphrase from @code{stdin}. @item --forget -Clear the passphrase for the given keygrip from the cache. +Flush the passphrase for the given keygrip from the cache. @end table -The following options may be used: +@noindent +The following additional options may be used: @table @gnupgtabopt @item -v @itemx --verbose @opindex verbose -Outputs additional information while running. +Output additional information while running. @item -P @var{string} @itemx --passphrase @var{string} @@ -663,3 +664,4 @@ + From cvs at cvs.gnupg.org Wed Dec 22 18:44:39 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 18:44:43 2004 Subject: gnupg/g10 (ChangeLog build-packet.c keyserver.c) Message-ID: Date: Wednesday, December 22, 2004 @ 18:49:44 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog build-packet.c keyserver.c * keyserver.c (keyserver_typemap): New. Map certain keyserver types to a common type (e.g. ldaps -> ldap). If we are building with curl, map both http and ftp to curl. * build-packet.c (build_sig_subpkt): Only allow one preferred keyserver subpacket at a time. ----------------+ ChangeLog | 9 +++++++++ build-packet.c | 1 - keyserver.c | 34 ++++++++++++++++++++++++---------- 3 files changed, 33 insertions(+), 11 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.669 gnupg/g10/ChangeLog:1.670 --- gnupg/g10/ChangeLog:1.669 Tue Dec 21 16:49:56 2004 +++ gnupg/g10/ChangeLog Wed Dec 22 18:49:44 2004 @@ -1,3 +1,12 @@ +2004-12-22 David Shaw + + * keyserver.c (keyserver_typemap): New. Map certain keyserver + types to a common type (e.g. ldaps -> ldap). If we are building + with curl, map both http and ftp to curl. + + * build-packet.c (build_sig_subpkt): Only allow one preferred + keyserver subpacket at a time. + 2004-12-21 David Shaw * keyedit.c (menu_set_keyserver_url): Make sure we only operate on Index: gnupg/g10/build-packet.c diff -u gnupg/g10/build-packet.c:1.89 gnupg/g10/build-packet.c:1.90 --- gnupg/g10/build-packet.c:1.89 Thu Oct 28 05:14:55 2004 +++ gnupg/g10/build-packet.c Wed Dec 22 18:49:44 2004 @@ -658,7 +658,6 @@ case SIGSUBPKT_POLICY: case SIGSUBPKT_REV_KEY: case SIGSUBPKT_SIGNATURE: - case SIGSUBPKT_PREF_KS: /* we do allow multiple subpackets */ break; Index: gnupg/g10/keyserver.c diff -u gnupg/g10/keyserver.c:1.73 gnupg/g10/keyserver.c:1.74 --- gnupg/g10/keyserver.c:1.73 Tue Dec 14 08:49:26 2004 +++ gnupg/g10/keyserver.c Wed Dec 22 18:49:44 2004 @@ -759,6 +759,24 @@ m_free(line); } +/* We sometimes want to use a different gpgkeys_xxx for a given + protocol (for example, ldaps is handled by gpgkeys_ldap). Map + these here. */ +static const char * +keyserver_typemap(const char *type) +{ + if(strcmp(type,"ldaps")==0) + return "ldap"; +#ifdef HAVE_LIBCURL + else if(strcmp(type,"ftp")==0) + return "curl"; + else if(strcmp(type,"http")==0) + return "curl"; +#endif /* HAVE_LIBCURL */ + else + return type; +} + #define KEYSERVER_ARGS_KEEP " -o \"%O\" \"%I\"" #define KEYSERVER_ARGS_NOKEEP " -o \"%o\" \"%i\"" @@ -773,6 +791,7 @@ byte *line=NULL; struct parse_options *kopts; struct exec_info *spawn; + const char *scheme; assert(keyserver); @@ -789,14 +808,10 @@ #endif /* Build the filename for the helper to execute */ - /* Note that we don't use a symlink for "ldaps" anymore because this - won't work under MS Windows. */ - command=m_alloc(strlen("gpgkeys_")+strlen(keyserver->scheme)+1); + scheme=keyserver_typemap(keyserver->scheme); + command=m_alloc(strlen("gpgkeys_")+strlen(scheme)+1); strcpy(command,"gpgkeys_"); - if (!strcmp (keyserver->scheme, "ldaps")) - strcat(command, "ldap"); - else - strcat(command,keyserver->scheme); + strcat(command,scheme); if(opt.keyserver_options.options&KEYSERVER_USE_TEMP_FILES) { @@ -1252,9 +1267,8 @@ case KEYSERVER_VERSION_ERROR: log_error(_("gpgkeys_%s does not support handler version %d\n"), - !strcmp (keyserver->scheme,"ldaps")? - "ldap": keyserver->scheme, - KEYSERVER_PROTO_VERSION); + keyserver_typemap(keyserver->scheme), + KEYSERVER_PROTO_VERSION); break; case KEYSERVER_TIMEOUT: From cvs at cvs.gnupg.org Wed Dec 22 18:50:23 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 22 18:50:26 2004 Subject: GNUPG-1-9-BRANCH gnupg (ChangeLog NEWS configure.ac sm/ChangeLog sm/gpgsm.c) Message-ID: Date: Wednesday, December 22, 2004 @ 18:55:28 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: ChangeLog NEWS configure.ac sm/ChangeLog sm/gpgsm.c (set_binary): New. (main, open_read, open_fwrite): Use it. --------------+ ChangeLog | 4 ++++ NEWS | 6 ++++-- configure.ac | 4 ++-- sm/ChangeLog | 5 +++++ sm/gpgsm.c | 40 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 51 insertions(+), 8 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.131.2.63 gnupg/ChangeLog:1.131.2.64 --- gnupg/ChangeLog:1.131.2.63 Mon Dec 20 17:17:25 2004 +++ gnupg/ChangeLog Wed Dec 22 18:55:28 2004 @@ -1,3 +1,7 @@ +2004-12-22 Werner Koch + + Released 1.9.14. + 2004-12-20 Werner Koch * configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all Index: gnupg/NEWS diff -u gnupg/NEWS:1.165.2.61 gnupg/NEWS:1.165.2.62 --- gnupg/NEWS:1.165.2.61 Mon Dec 20 17:17:25 2004 +++ gnupg/NEWS Wed Dec 22 18:55:28 2004 @@ -1,11 +1,13 @@ -Noteworthy changes in version 1.9.14 +Noteworthy changes in version 1.9.14 (2004-12-22) ------------------------------------------------- * [gpg-agent] New option --use-standard-socket to allow the use of a fixed socket. gpgsm falls back to this socket if GPG_AGENT_INFO has not been set. - * Ported to MS Windows. + * Ported to MS Windows with some functional limitations. + + * New tool gpg-preset-passphrase. Noteworthy changes in version 1.9.13 (2004-12-03) Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.75 gnupg/configure.ac:1.36.2.76 --- gnupg/configure.ac:1.36.2.75 Mon Dec 20 17:17:24 2004 +++ gnupg/configure.ac Wed Dec 22 18:55:28 2004 @@ -20,11 +20,11 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -min_automake_version="1.7.9" +min_automake_version="1.9.3" # Version number: Remember to change it immediately *after* a release. # Add a "-cvs" prefix for non-released code. -AC_INIT(gnupg, 1.9.14-cvs, gnupg-devel@gnupg.org) +AC_INIT(gnupg, 1.9.14, gnupg-devel@gnupg.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.86 gnupg/sm/ChangeLog:1.101.2.87 --- gnupg/sm/ChangeLog:1.101.2.86 Tue Dec 21 20:05:14 2004 +++ gnupg/sm/ChangeLog Wed Dec 22 18:55:28 2004 @@ -1,3 +1,8 @@ +2004-12-22 Werner Koch + + * gpgsm.c (set_binary): New. + (main, open_read, open_fwrite): Use it. + 2004-12-21 Werner Koch * gpgsm.c (main): Use default_homedir(). Index: gnupg/sm/gpgsm.c diff -u gnupg/sm/gpgsm.c:1.67.2.37 gnupg/sm/gpgsm.c:1.67.2.38 --- gnupg/sm/gpgsm.c:1.67.2.37 Tue Dec 21 20:05:14 2004 +++ gnupg/sm/gpgsm.c Wed Dec 22 18:55:28 2004 @@ -39,6 +39,11 @@ #include "keydb.h" #include "sysutils.h" + +#ifndef O_BINARY +#define O_BINARY 0 +#endif + enum cmd_and_opt_values { aNull = 0, oArmor = 'a', @@ -562,6 +567,17 @@ } +/* Set the file pointer into binary mode if required. */ +static void +set_binary (FILE *fp) +{ +#ifdef HAVE_DOSISH_SYSTEM + setmode (fileno (fp), O_BINARY); +#endif +} + + + static void i18n_init(void) { @@ -758,7 +774,7 @@ opt.homedir = default_homedir (); #ifdef HAVE_W32_SYSTEM - opt.no_crl_checks = 1; + opt.no_crl_check = 1; #endif /* First check whether we have a config file on the commandline */ @@ -1374,6 +1390,8 @@ break; case aEncr: /* encrypt the given file */ + set_binary (stdin); + set_binary (stdout); if (!argc) gpgsm_encrypt (&ctrl, recplist, 0, stdout); /* from stdin */ else if (argc == 1) @@ -1386,6 +1404,8 @@ /* FIXME: We don't handle --output yet. We should also allow to concatenate multiple files for signing because that is what gpg does.*/ + set_binary (stdin); + set_binary (stdout); if (!argc) gpgsm_sign (&ctrl, signerlist, 0, detached_sig, stdout); /* create from stdin */ @@ -1408,6 +1428,7 @@ { FILE *fp = NULL; + set_binary (stdin); if (argc == 2 && opt.outfile) log_info ("option --output ignored for a detached signature\n"); else if (opt.outfile) @@ -1432,6 +1453,8 @@ break; case aDecrypt: + set_binary (stdin); + set_binary (stdout); if (!argc) gpgsm_decrypt (&ctrl, 0, stdout); /* from stdin */ else if (argc == 1) @@ -1502,6 +1525,7 @@ break; case aExport: + set_binary (stdout); for (sl=NULL; argc; argc--, argv++) add_to_strlist (&sl, *argv); gpgsm_export (&ctrl, sl, stdout); @@ -1509,6 +1533,7 @@ break; case aExportSecretKeyP12: + set_binary (stdout); if (argc == 1) gpgsm_p12_export (&ctrl, *argv, stdout); else @@ -1644,11 +1669,14 @@ int fd; if (filename[0] == '-' && !filename[1]) - return 0; /* stdin */ + { + set_binary (stdin); + return 0; /* stdin */ + } fd = check_special_filename (filename); if (fd != -1) return fd; - fd = open (filename, O_RDONLY); + fd = open (filename, O_RDONLY | O_BINARY); if (fd == -1) { log_error (_("can't open `%s': %s\n"), filename, strerror (errno)); @@ -1668,7 +1696,10 @@ FILE *fp; if (filename[0] == '-' && !filename[1]) - return stdout; + { + set_binary (stdout); + return stdout; + } fd = check_special_filename (filename); if (fd != -1) @@ -1679,6 +1710,7 @@ log_error ("fdopen(%d) failed: %s\n", fd, strerror (errno)); gpgsm_exit (2); } + set_binary (fp); return fp; } fp = fopen (filename, "wb"); From cvs at cvs.gnupg.org Wed Dec 22 19:00:11 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 22 19:00:14 2004 Subject: GNUPG-1-9-BRANCH gnupg/po (de.po) Message-ID: Date: Wednesday, December 22, 2004 @ 19:05:15 Author: wk Path: /cvs/gnupg/gnupg/po Tag: GNUPG-1-9-BRANCH Modified: de.po Preapring a release -------+ de.po | 446 ++++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 226 insertions(+), 220 deletions(-) Index: gnupg/po/de.po diff -u gnupg/po/de.po:1.84.2.15 gnupg/po/de.po:1.84.2.16 --- gnupg/po/de.po:1.84.2.15 Fri Dec 3 18:44:55 2004 +++ gnupg/po/de.po Wed Dec 22 19:05:14 2004 @@ -8,17 +8,17 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg2 1.9.10\n" +"Project-Id-Version: gnupg2 1.9.14\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-12-03 18:30+0100\n" -"PO-Revision-Date: 2004-11-24 15:43+0100\n" +"POT-Creation-Date: 2004-12-22 18:57+0100\n" +"PO-Revision-Date: 2004-12-22 19:00+0100\n" "Last-Translator: Werner Koch \n" "Language-Team: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: agent/gpg-agent.c:97 agent/protect-tool.c:101 scd/scdaemon.c:93 +#: agent/gpg-agent.c:103 agent/protect-tool.c:106 scd/scdaemon.c:98 msgid "" "@Options:\n" " " @@ -26,94 +26,102 @@ "@Optionen:\n" " " -#: agent/gpg-agent.c:99 scd/scdaemon.c:95 +#: agent/gpg-agent.c:105 scd/scdaemon.c:100 msgid "run in server mode (foreground)" msgstr "Im Server Modus ausführen" -#: agent/gpg-agent.c:100 scd/scdaemon.c:96 +#: agent/gpg-agent.c:106 scd/scdaemon.c:101 msgid "run in daemon mode (background)" msgstr "Im Daemon Modus ausführen" -#: agent/gpg-agent.c:101 kbx/kbxutil.c:81 scd/scdaemon.c:97 sm/gpgsm.c:317 +#: agent/gpg-agent.c:107 kbx/kbxutil.c:81 scd/scdaemon.c:102 sm/gpgsm.c:325 #: tools/gpgconf.c:62 msgid "verbose" msgstr "ausführlich" -#: agent/gpg-agent.c:102 kbx/kbxutil.c:82 scd/scdaemon.c:98 sm/gpgsm.c:318 +#: agent/gpg-agent.c:108 kbx/kbxutil.c:82 scd/scdaemon.c:103 sm/gpgsm.c:326 msgid "be somewhat more quiet" msgstr "Etwas weniger Ausgaben erzeugen" -#: agent/gpg-agent.c:103 scd/scdaemon.c:99 +#: agent/gpg-agent.c:109 scd/scdaemon.c:104 msgid "sh-style command output" msgstr "Ausgabe für /bin/sh" -#: agent/gpg-agent.c:104 scd/scdaemon.c:100 +#: agent/gpg-agent.c:110 scd/scdaemon.c:105 msgid "csh-style command output" msgstr "Ausgabe für /bin/csh" -#: agent/gpg-agent.c:105 +#: agent/gpg-agent.c:111 msgid "|FILE|read options from FILE" msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen" -#: agent/gpg-agent.c:110 scd/scdaemon.c:107 +#: agent/gpg-agent.c:116 scd/scdaemon.c:112 msgid "do not detach from the console" msgstr "Im Vordergrund laufen lassen" -#: agent/gpg-agent.c:111 +#: agent/gpg-agent.c:117 msgid "do not grab keyboard and mouse" msgstr "Tastatur und Maus nicht \"grabben\"" -#: agent/gpg-agent.c:112 scd/scdaemon.c:108 sm/gpgsm.c:320 +#: agent/gpg-agent.c:118 scd/scdaemon.c:113 sm/gpgsm.c:328 msgid "use a log file for the server" msgstr "Logausgaben in eine Datei umlenken" -#: agent/gpg-agent.c:113 +#: agent/gpg-agent.c:119 msgid "do not allow multiple connections" msgstr "Nicht mehr als eine Verbindung erlauben" -#: agent/gpg-agent.c:116 +#: agent/gpg-agent.c:121 +msgid "use a standard location for the socket" +msgstr "Benutze einen Standardnamen für den Socket" + +#: agent/gpg-agent.c:125 msgid "|PGM|use PGM as the PIN-Entry program" msgstr "|PGM|benutze PGM as PIN-Entry" -#: agent/gpg-agent.c:118 +#: agent/gpg-agent.c:127 msgid "|PGM|use PGM as the SCdaemon program" msgstr "|PGM|benutze PGM as SCdaemon" -#: agent/gpg-agent.c:125 +#: agent/gpg-agent.c:134 msgid "ignore requests to change the TTY" msgstr "Ignoriere Anfragen, das TTY zu wechseln" -#: agent/gpg-agent.c:127 +#: agent/gpg-agent.c:136 msgid "ignore requests to change the X display" msgstr "Ignoriere Anfragen, das X-Display zu wechseln" -#: agent/gpg-agent.c:130 +#: agent/gpg-agent.c:139 msgid "|N|expire cached PINs after N seconds" msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen" -#: agent/gpg-agent.c:133 +#: agent/gpg-agent.c:142 msgid "do not use the PIN cache when signing" msgstr "benutze PINs im Cache nicht bem Signieren" -#: agent/gpg-agent.c:135 +#: agent/gpg-agent.c:144 msgid "allow clients to mark keys as \"trusted\"" msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren" -#: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168 -#: sm/gpgsm.c:491 tools/gpgconf.c:85 +#: agent/gpg-agent.c:146 +msgid "allow presetting passphrase" +msgstr "erlaube ein \"preset\" von Passphrases" + +#: agent/gpg-agent.c:205 agent/protect-tool.c:139 scd/scdaemon.c:178 +#: sm/gpgsm.c:499 tools/gpgconf.c:85 msgid "Please report bugs to <" msgstr "Fehlerberichte bitte an <" -#: agent/gpg-agent.c:195 agent/protect-tool.c:134 scd/scdaemon.c:168 -#: sm/gpgsm.c:491 tools/gpgconf.c:85 +#: agent/gpg-agent.c:205 agent/protect-tool.c:139 scd/scdaemon.c:178 +#: sm/gpgsm.c:499 tools/gpgconf.c:85 msgid ">.\n" msgstr ">.\n" -#: agent/gpg-agent.c:198 +#: agent/gpg-agent.c:208 msgid "Usage: gpg-agent [options] (-h for help)" msgstr "Gebrauch: gpg-agent [Optionen] (-h für Hilfe)" -#: agent/gpg-agent.c:200 +#: agent/gpg-agent.c:210 msgid "" "Syntax: gpg-agent [options] [command [args]]\n" "Secret key management for GnuPG\n" @@ -121,62 +129,63 @@ "Syntax: gpg-agent [Optionen] [Kommando [Argumente]]\n" "Verwaltung von geheimen Schlüssel für GnuPG\n" -#: agent/gpg-agent.c:271 scd/scdaemon.c:242 sm/gpgsm.c:609 +#: agent/gpg-agent.c:281 scd/scdaemon.c:252 sm/gpgsm.c:628 #, c-format msgid "invalid debug-level `%s' given\n" msgstr "ungültige Debugebene `%s' angegeben\n" -#: agent/gpg-agent.c:448 agent/protect-tool.c:1050 kbx/kbxutil.c:431 -#: scd/scdaemon.c:357 sm/gpgsm.c:730 +#: agent/gpg-agent.c:462 agent/protect-tool.c:1061 kbx/kbxutil.c:431 +#: scd/scdaemon.c:367 sm/gpgsm.c:749 #, c-format msgid "libgcrypt is too old (need %s, have %s)\n" msgstr "" "Die Bibliothek \"libgcrypt\" is zu alt (benötigt wird %s, vorhanden ist %s)\n" -#: agent/gpg-agent.c:521 scd/scdaemon.c:437 sm/gpgsm.c:828 +#: agent/gpg-agent.c:537 scd/scdaemon.c:442 sm/gpgsm.c:850 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Notiz: Voreingestellte Konfigurationsdatei `%s' fehlt\n" -#: agent/gpg-agent.c:526 agent/gpg-agent.c:1000 scd/scdaemon.c:442 -#: sm/gpgsm.c:832 +#: agent/gpg-agent.c:542 agent/gpg-agent.c:1056 scd/scdaemon.c:447 +#: sm/gpgsm.c:854 #, c-format msgid "option file `%s': %s\n" msgstr "Konfigurationsdatei `%s': %s\n" -#: agent/gpg-agent.c:534 scd/scdaemon.c:450 sm/gpgsm.c:839 +#: agent/gpg-agent.c:550 scd/scdaemon.c:455 sm/gpgsm.c:861 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus `%s' gelesen\n" -#: agent/gpg-agent.c:1033 agent/gpg-agent.c:1067 +#: agent/gpg-agent.c:775 agent/gpg-agent.c:1090 agent/gpg-agent.c:1094 +#: agent/gpg-agent.c:1130 agent/gpg-agent.c:1134 #, c-format msgid "can't create directory `%s': %s\n" msgstr "Das Verzeichniss `%s' kann nicht erstell werden: %s\n" -#: agent/gpg-agent.c:1036 agent/gpg-agent.c:1072 +#: agent/gpg-agent.c:1098 agent/gpg-agent.c:1140 #, c-format msgid "directory `%s' created\n" msgstr "Verzeichniss `%s' wurde erstellt\n" -#: agent/gpg-agent.c:1250 +#: agent/gpg-agent.c:1327 msgid "no gpg-agent running in this session\n" msgstr "Der gpg-agent läuft nicht für diese Session\n" -#: agent/gpg-agent.c:1257 common/simple-pwquery.c:293 sm/call-agent.c:128 +#: agent/gpg-agent.c:1337 common/simple-pwquery.c:323 sm/call-agent.c:140 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "Die Variable GPG_AGENT_INFO ist fehlerhaft\n" -#: agent/gpg-agent.c:1269 common/simple-pwquery.c:305 sm/call-agent.c:140 +#: agent/gpg-agent.c:1349 common/simple-pwquery.c:335 sm/call-agent.c:152 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "Das gpg-agent Protocol %d wird nicht unterstützt\n" -#: agent/protect-tool.c:137 +#: agent/protect-tool.c:142 msgid "Usage: gpg-protect-tool [options] (-h for help)\n" msgstr "Gebrauch: gpg-protect-tool [Optionen] (-h für Hilfe)\n" -#: agent/protect-tool.c:139 +#: agent/protect-tool.c:144 msgid "" "Syntax: gpg-protect-tool [options] [args]]\n" "Secret key maintenance tool\n" @@ -184,16 +193,16 @@ "Syntax: gpg-protect-tool [Optionen] [Argumente]\n" "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n" -#: agent/protect-tool.c:1187 +#: agent/protect-tool.c:1193 msgid "Please enter the passphrase to unprotect the PKCS#12 object." msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein" -#: agent/protect-tool.c:1190 +#: agent/protect-tool.c:1196 msgid "Please enter the passphrase to protect the new PKCS#12 object." msgstr "" "Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein" -#: agent/protect-tool.c:1193 +#: agent/protect-tool.c:1199 msgid "" "Please enter the passphrase to protect the imported object within the GnuPG " "system." @@ -201,11 +210,11 @@ "Bitte geben Sie die Passphrase ein, um das importierte Objket im GnuPG " "System zu schützen." -#: agent/protect-tool.c:1196 agent/genkey.c:110 agent/genkey.c:224 +#: agent/protect-tool.c:1202 agent/genkey.c:110 agent/genkey.c:218 msgid "Please re-enter this passphrase" msgstr "Bitte geben Sie das Mantra (Passphrase) noch einmal ein:" -#: agent/protect-tool.c:1198 +#: agent/protect-tool.c:1204 msgid "" "Please enter the passphrase or the PIN\n" "needed to complete this operation." @@ -213,14 +222,23 @@ "Die Eingabe des Mantras (Passphrase) bzw. der PIN\n" "wird benötigt um diese Aktion auszuführen." -#: agent/protect-tool.c:1202 agent/genkey.c:131 agent/genkey.c:244 +#: agent/protect-tool.c:1208 agent/genkey.c:131 agent/genkey.c:238 msgid "does not match - try again" msgstr "Keine Übereinstimmung - bitte nochmal versuchen" -#: agent/protect-tool.c:1203 +#: agent/protect-tool.c:1209 msgid "Passphrase:" msgstr "Passphrase:" +#: agent/protect-tool.c:1222 +#, c-format +msgid "error while asking for the passphrase: %s\n" +msgstr "Fehler bei der Abfrage der Passphrase: %s\n" + +#: agent/protect-tool.c:1225 +msgid "cancelled\n" +msgstr "Vom Benutzer abgebrochen\n" + #: agent/divert-scd.c:200 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" @@ -232,16 +250,16 @@ msgstr "" "Bitte geben Sie das Mantra (Passphrase) ein%0Aum Ihren Schlüssel zu schützen" -#: agent/genkey.c:223 +#: agent/genkey.c:217 msgid "Please enter the new passphrase" msgstr "Bitte geben Sie das Mantra (Passphrase) ein:" -#: agent/query.c:126 +#: agent/query.c:145 #, c-format msgid "failed to acquire the pinentry lock: %s\n" msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n" -#: agent/query.c:288 +#: agent/query.c:307 msgid "" "Please enter your PIN, so that the secret key can be unlocked for this " "session" @@ -249,7 +267,7 @@ "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden " "kann" -#: agent/query.c:291 +#: agent/query.c:310 msgid "" "Please enter your passphrase, so that the secret key can be unlocked for " "this session" @@ -257,31 +275,31 @@ "Bitte geben Sie Ihr Mantra (Passphrase) ein, so daß der geheime Schlüssel " "benutzt werden kann" -#: agent/query.c:346 agent/query.c:358 +#: agent/query.c:365 agent/query.c:377 msgid "PIN too long" msgstr "Die PIN ist zu lang" -#: agent/query.c:347 +#: agent/query.c:366 msgid "Passphrase too long" msgstr "Das Matra (Passphrase) ist zu lang" -#: agent/query.c:355 +#: agent/query.c:374 msgid "Invalid characters in PIN" msgstr "Ungültige Zeichen in der PIN" -#: agent/query.c:360 +#: agent/query.c:379 msgid "PIN too short" msgstr "Die PIN ist zu kurz" -#: agent/query.c:372 +#: agent/query.c:391 msgid "Bad PIN" msgstr "Falsche PIN" -#: agent/query.c:373 +#: agent/query.c:392 msgid "Bad Passphrase" msgstr "Falsches Mantra (Passphrase)" -#: agent/query.c:412 +#: agent/query.c:431 msgid "Passphrase" msgstr "Mantra" @@ -302,37 +320,37 @@ msgid "Warning: unsafe permissions on %s \"%s\"\n" msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n" -#: common/simple-pwquery.c:279 +#: common/simple-pwquery.c:309 msgid "gpg-agent is not available in this session\n" msgstr "Der gpg-agent ist nicht verfügbar\n" -#: common/simple-pwquery.c:327 +#: common/simple-pwquery.c:367 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu `%s' kann nicht aufgebaut werden: %s\n" -#: common/simple-pwquery.c:338 +#: common/simple-pwquery.c:378 msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit gpg-agent\n" -#: common/simple-pwquery.c:348 +#: common/simple-pwquery.c:388 msgid "problem setting the gpg-agent options\n" msgstr "Beim setzen der gpg-agent Optionen ist ein problem aufgetreten\n" -#: common/simple-pwquery.c:487 +#: common/simple-pwquery.c:526 common/simple-pwquery.c:592 msgid "canceled by user\n" msgstr "Vom Benutzer abgebrochen\n" -#: common/simple-pwquery.c:494 +#: common/simple-pwquery.c:533 common/simple-pwquery.c:598 msgid "problem with the agent\n" msgstr "Problem mit dem Agenten\n" -#: jnlib/logging.c:627 +#: jnlib/logging.c:624 #, c-format msgid "you found a bug ... (%s:%d)\n" msgstr "Sie haben einen Bug (Softwarefehler) gefunden ... (%s:%d)\n" -#: kbx/kbxutil.c:68 sm/gpgsm.c:227 tools/gpgconf.c:53 +#: kbx/kbxutil.c:68 sm/gpgsm.c:235 tools/gpgconf.c:53 msgid "" "@Commands:\n" " " @@ -340,7 +358,7 @@ "@Kommandos:\n" " " -#: kbx/kbxutil.c:76 sm/gpgsm.c:262 tools/gpgconf.c:59 +#: kbx/kbxutil.c:76 sm/gpgsm.c:270 tools/gpgconf.c:59 msgid "" "@\n" "Options:\n" @@ -350,7 +368,7 @@ "Optionen:\n" " " -#: kbx/kbxutil.c:83 sm/gpgsm.c:325 tools/gpgconf.c:64 +#: kbx/kbxutil.c:83 sm/gpgsm.c:333 tools/gpgconf.c:64 msgid "do not make any changes" msgstr "Keine Änderungen durchführen" @@ -382,43 +400,43 @@ "Syntax: kbxutil [Optionen] [Dateien]\n" "Anlistem exportieren und Importieren von KeyBox Dateien\n" -#: scd/scdaemon.c:101 sm/gpgsm.c:337 +#: scd/scdaemon.c:106 sm/gpgsm.c:345 msgid "read options from file" msgstr "Konfigurationsoptionen aus Datei lesen" -#: scd/scdaemon.c:106 +#: scd/scdaemon.c:111 msgid "|N|set OpenSC debug level to N" msgstr "|N|Den OpenSC Debugstufe auf N setzen" -#: scd/scdaemon.c:109 +#: scd/scdaemon.c:114 msgid "|N|connect to reader at port N" msgstr "|N|Verbinde mit dem Leser auf Port N" -#: scd/scdaemon.c:110 +#: scd/scdaemon.c:115 msgid "|NAME|use NAME as ct-API driver" msgstr "|NAME|Benutze NAME als CT-API Treiber" -#: scd/scdaemon.c:111 +#: scd/scdaemon.c:116 msgid "|NAME|use NAME as PC/SC driver" msgstr "|NAME|Benutze NAME als PC/SC Treiber" -#: scd/scdaemon.c:114 +#: scd/scdaemon.c:119 msgid "do not use the internal CCID driver" msgstr "Den internen CCID Treiber nicht benutzen" -#: scd/scdaemon.c:121 +#: scd/scdaemon.c:126 msgid "do not use the OpenSC layer" msgstr "Den OpenSC basierten Kartenzugriff nicht nutzen" -#: scd/scdaemon.c:126 +#: scd/scdaemon.c:131 msgid "allow the use of admin card commands" msgstr "Erlaube die Benutzung von \"Admin\" Kommandos" -#: scd/scdaemon.c:171 +#: scd/scdaemon.c:181 msgid "Usage: scdaemon [options] (-h for help)" msgstr "Gebrauch: scdaemon [Optionen] (-h für Hilfe)" -#: scd/scdaemon.c:173 +#: scd/scdaemon.c:183 msgid "" "Syntax: scdaemon [options] [command [args]]\n" "Smartcard daemon for GnuPG\n" @@ -426,7 +444,7 @@ "Synatx: scdaemon [Optionen] [Kommando [Argumente]]\n" "Smartcard Daemon für GnuPG\n" -#: scd/scdaemon.c:630 +#: scd/scdaemon.c:635 msgid "please use the option `--daemon' to run the program in the background\n" msgstr "" "Bitte die Option `--daemon' nutzen um das Programm im Hintergund " @@ -521,28 +539,28 @@ msgid "invalid radix64 character %02x skipped\n" msgstr "Ungültiges Basis-64 Zeichen %02X wurde übergangen\n" -#: sm/call-agent.c:88 +#: sm/call-agent.c:98 msgid "no running gpg-agent - starting one\n" msgstr "Kein aktiver gpg-agent - es wird einer gestarted\n" -#: sm/call-agent.c:151 +#: sm/call-agent.c:163 msgid "can't connect to the agent - trying fall back\n" msgstr "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n" -#: sm/call-dirmngr.c:173 +#: sm/call-dirmngr.c:174 msgid "no running dirmngr - starting one\n" msgstr "Kein aktiver Dirmngr - es wird einer gestartet\n" -#: sm/call-dirmngr.c:213 +#: sm/call-dirmngr.c:214 msgid "malformed DIRMNGR_INFO environment variable\n" msgstr "Die Variable DIRMNGR_INFO ist fehlerhaft\n" -#: sm/call-dirmngr.c:225 +#: sm/call-dirmngr.c:226 #, c-format msgid "dirmngr protocol version %d is not supported\n" msgstr "Die Dirmngr Protokollversion %d wird nicht unterstützt\n" -#: sm/call-dirmngr.c:239 +#: sm/call-dirmngr.c:240 msgid "can't connect to the dirmngr - trying fall back\n" msgstr "" "Verbindung zum Dirmngr kann nicht aufgebaut werden - Ersatzmethode wird " @@ -717,7 +735,7 @@ msgid "checking the trust list failed: %s\n" msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n" -#: sm/certchain.c:736 sm/import.c:166 +#: sm/certchain.c:736 sm/import.c:157 msgid "certificate chain too long\n" msgstr "Der Zertifikatkette ist zu lang\n" @@ -760,7 +778,7 @@ msgid "certificate `%s' not found: %s\n" msgstr "Zertifikat `%s' nicht gefunden: %s\n" -#: sm/delete.c:112 sm/keydb.c:1403 sm/keydb.c:1496 +#: sm/delete.c:112 sm/keydb.c:1401 sm/keydb.c:1494 #, c-format msgid "error locking keybox: %s\n" msgstr "Fehler beim Sperren der Keybox: %s\n" @@ -788,243 +806,243 @@ msgid "no valid recipients given\n" msgstr "Keine gültigen Empfänger angegeben\n" -#: sm/gpgsm.c:229 +#: sm/gpgsm.c:237 msgid "|[FILE]|make a signature" msgstr "|[DATEI]|Erzeuge eine Signatur" -#: sm/gpgsm.c:230 +#: sm/gpgsm.c:238 msgid "|[FILE]|make a clear text signature" msgstr "|[DATEI]|Erzeuge eine Klartextsignatur" -#: sm/gpgsm.c:231 +#: sm/gpgsm.c:239 msgid "make a detached signature" msgstr "Erzeuge eine abgetrennte Signatur" -#: sm/gpgsm.c:232 +#: sm/gpgsm.c:240 msgid "encrypt data" msgstr "Verschlüssele die Daten" -#: sm/gpgsm.c:233 +#: sm/gpgsm.c:241 msgid "encryption only with symmetric cipher" msgstr "Verschlüsselung nur mit symmetrischem Algrithmus" -#: sm/gpgsm.c:234 +#: sm/gpgsm.c:242 msgid "decrypt data (default)" msgstr "Enschlüssele die Daten" -#: sm/gpgsm.c:235 +#: sm/gpgsm.c:243 msgid "verify a signature" msgstr "Überprüfen einer Signatur" -#: sm/gpgsm.c:237 +#: sm/gpgsm.c:245 msgid "list keys" msgstr "Schlüssel anzeigen" -#: sm/gpgsm.c:238 +#: sm/gpgsm.c:246 msgid "list external keys" msgstr "Externe Schlüssel anzeigen" -#: sm/gpgsm.c:239 +#: sm/gpgsm.c:247 msgid "list secret keys" msgstr "Geheime Schlüssel anzeigen" -#: sm/gpgsm.c:240 +#: sm/gpgsm.c:248 msgid "list certificate chain" msgstr "Schlüssel mit Zertifikatekette anzeigen" -#: sm/gpgsm.c:242 +#: sm/gpgsm.c:250 msgid "list keys and fingerprints" msgstr "Schlüssel und Fingerprint anzeigen" -#: sm/gpgsm.c:243 +#: sm/gpgsm.c:251 msgid "generate a new key pair" msgstr "Neues Schlüsselpaar erzeugen" -#: sm/gpgsm.c:244 +#: sm/gpgsm.c:252 msgid "remove key from the public keyring" msgstr "Schlüssel aus dem öffentlichen Schlüsselbund löschen" -#: sm/gpgsm.c:245 +#: sm/gpgsm.c:253 msgid "export keys to a key server" msgstr "Schlüssen an eine Schlüsselserver exportieren" -#: sm/gpgsm.c:246 +#: sm/gpgsm.c:254 msgid "import keys from a key server" msgstr "Schlüssel von einem Schlüsselserver importieren" -#: sm/gpgsm.c:247 +#: sm/gpgsm.c:255 msgid "import certificates" msgstr "Zertifikate importieren" -#: sm/gpgsm.c:248 +#: sm/gpgsm.c:256 msgid "export certificates" msgstr "Zertifikate exportieren" -#: sm/gpgsm.c:249 +#: sm/gpgsm.c:257 msgid "register a smartcard" msgstr "Smartcard registrieren" -#: sm/gpgsm.c:250 +#: sm/gpgsm.c:258 msgid "run in server mode" msgstr "Im Server Modus ausführen" -#: sm/gpgsm.c:251 +#: sm/gpgsm.c:259 msgid "pass a command to the dirmngr" msgstr "Das Kommand an den Dirmngr durchreichen" -#: sm/gpgsm.c:253 +#: sm/gpgsm.c:261 msgid "invoke gpg-protect-tool" msgstr "Rufe das gpg-protect-tool auf" -#: sm/gpgsm.c:254 +#: sm/gpgsm.c:262 msgid "change a passphrase" msgstr "Das Mantra (Passphrase) ändern" -#: sm/gpgsm.c:264 +#: sm/gpgsm.c:272 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII Hülle wird erzeugt" -#: sm/gpgsm.c:266 +#: sm/gpgsm.c:274 msgid "create base-64 encoded output" msgstr "Ausgabe im Basis-64 format erzeugen" -#: sm/gpgsm.c:268 +#: sm/gpgsm.c:276 msgid "assume input is in PEM format" msgstr "Eingabedaten sind im PEM Format" -#: sm/gpgsm.c:270 +#: sm/gpgsm.c:278 msgid "assume input is in base-64 format" msgstr "Eingabedaten sind im Basis-64 Format" -#: sm/gpgsm.c:272 +#: sm/gpgsm.c:280 msgid "assume input is in binary format" msgstr "Eingabedaten sind im Binärformat" -#: sm/gpgsm.c:274 +#: sm/gpgsm.c:282 msgid "|NAME|encrypt for NAME" msgstr "|NAME|Verschlüsseln für NAME" -#: sm/gpgsm.c:277 +#: sm/gpgsm.c:285 msgid "use system's dirmngr if available" msgstr "Benutze den System Dirmngr when verfügbar" -#: sm/gpgsm.c:278 +#: sm/gpgsm.c:286 msgid "never consult a CRL" msgstr "Niemals eine CRL konsultieren" -#: sm/gpgsm.c:283 +#: sm/gpgsm.c:291 msgid "check validity using OCSP" msgstr "Die Gültigkeit mittels OCSP prüfen" -#: sm/gpgsm.c:286 +#: sm/gpgsm.c:294 msgid "|N|number of certificates to include" msgstr "|N|Sende N Zertifikate mit" -#: sm/gpgsm.c:289 +#: sm/gpgsm.c:297 msgid "|FILE|take policy information from FILE" msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen" -#: sm/gpgsm.c:292 +#: sm/gpgsm.c:300 msgid "do not check certificate policies" msgstr "Zertikikatrichtlinien nicht überprüfen" -#: sm/gpgsm.c:296 +#: sm/gpgsm.c:304 msgid "fetch missing issuer certificates" msgstr "Fehlende Zertifikate automatisch holen" -#: sm/gpgsm.c:300 +#: sm/gpgsm.c:308 msgid "|NAME|use NAME as default recipient" msgstr "|NAME|Benutze NAME als voreingestellten Empfänger" -#: sm/gpgsm.c:302 +#: sm/gpgsm.c:310 msgid "use the default key as default recipient" msgstr "Benuzte voreingestellten Schlüssel als Standardempfänger" -#: sm/gpgsm.c:308 +#: sm/gpgsm.c:316 msgid "use this user-id to sign or decrypt" msgstr "Benuzte diese Benutzer ID zum Signieren oder Entschlüsseln" -#: sm/gpgsm.c:311 +#: sm/gpgsm.c:319 msgid "|N|set compress level N (0 disables)" msgstr "|N|Benutze Komprimierungsstufe N" -#: sm/gpgsm.c:313 +#: sm/gpgsm.c:321 msgid "use canonical text mode" msgstr "Kanonischen Textmodus benutzen" -#: sm/gpgsm.c:316 tools/gpgconf.c:61 +#: sm/gpgsm.c:324 tools/gpgconf.c:61 msgid "use as output file" msgstr "als Ausgabedatei benutzen" -#: sm/gpgsm.c:319 +#: sm/gpgsm.c:327 msgid "don't use the terminal at all" msgstr "Das Terminal überhaupt nicht benutzen" -#: sm/gpgsm.c:322 +#: sm/gpgsm.c:330 msgid "force v3 signatures" msgstr "Version 3 Signaturen erzwingen" -#: sm/gpgsm.c:323 +#: sm/gpgsm.c:331 msgid "always use a MDC for encryption" msgstr "Immer das MDC Verfahren zum verschlüsseln mitbenutzen" -#: sm/gpgsm.c:328 +#: sm/gpgsm.c:336 msgid "batch mode: never ask" msgstr "Stapelverarbeitungs Modus: Nie nachfragen" -#: sm/gpgsm.c:329 +#: sm/gpgsm.c:337 msgid "assume yes on most questions" msgstr "\"Ja\" auf die meisten Anfragen annehmen" -#: sm/gpgsm.c:330 +#: sm/gpgsm.c:338 msgid "assume no on most questions" msgstr "\"Nein\" auf die meisten Anfragen annehmen" -#: sm/gpgsm.c:332 +#: sm/gpgsm.c:340 msgid "add this keyring to the list of keyrings" msgstr "Diesen Keyring in die Liste der Keyrings aufnehmen" -#: sm/gpgsm.c:333 +#: sm/gpgsm.c:341 msgid "add this secret keyring to the list" msgstr "Diese geheimen Keyring in die Liste aufnehmen" -#: sm/gpgsm.c:334 +#: sm/gpgsm.c:342 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|Benutze NAME als voreingestellten Schlüssel" -#: sm/gpgsm.c:335 +#: sm/gpgsm.c:343 msgid "|HOST|use this keyserver to lookup keys" msgstr "|HOST|Benutze HOST als Schlüsselserver" -#: sm/gpgsm.c:336 +#: sm/gpgsm.c:344 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Den Zeichensatz für das Terminal auf NAME setzen" -#: sm/gpgsm.c:340 +#: sm/gpgsm.c:348 msgid "|LEVEL|set the debugging level to LEVEL" msgstr "|NAME|Die Debugstufe auf NAME setzen" -#: sm/gpgsm.c:347 +#: sm/gpgsm.c:355 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinformationen auf Dateidescriptor FD schreiben" -#: sm/gpgsm.c:354 +#: sm/gpgsm.c:362 msgid "|FILE|load extension module FILE" msgstr "|DATEI|Das Erweiterungsmodul DATEI laden" -#: sm/gpgsm.c:360 +#: sm/gpgsm.c:368 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Den Verschlüsselungsalgrithmus NAME benutzen" -#: sm/gpgsm.c:362 +#: sm/gpgsm.c:370 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Den Hashalgorithmus NAME benutzen" -#: sm/gpgsm.c:364 +#: sm/gpgsm.c:372 msgid "|N|use compress algorithm N" msgstr "|N|Den Kompressionsalgorithmus Nummer N benutzen" -#: sm/gpgsm.c:372 +#: sm/gpgsm.c:380 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1032,7 +1050,7 @@ "@\n" "(Die \"man\" Seite beschreibt alle Kommands und Optionen)\n" -#: sm/gpgsm.c:375 +#: sm/gpgsm.c:383 msgid "" "@\n" "Examples:\n" @@ -1052,11 +1070,11 @@ " --list-keys [Namen] Schlüssel anzeigenn\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\\n\n" -#: sm/gpgsm.c:494 +#: sm/gpgsm.c:502 msgid "Usage: gpgsm [options] [files] (-h for help)" msgstr "Gebrauch: gpgsm [Optionen] [Dateien] (-h für Hilfe)" -#: sm/gpgsm.c:497 +#: sm/gpgsm.c:505 msgid "" "Syntax: gpgsm [options] [files]\n" "sign, check, encrypt or decrypt using the S/MIME protocol\n" @@ -1065,7 +1083,7 @@ "Gebrauch: gpgsm [Optionen] [Dateien]\n" "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME protocol\n" -#: sm/gpgsm.c:504 +#: sm/gpgsm.c:512 msgid "" "\n" "Supported algorithms:\n" @@ -1073,201 +1091,170 @@ "\n" "Unterstützte Algorithmen:\n" -#: sm/gpgsm.c:580 +#: sm/gpgsm.c:599 msgid "usage: gpgsm [options] " msgstr "Gebrauch: gpgsm [Optionen] " -#: sm/gpgsm.c:645 +#: sm/gpgsm.c:664 msgid "conflicting commands\n" msgstr "Widersprechende Kommandos\n" -#: sm/gpgsm.c:661 +#: sm/gpgsm.c:680 #, c-format msgid "can't encrypt to `%s': %s\n" msgstr "Verschlüsseln für `%s' nicht möglich: %s\n" -#: sm/gpgsm.c:735 +#: sm/gpgsm.c:754 #, c-format msgid "libksba is too old (need %s, have %s)\n" msgstr "Die Bibliothek Libksba is nicht aktuell (benötige %s, habe %s)\n" -#: sm/gpgsm.c:1183 +#: sm/gpgsm.c:1205 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: sm/gpgsm.c:1195 +#: sm/gpgsm.c:1217 msgid "WARNING: running with faked system time: " msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: " -#: sm/gpgsm.c:1221 +#: sm/gpgsm.c:1243 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n" -#: sm/gpgsm.c:1229 +#: sm/gpgsm.c:1251 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: sm/gpgsm.c:1259 +#: sm/gpgsm.c:1281 #, c-format msgid "can't sign using `%s': %s\n" msgstr "Signieren mit `%s' nicht möglich: %s\n" -#: sm/gpgsm.c:1425 +#: sm/gpgsm.c:1452 msgid "this command has not yet been implemented\n" msgstr "Diee Kommando wurde noch nicht implementiert\n" -#: sm/gpgsm.c:1648 sm/gpgsm.c:1681 +#: sm/gpgsm.c:1682 sm/gpgsm.c:1719 #, c-format msgid "can't open `%s': %s\n" msgstr "Datei `%s' kann nicht geöffnet werden: %s\n" -#: sm/import.c:118 +#: sm/import.c:109 #, c-format msgid "total number processed: %lu\n" msgstr "gesamte verarbeitete Anzahl: %lu\n" -#: sm/import.c:121 +#: sm/import.c:112 #, c-format msgid " imported: %lu" msgstr " importiert: %lu" -#: sm/import.c:125 +#: sm/import.c:116 #, c-format msgid " unchanged: %lu\n" msgstr " nicht geändert: %lu\n" -#: sm/import.c:127 +#: sm/import.c:118 #, c-format msgid " secret keys read: %lu\n" msgstr " gelesene private Schlüssel: %lu\n" -#: sm/import.c:129 +#: sm/import.c:120 #, c-format msgid " secret keys imported: %lu\n" msgstr "importierte priv. Schlüssel: %lu\n" -#: sm/import.c:131 +#: sm/import.c:122 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "ungeänderte priv. Schlüssel: %lu\n" -#: sm/import.c:133 +#: sm/import.c:124 #, c-format msgid " not imported: %lu\n" msgstr " nicht importiert: %lu\n" -#: sm/import.c:235 +#: sm/import.c:226 msgid "error storing certificate\n" msgstr "Fehler beim speichern des Zertifikats\n" -#: sm/import.c:243 +#: sm/import.c:234 msgid "basic certificate checks failed - not imported\n" msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n" -#: sm/import.c:429 sm/import.c:461 +#: sm/import.c:420 sm/import.c:452 #, c-format msgid "error importing certificate: %s\n" msgstr "Fehler beim Importieren des Zertifikats: %s\n" -#: sm/import.c:490 -#, c-format -msgid "error creating a pipe: %s\n" -msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n" - -#: sm/import.c:498 -#, c-format -msgid "error forking process: %s\n" -msgstr "Fehler beim \"Forken\" des Prozess: %s\n" - -#: sm/import.c:609 sm/import.c:634 +#: sm/import.c:524 sm/import.c:549 #, c-format msgid "error creating temporary file: %s\n" msgstr "Fehler beim Erstellen einer temporären Datei: %s\n" -#: sm/import.c:617 +#: sm/import.c:532 #, c-format msgid "error writing to temporary file: %s\n" msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n" -#: sm/import.c:626 +#: sm/import.c:541 #, c-format msgid "error reading input: %s\n" msgstr "Fehler beim Lesen der Eingabe: %s\n" -#: sm/import.c:728 -#, c-format -msgid "waiting for protect-tool to terminate failed: %s\n" -msgstr "" -"Das Warten auf die Beendigung des protect-tools ist fehlgeschlagen: %s\n" - -#: sm/import.c:731 -#, c-format -msgid "error running `%s': probably not installed\n" -msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n" - -#: sm/import.c:733 -#, c-format -msgid "error running `%s': exit status %d\n" -msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n" - -#: sm/import.c:736 -#, c-format -msgid "error running `%s': terminated\n" -msgstr "Fehler beim Ausführen von `%s': beendet\n" - -#: sm/keydb.c:189 +#: sm/keydb.c:187 #, c-format msgid "error creating keybox `%s': %s\n" msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n" -#: sm/keydb.c:192 +#: sm/keydb.c:190 msgid "you may want to start the gpg-agent first\n" msgstr "Sie sollten zuerst den gpg-agent starten\n" -#: sm/keydb.c:197 +#: sm/keydb.c:195 #, c-format msgid "keybox `%s' created\n" msgstr "Die \"Keybox\" `%s' wurde erstellt\n" -#: sm/keydb.c:220 +#: sm/keydb.c:218 #, c-format msgid "can't create lock for `%s'\n" msgstr "Datei `%s' konnte nicht gesperrt werden\n" -#: sm/keydb.c:1327 sm/keydb.c:1389 +#: sm/keydb.c:1325 sm/keydb.c:1387 msgid "failed to get the fingerprint\n" msgstr "Kann den Fingerprint nicht ermitteln\n" -#: sm/keydb.c:1334 sm/keydb.c:1396 +#: sm/keydb.c:1332 sm/keydb.c:1394 msgid "failed to allocate keyDB handle\n" msgstr "Kann keinen KeyDB Handler bereitstellen\n" -#: sm/keydb.c:1351 +#: sm/keydb.c:1349 #, c-format msgid "problem looking for existing certificate: %s\n" msgstr "Problem bei der Suche nach vorhandenem Zertifikat: %s\n" -#: sm/keydb.c:1359 +#: sm/keydb.c:1357 #, c-format msgid "error finding writable keyDB: %s\n" msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n" -#: sm/keydb.c:1367 +#: sm/keydb.c:1365 #, c-format msgid "error storing certificate: %s\n" msgstr "Fehler beim Speichern des Zertifikats: %s\n" -#: sm/keydb.c:1411 +#: sm/keydb.c:1409 #, c-format msgid "problem re-searching certificate: %s\n" msgstr "Problem bei Wiederfinden des Zertifikats: %s\n" -#: sm/keydb.c:1420 sm/keydb.c:1508 +#: sm/keydb.c:1418 sm/keydb.c:1506 #, c-format msgid "error getting stored flags: %s\n" msgstr "Fehler beim Holen der gespeicherten Flags: %s\n" -#: sm/keydb.c:1429 sm/keydb.c:1519 +#: sm/keydb.c:1427 sm/keydb.c:1517 #, c-format msgid "error storing flags: %s\n" msgstr "Fehler beim Speichern der Flags: %s\n" @@ -1385,6 +1372,25 @@ msgid "Configuration for OCSP" msgstr "Konfiguration zu OCSP" +#~ msgid "error creating a pipe: %s\n" +#~ msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n" + +#~ msgid "error forking process: %s\n" +#~ msgstr "Fehler beim \"Forken\" des Prozess: %s\n" + +#~ msgid "waiting for protect-tool to terminate failed: %s\n" +#~ msgstr "" +#~ "Das Warten auf die Beendigung des protect-tools ist fehlgeschlagen: %s\n" + +#~ msgid "error running `%s': probably not installed\n" +#~ msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n" + +#~ msgid "error running `%s': exit status %d\n" +#~ msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n" + +#~ msgid "error running `%s': terminated\n" +#~ msgstr "Fehler beim Ausführen von `%s': beendet\n" + #~ msgid "Usage: sc-investigate [options] (-h for help)\n" #~ msgstr "Gebrauch: sc-investigate [Optionen] (-h für Hilfe)\n" From cvs at cvs.gnupg.org Wed Dec 22 19:02:16 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 19:02:19 2004 Subject: gnupg/keyserver (ChangeLog gpgkeys_curl.c gpgkeys_http.c) Message-ID: Date: Wednesday, December 22, 2004 @ 19:07:22 Author: dshaw Path: /cvs/gnupg/gnupg/keyserver Modified: ChangeLog gpgkeys_curl.c gpgkeys_http.c * gpgkeys_curl.c (get_key, writer): New function to wrap around fwrite to avoid DLL access problem on win32. * gpgkeys_http.c (main, get_key): Properly pass authentication info through to the http library. ----------------+ ChangeLog | 6 ++++++ gpgkeys_curl.c | 10 +++++++++- gpgkeys_http.c | 12 +++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.96 gnupg/keyserver/ChangeLog:1.97 --- gnupg/keyserver/ChangeLog:1.96 Wed Dec 22 18:12:23 2004 +++ gnupg/keyserver/ChangeLog Wed Dec 22 19:07:21 2004 @@ -1,5 +1,11 @@ 2004-12-22 David Shaw + * gpgkeys_curl.c (get_key, writer): New function to wrap around + fwrite to avoid DLL access problem on win32. + + * gpgkeys_http.c (main, get_key): Properly pass authentication + info through to the http library. + * Makefile.am: Build gpgkeys_http or gpgkeys_curl as needed. * gpgkeys_curl.c (main, get_key): Minor tweaks to work with either Index: gnupg/keyserver/gpgkeys_curl.c diff -u gnupg/keyserver/gpgkeys_curl.c:1.1 gnupg/keyserver/gpgkeys_curl.c:1.2 --- gnupg/keyserver/gpgkeys_curl.c:1.1 Wed Dec 22 18:12:23 2004 +++ gnupg/keyserver/gpgkeys_curl.c Wed Dec 22 19:07:21 2004 @@ -62,6 +62,14 @@ } } +/* We wrap fwrite so to avoid DLL problems on Win32 (see curl faq for + more). */ +static size_t +writer(const void *ptr,size_t size,size_t nmemb,void *stream) +{ + return fwrite(ptr,size,nmemb,stream); +} + static int get_key(char *getkey) { @@ -77,7 +85,7 @@ host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); curl_easy_setopt(curl,CURLOPT_URL,request); - curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,fwrite); + curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,writer); curl_easy_setopt(curl,CURLOPT_FILE,output); curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errorbuffer); Index: gnupg/keyserver/gpgkeys_http.c diff -u gnupg/keyserver/gpgkeys_http.c:1.7 gnupg/keyserver/gpgkeys_http.c:1.8 --- gnupg/keyserver/gpgkeys_http.c:1.7 Fri Oct 15 14:19:06 2004 +++ gnupg/keyserver/gpgkeys_http.c Wed Dec 22 19:07:21 2004 @@ -41,7 +41,7 @@ static int verbose=0; static unsigned int http_flags=0; -static char host[80]={'\0'},proxy[80]={'\0'},port[10]={'\0'},path[1024]={'\0'}; +static char auth[128]={'\0'},host[80]={'\0'},proxy[80]={'\0'},port[10]={'\0'},path[1024]={'\0'}; static FILE *input=NULL,*output=NULL,*console=NULL; #define BEGIN "-----BEGIN PGP PUBLIC KEY BLOCK-----" @@ -72,8 +72,8 @@ return KEYSERVER_NO_MEMORY; } - sprintf(request,"http://%s%s%s%s%s",host,port[0]?":":"", - port[0]?port:"",path[0]?"":"/",path); + sprintf(request,"http://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"", + host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); rc=http_open_document(&hd,request,http_flags,proxy[0]?proxy:NULL); if(rc!=0) @@ -219,6 +219,12 @@ continue; } + if(sscanf(line,"AUTH %127s\n",auth)==1) + { + auth[127]='\0'; + continue; + } + if(sscanf(line,"HOST %79s\n",host)==1) { host[79]='\0'; From cvs at cvs.gnupg.org Wed Dec 22 19:04:36 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 19:04:38 2004 Subject: gnupg/g10 (ChangeLog keyserver.c options.h) Message-ID: Date: Wednesday, December 22, 2004 @ 19:09:41 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyserver.c options.h * options.h, keyserver.c (parse_keyserver_uri): Properly parse auth data from URLs and pass to keyserver helpers. -------------+ ChangeLog | 3 +++ keyserver.c | 20 ++++++++++++++++++++ options.h | 1 + 3 files changed, 24 insertions(+) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.670 gnupg/g10/ChangeLog:1.671 --- gnupg/g10/ChangeLog:1.670 Wed Dec 22 18:49:44 2004 +++ gnupg/g10/ChangeLog Wed Dec 22 19:09:41 2004 @@ -1,5 +1,8 @@ 2004-12-22 David Shaw + * options.h, keyserver.c (parse_keyserver_uri): Properly parse + auth data from URLs and pass to keyserver helpers. + * keyserver.c (keyserver_typemap): New. Map certain keyserver types to a common type (e.g. ldaps -> ldap). If we are building with curl, map both http and ftp to curl. Index: gnupg/g10/keyserver.c diff -u gnupg/g10/keyserver.c:1.74 gnupg/g10/keyserver.c:1.75 --- gnupg/g10/keyserver.c:1.74 Wed Dec 22 18:49:44 2004 +++ gnupg/g10/keyserver.c Wed Dec 22 19:09:41 2004 @@ -218,6 +218,23 @@ if(!assume_hkp) uri+=2; + /* Do we have userinfo auth data present? */ + for(idx=uri,count=0;*idx && *idx!='@' && *idx!='/';idx++) + count++; + + /* We found a @ before the slash, so that means everything + before the @ is auth data. */ + if(*idx=='@') + { + if(count==0) + goto fail; + + keyserver->auth=m_alloc(count+1); + strncpy(keyserver->auth,uri,count); + keyserver->auth[count]='\0'; + uri+=count+1; + } + for(idx=uri,count=0;*idx && *idx!=':' && *idx!='/';idx++) count++; @@ -846,6 +863,9 @@ fprintf(spawn->tochild,"OPAQUE %s\n",keyserver->opaque); else { + if(keyserver->auth) + fprintf(spawn->tochild,"AUTH %s\n",keyserver->auth); + if(keyserver->host) fprintf(spawn->tochild,"HOST %s\n",keyserver->host); Index: gnupg/g10/options.h diff -u gnupg/g10/options.h:1.131 gnupg/g10/options.h:1.132 --- gnupg/g10/options.h:1.131 Mon Dec 20 06:19:09 2004 +++ gnupg/g10/options.h Wed Dec 22 19:09:41 2004 @@ -129,6 +129,7 @@ { char *uri; char *scheme; + char *auth; char *host; char *port; char *path; From cvs at cvs.gnupg.org Wed Dec 22 19:17:44 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 22 19:17:46 2004 Subject: GNUPG-1-9-BRANCH gnupg/g10 (g10.c) Message-ID: Date: Wednesday, December 22, 2004 @ 19:22:49 Author: wk Path: /cvs/gnupg/gnupg/g10 Tag: GNUPG-1-9-BRANCH Modified: g10.c Minor tweaks -------+ g10.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) Index: gnupg/g10/g10.c diff -u gnupg/g10/g10.c:1.202.2.19 gnupg/g10/g10.c:1.202.2.20 --- gnupg/g10/g10.c:1.202.2.19 Tue Dec 21 11:03:00 2004 +++ gnupg/g10/g10.c Wed Dec 22 19:22:49 2004 @@ -812,12 +812,12 @@ static char * make_username( const char *string ) { - char *p; - if( utf8_strings ) - p = xstrdup (string); - else - p = native_to_utf8( string ); - return p; + char *p; + if( utf8_strings ) + p = xstrdup (string); + else + p = native_to_utf8( string ); + return p; } @@ -884,7 +884,7 @@ /* We need the home directory also in some other directories, so make sure that both variables are always in sync. */ static void -set_homedir (char *dir) +set_homedir (const char *dir) { if (!dir) dir = ""; From cvs at cvs.gnupg.org Wed Dec 22 20:02:40 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Wed Dec 22 20:02:44 2004 Subject: GNUPG-1-9-BRANCH gnupg (NEWS configure.ac) Message-ID: Date: Wednesday, December 22, 2004 @ 20:07:46 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Modified: NEWS configure.ac Post release updates --------------+ NEWS | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) Index: gnupg/NEWS diff -u gnupg/NEWS:1.165.2.62 gnupg/NEWS:1.165.2.63 --- gnupg/NEWS:1.165.2.62 Wed Dec 22 18:55:28 2004 +++ gnupg/NEWS Wed Dec 22 20:07:46 2004 @@ -1,3 +1,7 @@ +Noteworthy changes in version 1.9.15 +------------------------------------------------- + + Noteworthy changes in version 1.9.14 (2004-12-22) ------------------------------------------------- Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.36.2.76 gnupg/configure.ac:1.36.2.77 --- gnupg/configure.ac:1.36.2.76 Wed Dec 22 18:55:28 2004 +++ gnupg/configure.ac Wed Dec 22 20:07:46 2004 @@ -24,7 +24,7 @@ # Version number: Remember to change it immediately *after* a release. # Add a "-cvs" prefix for non-released code. -AC_INIT(gnupg, 1.9.14, gnupg-devel@gnupg.org) +AC_INIT(gnupg, 1.9.15-cvs, gnupg-devel@gnupg.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. From cvs at cvs.gnupg.org Wed Dec 22 20:14:04 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 22 20:14:09 2004 Subject: gnupg/keyserver (6 files) Message-ID: Date: Wednesday, December 22, 2004 @ 20:19:10 Author: dshaw Path: /cvs/gnupg/gnupg/keyserver Modified: ChangeLog gpgkeys_curl.c gpgkeys_finger.c gpgkeys_hkp.c gpgkeys_http.c gpgkeys_ldap.c * gpgkeys_curl.c (main): New "follow-redirects" option. Takes an optional numeric value for the maximum number of redirects to allow. Defaults to 5. * gpgkeys_curl.c (main), gpgkeys_finger.c (main), gpgkeys_hkp.c (main), gpgkeys_http.c (main), gpgkeys_ldap.c (main): Make sure that a "timeout" option passed with no arguments is properly handled. ------------------+ ChangeLog | 9 +++++++++ gpgkeys_curl.c | 22 +++++++++++++++++++++- gpgkeys_finger.c | 4 +++- gpgkeys_hkp.c | 4 +++- gpgkeys_http.c | 4 +++- gpgkeys_ldap.c | 4 +++- 6 files changed, 42 insertions(+), 5 deletions(-) Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.97 gnupg/keyserver/ChangeLog:1.98 --- gnupg/keyserver/ChangeLog:1.97 Wed Dec 22 19:07:21 2004 +++ gnupg/keyserver/ChangeLog Wed Dec 22 20:19:10 2004 @@ -1,5 +1,14 @@ 2004-12-22 David Shaw + * gpgkeys_curl.c (main): New "follow-redirects" option. Takes an + optional numeric value for the maximum number of redirects to + allow. Defaults to 5. + + * gpgkeys_curl.c (main), gpgkeys_finger.c (main), gpgkeys_hkp.c + (main), gpgkeys_http.c (main), gpgkeys_ldap.c (main): Make sure + that a "timeout" option passed with no arguments is properly + handled. + * gpgkeys_curl.c (get_key, writer): New function to wrap around fwrite to avoid DLL access problem on win32. Index: gnupg/keyserver/gpgkeys_curl.c diff -u gnupg/keyserver/gpgkeys_curl.c:1.2 gnupg/keyserver/gpgkeys_curl.c:1.3 --- gnupg/keyserver/gpgkeys_curl.c:1.2 Wed Dec 22 19:07:21 2004 +++ gnupg/keyserver/gpgkeys_curl.c Wed Dec 22 20:19:10 2004 @@ -123,6 +123,7 @@ char line[MAX_LINE]; char *thekey=NULL; unsigned int timeout=DEFAULT_KEYSERVER_TIMEOUT; + long follow_redirects=5; console=stderr; @@ -269,8 +270,19 @@ { if(no) timeout=0; - else + else if(start[7]=='=') timeout=atoi(&start[8]); + else if(start[7]=='\0') + timeout=DEFAULT_KEYSERVER_TIMEOUT; + } + else if(strncasecmp(start,"follow-redirects",16)==0) + { + if(no) + follow_redirects=0; + else if(start[16]=='=') + follow_redirects=atoi(&start[17]); + else if(start[16]=='\0') + follow_redirects=-1; } continue; @@ -312,6 +324,14 @@ goto fail; } + if(follow_redirects) + { + curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1); + if(follow_redirects>0) + curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects); + } + + /* If it's a GET or a SEARCH, the next thing to come in is the keyids. If it's a SEND, then there are no keyids. */ Index: gnupg/keyserver/gpgkeys_finger.c diff -u gnupg/keyserver/gpgkeys_finger.c:1.8 gnupg/keyserver/gpgkeys_finger.c:1.9 --- gnupg/keyserver/gpgkeys_finger.c:1.8 Thu Oct 28 23:53:51 2004 +++ gnupg/keyserver/gpgkeys_finger.c Wed Dec 22 20:19:10 2004 @@ -502,8 +502,10 @@ { if(no) timeout=0; - else + else if(start[7]=='=') timeout=atoi(&start[8]); + else if(start[7]=='\0') + timeout=DEFAULT_KEYSERVER_TIMEOUT; } continue; Index: gnupg/keyserver/gpgkeys_hkp.c diff -u gnupg/keyserver/gpgkeys_hkp.c:1.44 gnupg/keyserver/gpgkeys_hkp.c:1.45 --- gnupg/keyserver/gpgkeys_hkp.c:1.44 Mon Oct 18 17:53:28 2004 +++ gnupg/keyserver/gpgkeys_hkp.c Wed Dec 22 20:19:10 2004 @@ -949,8 +949,10 @@ { if(no) timeout=0; - else + else if(start[7]=='=') timeout=atoi(&start[8]); + else if(start[7]=='\0') + timeout=DEFAULT_KEYSERVER_TIMEOUT; } continue; Index: gnupg/keyserver/gpgkeys_http.c diff -u gnupg/keyserver/gpgkeys_http.c:1.8 gnupg/keyserver/gpgkeys_http.c:1.9 --- gnupg/keyserver/gpgkeys_http.c:1.8 Wed Dec 22 19:07:21 2004 +++ gnupg/keyserver/gpgkeys_http.c Wed Dec 22 20:19:10 2004 @@ -311,8 +311,10 @@ { if(no) timeout=0; - else + else if(start[7]=='=') timeout=atoi(&start[8]); + else if(start[7]=='\0') + timeout=DEFAULT_KEYSERVER_TIMEOUT; } continue; Index: gnupg/keyserver/gpgkeys_ldap.c diff -u gnupg/keyserver/gpgkeys_ldap.c:1.44 gnupg/keyserver/gpgkeys_ldap.c:1.45 --- gnupg/keyserver/gpgkeys_ldap.c:1.44 Fri Oct 15 14:19:06 2004 +++ gnupg/keyserver/gpgkeys_ldap.c Wed Dec 22 20:19:10 2004 @@ -1763,8 +1763,10 @@ { if(no) timeout=0; - else + else if(start[7]=='=') timeout=atoi(&start[8]); + else if(start[7]=='\0') + timeout=DEFAULT_KEYSERVER_TIMEOUT; } continue; From cvs at cvs.gnupg.org Wed Dec 22 21:56:50 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Wed Dec 22 21:56:59 2004 Subject: libassuan/src (2 files) Message-ID: Date: Wednesday, December 22, 2004 @ 21:56:50 Author: werner Path: /cvs/gnupg/libassuan/src Modified: assuan-pipe-connect.c assuan-socket-connect.c Switched to automake 1.9. -------------------------+ assuan-pipe-connect.c | 15 +++++++-------- assuan-socket-connect.c | 14 +------------- 2 files changed, 8 insertions(+), 21 deletions(-) From cvs at cvs.gnupg.org Wed Dec 22 21:56:51 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Wed Dec 22 21:57:10 2004 Subject: libassuan/doc (mdate-sh texinfo.tex) Message-ID: Date: Wednesday, December 22, 2004 @ 21:56:51 Author: werner Path: /cvs/gnupg/libassuan/doc Modified: mdate-sh texinfo.tex Switched to automake 1.9. -------------+ mdate-sh | 37 texinfo.tex | 5594 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 2959 insertions(+), 2672 deletions(-) From cvs at cvs.gnupg.org Wed Dec 22 21:56:52 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Wed Dec 22 21:57:30 2004 Subject: libassuan (8 files) Message-ID: Date: Wednesday, December 22, 2004 @ 21:56:52 Author: werner Path: /cvs/gnupg/libassuan Modified: ChangeLog INSTALL NEWS configure.ac depcomp install-sh missing mkinstalldirs Switched to automake 1.9. ---------------+ ChangeLog | 6 INSTALL | 52 +++--- NEWS | 5 configure.ac | 6 depcomp | 104 +++++++++--- install-sh | 471 +++++++++++++++++++++++++++++--------------------------- missing | 131 ++++++++------- mkinstalldirs | 69 ++++++-- 8 files changed, 494 insertions(+), 350 deletions(-) From cvs at cvs.gnupg.org Wed Dec 22 22:29:36 2004 From: cvs at cvs.gnupg.org (cvs user werner) Date: Wed Dec 22 22:29:58 2004 Subject: libassuan (NEWS configure.ac) Message-ID: Date: Wednesday, December 22, 2004 @ 22:29:36 Author: werner Path: /cvs/gnupg/libassuan Modified: NEWS configure.ac post release updates --------------+ NEWS | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) From cvs at cvs.gnupg.org Thu Dec 23 03:58:02 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 23 03:58:06 2004 Subject: STABLE-BRANCH-1-2 gnupg (ChangeLog NEWS) Message-ID: Date: Thursday, December 23, 2004 @ 04:03:10 Author: dshaw Path: /cvs/gnupg/gnupg Tag: STABLE-BRANCH-1-2 Modified: ChangeLog NEWS * NEWS: Note pgpgroup-to-gpggroup. -----------+ ChangeLog | 4 ++++ NEWS | 3 +++ 2 files changed, 7 insertions(+) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.118.2.85 gnupg/ChangeLog:1.118.2.86 --- gnupg/ChangeLog:1.118.2.85 Wed Nov 17 05:51:49 2004 +++ gnupg/ChangeLog Thu Dec 23 04:03:10 2004 @@ -1,3 +1,7 @@ +2004-12-22 David Shaw + + * NEWS: Note pgpgroup-to-gpggroup. + 2004-11-16 David Shaw * acinclude.m4: aclocal 1.9 wants quoting on AC_DEFUN arguments. Index: gnupg/NEWS diff -u gnupg/NEWS:1.158.2.48 gnupg/NEWS:1.158.2.49 --- gnupg/NEWS:1.158.2.48 Wed Aug 25 18:11:06 2004 +++ gnupg/NEWS Thu Dec 23 04:03:10 2004 @@ -1,6 +1,9 @@ Noteworthy changes in version 1.2.7 ------------------------------------------------ + * New "pgpgroup-to-gpggroup" script (in the tools directory) to + convert from PGP 6 group syntax to GnuPG group syntax. + Noteworthy changes in version 1.2.6 (2004-08-25) ------------------------------------------------ From cvs at cvs.gnupg.org Thu Dec 23 17:07:04 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 23 17:07:07 2004 Subject: gnupg/m4 (ChangeLog libcurl.m4 readline.m4) Message-ID: Date: Thursday, December 23, 2004 @ 17:12:13 Author: dshaw Path: /cvs/gnupg/gnupg/m4 Modified: ChangeLog libcurl.m4 readline.m4 * readline.m4: Make sure that readline is modern enough to understand rl_catch_signals. * libcurl.m4: Don't require curl-config to be present since it seems some binary packages don't include it. Allow users to specify LIBCURL and LIBCURL_INCLUDES for us. -------------+ ChangeLog | 9 +++++++++ libcurl.m4 | 28 ++++++++++++++++++++-------- readline.m4 | 5 ++++- 3 files changed, 33 insertions(+), 9 deletions(-) Index: gnupg/m4/ChangeLog diff -u gnupg/m4/ChangeLog:1.6 gnupg/m4/ChangeLog:1.7 --- gnupg/m4/ChangeLog:1.6 Wed Dec 22 18:03:27 2004 +++ gnupg/m4/ChangeLog Thu Dec 23 17:12:13 2004 @@ -1,3 +1,12 @@ +2004-12-23 David Shaw + + * readline.m4: Make sure that readline is modern enough to + understand rl_catch_signals. + + * libcurl.m4: Don't require curl-config to be present since it + seems some binary packages don't include it. Allow users to + specify LIBCURL and LIBCURL_INCLUDES for us. + 2004-12-22 David Shaw * libcurl.m4: Be much more strict with libcurl by trying to Index: gnupg/m4/libcurl.m4 diff -u gnupg/m4/libcurl.m4:1.2 gnupg/m4/libcurl.m4:1.3 --- gnupg/m4/libcurl.m4:1.2 Wed Dec 22 18:03:27 2004 +++ gnupg/m4/libcurl.m4 Thu Dec 23 17:12:13 2004 @@ -24,19 +24,28 @@ LDFLAGS="${LDFLAGS} -L$withval/lib" fi - AC_MSG_CHECKING([for libcurl]) + AC_MSG_CHECKING([for curl-config]) if eval curl-config --version 2>/dev/null >/dev/null; then - AC_SUBST([LIBCURL_INCLUDES],[`curl-config --cflags`]) - AC_SUBST([LIBCURL],[`curl-config --libs`]) - have_libcurl=yes + if test x"$LIBCURL_INCLUDES" = "x" ; then + LIBCURL_INCLUDES=`curl-config --cflags` + fi + if test x"$LIBCURL" = "x" ; then + LIBCURL=`curl-config --libs` + fi + _have_config=yes else - have_libcurl=no + _have_config=no fi - AC_MSG_RESULT([$have_libcurl]) + AC_MSG_RESULT([$_have_config]) + + # we didn't find curl-config, so let's see if the user-supplied + # link line (or failing that, "-lcurl") is enough. + + LIBCURL=${LIBCURL-"-lcurl"} - AC_MSG_CHECKING([whether libcurl is modern enough]) + AC_MSG_CHECKING([whether libcurl is usable]) _libcurl_save_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $LIBCURL_INCLUDES" @@ -53,7 +62,7 @@ x=CURLOPT_ERRORBUFFER; x=CURLOPT_STDERR; x=CURLOPT_VERBOSE; -]),,have_libcurl=no) +]),have_libcurl=yes,have_libcurl=no) CPPFLAGS=$_libcurl_save_cppflags LDFLAGS=$_libcurl_save_ldflags @@ -63,9 +72,12 @@ if test $have_libcurl = yes ; then AC_DEFINE(HAVE_LIBCURL,1, [Define to 1 if you have a fully functional curl library.]) + AC_SUBST(LIBCURL_INCLUDES) + AC_SUBST(LIBCURL) fi unset _do_libcurl + unset _have_config unset _libcurl_save_cppflags unset _libcurl_save_ldflags fi Index: gnupg/m4/readline.m4 diff -u gnupg/m4/readline.m4:1.1 gnupg/m4/readline.m4:1.2 --- gnupg/m4/readline.m4:1.1 Sat Dec 18 23:23:49 2004 +++ gnupg/m4/readline.m4 Thu Dec 23 17:12:13 2004 @@ -34,7 +34,10 @@ #include #include #include -],[add_history("foobar");]),_found_readline=yes,_found_readline=no) +],[ +add_history("foobar"); +rl_catch_signals=0; +]),_found_readline=yes,_found_readline=no) AC_MSG_RESULT([$_found_readline]) From cvs at cvs.gnupg.org Thu Dec 23 17:28:57 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 23 17:29:00 2004 Subject: gnupg/m4 (ChangeLog libcurl.m4) Message-ID: Date: Thursday, December 23, 2004 @ 17:34:08 Author: dshaw Path: /cvs/gnupg/gnupg/m4 Modified: ChangeLog libcurl.m4 * libcurl.m4: OSX has a problem with their curl-config script. ------------+ ChangeLog | 2 ++ libcurl.m4 | 9 +++++++++ 2 files changed, 11 insertions(+) Index: gnupg/m4/ChangeLog diff -u gnupg/m4/ChangeLog:1.7 gnupg/m4/ChangeLog:1.8 --- gnupg/m4/ChangeLog:1.7 Thu Dec 23 17:12:13 2004 +++ gnupg/m4/ChangeLog Thu Dec 23 17:34:08 2004 @@ -1,5 +1,7 @@ 2004-12-23 David Shaw + * libcurl.m4: OSX has a problem with their curl-config script. + * readline.m4: Make sure that readline is modern enough to understand rl_catch_signals. Index: gnupg/m4/libcurl.m4 diff -u gnupg/m4/libcurl.m4:1.3 gnupg/m4/libcurl.m4:1.4 --- gnupg/m4/libcurl.m4:1.3 Thu Dec 23 17:12:13 2004 +++ gnupg/m4/libcurl.m4 Thu Dec 23 17:34:08 2004 @@ -32,6 +32,15 @@ fi if test x"$LIBCURL" = "x" ; then LIBCURL=`curl-config --libs` + + # This is so silly, but Apple actually has a bug in their + # curl-config script! + + case "${host}" in + powerpc-apple-darwin*) + LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` + ;; + esac fi _have_config=yes else From cvs at cvs.gnupg.org Fri Dec 24 20:35:53 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Fri Dec 24 20:35:58 2004 Subject: gnupg/m4 (ChangeLog Makefile.am libcurl.m4) Message-ID: Date: Friday, December 24, 2004 @ 20:41:07 Author: dshaw Path: /cvs/gnupg/gnupg/m4 Modified: ChangeLog Makefile.am libcurl.m4 * libcurl.m4: Rewrite this to use the new --protocols flag I gave to the libcurl people. * Makefile.am: Add readline.m4 and libcurl.m4. -------------+ ChangeLog | 7 + Makefile.am | 2 libcurl.m4 | 234 +++++++++++++++++++++++++++++++++++++++++----------------- 3 files changed, 177 insertions(+), 66 deletions(-) Index: gnupg/m4/ChangeLog diff -u gnupg/m4/ChangeLog:1.8 gnupg/m4/ChangeLog:1.9 --- gnupg/m4/ChangeLog:1.8 Thu Dec 23 17:34:08 2004 +++ gnupg/m4/ChangeLog Fri Dec 24 20:41:06 2004 @@ -1,3 +1,10 @@ +2004-12-24 David Shaw + + * libcurl.m4: Rewrite this to use the new --protocols flag I gave + to the libcurl people. + + * Makefile.am: Add readline.m4 and libcurl.m4. + 2004-12-23 David Shaw * libcurl.m4: OSX has a problem with their curl-config script. Index: gnupg/m4/Makefile.am diff -u gnupg/m4/Makefile.am:1.3 gnupg/m4/Makefile.am:1.4 --- gnupg/m4/Makefile.am:1.3 Tue Jul 27 17:11:53 2004 +++ gnupg/m4/Makefile.am Fri Dec 24 20:41:06 2004 @@ -1 +1 @@ -EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 +EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 readline.m4 libcurl.m4 Index: gnupg/m4/libcurl.m4 diff -u gnupg/m4/libcurl.m4:1.4 gnupg/m4/libcurl.m4:1.5 --- gnupg/m4/libcurl.m4:1.4 Thu Dec 23 17:34:08 2004 +++ gnupg/m4/libcurl.m4 Fri Dec 24 20:41:06 2004 @@ -1,93 +1,197 @@ -dnl Check for libcurl and dependencies -dnl Copyright (C) 2004 Free Software Foundation, Inc. -dnl -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl Defines HAVE_LIBCURL to 1 if a working curl setup is found, and sets -dnl @LIBCURL@ and @LIBCURL_INCLUDES@ to the necessary values. -dnl $have_libcurl is set to yes or no so other things in configure can -dnl make use of it. +# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], +# [ACTION-IF-YES], [ACTION-IF-NO]) +# ---------------------------------------------------------- +# David Shaw Dec-24-2004 +# +# Checks for libcurl. DEFAULT-ACTION is yes or no whether to default +# to --with-libcurl or --without-libcurl. If not supplied, +# DEFAULT-ACTION is yes. MINIMUM-VERSION is the minimum version of +# libcurl to accept. If not supplied, any version is accepted. +# ACTION-IF-YES is a list of shell commands to run if libcurl was +# successfully found and passed the various tests. ACTION-IF-NO is a +# list of shell commands that are run otherwise. Note that using +# --without-libcurl does run ACTION-IF-NO. +# +# This macro defines HAVE_LIBCURL if a working libcurl setup is found, +# and sets @LIBCURL@ and @LIBCURL_INCLUDES@ to the necessary values. +# Other useful defines are LIBCURL_FEATURE_xxx where xxx are the +# various features supported by libcurl, and LIBCURL_PROTOCOL_yyy +# where yyy are the various protocols supported by libcurl. Both xxx +# and yyy are capitalized. See the list of AH_TEMPLATEs at the top of +# the macro for the complete list of possible defines. Shell +# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also +# defined to 'yes' for those features and protocols that were found. +# Note that xxx and yyy keep the same capitalization as in the +# curl-config list (i.e. it's "HTTP" and not "http"). -AC_DEFUN([GNUPG_CHECK_LIBCURL], +AC_DEFUN([LIBCURL_CHECK_CONFIG], [ + AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL]) + AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4]) + AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6]) + AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz]) + AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS]) + + AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP]) + AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) + AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP]) + AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS]) + AH_TEMPLATE([LIBCURL_PROTOCOL_GOPHER],[Defined if libcurl supports GOPHER]) + AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE]) + AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) + AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) + AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT]) + AC_ARG_WITH(libcurl, AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]), - [_do_libcurl=$withval],[_do_libcurl=no]) + [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) - if test "$_do_libcurl" != "no" ; then - if test -d "$withval" ; then - CPPFLAGS="${CPPFLAGS} -I$withval/include" - LDFLAGS="${LDFLAGS} -L$withval/lib" - fi + if test "$_libcurl_with" != "no" ; then - AC_MSG_CHECKING([for curl-config]) + AC_PROG_AWK - if eval curl-config --version 2>/dev/null >/dev/null; then - if test x"$LIBCURL_INCLUDES" = "x" ; then - LIBCURL_INCLUDES=`curl-config --cflags` - fi - if test x"$LIBCURL" = "x" ; then - LIBCURL=`curl-config --libs` + _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'" - # This is so silly, but Apple actually has a bug in their - # curl-config script! + _libcurl_try_link=yes - case "${host}" in - powerpc-apple-darwin*) - LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` - ;; - esac - fi - _have_config=yes - else - _have_config=no + if test -d "$_libcurl_with" ; then + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" fi - AC_MSG_RESULT([$_have_config]) + AC_PATH_PROG([_libcurl_config],[curl-config]) - # we didn't find curl-config, so let's see if the user-supplied - # link line (or failing that, "-lcurl") is enough. + if test x$_libcurl_config != "x" ; then + AC_CACHE_CHECK([for the version of libcurl], + [libcurl_cv_lib_curl_version], + [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`]) + + _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse` + _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse` + + if test $_libcurl_wanted -gt 0 ; then + AC_CACHE_CHECK([for libcurl >= version $2], + [libcurl_cv_lib_version_ok], + [ + if test $_libcurl_version -ge $_libcurl_wanted ; then + libcurl_cv_lib_version_ok=yes + else + libcurl_cv_lib_version_ok=no + fi + ]) + fi - LIBCURL=${LIBCURL-"-lcurl"} + if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then + if test x"$LIBCURL_INCLUDES" = "x" ; then + LIBCURL_INCLUDES=`$_libcurl_config --cflags` + fi + if test x"$LIBCURL" = "x" ; then + LIBCURL=`$_libcurl_config --libs` + + # This is so silly, but Apple actually has a bug in their + # curl-config script! + case "${host}" in + powerpc-apple-darwin*) + LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'` + ;; + esac + fi + + # Is it modern enough to have --feature? + if test $_libcurl_version -ge 0 ; then + _libcurl_features=`$_libcurl_config --feature` + fi + + # Is it modern enough to have --protocols? (7.12.4) + if test $_libcurl_version -ge 461828 ; then + _libcurl_protocols=`$_libcurl_config --protocols` + fi + else + _libcurl_try_link=no + fi - AC_MSG_CHECKING([whether libcurl is usable]) + unset _libcurl_wanted + unset _libcurl_version + fi - _libcurl_save_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $LIBCURL_INCLUDES" - _libcurl_save_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS $LIBCURL" + if test $_libcurl_try_link = yes ; then - AC_LINK_IFELSE(AC_LANG_PROGRAM([#include ],[ + # we didn't find curl-config, so let's see if the user-supplied + # link line (or failing that, "-lcurl") is enough. + LIBCURL=${LIBCURL-"-lcurl"} + + AC_CACHE_CHECK([whether libcurl is usable], + [libcurl_cv_lib_curl_usable], + [ + _libcurl_save_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LIBCURL_INCLUDES" + _libcurl_save_ldflags=$LDFLAGS + LDFLAGS="$LDFLAGS $LIBCURL" + + AC_LINK_IFELSE(AC_LANG_PROGRAM([#include ],[ +/* Try and use a few common options to force a failure if we are + missing symbols or can't link. */ int x; -x=CURL_ERROR_SIZE; curl_easy_setopt(NULL,CURLOPT_URL,NULL); +x=CURL_ERROR_SIZE; x=CURLOPT_WRITEFUNCTION; x=CURLOPT_FILE; -/* x=CURLOPT_WRITEDATA; */ x=CURLOPT_ERRORBUFFER; x=CURLOPT_STDERR; x=CURLOPT_VERBOSE; -]),have_libcurl=yes,have_libcurl=no) - - CPPFLAGS=$_libcurl_save_cppflags - LDFLAGS=$_libcurl_save_ldflags - - AC_MSG_RESULT([$have_libcurl]) +]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) - if test $have_libcurl = yes ; then - AC_DEFINE(HAVE_LIBCURL,1, - [Define to 1 if you have a fully functional curl library.]) - AC_SUBST(LIBCURL_INCLUDES) - AC_SUBST(LIBCURL) + CPPFLAGS=$_libcurl_save_cppflags + LDFLAGS=$_libcurl_save_ldflags + unset _libcurl_save_cppflags + unset _libcurl_save_ldflags + ]) + + if test $libcurl_cv_lib_curl_usable = yes ; then + AC_DEFINE(HAVE_LIBCURL,1, + [Define to 1 if you have a functional curl library.]) + AC_SUBST(LIBCURL_INCLUDES) + AC_SUBST(LIBCURL) + + for _libcurl_feature in $_libcurl_features ; do + AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1]) + eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes + done + + if test "x$_libcurl_protocols" = "x" ; then + # We don't have --protocols, so just assume that all protocols + # are available + + _libcurl_protocols="HTTP FTP GOPHER FILE TELNET LDAP DICT" + + if test x$libcurl_feature_SSL = xyes ; then + _libcurl_protocols="$_libcurl_protocols HTTPS FTPS" + fi + fi + + for _libcurl_protocol in $_libcurl_protocols ; do + AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1]) + eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes + done + fi fi - unset _do_libcurl - unset _have_config - unset _libcurl_save_cppflags - unset _libcurl_save_ldflags + unset _libcurl_try_link + unset _libcurl_version_parse + unset _libcurl_config + unset _libcurl_feature + unset _libcurl_features + unset _libcurl_protocol + unset _libcurl_protocols + fi + + if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then + # This is the IF-NO path + ifelse([$4],,:,[$4]) + else + # This is the IF-YES path + ifelse([$3],,:,[$3]) fi + + unset _libcurl_with ])dnl From cvs at cvs.gnupg.org Fri Dec 24 20:37:59 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Fri Dec 24 20:38:02 2004 Subject: gnupg (ChangeLog configure.ac) Message-ID: Date: Friday, December 24, 2004 @ 20:43:16 Author: dshaw Path: /cvs/gnupg/gnupg Modified: ChangeLog configure.ac * configure.ac: Use new LIBCURL_CHECK_CONFIG macro for all libcurl stuff. This simplifies, and we don't need the automake conditional stuff any longer. --------------+ ChangeLog | 6 ++++++ configure.ac | 33 ++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.229 gnupg/ChangeLog:1.230 --- gnupg/ChangeLog:1.229 Wed Dec 22 18:07:39 2004 +++ gnupg/ChangeLog Fri Dec 24 20:43:16 2004 @@ -1,3 +1,9 @@ +2004-12-24 David Shaw + + * configure.ac: Use new LIBCURL_CHECK_CONFIG macro for + all libcurl stuff. This simplifies, and we don't need the + automake conditional stuff any longer. + 2004-12-22 David Shaw * configure.ac: --enable-ftp is on by default, --with-libcurl is Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.121 gnupg/configure.ac:1.122 --- gnupg/configure.ac:1.121 Wed Dec 22 18:07:39 2004 +++ gnupg/configure.ac Fri Dec 24 20:43:16 2004 @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.121 $)dnl +dnlAC_REVISION($Revision: 1.122 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" @@ -524,19 +524,10 @@ AC_SUBST(GPGKEYS_HKP,"gpgkeys_hkp$EXEEXT") fi -if test x"$try_http" = xyes ; then - AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT") - AC_DEFINE(HTTP_SUPPORT,1,[Define to include HTTP support]) -fi - if test x"$try_finger" = xyes ; then AC_SUBST(GPGKEYS_FINGER,"gpgkeys_finger$EXEEXT") fi -if test x"$try_ftp" = xyes ; then - AC_DEFINE(FTP_SUPPORT,1,[Define to include FTP support]) -fi - dnl Must check for network library requirements before doing link tests dnl for ldap, for example. If ldap libs are static (or dynamic and without dnl ELF runtime link paths), then link will fail and LDAP support won't @@ -653,16 +644,28 @@ AC_SUBST(LDAPLIBS) AM_CONDITIONAL(GPGKEYS_LDAP, test "$GPGKEYS_LDAP" != "") -dnl If we have neither FTP or HTTP defined, then don't bother to check -dnl for curl. +# If we have neither FTP or HTTP defined, then don't bother to check +# for curl. if test "$try_ftp" = yes || test "$try_http" = yes ; then - GNUPG_CHECK_LIBCURL + LIBCURL_CHECK_CONFIG([no],,[have_libcurl=yes]) +fi + +# Are we doing HTTP? + +if test x"$try_http" = xyes ; then + if test x$libcurl_protocol_HTTP = xyes ; then + AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT") + AC_DEFINE(HTTP_VIA_LIBCURL,1,[Define if HTTP is handled via libcurl]) + else + AC_SUBST(GPGKEYS_HTTP,"gpgkeys_http$EXEEXT") + fi fi -AM_CONDITIONAL(HAVE_LIBCURL, test "$have_libcurl" = "yes") +# Are we doing FTP? We only do FTP if we have libcurl. -if test x"$have_libcurl" = xyes ; then +if test x"$try_ftp" = xyes && test x$libcurl_protocol_FTP = xyes ; then + AC_DEFINE(FTP_VIA_LIBCURL,1,[Define if FTP is handled via libcurl]) AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT") fi From cvs at cvs.gnupg.org Fri Dec 24 20:43:18 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Fri Dec 24 20:43:23 2004 Subject: gnupg/keyserver (ChangeLog Makefile.am gpgkeys_curl.c) Message-ID: Date: Friday, December 24, 2004 @ 20:48:36 Author: dshaw Path: /cvs/gnupg/gnupg/keyserver Modified: ChangeLog Makefile.am gpgkeys_curl.c * gpgkeys_curl.c (main): Use new defines for opting out of certain transfer protocols. Allow setting HTTP proxy via "http-proxy=foo" option (there is natural support in libcurl for the http_proxy environment variable). * Makefile.am: Remove the conditional since this is all handled in autoconf now. ----------------+ ChangeLog | 10 ++++++++++ Makefile.am | 8 +------- gpgkeys_curl.c | 40 +++++++++++++++++++++++++++------------- 3 files changed, 38 insertions(+), 20 deletions(-) Index: gnupg/keyserver/ChangeLog diff -u gnupg/keyserver/ChangeLog:1.98 gnupg/keyserver/ChangeLog:1.99 --- gnupg/keyserver/ChangeLog:1.98 Wed Dec 22 20:19:10 2004 +++ gnupg/keyserver/ChangeLog Fri Dec 24 20:48:36 2004 @@ -1,3 +1,13 @@ +2004-12-24 David Shaw + + * gpgkeys_curl.c (main): Use new defines for opting out of certain + transfer protocols. Allow setting HTTP proxy via "http-proxy=foo" + option (there is natural support in libcurl for the http_proxy + environment variable). + + * Makefile.am: Remove the conditional since this is all handled in + autoconf now. + 2004-12-22 David Shaw * gpgkeys_curl.c (main): New "follow-redirects" option. Takes an Index: gnupg/keyserver/Makefile.am diff -u gnupg/keyserver/Makefile.am:1.23 gnupg/keyserver/Makefile.am:1.24 --- gnupg/keyserver/Makefile.am:1.23 Wed Dec 22 18:12:23 2004 +++ gnupg/keyserver/Makefile.am Fri Dec 24 20:48:36 2004 @@ -23,16 +23,10 @@ EXTRA_SCRIPTS = gpgkeys_mailto libexecdir = @libexecdir@/@PACKAGE@ -libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ +libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_FINGER@ @GPGKEYS_HTTP@ @GPGKEYS_CURL@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test -if HAVE_LIBCURL -libexec_PROGRAMS += @GPGKEYS_CURL@ -else -libexec_PROGRAMS += @GPGKEYS_HTTP@ -endif - gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h Index: gnupg/keyserver/gpgkeys_curl.c diff -u gnupg/keyserver/gpgkeys_curl.c:1.3 gnupg/keyserver/gpgkeys_curl.c:1.4 --- gnupg/keyserver/gpgkeys_curl.c:1.3 Wed Dec 22 20:19:10 2004 +++ gnupg/keyserver/gpgkeys_curl.c Fri Dec 24 20:48:36 2004 @@ -34,20 +34,22 @@ extern char *optarg; extern int optind; -#define GET 0 -#define MAX_SCHEME 20 -#define MAX_LINE 80 -#define MAX_PATH 1023 -#define MAX_AUTH 127 -#define MAX_HOST 79 -#define MAX_PORT 9 -#define MAX_URL (MAX_SCHEME+3+MAX_AUTH+1+1+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50) +#define GET 0 +#define MAX_LINE 80 + +#define MAX_SCHEME 20 +#define MAX_AUTH 128 +#define MAX_HOST 80 +#define MAX_PORT 10 +#define MAX_PATH 1024 +#define MAX_PROXY 128 +#define MAX_URL (MAX_SCHEME+1+3+MAX_AUTH+1+1+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50) #define STRINGIFY(x) #x #define MKSTRING(x) STRINGIFY(x) static int verbose=0; -static char scheme[MAX_SCHEME+1],auth[MAX_AUTH+1],host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'}; +static char scheme[MAX_SCHEME+1],auth[MAX_AUTH+1],host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'},proxy[MAX_PROXY+1]={'\0'}; static FILE *input=NULL,*output=NULL,*console=NULL; static CURL *curl; static char request[MAX_URL]={'\0'}; @@ -266,6 +268,16 @@ else verbose++; } + else if(strncasecmp(start,"http-proxy",10)==0) + { + if(no) + proxy[0]='\0'; + else if(start[10]=='=') + { + strncpy(proxy,&start[11],MAX_PROXY); + proxy[MAX_PROXY]='\0'; + } + } else if(strncasecmp(start,"timeout",7)==0) { if(no) @@ -294,20 +306,20 @@ fprintf(console,"gpgkeys: no scheme supplied!\n"); return KEYSERVER_SCHEME_NOT_FOUND; } -#ifndef HTTP_SUPPORT +#ifndef HTTP_VIA_LIBCURL else if(strcasecmp(scheme,"http")==0) { fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme); return KEYSERVER_SCHEME_NOT_FOUND; } -#endif /* HTTP_SUPPORT */ -#ifndef FTP_SUPPORT +#endif /* HTTP_VIA_LIBCURL */ +#ifndef FTP_VIA_LIBCURL else if(strcasecmp(scheme,"ftp")==0) { fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme); return KEYSERVER_SCHEME_NOT_FOUND; } -#endif /* FTP_SUPPORT */ +#endif /* FTP_VIA_LIBCURL */ if(timeout && register_timeout()==-1) { @@ -331,6 +343,8 @@ curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects); } + if(proxy[0]) + curl_easy_setopt(curl,CURLOPT_PROXY,proxy); /* If it's a GET or a SEARCH, the next thing to come in is the keyids. If it's a SEND, then there are no keyids. */ From cvs at cvs.gnupg.org Fri Dec 24 20:45:45 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Fri Dec 24 20:45:47 2004 Subject: gnupg/g10 (ChangeLog keyserver.c) Message-ID: Date: Friday, December 24, 2004 @ 20:51:02 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog keyserver.c * keyserver.c (keyserver_typemap): Only map HTTP and FTP if libcurl has specifically been selected to handle them. -------------+ ChangeLog | 5 +++++ keyserver.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.671 gnupg/g10/ChangeLog:1.672 --- gnupg/g10/ChangeLog:1.671 Wed Dec 22 19:09:41 2004 +++ gnupg/g10/ChangeLog Fri Dec 24 20:51:02 2004 @@ -1,3 +1,8 @@ +2004-12-24 David Shaw + + * keyserver.c (keyserver_typemap): Only map HTTP and FTP if + libcurl has specifically been selected to handle them. + 2004-12-22 David Shaw * options.h, keyserver.c (parse_keyserver_uri): Properly parse Index: gnupg/g10/keyserver.c diff -u gnupg/g10/keyserver.c:1.75 gnupg/g10/keyserver.c:1.76 --- gnupg/g10/keyserver.c:1.75 Wed Dec 22 19:09:41 2004 +++ gnupg/g10/keyserver.c Fri Dec 24 20:51:02 2004 @@ -784,12 +784,14 @@ { if(strcmp(type,"ldaps")==0) return "ldap"; -#ifdef HAVE_LIBCURL +#ifdef FTP_VIA_LIBCURL else if(strcmp(type,"ftp")==0) return "curl"; +#endif +#ifdef HTTP_VIA_LIBCURL else if(strcmp(type,"http")==0) return "curl"; -#endif /* HAVE_LIBCURL */ +#endif else return type; } From cvs at cvs.gnupg.org Mon Dec 27 18:41:47 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 27 18:41:53 2004 Subject: STABLE-BRANCH-1-2 gnupg/scripts (autogen.sh) Message-ID: Date: Monday, December 27, 2004 @ 18:47:22 Author: wk Path: /cvs/gnupg/gnupg/scripts Tag: STABLE-BRANCH-1-2 Modified: autogen.sh Updated the build script for Windows ------------+ autogen.sh | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) Index: gnupg/scripts/autogen.sh diff -u gnupg/scripts/autogen.sh:1.14.2.5 gnupg/scripts/autogen.sh:1.14.2.6 --- gnupg/scripts/autogen.sh:1.14.2.5 Mon Aug 9 21:45:36 2004 +++ gnupg/scripts/autogen.sh Mon Dec 27 18:47:22 2004 @@ -23,32 +23,42 @@ tmp=`dirname $0` tsdir=`cd "$tmp"; cd ..; pwd` shift - host=i386--mingw32 if [ ! -f $tsdir/scripts/config.guess ]; then echo "$tsdir/scripts/config.guess not found" >&2 exit 1 fi build=`$tsdir/scripts/config.guess` - - if ! mingw32 --version >/dev/null; then - echo "We need at least version 0.3 of MingW32/CPD" >&2 - exit 1 - fi + # See whether we have the Debian cross compiler package or the + # old mingw32/cpd system + if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then + host=i586-mingw32msvc + crossbindir=/usr/$host/bin + conf_CC="CC=${host}-gcc" + else + host=i386--mingw32 + if ! mingw32 --version >/dev/null; then + echo "We need at least version 0.3 of MingW32/CPD" >&2 + exit 1 + fi + crossbindir=`mingw32 --install-dir`/bin + # Old autoconf version required us to setup the environment + # with the proper tool names. + CC=`mingw32 --get-path gcc` + CPP=`mingw32 --get-path cpp` + AR=`mingw32 --get-path ar` + RANLIB=`mingw32 --get-path ranlib` + export CC CPP AR RANLIB + conf_CC="" + fi + if [ -f "$tsdir/config.log" ]; then - if ! head $tsdir/config.log | grep i386--mingw32 >/dev/null; then + if ! head $tsdir/config.log | grep "$host" >/dev/null; then echo "Pease run a 'make distclean' first" >&2 exit 1 fi fi - crossbindir=`mingw32 --install-dir`/bin - CC=`mingw32 --get-path gcc` - CPP=`mingw32 --get-path cpp` - AR=`mingw32 --get-path ar` - RANLIB=`mingw32 --get-path ranlib` - export CC CPP AR RANLIB - disable_foo_tests="" if [ -n "$lib_config_files" ]; then for i in $lib_config_files; do @@ -65,8 +75,8 @@ fi [ $DIE = yes ] && exit 1 - $tsdir/configure --build=${build} --host=${host} \ - ${disable_foo_tests} $* + $tsdir/configure ${conf_CC} --build=${build} --host=${host} \ + ${disable_foo_tests} $* # Ugly hack to overcome a gettext problem. Someone should look into # gettext to figure out why the po directory is not ignored as it used @@ -75,6 +85,7 @@ exit $? fi + # This is the special case to build on a ColdFire platform under # the uClinux kernel. Tested on a MCF4249C3 board. if test "$1" = "--build-coldfire"; then From cvs at cvs.gnupg.org Mon Dec 27 19:08:32 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Mon Dec 27 19:08:37 2004 Subject: STABLE-BRANCH-1-2 gnupg (NEWS configure.ac) Message-ID: Date: Monday, December 27, 2004 @ 19:14:07 Author: wk Path: /cvs/gnupg/gnupg Tag: STABLE-BRANCH-1-2 Modified: NEWS configure.ac post release updates --------------+ NEWS | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) Index: gnupg/NEWS diff -u gnupg/NEWS:1.158.2.50 gnupg/NEWS:1.158.2.51 --- gnupg/NEWS:1.158.2.50 Mon Dec 27 18:27:11 2004 +++ gnupg/NEWS Mon Dec 27 19:14:07 2004 @@ -1,3 +1,7 @@ +Noteworthy changes in version 1.2.? +------------------------------------------------ + + Noteworthy changes in version 1.2.7 (2004-12-27) ------------------------------------------------ Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.25.2.63 gnupg/configure.ac:1.25.2.64 --- gnupg/configure.ac:1.25.2.63 Mon Dec 27 18:27:11 2004 +++ gnupg/configure.ac Mon Dec 27 19:14:07 2004 @@ -19,14 +19,14 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.25.2.63 $)dnl +dnlAC_REVISION($Revision: 1.25.2.64 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.2.7, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.2.8-cvs, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. From cvs at cvs.gnupg.org Tue Dec 28 08:07:47 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 28 08:07:50 2004 Subject: GNUPG-1-9-BRANCH gnupg/scd (ChangeLog ccid-driver.c) Message-ID: Date: Tuesday, December 28, 2004 @ 08:13:24 Author: wk Path: /cvs/gnupg/gnupg/scd Tag: GNUPG-1-9-BRANCH Modified: ChangeLog ccid-driver.c (find_endpoint): New. (scan_or_find_devices): Add new args to return endpoint info and interface number. (ccid_open_reader, ccid_shutdown_reader): Take care of these new args. (bulk_in, bulk_out): Use the correct endpoints. (ccid_transceive_apdu_level): New. (ccid_transceive): Divert to above. (parse_ccid_descriptor): Allow APDU level exchange mode. ---------------+ ChangeLog | 12 +++ ccid-driver.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 172 insertions(+), 22 deletions(-) Index: gnupg/scd/ChangeLog diff -u gnupg/scd/ChangeLog:1.25.2.63 gnupg/scd/ChangeLog:1.25.2.64 --- gnupg/scd/ChangeLog:1.25.2.63 Tue Dec 21 11:02:59 2004 +++ gnupg/scd/ChangeLog Tue Dec 28 08:13:24 2004 @@ -1,3 +1,15 @@ +2004-12-28 Werner Koch + + * ccid-driver.c (find_endpoint): New. + (scan_or_find_devices): Add new args to return endpoint info and + interface number. + (ccid_open_reader, ccid_shutdown_reader): Take care of these new + args. + (bulk_in, bulk_out): Use the correct endpoints. + (ccid_transceive_apdu_level): New. + (ccid_transceive): Divert to above. + (parse_ccid_descriptor): Allow APDU level exchange mode. + 2004-12-21 Werner Koch * scdaemon.c (main): Use default_homedir(). Index: gnupg/scd/ccid-driver.c diff -u gnupg/scd/ccid-driver.c:1.1.2.21 gnupg/scd/ccid-driver.c:1.1.2.22 --- gnupg/scd/ccid-driver.c:1.1.2.21 Wed Oct 20 10:54:45 2004 +++ gnupg/scd/ccid-driver.c Tue Dec 28 08:13:24 2004 @@ -52,7 +52,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ccid-driver.c,v 1.1.2.21 2004/10/20 08:54:45 wk Exp $ + * $Id: ccid-driver.c,v 1.1.2.22 2004/12/28 07:13:24 wk Exp $ */ @@ -198,6 +198,9 @@ unsigned short id_vendor; unsigned short id_product; unsigned short bcd_device; + int ep_bulk_out; + int ep_bulk_in; + int ep_intr; int seqno; unsigned char t1_ns; unsigned char t1_nr; @@ -207,6 +210,7 @@ int ifsd; int powered_off; int has_pinpad; + int apdu_level; /* Reader supports short APDU level exchange. */ }; @@ -260,6 +264,7 @@ handle->max_ifsd = 32; handle->ifsd = 0; handle->has_pinpad = 0; + handle->apdu_level = 0; DEBUGOUT_3 ("idVendor: %04X idProduct: %04X bcdDevice: %04X\n", handle->id_vendor, handle->id_product, handle->bcd_device); if (buflen < 54 || buf[0] < 54) @@ -372,9 +377,15 @@ have_tpdu = 1; } else if ((us & 0x00020000)) - DEBUGOUT (" Short APDU level exchange\n"); + { + DEBUGOUT (" Short APDU level exchange\n"); + handle->apdu_level = 1; + } else if ((us & 0x00040000)) - DEBUGOUT (" Short and extended APDU level exchange\n"); + { + DEBUGOUT (" Short and extended APDU level exchange\n"); + handle->apdu_level = 1; + } else if ((us & 0x00070000)) DEBUGOUT (" WARNING: conflicting exchange levels\n"); @@ -421,10 +432,10 @@ DEBUGOUT_LF (); } - if (!have_t1 || !have_tpdu || !have_auto_conf) + if (!have_t1 || !(have_tpdu || handle->apdu_level) || !have_auto_conf) { DEBUGOUT ("this drivers requires that the reader supports T=1, " - "TPDU level exchange and auto configuration - " + "TPDU or APDU level exchange and auto configuration - " "this is not available\n"); return -1; } @@ -546,6 +557,36 @@ } +/* Helper to find the endpoint from an interface descriptor. */ +static int +find_endpoint (struct usb_interface_descriptor *ifcdesc, int mode) +{ + int no; + int want_bulk_in = 0; + + if (mode == 1) + want_bulk_in = 0x80; + for (no=0; no < ifcdesc->bNumEndpoints; no++) + { + struct usb_endpoint_descriptor *ep = ifcdesc->endpoint + no; + if (ep->bDescriptorType != USB_DT_ENDPOINT) + ; + else if (mode == 2 + && ((ep->bmAttributes & USB_ENDPOINT_TYPE_MASK) + == USB_ENDPOINT_TYPE_INTERRUPT) + && (ep->bEndpointAddress & 0x80)) + return (ep->bEndpointAddress & 0x0f); + else if (((ep->bmAttributes & USB_ENDPOINT_TYPE_MASK) + == USB_ENDPOINT_TYPE_BULK) + && (ep->bEndpointAddress & 0x80) == want_bulk_in) + return (ep->bEndpointAddress & 0x0f); + } + /* Should never happen. */ + return mode == 2? 0x83 : mode == 1? 0x82 :1; +} + + + /* Combination function to either scan all CCID devices or to find and open one specific device. @@ -579,7 +620,9 @@ char **r_rid, struct usb_device **r_dev, unsigned char **ifcdesc_extra, - size_t *ifcdesc_extra_len) + size_t *ifcdesc_extra_len, + int *interface_number, + int *ep_bulk_out, int *ep_bulk_in, int *ep_intr) { char *rid_list = NULL; int count = 0; @@ -597,6 +640,8 @@ *ifcdesc_extra = NULL; if (ifcdesc_extra_len) *ifcdesc_extra_len = 0; + if (interface_number) + *interface_number = 0; /* See whether we want scan or find mode. */ if (scan_mode) @@ -721,6 +766,16 @@ ifcdesc->extralen); *ifcdesc_extra_len = ifcdesc->extralen; } + if (interface_number) + *interface_number = (ifcdesc-> + bInterfaceNumber); + if (ep_bulk_out) + *ep_bulk_out = find_endpoint (ifcdesc, 0); + if (ep_bulk_in) + *ep_bulk_in = find_endpoint (ifcdesc, 1); + if (ep_intr) + *ep_intr = find_endpoint (ifcdesc, 2); + if (r_dev) *r_dev = dev; @@ -787,7 +842,8 @@ initialized_usb = 1; } - scan_or_find_devices (-1, NULL, &reader_list, NULL, NULL, NULL); + scan_or_find_devices (-1, NULL, &reader_list, NULL, NULL, NULL, NULL, + NULL, NULL, NULL); return reader_list; } @@ -804,6 +860,7 @@ unsigned char *ifcdesc_extra = NULL; size_t ifcdesc_extra_len; int readerno; + int ifc_no, ep_bulk_out, ep_bulk_in, ep_intr; *handle = NULL; @@ -832,7 +889,8 @@ readerno = 0; /* Default. */ idev = scan_or_find_devices (readerno, readerid, &rid, &dev, - &ifcdesc_extra, &ifcdesc_extra_len); + &ifcdesc_extra, &ifcdesc_extra_len, + &ifc_no, &ep_bulk_out, &ep_bulk_in, &ep_intr); if (!idev) { if (readerno == -1) @@ -856,6 +914,9 @@ (*handle)->id_vendor = dev->descriptor.idVendor; (*handle)->id_product = dev->descriptor.idProduct; (*handle)->bcd_device = dev->descriptor.bcdDevice; + (*handle)->ep_bulk_out = ep_bulk_out; + (*handle)->ep_bulk_in = ep_bulk_in; + (*handle)->ep_intr = ep_intr; DEBUGOUT_2 ("using CCID reader %d (ID=%s)\n", readerno, rid ); @@ -867,9 +928,7 @@ goto leave; } - /* fixme: Do we need to claim and set the interface as - determined above? */ - rc = usb_claim_interface (idev, 0); + rc = usb_claim_interface (idev, ifc_no); if (rc) { DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); @@ -877,9 +936,6 @@ goto leave; } - /* FIXME: Do we need to get the endpoint addresses from the - structure and store them with the handle? */ - leave: free (ifcdesc_extra); if (rc) @@ -944,6 +1000,7 @@ usb_dev_handle *idev = NULL; unsigned char *ifcdesc_extra = NULL; size_t ifcdesc_extra_len; + int ifc_no, ep_bulk_out, ep_bulk_in, ep_intr; if (!handle || !handle->rid) return CCID_DRIVER_ERR_INV_VALUE; @@ -951,7 +1008,8 @@ do_close_reader (handle); idev = scan_or_find_devices (-1, handle->rid, NULL, &dev, - &ifcdesc_extra, &ifcdesc_extra_len); + &ifcdesc_extra, &ifcdesc_extra_len, + &ifc_no, &ep_bulk_out, &ep_bulk_in, &ep_intr); if (!idev) { DEBUGOUT_1 ("no CCID reader with ID %s\n", handle->rid); @@ -960,6 +1018,9 @@ handle->idev = idev; + handle->ep_bulk_out = ep_bulk_out; + handle->ep_bulk_in = ep_bulk_in; + handle->ep_intr = ep_intr; if (parse_ccid_descriptor (handle, ifcdesc_extra, ifcdesc_extra_len)) { @@ -968,9 +1029,7 @@ goto leave; } - /* fixme: Do we need to claim and set the interface as - determined above? */ - rc = usb_claim_interface (idev, 0); + rc = usb_claim_interface (idev, ifc_no); if (rc) { DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); @@ -1022,7 +1081,7 @@ int rc; rc = usb_bulk_write (handle->idev, - 1, /*endpoint */ + handle->ep_bulk_out, msg, msglen, 1000 /* ms timeout */); if (rc == msglen) @@ -1053,7 +1112,7 @@ memset (buffer, 0, length); retry: rc = usb_bulk_read (handle->idev, - 0x82, + handle->ep_bulk_in, buffer, length, 10000 /* ms timeout */ ); /* Fixme: instead of using a 10 second timeout we should better @@ -1160,7 +1219,7 @@ int i, j; rc = usb_bulk_read (handle->idev, - 0x83, + handle->ep_intr, msg, sizeof msg, 0 /* ms timeout */ ); if (rc < 0 && errno == ETIMEDOUT) @@ -1402,6 +1461,78 @@ } +/* Helper for ccid_transceive used for APDU level exchanges. */ +static int +ccid_transceive_apdu_level (ccid_driver_t handle, + const unsigned char *apdu_buf, size_t apdu_buflen, + unsigned char *resp, size_t maxresplen, + size_t *nresp) +{ + int rc; + unsigned char send_buffer[10+259], recv_buffer[10+259]; + const unsigned char *apdu; + size_t apdulen; + unsigned char *msg; + size_t msglen; + unsigned char seqno; + int i; + + msg = send_buffer; + + apdu = apdu_buf; + apdulen = apdu_buflen; + assert (apdulen); + + if (apdulen > 254) + return CCID_DRIVER_ERR_INV_VALUE; /* Invalid length. */ + + msg[0] = PC_to_RDR_XfrBlock; + msg[5] = 0; /* slot */ + msg[6] = seqno = handle->seqno++; + msg[7] = 4; /* bBWI */ + msg[8] = 0; /* RFU */ + msg[9] = 0; /* RFU */ + memcpy (msg+10, apdu, apdulen); + set_msg_len (msg, apdulen); + msglen = 10 + apdulen; + + DEBUGOUT ("sending"); + for (i=0; i < msglen; i++) + DEBUGOUT_CONT_1 (" %02X", msg[i]); + DEBUGOUT_LF (); + + rc = bulk_out (handle, msg, msglen); + if (rc) + return rc; + + msg = recv_buffer; + rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen, + RDR_to_PC_DataBlock, seqno); + if (rc) + return rc; + + apdu = msg + 10; + apdulen = msglen - 10; + + if (resp) + { + if (apdulen > maxresplen) + { + DEBUGOUT_2 ("provided buffer too short for received data " + "(%u/%u)\n", + (unsigned int)apdulen, (unsigned int)maxresplen); + return CCID_DRIVER_ERR_INV_VALUE; + } + + memcpy (resp, apdu, apdulen); + *nresp = apdulen; + } + + return 0; +} + + + /* Protocol T=1 overview @@ -1478,6 +1609,13 @@ nresp = &dummy_nresp; *nresp = 0; + /* Smarter readers allow to send APDUs directly; divert here. */ + if (handle->apdu_level) + return ccid_transceive_apdu_level (handle, apdu_buf, apdu_buflen, + resp, maxresplen, nresp); + + /* The other readers we support require sending TPDUs. */ + tpdulen = 0; /* Avoid compiler warning about no initialization. */ msg = send_buffer; for (;;) @@ -1828,7 +1966,7 @@ if (tpdulen < 4) { - usb_clear_halt (handle->idev, 0x82); + usb_clear_halt (handle->idev, handle->ep_bulk_in); return CCID_DRIVER_ERR_ABORTED; } #ifdef DEBUG_T1 From cvs at cvs.gnupg.org Tue Dec 28 08:25:19 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 28 08:25:29 2004 Subject: gnupg/g10 (ChangeLog ccid-driver.c) Message-ID: Date: Tuesday, December 28, 2004 @ 08:30:57 Author: wk Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog ccid-driver.c (find_endpoint): New. (scan_or_find_devices): Add new args to return endpoint info and interface number. (ccid_open_reader, ccid_shutdown_reader): Take care of these new args. (bulk_in, bulk_out): Use the correct endpoints. (ccid_transceive_apdu_level): New. (ccid_transceive): Divert to above. (parse_ccid_descriptor): Allow APDU level exchange mode. (do_close_reader): Pass the interface number to usb_release_interface. ---------------+ ChangeLog | 13 +++ ccid-driver.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 191 insertions(+), 27 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.672 gnupg/g10/ChangeLog:1.673 --- gnupg/g10/ChangeLog:1.672 Fri Dec 24 20:51:02 2004 +++ gnupg/g10/ChangeLog Tue Dec 28 08:30:57 2004 @@ -1,3 +1,16 @@ +2004-12-28 Werner Koch + + * ccid-driver.c (find_endpoint): New. + (scan_or_find_devices): Add new args to return endpoint info and + interface number. + (ccid_open_reader, ccid_shutdown_reader): Take care of these new + args. + (bulk_in, bulk_out): Use the correct endpoints. + (ccid_transceive_apdu_level): New. + (ccid_transceive): Divert to above. + (parse_ccid_descriptor): Allow APDU level exchange mode. + (do_close_reader): Pass the interface number to usb_release_interface. + 2004-12-24 David Shaw * keyserver.c (keyserver_typemap): Only map HTTP and FTP if Index: gnupg/g10/ccid-driver.c diff -u gnupg/g10/ccid-driver.c:1.19 gnupg/g10/ccid-driver.c:1.20 --- gnupg/g10/ccid-driver.c:1.19 Wed Oct 20 11:39:56 2004 +++ gnupg/g10/ccid-driver.c Tue Dec 28 08:30:57 2004 @@ -52,7 +52,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: ccid-driver.c,v 1.19 2004/10/20 09:39:56 wk Exp $ + * $Id: ccid-driver.c,v 1.20 2004/12/28 07:30:57 wk Exp $ */ @@ -198,6 +198,10 @@ unsigned short id_vendor; unsigned short id_product; unsigned short bcd_device; + int ifc_no; + int ep_bulk_out; + int ep_bulk_in; + int ep_intr; int seqno; unsigned char t1_ns; unsigned char t1_nr; @@ -207,6 +211,7 @@ int ifsd; int powered_off; int has_pinpad; + int apdu_level; /* Reader supports short APDU level exchange. */ }; @@ -260,6 +265,7 @@ handle->max_ifsd = 32; handle->ifsd = 0; handle->has_pinpad = 0; + handle->apdu_level = 0; DEBUGOUT_3 ("idVendor: %04X idProduct: %04X bcdDevice: %04X\n", handle->id_vendor, handle->id_product, handle->bcd_device); if (buflen < 54 || buf[0] < 54) @@ -372,9 +378,15 @@ have_tpdu = 1; } else if ((us & 0x00020000)) - DEBUGOUT (" Short APDU level exchange\n"); + { + DEBUGOUT (" Short APDU level exchange\n"); + handle->apdu_level = 1; + } else if ((us & 0x00040000)) - DEBUGOUT (" Short and extended APDU level exchange\n"); + { + DEBUGOUT (" Short and extended APDU level exchange\n"); + handle->apdu_level = 1; + } else if ((us & 0x00070000)) DEBUGOUT (" WARNING: conflicting exchange levels\n"); @@ -421,10 +433,10 @@ DEBUGOUT_LF (); } - if (!have_t1 || !have_tpdu || !have_auto_conf) + if (!have_t1 || !(have_tpdu || handle->apdu_level) || !have_auto_conf) { DEBUGOUT ("this drivers requires that the reader supports T=1, " - "TPDU level exchange and auto configuration - " + "TPDU or APDU level exchange and auto configuration - " "this is not available\n"); return -1; } @@ -546,6 +558,36 @@ } +/* Helper to find the endpoint from an interface descriptor. */ +static int +find_endpoint (struct usb_interface_descriptor *ifcdesc, int mode) +{ + int no; + int want_bulk_in = 0; + + if (mode == 1) + want_bulk_in = 0x80; + for (no=0; no < ifcdesc->bNumEndpoints; no++) + { + struct usb_endpoint_descriptor *ep = ifcdesc->endpoint + no; + if (ep->bDescriptorType != USB_DT_ENDPOINT) + ; + else if (mode == 2 + && ((ep->bmAttributes & USB_ENDPOINT_TYPE_MASK) + == USB_ENDPOINT_TYPE_INTERRUPT) + && (ep->bEndpointAddress & 0x80)) + return (ep->bEndpointAddress & 0x0f); + else if (((ep->bmAttributes & USB_ENDPOINT_TYPE_MASK) + == USB_ENDPOINT_TYPE_BULK) + && (ep->bEndpointAddress & 0x80) == want_bulk_in) + return (ep->bEndpointAddress & 0x0f); + } + /* Should never happen. */ + return mode == 2? 0x83 : mode == 1? 0x82 :1; +} + + + /* Combination function to either scan all CCID devices or to find and open one specific device. @@ -579,7 +621,9 @@ char **r_rid, struct usb_device **r_dev, unsigned char **ifcdesc_extra, - size_t *ifcdesc_extra_len) + size_t *ifcdesc_extra_len, + int *interface_number, + int *ep_bulk_out, int *ep_bulk_in, int *ep_intr) { char *rid_list = NULL; int count = 0; @@ -597,6 +641,8 @@ *ifcdesc_extra = NULL; if (ifcdesc_extra_len) *ifcdesc_extra_len = 0; + if (interface_number) + *interface_number = 0; /* See whether we want scan or find mode. */ if (scan_mode) @@ -721,6 +767,16 @@ ifcdesc->extralen); *ifcdesc_extra_len = ifcdesc->extralen; } + if (interface_number) + *interface_number = (ifcdesc-> + bInterfaceNumber); + if (ep_bulk_out) + *ep_bulk_out = find_endpoint (ifcdesc, 0); + if (ep_bulk_in) + *ep_bulk_in = find_endpoint (ifcdesc, 1); + if (ep_intr) + *ep_intr = find_endpoint (ifcdesc, 2); + if (r_dev) *r_dev = dev; @@ -787,7 +843,8 @@ initialized_usb = 1; } - scan_or_find_devices (-1, NULL, &reader_list, NULL, NULL, NULL); + scan_or_find_devices (-1, NULL, &reader_list, NULL, NULL, NULL, NULL, + NULL, NULL, NULL); return reader_list; } @@ -804,6 +861,7 @@ unsigned char *ifcdesc_extra = NULL; size_t ifcdesc_extra_len; int readerno; + int ifc_no, ep_bulk_out, ep_bulk_in, ep_intr; *handle = NULL; @@ -832,7 +890,8 @@ readerno = 0; /* Default. */ idev = scan_or_find_devices (readerno, readerid, &rid, &dev, - &ifcdesc_extra, &ifcdesc_extra_len); + &ifcdesc_extra, &ifcdesc_extra_len, + &ifc_no, &ep_bulk_out, &ep_bulk_in, &ep_intr); if (!idev) { if (readerno == -1) @@ -856,6 +915,10 @@ (*handle)->id_vendor = dev->descriptor.idVendor; (*handle)->id_product = dev->descriptor.idProduct; (*handle)->bcd_device = dev->descriptor.bcdDevice; + (*handle)->ifc_no = ifc_no; + (*handle)->ep_bulk_out = ep_bulk_out; + (*handle)->ep_bulk_in = ep_bulk_in; + (*handle)->ep_intr = ep_intr; DEBUGOUT_2 ("using CCID reader %d (ID=%s)\n", readerno, rid ); @@ -867,9 +930,7 @@ goto leave; } - /* fixme: Do we need to claim and set the interface as - determined above? */ - rc = usb_claim_interface (idev, 0); + rc = usb_claim_interface (idev, ifc_no); if (rc) { DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); @@ -877,9 +938,6 @@ goto leave; } - /* FIXME: Do we need to get the endpoint addresses from the - structure and store them with the handle? */ - leave: free (ifcdesc_extra); if (rc) @@ -921,7 +979,7 @@ } if (handle->idev) { - usb_release_interface (handle->idev, 0); + usb_release_interface (handle->idev, handle->ifc_no); usb_close (handle->idev); handle->idev = NULL; } @@ -944,6 +1002,7 @@ usb_dev_handle *idev = NULL; unsigned char *ifcdesc_extra = NULL; size_t ifcdesc_extra_len; + int ifc_no, ep_bulk_out, ep_bulk_in, ep_intr; if (!handle || !handle->rid) return CCID_DRIVER_ERR_INV_VALUE; @@ -951,7 +1010,8 @@ do_close_reader (handle); idev = scan_or_find_devices (-1, handle->rid, NULL, &dev, - &ifcdesc_extra, &ifcdesc_extra_len); + &ifcdesc_extra, &ifcdesc_extra_len, + &ifc_no, &ep_bulk_out, &ep_bulk_in, &ep_intr); if (!idev) { DEBUGOUT_1 ("no CCID reader with ID %s\n", handle->rid); @@ -960,6 +1020,10 @@ handle->idev = idev; + handle->ifc_no = ifc_no; + handle->ep_bulk_out = ep_bulk_out; + handle->ep_bulk_in = ep_bulk_in; + handle->ep_intr = ep_intr; if (parse_ccid_descriptor (handle, ifcdesc_extra, ifcdesc_extra_len)) { @@ -968,9 +1032,7 @@ goto leave; } - /* fixme: Do we need to claim and set the interface as - determined above? */ - rc = usb_claim_interface (idev, 0); + rc = usb_claim_interface (idev, ifc_no); if (rc) { DEBUGOUT_1 ("usb_claim_interface failed: %d\n", rc); @@ -1022,7 +1084,7 @@ int rc; rc = usb_bulk_write (handle->idev, - 1, /*endpoint */ + handle->ep_bulk_out, msg, msglen, 1000 /* ms timeout */); if (rc == msglen) @@ -1053,7 +1115,7 @@ memset (buffer, 0, length); retry: rc = usb_bulk_read (handle->idev, - 0x82, + handle->ep_bulk_in, buffer, length, 10000 /* ms timeout */ ); /* Fixme: instead of using a 10 second timeout we should better @@ -1160,7 +1222,7 @@ int i, j; rc = usb_bulk_read (handle->idev, - 0x83, + handle->ep_intr, msg, sizeof msg, 0 /* ms timeout */ ); if (rc < 0 && errno == ETIMEDOUT) @@ -1402,6 +1464,78 @@ } +/* Helper for ccid_transceive used for APDU level exchanges. */ +static int +ccid_transceive_apdu_level (ccid_driver_t handle, + const unsigned char *apdu_buf, size_t apdu_buflen, + unsigned char *resp, size_t maxresplen, + size_t *nresp) +{ + int rc; + unsigned char send_buffer[10+259], recv_buffer[10+259]; + const unsigned char *apdu; + size_t apdulen; + unsigned char *msg; + size_t msglen; + unsigned char seqno; + int i; + + msg = send_buffer; + + apdu = apdu_buf; + apdulen = apdu_buflen; + assert (apdulen); + + if (apdulen > 254) + return CCID_DRIVER_ERR_INV_VALUE; /* Invalid length. */ + + msg[0] = PC_to_RDR_XfrBlock; + msg[5] = 0; /* slot */ + msg[6] = seqno = handle->seqno++; + msg[7] = 4; /* bBWI */ + msg[8] = 0; /* RFU */ + msg[9] = 0; /* RFU */ + memcpy (msg+10, apdu, apdulen); + set_msg_len (msg, apdulen); + msglen = 10 + apdulen; + + DEBUGOUT ("sending"); + for (i=0; i < msglen; i++) + DEBUGOUT_CONT_1 (" %02X", msg[i]); + DEBUGOUT_LF (); + + rc = bulk_out (handle, msg, msglen); + if (rc) + return rc; + + msg = recv_buffer; + rc = bulk_in (handle, msg, sizeof recv_buffer, &msglen, + RDR_to_PC_DataBlock, seqno); + if (rc) + return rc; + + apdu = msg + 10; + apdulen = msglen - 10; + + if (resp) + { + if (apdulen > maxresplen) + { + DEBUGOUT_2 ("provided buffer too short for received data " + "(%u/%u)\n", + (unsigned int)apdulen, (unsigned int)maxresplen); + return CCID_DRIVER_ERR_INV_VALUE; + } + + memcpy (resp, apdu, apdulen); + *nresp = apdulen; + } + + return 0; +} + + + /* Protocol T=1 overview @@ -1478,6 +1612,13 @@ nresp = &dummy_nresp; *nresp = 0; + /* Smarter readers allow to send APDUs directly; divert here. */ + if (handle->apdu_level) + return ccid_transceive_apdu_level (handle, apdu_buf, apdu_buflen, + resp, maxresplen, nresp); + + /* The other readers we support require sending TPDUs. */ + tpdulen = 0; /* Avoid compiler warning about no initialization. */ msg = send_buffer; for (;;) @@ -1828,7 +1969,7 @@ if (tpdulen < 4) { - usb_clear_halt (handle->idev, 0x82); + usb_clear_halt (handle->idev, handle->ep_bulk_in); return CCID_DRIVER_ERR_ABORTED; } #ifdef DEBUG_T1 @@ -1977,6 +2118,7 @@ int no_pinpad = 0; int verify_123456 = 0; int did_verify = 0; + int no_poll = 0; if (argc) { @@ -2001,6 +2143,11 @@ ccid_set_debug_level (1); argc--; argv++; } + else if ( !strcmp (*argv, "--no-poll")) + { + no_poll = 1; + argc--; argv++; + } else if ( !strcmp (*argv, "--no-pinpad")) { no_pinpad = 1; @@ -2019,7 +2166,8 @@ if (rc) return 1; - ccid_poll (ccid); + if (!no_poll) + ccid_poll (ccid); fputs ("getting ATR ...\n", stderr); rc = ccid_get_atr (ccid, NULL, 0, NULL); if (rc) @@ -2028,7 +2176,8 @@ return 1; } - ccid_poll (ccid); + if (!no_poll) + ccid_poll (ccid); fputs ("getting slot status ...\n", stderr); rc = ccid_slot_status (ccid, &slotstat); if (rc) @@ -2037,7 +2186,8 @@ return 1; } - ccid_poll (ccid); + if (!no_poll) + ccid_poll (ccid); fputs ("selecting application OpenPGP ....\n", stderr); { @@ -2050,7 +2200,8 @@ } - ccid_poll (ccid); + if (!no_poll) + ccid_poll (ccid); fputs ("getting OpenPGP DO 0x65 ....\n", stderr); { From cvs at cvs.gnupg.org Tue Dec 28 12:31:19 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 28 12:31:21 2004 Subject: gpgme-1-0-branch gpgme (ChangeLog Makefile.am) Message-ID: Date: Tuesday, December 28, 2004 @ 12:36:59 Author: wk Path: /cvs/gpgme/gpgme Tag: gpgme-1-0-branch Modified: ChangeLog Makefile.am * Makefile.am (AUTOMAKE_OPTIONS): Build bzip 2 version (ACLOCAL_AMFLAGS): Add -I m4 -------------+ ChangeLog | 2 ++ Makefile.am | 3 +++ 2 files changed, 5 insertions(+) Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.108.2.3 gpgme/ChangeLog:1.108.2.4 --- gpgme/ChangeLog:1.108.2.3 Tue Dec 28 12:32:51 2004 +++ gpgme/ChangeLog Tue Dec 28 12:36:59 2004 @@ -2,6 +2,8 @@ Released 1.0.2. + * Makefile.am (AUTOMAKE_OPTIONS): Build bzip 2 version + (ACLOCAL_AMFLAGS): Add -I m4 * configure.ac: Require automake 1.9.3 and autoconf 2.59. * acinclude.m4: Changed quoting for automake 1.9. * README: Use SHA1 instead of MD5. Index: gpgme/Makefile.am diff -u gpgme/Makefile.am:1.17.2.1 gpgme/Makefile.am:1.17.2.2 --- gpgme/Makefile.am:1.17.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/Makefile.am Tue Dec 28 12:36:59 2004 @@ -20,6 +20,9 @@ ## Process this file with automake to produce Makefile.in +ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = dist-bzip2 + EXTRA_DIST = gpgme.spec.in if BUILD_ASSUAN From cvs at cvs.gnupg.org Tue Dec 28 12:36:39 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Tue Dec 28 12:36:44 2004 Subject: gpgme-1-0-branch gpgme (NEWS configure.ac) Message-ID: Date: Tuesday, December 28, 2004 @ 12:42:19 Author: wk Path: /cvs/gpgme/gpgme Tag: gpgme-1-0-branch Modified: NEWS configure.ac post release updates --------------+ NEWS | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) Index: gpgme/NEWS diff -u gpgme/NEWS:1.136.2.2 gpgme/NEWS:1.136.2.3 --- gpgme/NEWS:1.136.2.2 Tue Dec 28 12:32:51 2004 +++ gpgme/NEWS Tue Dec 28 12:42:19 2004 @@ -1,3 +1,7 @@ +Noteworthy changes in version 1.0.3 +------------------------------------------------ + + Noteworthy changes in version 1.0.2 (2004-12-28) ------------------------------------------------ Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.93.2.3 gpgme/configure.ac:1.93.2.4 --- gpgme/configure.ac:1.93.2.3 Tue Dec 28 12:32:51 2004 +++ gpgme/configure.ac Tue Dec 28 12:42:19 2004 @@ -24,7 +24,7 @@ min_automake_version="1.9.3" # Version number: Remember to change it immediately *after* a release. -AC_INIT(gpgme, 1.0.2, [bug-gpgme@gnupg.org]) +AC_INIT(gpgme, 1.0.3-cvs, [bug-gpgme@gnupg.org]) # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.93.2.3 $) +AC_REVISION($Revision: 1.93.2.4 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION From cvs at cvs.gnupg.org Wed Dec 29 01:52:25 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Wed Dec 29 01:52:27 2004 Subject: gnupg/util (ChangeLog http.c srv.h) Message-ID: Date: Wednesday, December 29, 2004 @ 01:58:05 Author: dshaw Path: /cvs/gnupg/gnupg/util Modified: ChangeLog http.c srv.h Better implementation for the SRV check. We don't need to actually check all the header files individually since the SRV test compile uses them together. -----------+ ChangeLog | 6 ++++++ http.c | 1 + srv.h | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) Index: gnupg/util/ChangeLog diff -u gnupg/util/ChangeLog:1.173 gnupg/util/ChangeLog:1.174 --- gnupg/util/ChangeLog:1.173 Mon Dec 20 09:55:03 2004 +++ gnupg/util/ChangeLog Wed Dec 29 01:58:05 2004 @@ -1,3 +1,9 @@ +2004-12-28 David Shaw + + * srv.h: Better implementation for the SRV check. We don't need + to actually check all the header files individually since the SRV + test compile uses them together. + 2004-12-20 Werner Koch * strgutil.c (handle_iconv_error): Turn diagnostics into warnings Index: gnupg/util/http.c diff -u gnupg/util/http.c:1.29 gnupg/util/http.c:1.30 --- gnupg/util/http.c:1.29 Fri Dec 3 21:23:12 2004 +++ gnupg/util/http.c Wed Dec 29 01:58:05 2004 @@ -826,6 +826,7 @@ srvlist=m_alloc_clear(sizeof(struct srventry)); srvlist->port=port; strncpy(srvlist->target,server,MAXDNAME); + srvlist->target[MAXDNAME-1]='\0'; srvcount=1; } Index: gnupg/util/srv.h diff -u gnupg/util/srv.h:1.6 gnupg/util/srv.h:1.7 --- gnupg/util/srv.h:1.6 Thu Dec 16 19:36:42 2004 +++ gnupg/util/srv.h Wed Dec 29 01:58:05 2004 @@ -21,15 +21,15 @@ #ifndef _SRV_H_ #define _SRV_H_ +#ifdef USE_DNS_SRV #ifdef _WIN32 #include #else #include -#ifdef HAVE_ARPA_NAMESER_H #include -#endif #include -#endif +#endif /* !_WIN32 */ +#endif /* USE_DNS_SRV */ #include "types.h" #ifndef MAXDNAME From cvs at cvs.gnupg.org Thu Dec 30 04:21:11 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 30 04:21:14 2004 Subject: gnupg/g10 (ChangeLog getkey.c keyedit.c keyid.c packet.h) Message-ID: Date: Thursday, December 30, 2004 @ 04:26:57 Author: dshaw Path: /cvs/gnupg/gnupg/g10 Modified: ChangeLog getkey.c keyedit.c keyid.c packet.h * packet.h, getkey.c (merge_selfsigs_main, sig_to_revoke_info), keyid.c (revokestr_from_pk), keyedit.c (show_key_with_all_names): Show who revoked a key (either the same key or a designated revoker) and when. -----------+ ChangeLog | 7 +++++++ getkey.c | 26 ++++++++++++++++++-------- keyedit.c | 9 +++++++++ keyid.c | 4 ++-- packet.h | 11 ++++++++++- 5 files changed, 46 insertions(+), 11 deletions(-) Index: gnupg/g10/ChangeLog diff -u gnupg/g10/ChangeLog:1.673 gnupg/g10/ChangeLog:1.674 --- gnupg/g10/ChangeLog:1.673 Tue Dec 28 08:30:57 2004 +++ gnupg/g10/ChangeLog Thu Dec 30 04:26:57 2004 @@ -1,3 +1,10 @@ +2004-12-29 David Shaw + + * packet.h, getkey.c (merge_selfsigs_main, sig_to_revoke_info), + keyid.c (revokestr_from_pk), keyedit.c (show_key_with_all_names): + Show who revoked a key (either the same key or a designated + revoker) and when. + 2004-12-28 Werner Koch * ccid-driver.c (find_endpoint): New. Index: gnupg/g10/getkey.c diff -u gnupg/g10/getkey.c:1.122 gnupg/g10/getkey.c:1.123 --- gnupg/g10/getkey.c:1.122 Mon Dec 20 06:19:09 2004 +++ gnupg/g10/getkey.c Thu Dec 30 04:26:57 2004 @@ -1387,7 +1387,16 @@ } static void -merge_selfsigs_main( KBNODE keyblock, int *r_revoked, u32 *r_revokedate ) +sig_to_revoke_info(PKT_signature *sig,struct revoke_info *rinfo) +{ + rinfo->date = sig->timestamp; + rinfo->algo = sig->pubkey_algo; + rinfo->keyid[0] = sig->keyid[0]; + rinfo->keyid[1] = sig->keyid[1]; +} + +static void +merge_selfsigs_main(KBNODE keyblock, int *r_revoked, struct revoke_info *rinfo) { PKT_public_key *pk = NULL; KBNODE k; @@ -1402,7 +1411,8 @@ byte sigversion = 0; *r_revoked = 0; - *r_revokedate = 0; + memset(rinfo,0,sizeof(*rinfo)); + if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY ) BUG (); pk = keyblock->pkt->pkt.public_key; @@ -1448,7 +1458,7 @@ * that key. */ *r_revoked = 1; - *r_revokedate = sig->timestamp; + sig_to_revoke_info(sig,rinfo); } else if ( IS_KEY_SIG (sig) ) { /* Add any revocation keys onto the pk. This is @@ -1558,7 +1568,7 @@ if(rc==0) { *r_revoked=2; - *r_revokedate=sig->timestamp; + sig_to_revoke_info(sig,rinfo); /* don't continue checking since we can't be any more revoked than this */ break; @@ -1894,7 +1904,7 @@ problem is in the distribution. Plus, PGP (7) does this the same way. */ subpk->is_revoked = 1; - subpk->revokedate = sig->timestamp; + sig_to_revoke_info(sig,&subpk->revoked); /* although we could stop now, we continue to * figure out other information like the old expiration * time */ @@ -2011,7 +2021,7 @@ { KBNODE k; int revoked; - u32 revokedate; + struct revoke_info rinfo; PKT_public_key *main_pk; prefitem_t *prefs; int mdc_feature; @@ -2028,7 +2038,7 @@ BUG (); } - merge_selfsigs_main ( keyblock, &revoked, &revokedate ); + merge_selfsigs_main ( keyblock, &revoked, &rinfo ); /* now merge in the data from each of the subkeys */ for(k=keyblock; k; k = k->next ) { @@ -2051,7 +2061,7 @@ if(revoked && !pk->is_revoked) { pk->is_revoked = revoked; - pk->revokedate = revokedate; + memcpy(&pk->revoked,&rinfo,sizeof(rinfo)); } if(main_pk->has_expired) pk->has_expired = main_pk->has_expired; Index: gnupg/g10/keyedit.c diff -u gnupg/g10/keyedit.c:1.166 gnupg/g10/keyedit.c:1.167 --- gnupg/g10/keyedit.c:1.166 Tue Dec 21 16:49:56 2004 +++ gnupg/g10/keyedit.c Thu Dec 30 04:26:57 2004 @@ -2317,6 +2317,15 @@ primary=pk; } + if(pk->is_revoked) + { + char *user=get_user_id_string_native(pk->revoked.keyid); + const char *algo=pubkey_algo_to_string(pk->revoked.algo); + tty_printf(_("This key was revoked on %s by %s key %s\n"), + revokestr_from_pk(pk),algo?algo:"?",user); + m_free(user); + } + if(with_revoker) { if( !pk->revkey && pk->numrevkeys ) Index: gnupg/g10/keyid.c diff -u gnupg/g10/keyid.c:1.51 gnupg/g10/keyid.c:1.52 --- gnupg/g10/keyid.c:1.51 Thu Sep 23 15:32:30 2004 +++ gnupg/g10/keyid.c Thu Dec 30 04:26:57 2004 @@ -529,9 +529,9 @@ static char buffer[11+5]; time_t atime; - if(!pk->revokedate) + if(!pk->revoked.date) return _("never "); - atime=pk->revokedate; + atime=pk->revoked.date; return mk_datestr (buffer, atime); } Index: gnupg/g10/packet.h diff -u gnupg/g10/packet.h:1.92 gnupg/g10/packet.h:1.93 --- gnupg/g10/packet.h:1.92 Fri Apr 23 05:25:57 2004 +++ gnupg/g10/packet.h Thu Dec 30 04:26:57 2004 @@ -186,6 +186,15 @@ char name[1]; } PKT_user_id; +struct revoke_info +{ + /* revoked at this date */ + u32 date; + /* the keyid of the revoking key (selfsig or designated revoker) */ + u32 keyid[2]; + /* the algo of the revoking key */ + byte algo; +}; /**************** * Note about the pkey/skey elements: We assume that the secret keys @@ -197,7 +206,7 @@ u32 timestamp; /* key made */ u32 expiredate; /* expires at this date or 0 if not at all */ u32 max_expiredate; /* must not expire past this date */ - u32 revokedate; /* revoked at this date */ + struct revoke_info revoked; byte hdrbytes; /* number of header bytes */ byte version; byte selfsigversion; /* highest version of all of the self-sigs */ From cvs at cvs.gnupg.org Thu Dec 30 04:25:30 2004 From: cvs at cvs.gnupg.org (cvs user dshaw) Date: Thu Dec 30 04:25:32 2004 Subject: gnupg (ChangeLog configure.ac) Message-ID: Date: Thursday, December 30, 2004 @ 04:31:19 Author: dshaw Path: /cvs/gnupg/gnupg Modified: ChangeLog configure.ac * configure.ac: Better implementation for the SRV check. We don't need to actually check all the header files individually since the SRV test compile uses them together. --------------+ ChangeLog | 6 ++++++ configure.ac | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.230 gnupg/ChangeLog:1.231 --- gnupg/ChangeLog:1.230 Fri Dec 24 20:43:16 2004 +++ gnupg/ChangeLog Thu Dec 30 04:31:19 2004 @@ -1,3 +1,9 @@ +2004-12-28 David Shaw + + * configure.ac: Better implementation for the SRV check. We don't + need to actually check all the header files individually since the + SRV test compile uses them together. + 2004-12-24 David Shaw * configure.ac: Use new LIBCURL_CHECK_CONFIG macro for Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.122 gnupg/configure.ac:1.123 --- gnupg/configure.ac:1.122 Fri Dec 24 20:43:16 2004 +++ gnupg/configure.ac Thu Dec 30 04:31:19 2004 @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.122 $)dnl +dnlAC_REVISION($Revision: 1.123 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" @@ -572,9 +572,8 @@ if test x"$use_dns_srv" = xyes ; then AC_DEFINE(USE_DNS_SRV,1,[define to use DNS SRV]) SRVLIBS=$LIBS - else - AC_MSG_NOTICE([Resolver functions not found or not usable. Disabling DNS SRV.]) fi + LIBS=$_srv_save_libs fi @@ -804,13 +803,12 @@ dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([unistd.h langinfo.h termio.h locale.h getopt.h arpa/nameser.h]) +AC_CHECK_HEADERS([unistd.h langinfo.h termio.h locale.h getopt.h]) # Note that we do not check for iconv here because this is done anyway # by the gettext checks and thus it allows us to disable the use of # iconv by using --disable-nls. - dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE From cvs at cvs.gnupg.org Thu Dec 16 11:00:30 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Jan 28 12:16:43 2005 Subject: gnupg (29 files) Message-ID: Date: Thursday, December 16, 2004 @ 11:04:36 Author: wk Path: /cvs/gnupg/gnupg Modified: ChangeLog NEWS configure.ac po/be.po po/ca.po po/cs.po po/da.po po/de.po po/el.po po/eo.po po/es.po po/et.po po/fi.po po/fr.po po/gl.po po/hu.po po/id.po po/it.po po/ja.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sv.po po/tr.po po/zh_CN.po po/zh_TW.po About to release 1.4.0 --------------+ ChangeLog | 4 NEWS | 2 configure.ac | 6 po/be.po | 641 +++++++++++++++++++++++++++---------------------------- po/ca.po | 647 ++++++++++++++++++++++++++++---------------------------- po/cs.po | 646 ++++++++++++++++++++++++++++---------------------------- po/da.po | 655 ++++++++++++++++++++++++++++---------------------------- po/de.po | 657 ++++++++++++++++++++++++++++----------------------------- po/el.po | 647 ++++++++++++++++++++++++++++---------------------------- po/eo.po | 647 ++++++++++++++++++++++++++++---------------------------- po/es.po | 647 ++++++++++++++++++++++++++++---------------------------- po/et.po | 647 ++++++++++++++++++++++++++++---------------------------- po/fi.po | 647 ++++++++++++++++++++++++++++---------------------------- po/fr.po | 647 ++++++++++++++++++++++++++++---------------------------- po/gl.po | 647 ++++++++++++++++++++++++++++---------------------------- po/hu.po | 647 ++++++++++++++++++++++++++++---------------------------- po/id.po | 647 ++++++++++++++++++++++++++++---------------------------- po/it.po | 647 ++++++++++++++++++++++++++++---------------------------- po/ja.po | 645 ++++++++++++++++++++++++++++--------------------------- po/pl.po | 648 ++++++++++++++++++++++++++++---------------------------- po/pt.po | 647 ++++++++++++++++++++++++++++---------------------------- po/pt_BR.po | 655 ++++++++++++++++++++++++++++---------------------------- po/ro.po | 647 ++++++++++++++++++++++++++++---------------------------- po/ru.po | 647 ++++++++++++++++++++++++++++---------------------------- po/sk.po | 647 ++++++++++++++++++++++++++++---------------------------- po/sv.po | 649 ++++++++++++++++++++++++++++---------------------------- po/tr.po | 647 ++++++++++++++++++++++++++++---------------------------- po/zh_CN.po | 645 ++++++++++++++++++++++++++++--------------------------- po/zh_TW.po | 647 ++++++++++++++++++++++++++++---------------------------- 29 files changed, 8491 insertions(+), 8361 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.222 gnupg/ChangeLog:1.223 --- gnupg/ChangeLog:1.222 Tue Dec 14 08:49:26 2004 +++ gnupg/ChangeLog Thu Dec 16 11:04:36 2004 @@ -1,3 +1,7 @@ +2004-12-16 Werner Koch + + Released 1.4.0. + 2004-12-14 Werner Koch Released 1.3.93. Index: gnupg/NEWS diff -u gnupg/NEWS:1.224 gnupg/NEWS:1.225 --- gnupg/NEWS:1.224 Tue Dec 14 09:33:01 2004 +++ gnupg/NEWS Thu Dec 16 11:04:36 2004 @@ -1,4 +1,4 @@ -Noteworthy changes in version 1.4.0 +Noteworthy changes in version 1.4.0 (2004-12-16) ------------------------------------------------- * See the file doc/highlights-1.4.txt for an overview of all Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.114 gnupg/configure.ac:1.115 --- gnupg/configure.ac:1.114 Tue Dec 14 09:33:01 2004 +++ gnupg/configure.ac Thu Dec 16 11:04:36 2004 @@ -19,18 +19,18 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.114 $)dnl +dnlAC_REVISION($Revision: 1.115 $)dnl AC_PREREQ(2.59) min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.4.0-cvs, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.4.0, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. -development_version=yes +development_version=no AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_SRCDIR(g10/g10.c) Index: gnupg/po/be.po diff -u gnupg/po/be.po:1.9 gnupg/po/be.po:1.10 --- gnupg/po/be.po:1.9 Tue Dec 14 08:49:26 2004 +++ gnupg/po/be.po Thu Dec 16 11:04:36 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -31,7 +31,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -338,7 +338,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "" @@ -541,7 +541,7 @@ msgid "secret key already stored on a card\n" msgstr "" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "" @@ -550,7 +550,7 @@ msgid "show admin commands" msgstr "неÑумÑÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð·Ð°Ð³Ð°Ð´Ñ‹\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "паказаць гÑтую даведку" @@ -602,7 +602,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Загад> " @@ -621,7 +621,7 @@ msgid "Admin commands are not allowed\n" msgstr "ÑакрÑтны ключ недаÑтупны" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "ÐерÑчаіÑны загад (паÑпрабуйце \"help\")\n" @@ -665,7 +665,7 @@ msgid "PIN not correctly repeated; try again" msgstr "" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -675,7 +675,7 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -964,59 +964,59 @@ msgid "sign a key locally" msgstr "падпіÑаць ключ толькі мÑÑцова" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "падпіÑаць ці Ñ€Ñдагаваць ключ" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "ÑкÑпарт ключоў" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "ÑкÑпартаваць ключы на паÑлужнік ключоў" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "імпартаваць ключы з паÑлужніка ключоў" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "абнавіць уÑе ключы з паÑлужніка ключоў" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "імпартаваць/аб'Ñднаць ключы" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1026,51 +1026,51 @@ "Выбары:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|ІМЯ| зашыфраваць Ð´Ð»Ñ Ð²Ñ‹Ð»ÑƒÑ‡Ð°Ð½Ð°Ð¹ аÑобы" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "выкарыÑтоўваць у ÑкаÑьці файла вываду" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "шматÑлоўнаÑьць" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "не рабіць ніÑкіх зьменаў" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "пытацца перад перазапіÑам" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1078,7 +1078,7 @@ "@\n" "(ГлÑдзіце man Ñтаронку, Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆ поўнага апіÑÐ°Ð½ÑŒÐ½Ñ ÑžÑÑ–Ñ… загадаў Ñ– выбараў)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1128,7 +1128,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "" @@ -1136,7 +1136,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "" @@ -1220,382 +1220,379 @@ msgid "unknown configuration item `%s'\n" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s - гÑта недапушчальнае мноÑтва знакаў\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 msgid "could not parse keyserver URL\n" msgstr "" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ імпартаваньнÑ\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð²Ñ‹Ð±Ð°Ñ€Ñ‹ ÑкÑпартаваньнÑ\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s не дазвалÑецца разам з %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2715 +#: g10/g10.c:2723 msgid "selected compression algorithm is invalid\n" msgstr "" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2740 +#: g10/g10.c:2748 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "Ð½ÐµÐ´Ð°Ð¿ÑƒÑˆÑ‡Ð°Ð»ÑŒÐ½Ñ‹Ñ Ð´Ð°Ð¿Ð¾Ð¼Ð½Ñ‹Ñ Ð¿ÐµÑ€Ð°Ð²Ð°Ð³Ñ–\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s Ð½Ñ Ð¼Ð°Ðµ ÑÑнÑу разам з %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [назва_файла]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [назва_файла]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [назва_файла]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [назва_файла]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [назва_файла]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [назва_файла]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [назва_файла]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [назва_файла]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key user-id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key user-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [загады]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[назва_файла]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "" -#: g10/g10.c:3942 +#: g10/g10.c:3939 msgid "the given preferred keyserver URL is invalid\n" msgstr "" @@ -2353,12 +2350,12 @@ msgstr "" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr "" @@ -2521,7 +2518,7 @@ msgid "Really sign? (y/N) " msgstr "" -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2570,577 +2567,569 @@ msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "зрабіць адчÑплены подпіÑ" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 msgid "set preferred keyserver URL" msgstr "" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 #, fuzzy msgid "revoke a user ID" msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "памылка ÑтварÑÐ½ÑŒÐ½Ñ \"%s\": %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "ДаÑтупны ÑакрÑтны ключ.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 msgid "Really sign all user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 msgid "Really remove all selected user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 msgid "Really remove this user ID? (y/N) " msgstr "" -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 msgid "Really move the primary key? (y/N) " msgstr "" -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 msgid "You must select exactly one key.\n" msgstr "" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "" -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 msgid "Do you really want to delete this key? (y/N) " msgstr "" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 msgid "Really revoke all selected user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "паказаць ÑÑŒÐ¿Ñ–Ñ ÐºÐ»ÑŽÑ‡Ð¾Ñž Ñ– ID карыÑтальнікаў" -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "" -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 msgid "Do you really want to revoke this key? (y/N) " msgstr "" -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 msgid "Set preference list to:\n" msgstr "" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 msgid "Really update the preferences? (y/N) " msgstr "" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Захаваць зьмены? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "ВыйÑьці не захаваўшы зьмены? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "" -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, c-format msgid "This key may be revoked by %s key %s" msgstr "" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, c-format msgid "trust: %s" msgstr "" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 msgid "revoked" msgstr "" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 msgid "expired" msgstr "" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "" -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "" -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 msgid "this key has already been designated as a revoker\n" msgstr "" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 msgid "Are you sure you want to replace it? (y/N) " msgstr "" -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 msgid "Are you sure you want to delete it? (y/N) " msgstr "" -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 msgid " (non-revocable)" msgstr "" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, c-format msgid "revoked by your key %s on %s\n" msgstr "" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3440,7 +3429,7 @@ "\n" msgstr "" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "" @@ -3977,7 +3966,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 #, fuzzy msgid "unknown" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" @@ -4182,16 +4171,16 @@ msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, c-format msgid " (main key ID %s)" msgstr "" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4202,40 +4191,40 @@ "\"%.*s\"\n" "%u-бітавы %s ключ, ID %08lX, Ñтвораны %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Паўтарыце пароль\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "УвÑдзіце пароль\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "пароль занадта доўгі\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "ÑкаÑавана карыÑтальнікам\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 msgid "can't query passphrase in batch mode\n" msgstr "" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "УвÑдзіце пароль: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4245,17 +4234,17 @@ "Вам неабходна ўвеÑьці пароль, каб адчыніць ÑакрÑтны ключ длÑ\n" "карыÑтальніка: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-бітавы %s ключ, ID %08lX, Ñтвораны %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Паўтарыце пароль: " @@ -5128,119 +5117,119 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "збой падпіÑаньнÑ: %s\n" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "невÑÐ´Ð¾Ð¼Ð°Ñ Ð²ÑÑ€ÑÑ‹Ñ" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "грамадÑкі ключ Ð½Ñ Ð·Ð½Ð¾Ð¹Ð´Ð·ÐµÐ½Ñ‹" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5542,14 +5531,24 @@ msgstr "" "па больш падрабÑÐ·Ð½Ñ‹Ñ Ð·ÑŒÐ²ÐµÑткі шукайце на http://www.gnupg.org/faq.html\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "дзеÑньне немагчымае без раÑпачатае бÑÑьпечнае памÑці\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key user-id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key user-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "зрабіць адчÑплены подпіÑ" + #~ msgid "help" #~ msgstr "даведка (help)" Index: gnupg/po/ca.po diff -u gnupg/po/ca.po:1.11 gnupg/po/ca.po:1.12 --- gnupg/po/ca.po:1.11 Tue Dec 14 08:49:26 2004 +++ gnupg/po/ca.po Thu Dec 16 11:04:36 2004 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.4rc\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2003-12-05 19:15+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -51,7 +51,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -383,7 +383,7 @@ # Dest�s? ivb # Desat�s, s�. jm -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -599,7 +599,7 @@ msgid "secret key already stored on a card\n" msgstr "es descarta: la clau secreta ja �s present\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "ix del men�" @@ -610,7 +610,7 @@ # �pantalla� o �ajuda�? ivb # �ajuda�, evidentment. jm -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "mostra aquesta ajuda" @@ -663,7 +663,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Ordre> " @@ -682,7 +682,7 @@ msgid "Admin commands are not allowed\n" msgstr "s'est� escrivint la clau secreta a �%s�\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "L'ordre no �s v�lida (proveu �help�)\n" @@ -730,7 +730,7 @@ msgid "PIN not correctly repeated; try again" msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -740,7 +740,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona per a aquesta ordre\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1056,59 +1056,59 @@ msgid "sign a key locally" msgstr "signa una clau localment" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "signa o edita una clau" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "genera un certificat de revocaci�" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exporta claus" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exporta claus a un servidor de claus" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importa claus d'un servidor de claus" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "cerca claus en un servidor de claus" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "actualitza totes les claus des d'un servidor de claus" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importa/fon claus" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "actualitza la base de dades de confian�a" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [fitxers]|imprimeix resums de missatges" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1118,52 +1118,52 @@ "Opcions:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "crea eixida amb armadura ascii" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOM|xifra per a NOM" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "usa aquest id per a signar o desxifrar" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|nivell de compressi� N (0 no comprimeix)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "usa el mode de text can�nic" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "fitxer d'eixida" # Un dels dos �s en la llista d'opcions amb --help. Urgh. jm -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "detall" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "no fa cap canvi" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "pregunta abans de sobreescriure" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1174,7 +1174,7 @@ # Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman # en el manual original de PGP. A, B, C... ivb # En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1229,7 +1229,7 @@ msgid "Pubkey: " msgstr "Clau p�blica: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Xifratge: " @@ -1237,7 +1237,7 @@ msgid "Hash: " msgstr "Dispersi�: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Compressi�: " @@ -1330,375 +1330,372 @@ msgid "unknown configuration item `%s'\n" msgstr "s'ha creat el nou fitxer d'opcions �%s�\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "fitxer d'opcions �%s�: %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "s'estan llegint opcions de �%s�\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s no �s per a �s normal!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "la extensi� de xifrat �%s� no s'ha carregat per tindre permissos " "insegurs\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s no �s un joc de car�cters v�lid\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "" "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcions d'importanci� no v�lides\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "opcions d'importaci� no v�lides\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcions d'importanci� no v�lides\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "opcions d'importaci� no v�lides\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "opcions d'exportaci� no v�lides\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "no s'ha pogut fixar l'exec-path a %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "AV�S: el programa podria crear un fitxer core!\n" # FIXME: prefer�ncia? jm # Ho discut�rem en la llista, segur. Deu ser als arxius. ivb -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AV�S: %s t� prefer�ncia sobre %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s no �s perm�s amb %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s no t� sentit amb %s!\n" +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + # clares -> en clar? ivb -#: g10/g10.c:2608 +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 " "habilitat.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no �s v�lid\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "l'algorisme de resum seleccionat no �s v�lid\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algorisme de xifratge triat no �s v�lid\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ha de ser major que 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ha de ser major que 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "les prefer�ncies per defecte s�n inv�lides\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "les prefer�ncies personals de digest s�n inv�lides\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s encara no funciona amb %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "no podeu usar l'algorisme de xifratge �%s� mentre esteu en mode %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "no podeu usar l'algorisme de compressi� %s mentre esteu en mode %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [nom_del_fitxer]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [nom_del_fitxer]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "ha fallat el desxifratge: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [nom_del_fitxer]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [nom_del_fitxer]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nom_del_fitxer]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "no podeu usar %s mentre esteu en mode %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom_del_fitxer]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [nom_del_fitxer]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [nom_del_fitxer]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key user-id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key user-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [ordres]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [anell]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'enviament al servidor de claus ha fallat: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la recepci� des del servidor de claus ha fallat: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "l'exportaci� de la clau ha fallat: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "ha fallat la cerca al servidor de claus: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "ha fallat el refresc des del servidor de claus: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "no s'ha pogut llevar l'armadura: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "no s'ha pogut crear l'armadura: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nom_del_fitxer]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Endavant, escriviu el missatge...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1706,23 +1703,23 @@ "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i " "acabar amb el signe �=�\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "la URL de pol�tica de signatura donada no �s v�lida\n" @@ -2629,14 +2626,14 @@ msgstr "L'ID d'usuari �%s� est� revocat." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Segur que encara voleu signarla? (s/N) " # O no s'ha pogut? ivb # FIXME: comprovar context. jm #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " No es pot signar.\n" @@ -2839,7 +2836,7 @@ msgid "Really sign? (y/N) " msgstr "Signar realment? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2892,54 +2889,41 @@ msgid "moving a key signature to the correct place\n" msgstr "s'est� posant la signatura al lloc correcte\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "desa i ix" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "mostra empremta" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "llista claus i ID" # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents... ivb # Yeah, els vaig corregir abans de que enviares la teua correcci�. jm -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "tria l'ID d'usuari N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "tria la clau secund�ria N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "llista les signatures" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "signa la clau" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "crea una signatura separada" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "signa la clau localment" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "signa la clau irrevocablement" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "signa la clau localment i irrevocablement" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "afegeix un ID d'usuari" @@ -2947,327 +2931,332 @@ # Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot # el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids # i no hem unificat en catal�. Potser li ho dir� a Werner. jm. -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "afegeix un photo ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "esborra un ID d'usuari" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "afegeix una clau secund�ria" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "esborra una clau secund�ria" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "afegeix una clau de revocaci�" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "esborra signatures" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "canvia la data de caducitat" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "marca l'ID d'usuari com a primari" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "canvia entre el llistat de claus secretes i p�bliques" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "llista les prefer�ncies (expert)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "llista les prefer�ncies (detallat)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "estableix la llista de prefer�ncies" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "prefer�ncies actualitzades" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "" "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "canvia la contrasenya" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "canvia la confian�a" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revoca signatures" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "revoca un ID d'usuari" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revoca una clau secund�ria" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "desactiva una clau" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "activa una clau" # Igual que dalt. ivb # Idem :) jm -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "mostra el photo ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "error en llegir el bloc de claus secretes �%s�: %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "La clau secreta est� disponible.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Cal la clau secreta per a fer a��.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Useu l'ordre �toggle� abans.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "La clau est� revocada." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Realment voleu signar tots els ID d'usuari? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Pista: Trieu els ID d'usuari que voleu signar\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "la classe de signatura �s desconeguda" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Heu de seleccionar al menys un ID d'usuari.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "No podeu esborrar l'�ltim ID d'usuari!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Heu de seleccionar, si m�s no, una clau.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Heu de seleccionar, si m�s no, una clau.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Realment voleu eliminar les claus seleccionades? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Realment voleu eliminar aquesta clau? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Realment voleu eliminar aquest ID d'usuari? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Realment voleu revocar les claus seleccionades? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Realment voleu revocar aquesta clau? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "estableix la llista de prefer�ncies" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?" -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Realment voleu actualitzar les prefer�ncies? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Voleu desar els canvis? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Voleu eixir sense desar? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "ha fallat l'actualitzaci�: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Resum: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Funcionalitats: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" # Potser %s haja d'anar darrere de �clau�. ivb # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Aquesta clau pot ser revocada per la clau %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "no s'ha pogut creat %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " confian�a: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " confian�a: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Aquesta clau ha estat desactivada" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3276,19 +3265,19 @@ "necess�riament\n" "correcta a no ser que torneu a executar el programa.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[revocada]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3298,7 +3287,7 @@ "assumida.\n" # Photo ID com abans. ivb -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3307,49 +3296,49 @@ "AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que " "algunes versions de PGP rebutgen aquesta clau.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Esteu segur que encara voleu afegir-lo? (s/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n" # Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)? ivb # Hmm. S�... (s/N/x) jm -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "S'ha esborrat %d signatura.\n" # Werner FIXME: use ngettext. jm -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "S'han esborrat %d signatures.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "No s'hi ha eliminat res.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3359,168 +3348,168 @@ "pot\n" "fer que algunes versions de PGP rebutjen aquesta clau.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Introdu�u l'ID d'usuari del revocador designat: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no podeu nominar una clau com el seu propi revocador designat\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AV�S: no es pot desfer la nominaci� d'una clau com a revocador " "designat!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Per favor, elimineu les seleccions de les claus secretes.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "No podeu canviar la data de caducitat de les claus v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "No hi ha cap signatura corresponent en l'anell secret\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Heu de seleccionar exactament un ID.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Esteu segur que encara voleu utilitzarla (s/N)? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "No hi ha cap ID amb l'�ndex %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID d'usuari: �" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " signat per %08lX el %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (no-exportable)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Aquesta signatura va caducar el %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Esteu segur de que encara voleu revocarla? (s/N) " # (s/N) ivb # S! jm -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" "Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Heu signat els seg�ents ID d'usuari:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (no-exportable)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocat per %08lX el %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Esteu a punt de revocar aquestes signatures:\n" # (s/N)? ivb -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Realment voleu crear els certificats de revocaci�? (s/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "ho hi ha clau secreta\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'ID d'usuari �%s� ja est� revocat\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3854,7 +3843,7 @@ "Cal una contrasenya per a protegir la clau secreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4430,7 +4419,7 @@ msgid "textmode" msgstr "mode text" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "desconeguda" @@ -4653,11 +4642,11 @@ msgid "communication problem with gpg-agent\n" msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "hi ha un problema amb l'agent: es deshabilitar� el seu �s\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID de la clau principal %08lX)" @@ -4673,7 +4662,7 @@ # Se't passava l'argument �*�. printf(3), hieroglyph(7). ivb # Ah! Prova-ho, no casque alguna cosa :P ivb # Ah, ja veig! Moltes gr�cies! Aquest msgstr ha quedat curi�s :) jm -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4684,41 +4673,41 @@ "�%2$.*1$s�\n" "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Repetiu la contrasenya\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Introdu�u la contrasenya\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "la contrasenya �s massa llarga\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "la resposta de l'agent �s inv�lida\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "s'ha cancel�lat per l'usuari\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "no es pot demanar la contrasenya en mode desat�s\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Introdu�u la contrasenya: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4728,17 +4717,17 @@ "Necessiteu la contrasenya per desblocar la clau secreta de\n" "l'usuari: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Repetiu la contrasenya: " @@ -5710,128 +5699,128 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[revocada]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[caducada]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "desconeguda" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "" "la pr?xima comprovaci� de la base de dades de confian�a ser� el %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" "no �s necess�ria una comprovaci� de la base de dades de confian�a\n" "\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "no s'ha trobat la clau p�blica %08lX: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "si us plau, feu un --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "s'est� comprovant la base de dades de confian�a\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "no s'han trobat claus amb confian�a absoluta\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n" @@ -6160,14 +6149,30 @@ # �ltimament pense si �iniciar� no ser� millor que �inicialitzar�? ivb # Segons SC, hi ha difer�ncia. jm -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key user-id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key user-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "crea una signatura separada" + +#~ msgid "sign the key non-revocably" +#~ msgstr "signa la clau irrevocablement" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "signa la clau localment i irrevocablement" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/cs.po diff -u gnupg/po/cs.po:1.14 gnupg/po/cs.po:1.15 --- gnupg/po/cs.po:1.14 Tue Dec 14 08:49:27 2004 +++ gnupg/po/cs.po Thu Dec 16 11:04:36 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -29,7 +29,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "Nalezena OpenPGP karta èíslo %s\n" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "nelze provést v dávkovém módu\n" @@ -545,7 +545,7 @@ msgid "secret key already stored on a card\n" msgstr "tajný klíè je na kartì ulo¾en\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "ukonèit toto menu" @@ -553,7 +553,7 @@ msgid "show admin commands" msgstr "zobraz administrátorské pøíkazy" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "ukázat tuto pomoc" @@ -601,7 +601,7 @@ msgid "menu to change or unblock the PIN" msgstr "nabídka pro zmìnu anebo odblokování PINu" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Pøíkaz> " @@ -617,7 +617,7 @@ msgid "Admin commands are not allowed\n" msgstr "administrátorské pøíkazy nejsou povoleny\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný pøíkaz (zkuste \"help\")\n" @@ -668,7 +668,7 @@ msgid "PIN not correctly repeated; try again" msgstr "heslo není zopakováno správnì; zkuste to znovu" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -678,7 +678,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output pro tento pøíkaz není platný\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" @@ -973,59 +973,59 @@ msgid "sign a key locally" msgstr "podepsat klíè lokálnì" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "podepsat nebo modifikovat klíè" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "vytvoøit revokaèní certifikát" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exportovat klíèe" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exportovat klíèe na server klíèù" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importovat klíèe ze serveru klíèù" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "vyhledat klíèe na serveru klíèù" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "aktualizovat v¹echny klíèe ze serveru klíèù" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importovat/slouèit klíèe" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "vytisknout stav karty" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "zmìnit data na kartì" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "zmìnit PIN karty" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "aktualizovat databázi dùvìry" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [soubory] vypi¹ hash" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1035,55 +1035,55 @@ "Mo¾nosti:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "vytvoø výstup zakódovaný pomocí ASCII" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|JMÉNO|¹ifrovat pro JMÉNO" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "" "pou¾ít tento id u¾ivatele pro podepsání\n" " nebo de¹ifrování" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|nastavit úrovìò komprimace N (0 - ¾ádná\n" " komprimace)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "pou¾ít kanonický textový mód" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "pou¾ít jako výstupní soubor" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "s dodateènými informacemi" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "neprovádìt ¾ádné zmìny" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "vy¾ádat potvrzení pøed pøepsáním" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "pou¾ít chování striktnì podle OpenPGP" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "generovat zprávu komplatibilní s PGP 2.x" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1091,7 +1091,7 @@ "@\n" "(Pou¾ijte manuálové stránky pro kompletní seznam v¹ech pøíkazù a mo¾ností)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1141,7 +1141,7 @@ msgid "Pubkey: " msgstr "Veøejný klíè: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "©ifra: " @@ -1149,7 +1149,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Komprese: " @@ -1252,364 +1252,361 @@ msgid "unknown configuration item `%s'\n" msgstr "neznámá konfiguraèní polo¾ka \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitní soubor s mo¾nostmi `%s ignorován'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitní soubor s mo¾nostmi `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "soubor s mo¾nostmi `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "ètu mo¾nosti z `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s není pro normální pou¾ití!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "¹ifra `%s' nebyla nahrána, proto¾e pøístupová práva nejsou nastavena " "bezpeènì\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' není platná znaková sada\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 msgid "could not parse keyserver URL\n" msgstr "nelze zpracovat URL serveru klíèù\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: neplatný parametr pro server klíèù\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 msgid "invalid keyserver options\n" msgstr "neplatný parametr pro server klíèù\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parametr pro import\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "neplatný parametr pro import\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parametr pro export\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "neplatný parametr pro export\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: neplatný parametr pro výpis\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 msgid "invalid list options\n" msgstr "neplatný parametr pro výpis\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: neplatný parametr pro ovìøení\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 msgid "invalid verify options\n" msgstr "neplatný parametr pro ovìøení\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nelze nastavit exec-path na %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "VAROVÁNÍ: program mù¾e vytvoøit soubor core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVÁNÍ: %s pøepí¹e %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "Není dovoleno pou¾ívat %s s %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedává s %s smysl!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v módu --pgp2 mù¾ete vytváøet pouze oddìlené podpisy nebo podpisy èitelné " "jako text\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v módu --pgp2 nelze souèasnì ¹ifrovat a podepisovat\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v módu --pgp2 musíte pou¾ít soubor (ne rouru).\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrování zpráv v módu --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 msgid "selected compression algorithm is invalid\n" msgstr "vybraný komprimovací algoritmus je neplatný\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí být vìt¹í ne¾ 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí být vìt¹í ne¾ 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "polo¾ka max-cert-depth musí být v rozmezí od 1 do 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "neplatná implicitní úroveò certifikace (default-cert-level); musí být 0, 1, " "2 nebo 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "neplatná minimální úroveò certifikace (min-cert-level); musí být 0, 1, 2 " "nebo 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dùraznì nedoporuèován\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "neplatné defaultní pøedvolby\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro ¹ifrování\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro hashování\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ivatelské pøedvolby pro komprimaci\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s dosud není funkèní s %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "pou¾ití ¹ifrovacího algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "pou¾ití hashovacího algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pou¾ití komprimaèního algoritmu `%s' v módu %s dovoleno\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemohu inicializovat databázi dùvìry: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVÁNÍ: specifikován adresát (-r) bez pou¾ití ¹ifrování s veøejným klíèem\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [jméno souboru]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [jméno souboru]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symetrické ¹ifrování `%s' se nepovedlo: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [jméno souboru]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [jméno souboru]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "nelze pou¾ít --symmetric --encrypt s pøíkazem --s2k-mode 0\n" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "nelze pou¾ít --symmetric --encrypt v módu %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [jméno souboru]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [jméno souboru]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [jméno souboru]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "nelze pou¾ít --symmetric --sign --encrypt s pøíkazem --s2k-mode 0\n" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "nelze pou¾ít --symmetric --sign --encrypt v módu %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [jméno souboru]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [jméno souboru]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [jméno souboru]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id u¾ivatele" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ivatele" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key id u¾ivatele" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key id u¾ivatele" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ivatele [pøíkazy]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ivatele] [soubor s klíèi (keyring)]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "odeslání na keyserver se nezdaøilo: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "získání dat z keyserveru se nezdaøilo: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "export klíèe se nepodaøil: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "hledání na keyserveru se nezdaøilo: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "refresh dat na keyserveru se nezdaøil: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódování z ASCII formátu selhalo: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódování do ASCII formátu selhalo: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[jméno souboru]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Zaènìte psát svou zprávu ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1617,23 +1614,23 @@ "symbolické jméno smí obsahovat pouze písmena, èíslice, teèky nebo podtr¾ítka " "a musí konèit znakem '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "jméno u¾ivatele musí obsahovat znakt '@' \n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "hodnota nemù¾e obsahovat ¾ádné kontrolní znaky\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pro certifikaèní politiku je neplatné\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pro podepisovací politiku je neplatné\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 msgid "the given preferred keyserver URL is invalid\n" msgstr "zadané URL preferovaného serveru klíèù je neplaté\n" @@ -2506,12 +2503,12 @@ msgstr "U¾ivatelské ID \"%s\" je revokováno." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Jste si jistý(á), ¾e stále chcete podepsat tento klíè? (a/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Nelze podepsat.\n" @@ -2691,7 +2688,7 @@ msgid "Really sign? (y/N) " msgstr "Skuteènì podepsat? (a/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2742,354 +2739,347 @@ msgid "moving a key signature to the correct place\n" msgstr "pøesunuji podpis klíèe na správné místo\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "ulo¾it a ukonèit" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "vypsat fingerprint" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "vypsat seznam klíèù a id u¾ivatelù" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "vyberte identifikátor u¾ivatele N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "vyberte sekundární klíè N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "vypsat seznam podpisù" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "podepsat klíè" -#: g10/keyedit.c:1259 -msgid "make a trust signature" -msgstr "vytvoøit trust signature" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "podepsat klíè lokálnì" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "podepsat klíè bez mo¾nosti odvolat podpis (non-revocably)" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "podepsat klíè lokálnì a bez mo¾nosti odvolat podpis (non-revocably)" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "pøidat identifikátor u¾ivatele" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "pøidat fotografický ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "smazat identifikátor u¾ivatele" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "pøidat sekundární klíè" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "pøidat klíè na kartu" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "pøesunout klíè na kartu" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "smazat sekundární klíè" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "pøidat revokaèní klíè" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "smazat podpisy" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "zmìnit dobu platnosti" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "oznaèit u¾ivatelské ID jako primární" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "pøepnout mezi vypsáním seznamu tajných a veøejných klíèù" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "vypsat seznam pøedvoleb (pro experty)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "vypsat seznam pøedvoleb (podrobnì)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "nastavit seznam pøedvoleb" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "aktualizovat pøedvolby" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 msgid "set preferred keyserver URL" msgstr "nastavit URL pro preferovaný server klíèù" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "zmìnit heslo" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "zmìnit dùvìryhodnost vlastníka klíèe" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revokovat podpisy" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "odvolat platnost id u¾ivatele" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revokovat sekundární klíè" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "nastavit klíè jako neplatný (disable)" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "nastavit klíè jako platný (enable)" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "ukázat fotografický ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "chyba pøi ètení bloku tajného klíèe \"%s\": %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Tajný klíè je dostupný.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Pro provedení této operace je potøeba tajný klíè.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Prosím, nejdøíve pou¾ijte pøíkaz \"toggle\" (pøepnout).\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Klíè revokován." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 msgid "Really sign all user IDs? (y/N) " msgstr "Opravdu podepsat v¹echny id u¾ivatele? (a/N) " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Nápovìda: Vyberte id u¾ivatele k podepsání\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "neznámá tøída podpisu" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tento pøíkaz není v módù %s dovolený.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Musíte vybrat alespoò jeden id u¾ivatele.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Nemù¾ete smazat poslední id u¾ivatele!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 msgid "Really remove all selected user IDs? (y/N) " msgstr "Opravdu odstranit v¹echny vybrané id u¾ivatele? (a/N) " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 msgid "Really remove this user ID? (y/N) " msgstr "Opravdu odstranit tento id u¾ivatele? (a/N) " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 msgid "Really move the primary key? (y/N) " msgstr "Opravdu pøesunout primární klíè? (a/N) " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 msgid "You must select exactly one key.\n" msgstr "Musíte vybrat právì jeden klíè.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Musíte vybrat alespoò jeden klíè.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Opravdu chcete smazat vybrané klíèe? (a/N) " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 msgid "Do you really want to delete this key? (y/N) " msgstr "Opravdu chcete smazat tento klíè? (a/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 msgid "Really revoke all selected user IDs? (y/N) " msgstr "Opravdu revokovat v¹echny vybrané id u¾ivatele? (a/N) " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 msgid "Really revoke this user ID? (y/N) " msgstr "Opravdu revokovat tento id u¾ivatele? (a/N) " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Opravdu chcete revokovat vybrané klíèe? (a/N) " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 msgid "Do you really want to revoke this key? (y/N) " msgstr "Opravdu chcete revokovat tento klíè? (a/N) " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" "Dùvìryhodnost vlastníka nelze mìnit je-li pou¾ívána databáze dùvìry " "poskytnutá u¾ivatelem\n" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 msgid "Set preference list to:\n" msgstr "Nastavit seznam pøedvoleb:\n" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Opravdu aktualizovat pøedvolby pro vybraný id u¾ivatele? (a/N) " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 msgid "Really update the preferences? (y/N) " msgstr "Opravdu aktualizovat pøedvolby? (a/N) " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 msgid "Save changes? (y/N) " msgstr "Ulo¾it zmìny? (a/N) " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 msgid "Quit without saving? (y/N) " msgstr "Ukonèit bez ulo¾ení? (a/N) " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "aktualizace selhala: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizace tajného klíèe selhala: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Klíè nebyl zmìnìn, tak¾e není potøeba jej aktualizovat.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Hash: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Vlastnosti: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "Keyserver bez modifikace" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "Preferovaný keyserver: " -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Tento klíè mù¾e být revokován klíèem %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr "(citlivá informace)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "vytvoøen: %s" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "revokován: %s" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "platnost skonèila: %s" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "platnost skonèí: %s" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, c-format msgid "usage: %s" msgstr "pou¾ití: %s" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, c-format msgid "trust: %s" msgstr "dùvìra: %s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "platnost: %s" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Tento klíè byl oznaèen za neplatný (disabled)" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "èíslo karty: " -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "U¾ivatelský ID formátu PGP 2.x nemá ¾ádné pøedvolby\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3097,17 +3087,17 @@ "Prosím nezapomeòte, ¾e zobrazované údaje o platnosti klíèù nemusí\n" "být nutnì správné, dokud znova nespustíte program.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 msgid "revoked" msgstr "revokován" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 msgid "expired" msgstr "platnost skonèila" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3115,7 +3105,7 @@ "VAROVÁNÍ: ¾ádné u¾ivatelské ID nebylo oznaèeno jako primární. Tento pøíkaz\n" " mù¾e zpùsobit, ¾e za primární bude pova¾ováno jiné user ID.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3124,45 +3114,45 @@ "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání fotografického ID mù¾e v nìkterých\n" " verzích PGP vést k odmítnutí tohoto klíèe.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Jste si jistý, ¾e jej chcete stále pøidat? (a/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nemìli by jste pøidávat fotografický ID k PGP2 klíèi.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Smazat tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Smazat tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Smazat tento neznámý podpis? (a/N/u)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Smazán %d podpis.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Smazáno %d podpisù.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nic nebylo smazáno.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3171,155 +3161,155 @@ "VAROVÁNÍ: Toto je PGP2 klíè. Pøidání 'povìøení revokace' mù¾e v nìkterých\n" " verzích PGP vést k odmítnutí tohoto klíèe.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nemìli by jste pøidávat 'povìøení revokace' k PGP2 klíèi.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ivatele povìøeného revokací: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "klíè formátu PGP 2.x nelze povìøit revokací\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "klíè nelze povìøit revokací jím samým\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 msgid "this key has already been designated as a revoker\n" msgstr "tento klíè ji¾ bykl povìøen revokací\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "VAROVÁNÍ: ustanovení klíèe 'povøeným revokátorem' je nevratná operace!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Jste si jistí, ¾e tento klíè chcete povìøit revokací? (a/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Prosím, odstraòte výbìr z tajných klíèù.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte nejvý¹e jeden sekundární klíè.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Mìním dobu platnosti sekundárního klíèe.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Mìním dobu platnosti primárního klíèe.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nemù¾ete zmìnit dobu platnosti klíèe verze 3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "V souboru tajných klíèù chybí odpovídající podpis\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte právì jeden id u¾ivatele .\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "pøeskoèen v3 podpis klíèe jím samým u u¾ivatelského id \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "Vlo¾te URL preferovaného keyserveru: " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 msgid "Are you sure you want to replace it? (y/N) " msgstr "Jste si jistý(á), ¾e jej chcete pøepsat? (a/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 msgid "Are you sure you want to delete it? (y/N) " msgstr "Jste si jistý(á), ¾e jej chcete smazat? (a/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ivatele s indexem %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundární klíè s indexem %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, c-format msgid "user ID: \"%s\"\n" msgstr "id u¾ivatele:\"%s\"\n" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "podepsáno va¹ím klíèem %s v %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (neexportovatelné)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnost podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Jste si jistý, ¾e jej chcete stále revokovat? (a/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvoøit pro tento podpis revokaèní certifikát? (a/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Podepsal(a) jste následující identifikátory u¾ivatele: %s:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 msgid " (non-revocable)" msgstr " (nerevokovatelné)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, c-format msgid "revoked by your key %s on %s\n" msgstr "revokováno va¹ím klíèem %s v %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte se revokovat tyto podpisy:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Opravdu vytvoøit revokaèní certifikáty? (a/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "neexistuje tajný klíè\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "U¾ivatelské ID \"%s\" je ji¾ revokováno.\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "VAROVÁNÍ: podpis ID u¾ivatele je datován %d sekund v budoucnosti\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíè %s (uid %d)\n" @@ -3642,7 +3632,7 @@ "Pro ochranu Va¹eho tajného klíèe musíte zadat heslo.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4194,7 +4184,7 @@ msgid "textmode" msgstr "textový formát" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "neznámý formát" @@ -4400,16 +4390,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problém v komunikaci s gpg-agentem\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentem - pou¾ívání agenta vypnuto\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, c-format msgid " (main key ID %s)" msgstr "(hlavní ID klíèe %s)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4420,41 +4410,41 @@ "\"%.*s\"\n" "Klíè o délce %u bitù, typ %s, ID %s, vytvoøený %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Opakovat heslo\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Vlo¾it heslo\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "heslo je pøíli¹ dlouhé\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "neplatná reakce od agenta\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "zru¹eno u¾ivatelem\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentem: agent vrací 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "v dávkovém re¾imu se nemohu ptát na heslo\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4463,17 +4453,17 @@ "Musíte znát heslo, abyste odemknul(a) tajný klíè pro\n" "u¾ivatele: \"%s\"\n" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "délka %u bitù, typ %s, klíè %s, vytvoøený %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr " (podklíè na hlavním klíèi ID %s)" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -5398,115 +5388,115 @@ msgid "using %s trust model\n" msgstr "poui¾ití modelu dùvìry %s\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "revokován" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "platnost skonèila" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "neznámý formát" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 #, fuzzy msgid "[marginal]" msgstr "èásteèná" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 #, fuzzy msgid "[ultimate]" msgstr "absolutní" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "nedefinován" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "¾ádná" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "èásteèná" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "plná" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "absolutní" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "není nutné kontrolovat databázi dùvìry\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹í kontrola databáze dùvìry v %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "není nutné kontrolovat databázi dùvìry s modelem `%s'\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "není nutné aktualizovat databázi dùvìry s modelem `%s'\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, c-format msgid "public key %s not found: %s\n" msgstr "veøejný klíè %s nebyl nalezen: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "prosím proveïte --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "kontroluji databázi dùvìry\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "zpracováno %d klíèù (%d validit vymazáno)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "¾ádný absolutnì dùvìryhodný klíè nebyl nalezen\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "veøejný klíè k absolutnì dùvìryhodnému klíèi %s nebyl nalezen\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "po¾adováno %d èásteèné dùvìry a %d úplné dùvìry, model %s\n" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5514,7 +5504,7 @@ "hloubka: %d platných: %3d podepsaných: %3d dùvìra: %d-, %dq, %dn, %dm, %" "df, %du\n" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "nelze aktualizovat záznam v databázi dùvìry: chyba pøi zápisu: %s\n" @@ -5816,14 +5806,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "Více informací naleznete na adrese http://www.gnupg.cz/faq.html\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "provést operaci není mo¾né bez inicializované bezpeèné pamìti\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(pravdìpodobnì jste pro tento úkol pou¾ili nesprávný program)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key id u¾ivatele" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key id u¾ivatele" + +#~ msgid "make a trust signature" +#~ msgstr "vytvoøit trust signature" + +#~ msgid "sign the key non-revocably" +#~ msgstr "podepsat klíè bez mo¾nosti odvolat podpis (non-revocably)" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "" +#~ "podepsat klíè lokálnì a bez mo¾nosti odvolat podpis (non-revocably)" + #~ msgid "q" #~ msgstr "u" Index: gnupg/po/da.po diff -u gnupg/po/da.po:1.19 gnupg/po/da.po:1.20 --- gnupg/po/da.po:1.19 Tue Dec 14 08:49:27 2004 +++ gnupg/po/da.po Thu Dec 16 11:04:36 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -32,7 +32,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -352,7 +352,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "" @@ -563,7 +563,7 @@ msgid "secret key already stored on a card\n" msgstr "udelod: hemmelig nøgle er allerede tilstede\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "afslut denne menu" @@ -572,7 +572,7 @@ msgid "show admin commands" msgstr "konfliktende kommandoer\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "vis denne hjælp" @@ -625,7 +625,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "" @@ -644,7 +644,7 @@ msgid "Admin commands are not allowed\n" msgstr "skriver hemmeligt certifikat til '%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "" @@ -692,7 +692,7 @@ msgid "PIN not correctly repeated; try again" msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -702,7 +702,7 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -993,61 +993,61 @@ msgid "sign a key locally" msgstr "signér en nøgle lokalt" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "signér eller redigér en nøgle" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "Generér en annullérbar certifikat" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "eksportér nøgler" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "eksportér nøgler til en nøgletjener" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importér nøgler fra en nøgleserver" -#: g10/g10.c:392 +#: g10/g10.c:390 #, fuzzy msgid "search for keys on a key server" msgstr "eksportér nøgler til en nøgletjener" -#: g10/g10.c:394 +#: g10/g10.c:392 #, fuzzy msgid "update all keys from a keyserver" msgstr "importér nøgler fra en nøgleserver" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importér/fusionér nøgler" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "opdatér tillidsdatabasen" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [filer]|print meddelelsesresumé" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1057,57 +1057,57 @@ "Indstillinger:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "opret ascii beskyttet uddata" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NAME|kryptér for NAME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "brug denne bruger-id til at signere eller dekryptere" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|sæt kompresningsniveau N (0 = slået fra)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "brug kanonisk tekstmodus" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "brug som uddatafil" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "meddelsom" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "lav ingen ændringer" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1158,7 +1158,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "" @@ -1166,7 +1166,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 #, fuzzy msgid "Compression: " msgstr "Kommentar: " @@ -1251,400 +1251,395 @@ msgid "unknown configuration item `%s'\n" msgstr "ukendt standard modtager '%s'\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTITS: ingen standard alternativfil '%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "alternativfil`%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "læser indstillinger fra `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTITS: %s er ikke til normal brug!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s er ikke et gyldigt tegnsæt\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 #, fuzzy msgid "invalid import options\n" msgstr "ugyldig rustning" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 #, fuzzy msgid "invalid export options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "ugyldig rustning" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "ADVARSEL: '%s' er en tom fil\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "ugyldig nøglering" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ikke tilladt med %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valgte cifferalgoritme er ugyldig\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "valgte resuméalgoritme er ugyldig\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "" -#: g10/g10.c:2740 +#: g10/g10.c:2748 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "" -#: g10/g10.c:2742 +#: g10/g10.c:2750 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simpel S2K modus (0) frarådes på det skarpeste\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K modus; skal være 0, 1 el. 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 #, fuzzy msgid "invalid default preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2767 +#: g10/g10.c:2775 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2771 +#: g10/g10.c:2779 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2775 +#: g10/g10.c:2783 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "vis præferencer" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s er meningsløs sammen med %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "valgte cifferalgoritme er ugyldig\n" # er det klogt at oversætte TrustDB? -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [filnavn (som gemmes)]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn (som krypteres)]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [filnavn (som signeres)]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3091 +#: g10/g10.c:3099 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn (som dekrypteres)]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key bruger-id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key bruger-id" -#: g10/g10.c:3141 -#, fuzzy -msgid "--nrsign-key user-id" -msgstr "--sign-key bruger-id" - -#: g10/g10.c:3145 -#, fuzzy -msgid "--nrlsign-key user-id" -msgstr "--sign-key bruger-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key bruger-id [kommandoer]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [bruger-id] [nøglering]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "signering fejlede: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "fjernelse af beskyttelse fejlede: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "påklædning af beskyttelse fejlede: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hash-algoritme `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[filnavn]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Gå til sagen og skriv meddelelsen ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" -#: g10/g10.c:3863 +#: g10/g10.c:3860 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "den givne politik-URL er ugyldig\n" @@ -2407,13 +2402,13 @@ msgstr "Nøglen er beskyttet.\n" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr "" @@ -2581,7 +2576,7 @@ msgid "Really sign? (y/N) " msgstr "Vil du gerne signere? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2631,611 +2626,601 @@ msgid "moving a key signature to the correct place\n" msgstr "" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "gem og afslut" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "vis fingeraftryk" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "vis nøgler og bruger-id'er" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "vælg sekundær nøgle N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "vis signaturer" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "signér nøglen" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "opret en separat signatur" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "signér nøglen lokalt" -#: g10/keyedit.c:1261 -#, fuzzy -msgid "sign the key non-revocably" -msgstr "signér nøglen lokalt" - -#: g10/keyedit.c:1262 -#, fuzzy -msgid "sign the key locally and non-revocably" -msgstr "signér nøglen lokalt" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 #, fuzzy msgid "add a photo ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "slet bruger id" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "tilføj sekundær nøgle" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "slet sekundær nøgle" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 #, fuzzy msgid "add a revocation key" msgstr "tilføj sekundær nøgle" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "slet signaturer" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "ændr udløbsdatoen" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "skift imellem hemmelig og offentlig nøgle visning" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 #, fuzzy msgid "list preferences (expert)" msgstr "vis præferencer" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 #, fuzzy msgid "list preferences (verbose)" msgstr "vis præferencer" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 #, fuzzy msgid "set preference list" msgstr "vis præferencer" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 #, fuzzy msgid "updated preferences" msgstr "vis præferencer" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 msgid "set preferred keyserver URL" msgstr "" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "ændr kodesætningen" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 #, fuzzy msgid "revoke a user ID" msgstr "tilføj bruger-id" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "slå nøgle fra" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "slå nøgle til" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 #, fuzzy msgid "Key is revoked." msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Vil du gerne signere? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "ukendt signaturklasse" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 msgid "Really move the primary key? (y/N) " msgstr "" -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Vil du virkelig gerne gøre dette?" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Vil du virkelig oprette?" -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Vil du virkelig gerne gøre dette?" -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "vis præferencer" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Gem ændringer? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Afslut uden at gemme? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "" -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "kan ikke oprette %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "tilføj nøgle" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "Nøgle udløber d. %s\n" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr "betro" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr "betro" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "tilføj nøgle" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "udløb" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Slettede %d signatur.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Indtast nøglens størrelse" -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Vælg venligst hvilken slags nøgle du vil have:\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "nøgle %08lX: ingen gyldige bruger-id'er\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen bruger-id med indeks %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen sekundær nøgle med indeks %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "bruger-id: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Denne nøgle er ikke beskyttet.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr "signér en nøgle lokalt" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Generér en annullérbar certifikat" -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Nøglen er beskyttet.\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3546,7 +3531,7 @@ "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "" @@ -4093,7 +4078,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 #, fuzzy msgid "unknown" msgstr "ukendt version" @@ -4301,16 +4286,16 @@ msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (hovednøgle-ID %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4318,42 +4303,42 @@ "%u-bit %s key, ID %s, created %s%s\n" msgstr "" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 #, fuzzy msgid "Repeat passphrase\n" msgstr "Gentag kodesætning: " -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 #, fuzzy msgid "Enter passphrase\n" msgstr "Indtast kodesætning: " -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 msgid "can't query passphrase in batch mode\n" msgstr "" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Indtast kodesætning: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4362,17 +4347,17 @@ "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n" "\n" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Gentag kodesætning: " @@ -5276,120 +5261,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "tilføj nøgle" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "udløb" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "ukendt version" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "offentlig nøgle ikke fundet" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 #, fuzzy msgid "checking the trustdb\n" msgstr "|[NAMES]|tjek tillidsdatabasen" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5694,14 +5679,34 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "operation er ikke mulig uden beskyttet hukommelse indlæst\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan have brugt et forkert program til denne opgave)\n" +#, fuzzy +#~ msgid "--nrsign-key user-id" +#~ msgstr "--sign-key bruger-id" + +#, fuzzy +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--sign-key bruger-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "opret en separat signatur" + +#, fuzzy +#~ msgid "sign the key non-revocably" +#~ msgstr "signér nøglen lokalt" + +#, fuzzy +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "signér nøglen lokalt" + #~ msgid "q" #~ msgstr "a" Index: gnupg/po/de.po diff -u gnupg/po/de.po:1.99 gnupg/po/de.po:1.100 --- gnupg/po/de.po:1.99 Tue Dec 14 08:49:27 2004 +++ gnupg/po/de.po Thu Dec 16 11:04:36 2004 @@ -1,12 +1,14 @@ # GnuPG german translation -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2002, +# 2003 Free Software Foundation, Inc. # Walter Koch , 1998, 1999, 2000, 2001, 2002, 2003 +# msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" -"PO-Revision-Date: 2004-10-05 10:11+0200\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" +"PO-Revision-Date: 2004-12-16 10:54+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -29,7 +31,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -354,9 +356,8 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 -#, fuzzy msgid "can't do this in batch mode\n" msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n" @@ -381,7 +382,6 @@ msgstr "enable" #: g10/card-util.c:379 -#, fuzzy msgid "unspecified" msgstr "unbestimmt" @@ -477,9 +477,8 @@ msgstr "Fehler: ungültiger Fingerabdruck\n" #: g10/card-util.c:802 -#, fuzzy msgid "CA fingerprint: " -msgstr "Fingerabdruck:" +msgstr "CA Fingerabdruck: " #: g10/card-util.c:825 #, fuzzy @@ -567,7 +566,7 @@ msgid "secret key already stored on a card\n" msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "Menü verlassen" @@ -576,7 +575,7 @@ msgid "show admin commands" msgstr "Widersprüchliche Befehle\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "Diese Hilfe zeigen" @@ -629,7 +628,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Befehl> " @@ -648,7 +647,7 @@ msgid "Admin commands are not allowed\n" msgstr "schreiben des geheimen Schlüssels nach '%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n" @@ -696,7 +695,7 @@ msgid "PIN not correctly repeated; try again" msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -706,7 +705,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output funktioniert nicht bei diesem Kommando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1020,59 +1019,59 @@ msgid "sign a key locally" msgstr "Schlüssel nur für diesen Rechner signieren" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "Unterschreiben oder bearbeiten eines Schl." -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "Schlüssel exportieren" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "Schlüssel zu einem Schlü.server exportieren" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "Schlüssel von einem Schlü.server importieren" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "Schlüssel auf einem Schlü.server suchen" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "alle Schlüssel per Schlü.server aktualisieren" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "Schlüssel importieren/kombinieren" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "Ändern der \"Trust\"-Datenbank" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1082,51 +1081,51 @@ "Optionen:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-Hülle versehen" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NAME|Verschlüsseln für NAME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0=keine)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "Keine wirklichen Änderungen durchführen" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "vor Überschreiben nachfragen" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1135,7 +1134,7 @@ "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und " "Optionen)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1187,7 +1186,7 @@ msgid "Pubkey: " msgstr "Öff.Schlüssel: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Verschlü.: " @@ -1195,7 +1194,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Komprimierung: " @@ -1287,376 +1286,373 @@ msgid "unknown configuration item `%s'\n" msgstr "Unbekanntes Konfigurationselement `%s'\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "Verschlüsselungserweiterung \"%s\" wurde wegen falscher Rechte nicht " "geladen\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ungültige Import Option.\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "Ungültige Import Option\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ungültige Import Option.\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "Ungültige Import Option\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ungültige Export Option.\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "Ungültige export Option\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNUNG: %s ersetzt %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s kann nicht zusammen mit %s verwendet werden!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s zusammen mit %s ist nicht sinnvoll!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften " "machen\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und " "verschlüsseln\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes " "verwenden.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "Verschlüssen einer Botschaft benötigt im --pgp2-Modus die IDEA-" "Verschlüsselung\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 msgid "selected compression algorithm is invalid\n" msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen gröÂßer als 0 sein\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen gröÂßer als 1 sein\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "ungültige Standard Voreinstellungen\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "ungültige private Verschlüsselungsvoreinstellungen\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "ungültige private Hashvoreinstellungen\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "ungültige private Komprimierungsvoreinstellungen\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s arbeitet noch nicht mit %s zusammen\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht " "erlaubt.\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Entschlüsselung fehlgeschlagen: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [Dateiname]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key User-ID" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key User-ID" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key User-ID" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key User-ID" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key User-ID [Befehle]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "Schlüsselexport fehlgeschlagen: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1664,23 +1660,23 @@ "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche " "enthalten und muß mit einem '=' enden\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n" @@ -2584,12 +2580,12 @@ msgstr "User-ID \"%s\" ist widerrufen." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Beglaubigen ist nicht möglich.\n" @@ -2795,7 +2791,7 @@ msgid "Really sign? (y/N) " msgstr "Wirklich unterschreiben? (j/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2847,370 +2843,363 @@ msgid "moving a key signature to the correct place\n" msgstr "schiebe eine Beglaubigung an die richtige Stelle\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "speichern und Menü verlassen" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "\"Fingerabdruck\" anzeigen" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "Schlüssel und User-IDs auflisten" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "User-ID N auswählen" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "Zweitschlüssel N auswählen" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "Liste der Signaturen" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "Den Schlüssel signieren" -#: g10/keyedit.c:1259 -msgid "make a trust signature" -msgstr "Eine Trust-Unterschrift erzeugen" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "Den Schlüssel nur für diesen Rechner beglaubigen" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "Den Schlüssel nicht-widerrufbar beglaubigen" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "Den Schlüssel nicht-widerrufbar und nur für diesen Rechner signieren" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "Eine User-ID hinzufügen" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "Eine Foto-ID hinzufügen" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "User-ID entfernen" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "Einen Zweitschlüssel hinzufügen" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "Einen Zweitschlüssel entfernen" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "Einen Widerrufschlüssel hinzufügen" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "Signatur entfernen" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "Ändern des Verfallsdatums" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "User-ID als Haupt-User-ID kennzeichnen" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "Umschalten zwischen Anzeige geheimer und öffentlicher Schlüssel" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "Liste der Voreinstellungen (für Experten)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "Liste der Voreinstellungen (ausführlich)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "Liste der Voreinstellungen einstellen" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "geänderte Voreinstellungen" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "Schlüsselserver-URI konnte nicht zerlegt werden\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "Die Passphrase ändern" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "Den \"Owner trust\" ändern" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "Signaturen widerrufen" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "Eine User-ID widerrufen" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "Einen Zweitschlüssel widerrufen" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "Schlüssel abschalten" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "Schlüssel anschalten" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "Foto-ID anzeigen" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "Fehler beim Lesen des geheimen Schlüsselblocks `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Geheimer Schlüssel ist vorhanden.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Hierzu wird der geheime Schlüssel benötigt.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Schlüssel wurde widerrufen." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Wirklich alle User-IDs beglaubigen? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "Unbekannte Unterschriftenklasse" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Die letzte User-ID kann nicht gelöscht werden!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Diese User-ID wirklich entfernen? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Diese User-ID wirklich widerrufen? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Möchten Sie die ausgewählten Schlüssel wirklich widerrufen? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Möchten Sie diesen Schlüssel wirklich wiederrufen? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "Liste der Voreinstellungen einstellen" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Die Voreinstellungen wirklich ändern? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Änderungen speichern? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Beenden ohne zu speichern? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "Änderung fehlgeschlagen: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Eigenschaften: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "Keyserver no-modify" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Dieser Schlüssel könnte widerrufen worden sein von %s Schlüssel " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr "(empfindlich)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s kann nicht erzeugt werden: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[widerrufen]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [verfällt: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [verfällt: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " Vertrauen: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "Gültigkeit: %s" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3218,20 +3207,20 @@ "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n" "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[widerrufen]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" # translated by wk -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3239,7 +3228,7 @@ "WARNUNG: Keine User-ID ist als primär markiert. Dieses Kommando kann\n" "dazu führen, daß eine andere User-ID as primär angesehen wird.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3249,45 +3238,45 @@ "könnte\n" " bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Wollen Sie ihn immmer noch hinzufügen? (j/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Sie können einem PGP2-artigen SchlüÂüsel keine Foto-ID hinzufügen.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d Beglaubigungen entfernt.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nichts entfernt.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3297,37 +3286,37 @@ " Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n" " des Schlüssels führen.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Sie können einem PGP2-artigen SchlüÂüsel keine vorgesehenen Widerrufer " "hinzufügen.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Geben sie die User-ID des designierten Widerrufers ein: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer " "eingetragen werden\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 msgid "this key has already been designated as a revoker\n" msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann " "nicht rückgangig gemacht werden!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3335,129 +3324,129 @@ "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer " "deklarieren? (j/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Bitte genau eine User-ID auswählen.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Wollen Sie es wirklich benutzen? (j/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Wollen Sie es wirklich benutzen? (j/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Keine User-ID mit Index %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Kein Zweitschlüssel mit Index %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "User-ID: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " beglaubigt durch %08lX um %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Diese Unterschrift ist seit %s verfallen.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Sie haben folgende User-IDs beglaubigt:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (nicht-exportierbar)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " widerrufen durch %08lX um %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Es werden nun folgende Beglaubigungen entfernt:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "Kein geheimer Schlüssel\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User-ID \"%s\" ist bereits widerrufen\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3786,7 +3775,7 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4348,7 +4337,7 @@ msgid "textmode" msgstr "Textmodus" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "unbekannt" @@ -4558,17 +4547,17 @@ msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit GPG-Agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "" "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (Hauptschlüssel-ID %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4579,41 +4568,41 @@ "Benutzer: \"%.*s\"\n" "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Geben Sie die Passphrase nochmal ein\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Geben Sie die Passphrase ein\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "Passphrase ist zu lang\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "Falsche Antwort des Agenten\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "Abbruch durch Benutzer\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Geben Sie die Passphrase ein: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4623,17 +4612,17 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Geben Sie die Passphrase nochmal ein: " @@ -5612,125 +5601,125 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[widerrufen]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[verfallen]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "unbekannt" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 #, fuzzy msgid "[marginal]" msgstr "marginal" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 #, fuzzy msgid "[ultimate]" msgstr "uneingeschränkt" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "unbestimmt" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "niemals " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "vollständig" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "uneingeschränkt" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "\"Trust-DB\"-Überprüfung ist beim \"%s\"-Vertrauensmodell nicht nötig\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "\"Trust-DB\"-Änderung ist beim \"%s\"-Vertrauensmodell nicht nötig\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "Öffentlicher Schlüssel %08lX nicht gefunden: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "Bitte ein --check-trustdb durchführen\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "\"Trust-DB\" wird überprüft\n" # translated by wk -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d Schlüssel verarbeitet (%d Validity Zähler gelöscht)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "kein uneingeschränkt vertrauenswürdiger Schlüssel %08lX gefunden\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "öff.Schlüssel des uneingeschränkt vertrautem Schlüssel %08lX nicht gefunden\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -6039,15 +6028,31 @@ # " Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n" # " Bitte wenden Sie sich hierzu an den Systemadministrator.\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "" "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key User-ID" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key User-ID" + +#~ msgid "make a trust signature" +#~ msgstr "Eine Trust-Unterschrift erzeugen" + +#~ msgid "sign the key non-revocably" +#~ msgstr "Den Schlüssel nicht-widerrufbar beglaubigen" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "" +#~ "Den Schlüssel nicht-widerrufbar und nur für diesen Rechner signieren" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/el.po diff -u gnupg/po/el.po:1.15 gnupg/po/el.po:1.16 --- gnupg/po/el.po:1.15 Tue Dec 14 08:49:27 2004 +++ gnupg/po/el.po Thu Dec 16 11:04:36 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -354,7 +354,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -565,7 +565,7 @@ msgid "secret key already stored on a card\n" msgstr "ðáñáëåßöèçêå: ìõóôéêü êëåéäß Þäç ðáñþí\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "ôåñìáôéóìüò áõôïý ôïõ ìåíïý" @@ -574,7 +574,7 @@ msgid "show admin commands" msgstr "óõãêñïõüìåíåò åíôïëÝò\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "áðåéêüíéóç áõôÞò ôçò âïÞèåéáò" @@ -627,7 +627,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "ÅíôïëÞ> " @@ -646,7 +646,7 @@ msgid "Admin commands are not allowed\n" msgstr "åããñáöÞ ôïõ ìõóôéêïý êëåéäéïý óôï `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Ìç Ýãêõñç åíôïëÞ (äïêéìÜóôå \"help\")\n" @@ -691,7 +691,7 @@ msgid "PIN not correctly repeated; try again" msgstr "ç öñÜóç êëåéäß äåí åðáíáëÞöèçêå óùóôÜ. ÄïêéìÜóôå îáíÜ" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -701,7 +701,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output äåí ëåéôïõñãåß ãéá áõôÞ ôçí åíôïëÞ\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1009,59 +1009,59 @@ msgid "sign a key locally" msgstr "õðïãñáöÞ åíüò êëåéäéïý ôïðéêÜ" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "õðïãñáöÞ Þ åðåîåñãáóßá åíüò êëåéäéïý" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "åîáãùãÞ êëåéäéþí" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "åîáãùãÞ êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "åéóáãùãÞ êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "áíáæÞôçóç êëåéäéþí óå Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "áíáíÝùóç üëùí ôùí êëåéäéþí áðü Ýíá äéáêïìéóôÞ êëåéäéþí" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "åéóáãùãÞ/óõã÷þíåõóç êëåéäéþí" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "áíáíÝùóç ôçò âÜóçò äåäïìÝíùí åìðéóôïóýíçò" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|áëãüñ [áñ÷åßá]| áðåéêüíéóç ðåñéëÞøåùí ôùí ìçíõìÜôùí" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1071,51 +1071,51 @@ "ÅðéëïãÝò:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "äçìéïõñãßá ascii èùñáêéóìÝíçò åîüäïõ" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|ÏÍÏÌÁ|êñõðôïãñÜöçóç ãéá ÏÍÏÌÁ" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "÷ñÞóç áõôÞò ôçò ôáõôüôçôáò (user id) ãéá õðïãñáöÞ Þ áðïêñõðôïãñÜöçóç" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|êáèïñéóìüò åðéðÝäïõ óõìðßåóçò N (0 áðåíåñãïðïéåß)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "÷ñÞóç êáíïíéêÞò êáôÜóôáóçò êåéìÝíïõ" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "÷ñÞóç ùò áñ÷åßïõ åîüäïõ" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "áíáëõôéêÜ" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "íá ìç ãßíåé êáììßá áëëáãÞ" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "åñþôçóç ðñéí ôçí åðéêÜëõøç" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1123,7 +1123,7 @@ "@\n" "(äåßôå ôç óåëßäá man ãéá ìéá ðëÞñç ëßóôá åíôïëþí êáé åðéëïãþí)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1173,7 +1173,7 @@ msgid "Pubkey: " msgstr "ÄçìïóÊëåéäß:" -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Êñõðôáëãüñéèìïò: " @@ -1181,7 +1181,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Óõìðßåóç: " @@ -1268,375 +1268,372 @@ msgid "unknown configuration item `%s'\n" msgstr "Üãíùóôï áíôéêåßìåíï ñõèìßóåùò \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "ÓÇÌÅÉÙÓÇ: áãíïÞèçêå ôï ðáëéü áñ÷åßï ðñïêáèïñéóìÝíùí åðéëïãþí `%s'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ÓÇÌÅÉÙÓÇ: ìç ðñïêáèïñéóìÝíï áñ÷åßï åðéëïãþí `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "áñ÷åßï åðéëïãþí `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "áíÜãíùóç åðéëïãþí áðü `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ÓÇÌÅÉÙÓÇ: ôï %s äåí åßíáé ãéá êáíïíéêÞ ÷ñÞóç!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "ç åðÝêôáóç ôïõ êñõðôáëãüñéèìïõ \"%s\" äåí öïñôþèçêå åðåéäÞ õðÜñ÷ïõí\n" "áíáóöáëåßò Üäåéåò\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "ôï %s äåí åßíáé Ýãêõñï óåô ÷áñáêôÞñùí\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åéãáãùãÞò\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "ìç Ýãêõñåò åðéëïãÝò åîáãùãÞò\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "áäõíáìßá ïñéóìïý ôïõ exec-path óå %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï ðñüãñáììá ßóùò äçìéïõñãÞóåé áñ÷åßï core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ôï %s ðáñáêÜìðôåé ôï %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "ôï %s äåí åðéôñÝðåôáé ìå ôï %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "ôï %s äåí Ý÷åé êáììßá Ýííïéá ìáæß ìå ôï %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "ìðïñåßôå íá êÜíåôå áðïêïììÝíåò Þ êáèáñÝò õðïãñáöÝò ìüíï óå --pgp2 êáôÜóôáóç\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "äåí ìðïñåßôå íá õðïãñÜöåôå êáé íá êñõðôïãñáöåßôå ôáõôü÷ñïíá óå --pgp2 " "êáôÜóôáóç\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "ìüíï áñ÷åßá åðéôñÝðïíôáé (êáé ü÷é pipes) êáôá ôçí êáôáóôáóç --pgp2.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "ç êñõðôïãñÜöçóç åíüò ìçíýìáôïò óå --pgp2 êáôÜóôáóç áðáéôåß ôïí áëãïñ. IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "ï åðéëåãìÝíïò áëãüñéèìïò êñõðôïãñÜöçóçò äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "" "ï åðéëåãìÝíïò áëãüñéèìïò ðåñßëçøçò ãéá ðéóôïðïßçóç\n" "äåí åßíáé Ýãêõñïò\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ðñÝðåé íá åßíáé ìåãáëýôåñá áðü 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ðñÝðåé íá åßíáé ìåôáîý 1 êáé 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ìç Ýãêõñï default-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ìç Ýãêõñï min-cert-level· ðñÝðåé íá åßíáé 0, 1, 2, Þ 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÓÇÌÅÉÙÓÇ: ç áðëÞ S2K êáôÜóôáóç (0) ðñÝðåé íá áðïöåýãåôáé\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ìç Ýãêõñç êáôÜóôáóç S2K; ðñÝðåé íá åßíáé 0, 1 Þ 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý êñõðôáëãüñéèìïõ\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ ðåñßëçøçò\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "ìç Ýãêõñåò ðñïåðéëïãÝò ðñïóùðéêïý áëãüñéèìïõ óõìðßåóçò\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "ôï %s áêüìá äå ëåéôïõñãåß ìáæß ìå ôï %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ êñõðôáëãüñéèìïõ \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ ðåñßëçøçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "áðáãïñåýåôå ç ÷ñÞóç ôïõ áëãüñéèìïõ óõìðßåóçò \"%s\" óôçí êáôÜóôáóç %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "áðïôõ÷ßá áñ÷éêïðïßçóçò ôçò TrustDB: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äþèçêáí ðáñáëÞðôåò (-r) ÷þñéò ÷ñÞóç êñõðôïãñÜöçóçò\n" "äçìïóßïõ êëåéäéïý\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "áðïêñõðôïãñÜöçóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "áðáãïñåýåôå ç ÷ñÞóç ôïõ %s óôçí êáôÜóôáóç %s.\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [üíïìá áñ÷åßïõ]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key user-id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key user-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [åíôïëÝò]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [êëåéäïèÞêç]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver áðïóôïëÞ áðÝôõ÷å: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver ëÞøç áðÝôõ÷å: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "åîáãùãÞ êëåéäéïý áðÝôõ÷å: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver áíáæÞôçóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver áíáíÝùóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "áðïèùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "èùñÜêéóç áðÝôõ÷å: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ìç Ýãêõñïò áëãüñéèìïò hash `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[üíïìá áñ÷åßïõ]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Ìðïñåßôå ôþñá íá åéóáãÜãåôå ôï ìÞíõìá óáò ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1644,23 +1641,23 @@ "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï åêôõðþóéìïõò ÷áñáêôÞñåò êáé êåíÜ " "êáé íá ëÞãåé ìå Ýíá '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "ôï üíïìá óçìåßùóçò ÷ñÞóôç ðñÝðåé íá ðåñéÝ÷åé ôï '@' ÷áñáêôÞñá\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "ç ôéìÞ óçìåßùóçò ðñÝðåé íá ìç ÷ñçóéìïðïéåß ÷áñáêôÞñåò control\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò ðéóôïðïéçôéêïý ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "ôï URL ðïëéôéêÞò õðïãñáöÞò ðïõ äüèçêå äåí åßíáé Ýãêõñï\n" @@ -2534,12 +2531,12 @@ msgstr "Ôï user ID \"%s\" áíáêáëåßôå." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï õðïãñÜøåôå; (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Áäõíáìßá õðïãñáöÞò.\n" @@ -2744,7 +2741,7 @@ msgid "Really sign? (y/N) " msgstr "Óßãïõñá íá õðïãñáöåß; " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2794,371 +2791,363 @@ msgid "moving a key signature to the correct place\n" msgstr "ìåôáêßíçóç õðïãñáöÞò êëåéäéïý óôç óùóôÞ èÝóç\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "áðïèÞêåõóç êáé Ýîïäïò" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "áðåéêüíéóç ôïõ fingerprint" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "áðåéêüíéóç ôùí êëåéäéþí êáé ôùí user ID" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "åðéëïãÞ user ID N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "åðéëïãÞ äåõôåñåýïíôïò êëåéäéïý N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "áðåéêüíéóç õðïãñáöþí" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "õðïãñáöÞ ôïõ êëåéäéïý" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "õðïãñáöÞ ôïõ êëåéäéïý ìç-áíáêáëÝóéìá" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "ðñïóèÞêç åíüò user ID" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "ðñïóèÞêç åíüò photo ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "äéáãñáöÞ åíüò user ID" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "ðñïóèÞêç åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "äéáãñáöÞ åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "ðñïóèÞêç åíüò êëåéäéïý áíÜêëçóçò" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "äéáãñáöÞ õðïãñáöþí" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "áëëáãÞ ôçò çìåñïìçíßáò ëÞîçò" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "óçìåßùóç ôïõ user ID óáí ðñùôåýùí" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "áëëáãÞ ìåôáîý ôçò áðåéêüíéóçò ìõóôéêïý êáé äçìüóéïõ êëåéäéïý" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "áðåéêüíéóç ðñïåðéëïãþí (åéäéêÝò)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "áðåéêüíéóç åðéëïãþí (áíáëõôéêÜ)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "áíáùåùìÝíåò åðéëïãÝò" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "áäõíáìßá åðåîåñãáóßáò ôïõ URI ôïõ äéáêïìéóç êëåéäéþí\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "áëëáãÞ ôçò öñÜóçò êëåéäß" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "áëëáãÞ ôçò åìðéóôïóýíçò éäéïêôÞôç" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "áíÜêëçóç õðïãñáöþí" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "áíÜêëçóç åíüò user ID" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "áíÜêëçóç åíüò äåõôåñåýïíôïò êëåéäéïý" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "áðåíåñãïðïéåß Ýíá êëåéäß" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "åíåñãïðïéåß Ýíá êëåéäß" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "áðåéêüíéóç photo ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "óöÜëìá êáôÜ ôçí áíÜãíùóç ìõóôéêïý ìðëïê êëåéäéïý `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Ôï ìõóôéêü êëåéäß åßíáé äéáèÝóéìï.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Áðáéôåßôáé ôï ìõóôéêü êëåéäß ãéá íá ãßíåé áõôü.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôçí åíôïëÞ \"toggle\" ðñþôá.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Ôï êëåéäß áíáêëÞèçêå." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Óßãïõñá íá õðïãñáöïýí üëá ôá user ID; " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "ÓõìâïõëÞ: ÅðéëÝîôå ôï user ID ãéá õðïãñáöÞ\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "Üãíùóôç êëÜóç õðïãñáöÞò" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "ÁõôÞ ç åíôïëÞ áðáãïñåýåôå óå áõôÞ ôçí êáôÜóôáóç %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôï ëéãüôåñï Ýíá user ID.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Äåí ìðïñåßôå íá äéáãñÜøåôå ôï ôåëåõôáßï user ID!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí üëá ôá åðéëåãìÝíá user ID; " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï user ID; " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êëåéäß.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöïýí ôá åðéëåãìÝíá êëåéäéÜ; " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Óßãïõñá èÝëåôå íá äéáãñáöåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí üëá ôá åðéëåãìÝíá user ID; " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï user ID; " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèïýí ôá åðéëåãìÝíá êëåéäéÜ; " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "ïñéóìüò áðåéêüíéóçò åðéëïãþí" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Óßãïõñá èÝëåôå íá áíáíåùèïýí ïé ðñïåðéëïãÝò ãéá ôï åðéëåãìÝíï user ID; " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Óßãïõñá íá áíáíåùèïýí ïé ðñïåðéëïãÝò;" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "ÁðïèÞêåõóç ôùí áëëáãþí; " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Ôåñìáôéóìüò ÷ùñßò áðïèÞêåõóç; " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "ç åíçìÝñùóç áðÝôõ÷å: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "ç åíçìÝñùóç ìõóôéêïý áðÝôõ÷å: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Ôï êëåéäß äåí Üëëáîå ïðüôå äåí ÷ñåéÜæåôáé åíçìÝñùóç.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Ðåñßëçøç: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Äõíáôüôçôå: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Áõôü ôï êëåéäß ìðïñåß íá áíáêëçèåß áðü %s êëåéäß " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (åõáßóèçôï)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "áäõíáìßá äçìéïõñãßáò ôïõ %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[áíáêëçìÝíï]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [ëÞãåé: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " åìðéóôïóýíç: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Áõôü ôï êëåéäß Ý÷åé áðåíåñãïðïéçèåß" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Äåí õðÜñ÷ïõí ðñïåðéëïãÝò óå Ýíá user ID ôýðïõ PGP 2.x.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3166,19 +3155,19 @@ "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\n" "åêôüò êáé åÜí åðáíáêêéíÞóåôå ôï ðñüãñáììá.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[áíáêëçìÝíï]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3186,7 +3175,7 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ý÷åé óçìåéùèåß ID ÷ñÞóôç óáí ðñùôåýùí. ÁõôÞ ç åíôïëÞ\n" " ìðïñåß íá êÜíåé Ýíá Üëëï ID ÷ñÞóôç íá ãßíåé ôï ðñùôåýùí.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3195,45 +3184,45 @@ "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ PGP2. Ç ðñïóèÞêç åíüò photo ID\n" " ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Óßãïõñá áêüìá èÝëåôå íá ôï ðñïóèÝóåôå; (y/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Äåí ìðïñåßôå íá ðñïóèÝóåôå ìéá photo ID óå Ýíá êëåéäß ôýðïõ PGP2.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò êáëÞò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò ìç Ýãêõñçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "ÄéáãñáöÞ áõôÞò ôçò Üãíùóôçò õðïãñáöÞò; (y/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Óßãïõñá íá äéáãñáöåß áõôÞ ç éäéï-õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "ÄéáãñÜöôçêå %d õðïãñáöÞ.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "ÄéáãñÜöçêáí %d õðïãñáöÝò.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Ôßðïôá äåí äéáãñÜöôçêå.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3243,38 +3232,38 @@ " êáèïñéóìÝíïõ áíáêëçôÞ ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò PGP\n" " íá ôï áðïññßøïõí.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Äåí ìðïñåßôå íá ðñïóèÝóåôå Ýíá êáèïñéóìÝíï áíáêëçôÞ óå êëåéäß ôýðïõ PGP2.x.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "ÐëçêôñïëïãÞóôå ôï user ID ôïõ äéïñéóìÝíïõ áíáêëçôÞ: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "áäõíáìßá ïñéóìïý åíüò êëåéäéïý ôýðïõ PGP 2.x, óáí äéïñéóìÝíïõ áíáêëçôÞ\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "äå ìðïñåßôå íá ïñßóåôå Ýíá êëåéäß óáí ôï äéïñéóìÝíï áíáêëçôÞ ôïõ åáõôïý ôïõ\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü ôï êëåéäß Ý÷åé áíáêëçèåß áðü ôïí ïñéóìÝíï áíáêëçôÞ!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: åÜí ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ äåí ìðïñåß íá " "åðáíÝëèåé!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3282,129 +3271,129 @@ "Åßóôå óßãïõñïé üôé èÝëåôå íá ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ; (y/" "N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Ðáñáêáëþ áöáéñÝóôå ôéò åðéëïãÝò áðü ôá ìõóôéêÜ êëåéäéÜ.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Ðáñáêáëþ åðéëÝîôå ôï ðïëý Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá äåõôåñåýïí êëåéäß.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "ÁëëáãÞ çìåñïìçíßáò ëÞîçò ãéá Ýíá ðñùôåýïí êëåéäß.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Äåí ìðïñåßôå íá áëëÜîåôå ôçí çìåñïìçíßá ëÞîçò óå Ýíá v3 êëåéäß\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Äåí âñÝèçêå áíôßóôïé÷ç õðïãñáöÞ óôç ìõóôéêÞ êëåéäïèÞêç\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "ÐñÝðåé íá åðéëÝîåôå áêñéâþò Ýíá user ID.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "ðáñáëåßöèçêå ç v3 éäéï-õðïãñáöÞ óôï user id \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Óßãïõñá èÝëåôå áêüìá íá ôï ÷ñçóéìïðïéÞóåôå; (y/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Äåí õðÜñ÷åé user ID ìå äåßêôç %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Äåí õðÜñ÷åé äåõôåñåýïí êëåéäß ìå äåßêôç %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " õðïãñÜöèçêå áðü %08lX óôéò %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "ÁõôÞ ç õðïãñáöÞ Ýëçîå óôéò %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Óßãïõñá èÝëåôå íá áíáêëçèåß áõôü ôï êëåéäß; " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Äçìéïõñãßá åíüò ðéóôïðïéçôéêïý áíÜêëçóçò ãéá áõôÞ ôçí õðïãñáöÞ; (y/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "¸÷åôå õðïãñÜøåé áõôÜ ôá user ID:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (ìç-åîáãþãéìï)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " áíáêëÞèçêå áðü %08lX óôéò %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Óêïðåýåôå íá áíáêáëÝóåôå áõôÝò ôéò õðïãñáöÝò:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Óßãïõñá íá äçìéïõñãçèïýí ôá ðéóôïðïéçôéêÜ áíÜêëçóçò; (y/N)" -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "êáíÝíá ìõóôéêü êëåéäß\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ôï user ID \"%s\" Ý÷åé Þäç áíáêëçèåß\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ìéá õðïãñáöÞ user ID Ý÷åé çìåñïìçíßá %d äåýôåñá óôï ìÝëëïí\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Áðåéêüíéóç %s photo ID ìåãÝèïõò %ld ãéá ôï êëåéäß 0x%08lX (uid %d)\n" @@ -3732,7 +3721,7 @@ "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4292,7 +4281,7 @@ msgid "textmode" msgstr "êáôÜóôáóç-êåéìÝíïõ" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "Üãíùóôï" @@ -4503,16 +4492,16 @@ msgid "communication problem with gpg-agent\n" msgstr "ðñüâëçìá åðéêïéíùíßáò ìå ôï gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "ðñüâëçìá ìå ôïí agent - áðåíåñãïðïéÞóç ôçò ÷ñÞóçò ôïõ agent\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (êýñéï êëåéäß, ID %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4524,41 +4513,41 @@ "\"%.*s\"\n" "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "ÅðáíáëÜâåôå ôç öñÜóç\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "ç öñÜóç êëåéäß åßíáé ðïëý ìåãÜëç\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "ìç Ýãêõñç áðÜíôçóç áðü ôïí agent\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "áêõñþèçêå áðü ôï ÷ñÞóôç\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "ðñüâëçìá ìå ôïí agent: agent åðéóôñÝöåé 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "áäõíáìßá åñþôçóçò ôçò ëÝîçò êëåéäß óå êáôÜóôáóç äÝóìçò\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4568,17 +4557,17 @@ "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\n" "ãéá ôï ÷ñÞóôç: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " @@ -5532,121 +5521,121 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[áíáêëçìÝíï]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[ëçãìÝíï]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "Üãíùóôï" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "ðïôÝ " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "åðüìåíïò Ýëåã÷ïò ôçò trustdb èá ãßíåé óôéò %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "äåí õðÜñ÷åé áíÜãêç ãéá Ýëåã÷ï ôçò trustdb\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ôï äçìüóéï êëåéäß %08lX äåí âñÝèçêå: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "ðáñáêáëþ êÜíôå Ýíá --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "Ýëåã÷ïò ôçò trustdb\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d êëåéäéÜ åðåîåñãÜóôçêáí (%d ìåôñÞóåéò åããõñüôçôáò ðÝñáóáí)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "äå âñÝèçêáí áðüëõôá åìðéóôåýóéìá êëåéäéÜ\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "äå âñÝèçêå ôï äçìüóéï êëåéäß ôïõ áðüëõôá åìðéóôåýóéìïõ êëåéäéïý %08lX\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "åããñáöÞ trust %lu, ôýðïò %d: write áðÝôõ÷å: %s\n" @@ -5951,14 +5940,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "äåßôå ôï http://www.gnupg.org/faq.html ãéá ðåñéóóüôåñåò ðëçñïöïñßåò\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "ç ëåéôïõñãßá äåí åßíáé äõíáôÞ ÷ùñßò áñ÷éêïðïéçìÝíç áóöáëÞ ìíÞìç\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(ßóùò ÷ñçóéìïðïéÞóáôå ëÜèïò ðñüãñáììá ãéá áõôÞ ôçí åñãáóßá)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key user-id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key user-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "äçìéïõñãßá ìéáò ìç ðñïóáñôçìÝíçò õðïãñáöÞò" + +#~ msgid "sign the key non-revocably" +#~ msgstr "õðïãñáöÞ ôïõ êëåéäéïý ìç-áíáêáëÝóéìá" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "õðïãñáöÞ ôïõ êëåéäéïý ôïðéêÜ êáé ìç-áíáêáëÝóéìá" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/eo.po diff -u gnupg/po/eo.po:1.18 gnupg/po/eo.po:1.19 --- gnupg/po/eo.po:1.18 Tue Dec 14 08:49:27 2004 +++ gnupg/po/eo.po Thu Dec 16 11:04:36 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -562,7 +562,7 @@ msgid "secret key already stored on a card\n" msgstr "ignorita: sekreta þlosilo jam æeestas\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "forlasi æi tiun menuon" @@ -571,7 +571,7 @@ msgid "show admin commands" msgstr "malkongruaj komandoj\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "montri æi tiun helpon" @@ -624,7 +624,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Komando> " @@ -643,7 +643,7 @@ msgid "Admin commands are not allowed\n" msgstr "skribas sekretan þlosilon al '%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Nevalida komando (provu per \"helpo\")\n" @@ -691,7 +691,7 @@ msgid "PIN not correctly repeated; try again" msgstr "la pasfrazo ne estis øuste ripetita; provu denove" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -701,7 +701,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output ne funkcias por æi tiu komando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -994,59 +994,59 @@ msgid "sign a key locally" msgstr "subskribi þlosilon loke" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "subskribi aý redakti þlosilon" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "krei revokatestilon" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "eksporti þlosilojn" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "eksporti þlosilojn al þlosilservilo" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importi þlosilojn de þlosilservilo" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "seræi þlosilojn æe þlosilservilo" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "aktualigi æiujn þlosilojn de þlosilservilo" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importi/kunfandi þlosilojn" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "aktualigi la fido-datenaron" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|metodo [dosieroj]|presi mesaøo-kompendiojn" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1056,51 +1056,51 @@ "Opcioj:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "krei eligon en askia kiraso" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOMO|æifri por NOMO" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "uzi æi tiun uzantidentigilon por subskribi aý malæifri" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|difini densig-nivelon N (0=nenia)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "uzi tekstan reøimon" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "uzi dosieron por eligo" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "detala eligo" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "fari neniajn þanøojn" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1108,7 +1108,7 @@ "@\n" "(Vidu la manpaøon por kompleta listo de æiuj komandoj kaj opcioj)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1158,7 +1158,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "" @@ -1166,7 +1166,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 #, fuzzy msgid "Compression: " msgstr "Komento: " @@ -1251,372 +1251,369 @@ msgid "unknown configuration item `%s'\n" msgstr "%s: nova opcio-dosiero kreita\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "opcio-dosiero '%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "legas opciojn el '%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTO: %s ne estas por normala uzado!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ne estas valida signaro\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ne povis analizi URI de þlosilservilo\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 #, fuzzy msgid "invalid import options\n" msgstr "nevalida kiraso" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 #, fuzzy msgid "invalid export options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "nevalida kiraso" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVERTO: '%s' estas malplena dosiero\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "nevalida þlosilaro" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "AVERTO: programo povas krei core-dosieron!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTO: %s nuligas %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ne eblas kun %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "ne eblas samtempe subskribi kaj æifri kun --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "æifri mesaøon kun --pgp2 postulas la æifron IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "elektita æifrad-metodo ne validas\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "elektita kompendi-metodo ne validas\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed devas esti pli granda ol 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed devas esti pli granda ol 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth devas esti inter 1 kaj 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nevalida default-check-level; devas esti 0, 1, 2 aý 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "nevalida S2K-reøimo; devas esti 0, 1 aý 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 #, fuzzy msgid "invalid default preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "nevalidaj preferoj\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne havas sencon kun %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [dosiero]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [dosiero]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "malæifrado malsukcesis: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [dosiero]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [dosiero]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [dosiero]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [dosiero]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [dosiero]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [dosiero]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key uzantidentigilo" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key uzantidentigilo" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key uzantidentigilo" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key uzantidentigilo" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key uzantidentigilo [komandoj]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "Kreado de þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record malsukcesis: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "elkirasigo malsukcesis: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "enkirasigo malsukcesis: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "nevalida kompendi-metodo '%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[dosiero]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Ektajpu vian mesaøon ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1625,24 +1622,24 @@ "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn " "kaj fini per '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "notacia valoro ne povas enhavi stirsignojn\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "la donita gvidlinia URL por atestado ne validas\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "la donita gvidlinia URL por subskriboj ne validas\n" @@ -2496,13 +2493,13 @@ msgstr "Uzantidentigilo \"%s\" estas revokita.\n" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr "" @@ -2719,7 +2716,7 @@ msgid "Really sign? (y/N) " msgstr "Æu vere subskribi? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2771,397 +2768,389 @@ msgid "moving a key signature to the correct place\n" msgstr "movas þlosilsubskribon al la øusta loko\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "skribi kaj fini" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "montri fingrospuron" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "listigi þlosilojn kaj uzantidentigilojn" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "elekti uzantidentigilon N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "elekti flankan þlosilon N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "listigi subskribojn" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "subskribi la þlosilon" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "fari apartan subskribon" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "subskribi la þlosilon loke" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "subskribi la þlosilon nerevokeble" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "subskribi la þlosilon loke kaj nerevokeble" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "aldoni uzantidentigilon" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "aldoni foto-identigilon" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "forviþi uzantidentigilon" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "aldoni flankan þlosilon" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "forviþi flankan þlosilon" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 #, fuzzy msgid "add a revocation key" msgstr "aldoni flankan þlosilon" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "forviþi subskribojn" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "þanøi la daton de eksvalidiøo" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "marku uzantidentigilon kiel æefan" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "de sekreta aý publika listo iri al la alia" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "listigi preferojn (spertula)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "listigi preferojn (detale)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "agordi liston de preferoj" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "aktualigitaj preferoj" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "ne povis analizi URI de þlosilservilo\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "þanøi la pasfrazon" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "þanøi la posedantofidon" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revoki subskribojn" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 #, fuzzy msgid "revoke a user ID" msgstr "aldoni uzantidentigilon" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revoki flankan þlosilon" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "malþalti þlosilon" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "þalti þlosilon" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "montri foto-identigilon" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "eraro dum legado de sekreta þlosilbloko '%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Sekreta þlosilo estas havebla.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Bezonas la sekretan þlosilon por fari tion.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 #, fuzzy msgid "Key is revoked." msgstr "Þlosilo estas revokita.\n" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Æu vere subskribi æiujn uzantidentigilojn? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "nekonata klaso de subskribo" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tiu komando ne eblas en la reøimo %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Vi devas elekti almenaý unu uzantidentigilon.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Vi ne povas forviþi la lastan uzantidentigilon!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Vi devas elekti almenaý unu þlosilon.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Vi devas elekti almenaý unu þlosilon.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Æu vi vere volas forviþi la elektitajn þlosilojn? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Æu vi vere volas forviþi æi tiun þlosilon? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Æu vere forigi æiujn elektitajn uzantidentigilojn? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Æu vere forigi æi tiun uzantidentigilon? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Æu vi vere volas revoki la elektitajn þlosilojn? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Æu vi vere volas revoki æi tiun þlosilon? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "agordi liston de preferoj" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Æu vere aktualigi la preferojn por la elektitaj uzantidentigiloj? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Æu vere aktualigi la preferojn? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Æu skribi þanøojn? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Æu fini sen skribi þanøojn? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "aktualigo malsukcesis: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "aktualigo de sekreto malsukcesis: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Þlosilo ne þanøita, do aktualigo ne necesas.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "" -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Æi tiu þlosilo estas revokebla per %s þlosilo %s%s\n" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (sentema)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "ne povas krei %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "rev" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [eksvalidiøos: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " fido: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Æi tiu þlosilo estas malþaltita" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "rev" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "eksval" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3170,46 +3159,46 @@ "AVERTO: Æi tiu estas PGP2-stila þlosilo. Aldono de foto-identigilo eble\n" " kaýzos, ke iuj versioj de PGP malakceptos la þlosilon.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila þlosilo.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Forviþis %d subskribon.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Forviþis %d subskribojn.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nenio estis forviþita.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 #, fuzzy msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " @@ -3219,164 +3208,164 @@ "AVERTO: Æi tiu estas PGP2-stila þlosilo. Aldono de foto-identigilo eble\n" " kaýzos, ke iuj versioj de PGP malakceptos la þlosilon.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 #, fuzzy msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila þlosilo.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Donu la þlosilgrandon" -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Þanøas la daton de eksvalidiøo de la æefa þlosilo.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vi ne povas þanøi la daton de eksvalidiøo de v3-þlosilo\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Mankas responda subskribo en sekreta þlosilaro\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Bonvolu elekti precize unu uzantidentigilon.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "þlosilo %08lX: nevalida mem-subskribo\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas subskribi øin?\n" -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Mankas uzantidentigilo kun indekso %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Mankas flanka þlosilo kun indekso %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "uzantidentigilo: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " subskribita per %08lX je %s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Æi tiu þlosilo eksvalidiøos je %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Æu vi estas certa, ke vi ankoraý volas aldoni øin? (j/n) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr "subskribi þlosilon nerevokeble" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokita de %08lX je %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Vi revokos la sekvajn subskribojn:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Æu vere krei la revokatestilojn? (j/N)" -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "mankas sekreta þlosilo\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Uzantidentigilo \"%s\" estas revokita.\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3704,7 +3693,7 @@ "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4267,7 +4256,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 #, fuzzy msgid "unknown" msgstr "nekonata versio" @@ -4475,16 +4464,16 @@ msgid "communication problem with gpg-agent\n" msgstr "komunikproblemo kun gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problemo kun agento - malþaltas uzadon de agento\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (æefþlosilo %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4495,41 +4484,41 @@ "\"%.*s\"\n" "%u-bita %s þlosilo, ID %08lX, kreita je %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Ripetu pasfrazon\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Donu pasfrazon\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "pasfrazo estas tro longa\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "nevalida respondo de agento\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "nuligita de uzanto\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemo kun agento: agento redonas 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Donu pasfrazon: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4539,17 +4528,17 @@ "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n" "por la uzanto: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " @@ -5478,120 +5467,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "rev" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "eksval" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "nekonata versio" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "sekva kontrolo de fido-datenaro je %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "kontrolo de fido-datenaro ne estas bezonata\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "publika þlosilo %08lX ne trovita: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "kontrolas la fido-datenaron\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "publika þlosilo de absolute fidata þlosilo %08lX ne trovita\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n" @@ -5898,14 +5887,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key uzantidentigilo" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key uzantidentigilo" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "fari apartan subskribon" + +#~ msgid "sign the key non-revocably" +#~ msgstr "subskribi la þlosilon nerevokeble" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "subskribi la þlosilon loke kaj nerevokeble" + #~ msgid "q" #~ msgstr "f" Index: gnupg/po/es.po diff -u gnupg/po/es.po:1.14 gnupg/po/es.po:1.15 --- gnupg/po/es.po:1.14 Tue Dec 14 08:49:27 2004 +++ gnupg/po/es.po Thu Dec 16 11:04:36 2004 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-10-12 19:27+0200\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" @@ -34,7 +34,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -364,7 +364,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -577,7 +577,7 @@ msgid "secret key already stored on a card\n" msgstr "omitido: clave secreta ya presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "sale de este menú" @@ -586,7 +586,7 @@ msgid "show admin commands" msgstr "órdenes incompatibles\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "muestra esta ayuda" @@ -639,7 +639,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Orden> " @@ -658,7 +658,7 @@ msgid "Admin commands are not allowed\n" msgstr "escribiendo clave privada en `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Orden inválida (pruebe \"help\")\n" @@ -706,7 +706,7 @@ msgid "PIN not correctly repeated; try again" msgstr "frase contraseña repetida incorrectamente; inténtelo de nuevo" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -716,7 +716,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output no funciona con esta orden\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1025,59 +1025,59 @@ msgid "sign a key locally" msgstr "firma la clave localmente" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "genera un certificado de revocación" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exporta claves" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exporta claves a un servidor de claves" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importa claves desde un servidor de claves" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "busca claves en un servidor de claves" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "actualiza todas las claves desde un servidor de claves" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importa/fusiona claves" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "actualiza la base de datos de confianza" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [ficheros]|imprime resúmenes de mensaje" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1087,47 +1087,47 @@ "Opciones:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOMBRE|cifra para NOMBRE" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|nivel de compresión N (0 no comprime)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "usa modo de texto canónico" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "no hace ningún cambio" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "preguntar antes de sobreescribir" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" @@ -1135,7 +1135,7 @@ # página man -> página de manual # Vale. ¿del manual mejor? # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado. -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1143,7 +1143,7 @@ "@\n" "(Véase en la página del manual la lista completo de órdenes y opciones)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1193,7 +1193,7 @@ msgid "Pubkey: " msgstr "Clave pública: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Cifrado: " @@ -1201,7 +1201,7 @@ msgid "Hash: " msgstr "Resumen: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Compresión: " @@ -1285,355 +1285,352 @@ msgid "unknown configuration item `%s'\n" msgstr "artículo de configuración desconocido \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s no es para uso normal!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "no se carga el cifrado de ampliación \"%s\" por permisos inseguros\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s no es un juego de caracteres válido\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "no se puede interpretar la URI del servidor de claves\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "opciones de importación inválidas\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opciones de importación inválidas\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "opciones de importación inválidas\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opciones de exportación inválidas\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "opciones de exportación inválidas\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "imposible establecer camino de ejecutables %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sustituye a %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s no permitido con %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s no tiene sentido con %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "sólo puede hacer firmas separadas o en claro en modo --pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "debe usar ficheros (no tuberías) si trabaja con --pgp2 activo.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no inválido\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "el algoritmo de cifrado seleccionado es inválido\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "el algoritmo de certificación por resumen elegido es inválido\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level inválido; debe ser 0, 1, 2, ó 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level inválido; debe ser 0, 1, 2, ó 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "preferencias por defecto inválidas\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "preferencias personales de cifrado inválidas\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "preferencias personales de algoritmo de resumen inválidas\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "preferencias personales de compresión inválidas\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s aún no funciona con %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "no puede usar el cifrado \"%s\" en modo %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "no puede usar el resumen \"%s\" en modo %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "no puede usar la compresión \"%s\" en modo %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "descifrado fallido: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "no puede usar %s en modo %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "no puede usar %s en modo %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nombre_fichero]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id-usuario" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuario" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key id-usuario" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key id-usuario" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuario [órdenes]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuario] [anillo]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "envío al servidor de claves fallido: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepción del servidor de claves fallida: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "exportación de clave fallida: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "búsqueda del servidor de claves fallida: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "renovación al servidor de claves fallida: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución inválido `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nombre_fichero]" @@ -1641,11 +1638,11 @@ # En español no se deja espacio antes de los puntos suspensivos # (Real Academia dixit) :) # Tomo nota :-). Este comentario déjalo siempre. -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Adelante, teclee su mensaje...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1653,23 +1650,23 @@ "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y " "acabar con un '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "un nombre de notación de usuario debe contener el caracter '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación no debe usar ningún caracter de control\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "URL de política de certificado inválida\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "URL de política inválida\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL de política inválida\n" @@ -2538,12 +2535,12 @@ msgstr "ID de usuario \"%s\" revocado." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¿Seguro que todavía quiere firmarlo? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Imposible firmar.\n" @@ -2745,7 +2742,7 @@ msgid "Really sign? (y/N) " msgstr "¿Firmar de verdad? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2797,371 +2794,363 @@ msgid "moving a key signature to the correct place\n" msgstr "moviendo la firma de la clave al lugar correcto\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "graba y sale" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "muestra huella dactilar" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "lista clave e identificadores de usuario" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "selecciona identificador de usuario N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "selecciona clave secundaria N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "lista firmas" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "firma la clave" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "crea una firma separada" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "firma la clave localmente" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "firma la clave irrevocablemente" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "firma la clave local e irrevocablemente" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "añade un identificador de usuario" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "añade un ID fotográfico" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "borra un identificador de usuario" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "añade una clave secundaria" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "borra una clave secundaria" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "añade una clave de revocación" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "borra firmas" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "cambia fecha de caducidad" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "marca ID de usuario como primario" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "cambia entre lista de claves secretas y públicas" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "muestra preferencias (experto)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "muestra preferencias (prolijo)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "establece preferencias" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "preferencias actualizadas" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "no se puede interpretar la URI del servidor de claves\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "cambia la frase contraseña" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "cambia valores de confianza" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revoca firmas" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "revocar un identificador de usuario" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revoca una clave secundaria" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "deshabilita una clave" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "habilita una clave" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "mostrar ID fotográfico" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "error leyendo bloque de clave secreta `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Clave secreta disponible.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Se necesita la clave secreta para hacer esto.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor use la orden \"cambia\" primero.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "La clave está revocada." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "¿Firmar realmente todos los identificadores de usuario? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "clase de firma desconocida" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Esta orden no se permite en modo %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Debe seleccionar por lo menos un identificador de usuario.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "¡No puede borrar el último identificador de usuario!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "¿Borrar realmente todos los identificadores seleccionados? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "¿Borrar realmente este identificador de usuario? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "¿Borrar realmente este identificador de usuario? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Debe seleccionar por lo menos una clave.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Debe seleccionar por lo menos una clave.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "¿De verdad quiere borrar las claves seleccionadas? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "¿De verdad quiere borrar esta clave? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "¿Revocar realmente todos los identificadores seleccionados? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "¿Revocar realmente este identificador de usuario? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "¿De verdad quiere revocar las claves seleccionadas? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "¿De verdad quiere revocar esta clave? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "establece preferencias" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "¿Actualizar realmente las preferencias para todos los ID seleccionados? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "¿Actualizar realmente las preferencias? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "¿Grabar cambios? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "¿Salir sin grabar? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "actualización fallida: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "actualización de la clave secreta fallida: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Clave sin cambios, no se necesita actualización.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Resumen: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Esta clave puede ser revocada por la clave %s" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (confidencial)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "no se puede crear %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Esta clave está deshabilitada" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3169,19 +3158,19 @@ "Por favor, advierta que la validez de clave mostrada no es necesariamente\n" "correcta a menos de que reinicie el programa.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[revocada]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expira" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3189,7 +3178,7 @@ "AVISO: ningún ID de usuario está marcado como principal. Esta orden puede\n" " causar que se tome como principal por defecto otro ID de usuario.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3198,45 +3187,45 @@ "AVISO: esta es una clave de tipo PGP2. Añadir un ID fotográfico puede\n" "hacer que algunas versiones de PGP rechacen esta clave.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de querer añadirla? (s/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta firma correcta? (s/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta firma inválida? (s/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta firma desconocida? (s/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "¿Borrar realmente esta autofirma? (s/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d firmas borradas.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d firmas borradas\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "No se borró nada\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3245,163 +3234,163 @@ "AVISO: esta es una clave tipo PGP2. Añadir un revocador designado puede\n" " hacer que algunas versiones de PGP rechacen esta clave.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Introduzca el ID de usuario del revocador designado: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "no puede elegir una clave como su propio revocador designado\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ATENCIÓN: ¡Esta clave ha sido revocada por la persona designada\n" "como revocador!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "¿Está seguro de querer elegir esta clave como revocador designado? (s/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite las selecciones de las claves secretas.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo una clave secundaria.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando caducidad de clave secundaria.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando caducidad de clave primaria.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "No puede cambiar la fecha de caducidad de una clave v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "No existe la firma correspondiente en el anillo secreto\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Por favor seleccione exactamente un identificador de usuario.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "omitiendo autofirma V3 para el id \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Seguro que quiere usarlo? (s/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Seguro que quiere usarlo? (s/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "No hay ningún identificador de usuario con el índice %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el índice %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " firmada por %08lX el %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (no exportable)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta firma caducó el %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿De verdad quiere revocarla? (s/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta clave? (s/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ha firmado los siguientes IDs de usuario:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (no exportable)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocada por %08lX el %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Va a revocar las siguientes firmas:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Crear los certificados de revocación realmente? (s/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "no hay clave secreta\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID de usuario \"%s\" ya ha sido revocado\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3732,7 +3721,7 @@ "Necesita una frase contraseña para proteger su clave secreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4287,7 +4276,7 @@ msgid "textmode" msgstr "modotexto" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "desconocido" @@ -4496,16 +4485,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con el agente gpg\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problema con el agente - inhabilitando el uso del agente\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr "(ID clave primaria %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4516,41 +4505,41 @@ "del usuario: \"%.*s\"\n" "%u bits, clave %s, ID %08lX, creada el %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Repita frase contraseña\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Introduzca frase contraseña\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "frase contraseña demasiado larga\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "respuesta del agente inválida\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "cancelado por el usuario\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con el agente: el agente devuelve 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "imposible pedir contraseña en modo de proceso por lotes\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Introduzca frase contraseña: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4560,17 +4549,17 @@ "Necesita una frase contraseña para desbloquear la clave secreta\n" "del usuario: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Repita frase contraseña: " @@ -5510,120 +5499,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[revocada]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[caducada]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "desconocido" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "nunca " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "siguiente comprobación de base de datos de confianza el: %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "no es necesaria una comprobación de la base de datos de confianza\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "clave pública %08lX no encontrada: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "por favor haga un --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "comprobando base de datos de confianza\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d claves procesadas (%d validaciones superadas)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "no se encuentran claves totalmente fiables\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "clave pública de la clave totalmente fiable %08lX no encontrada\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n" @@ -5954,14 +5943,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "por favor, vea http://www.gnupg.org/faq.html para más información\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "operación imposible sin memoria segura inicializada\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key id-usuario" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key id-usuario" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "crea una firma separada" + +#~ msgid "sign the key non-revocably" +#~ msgstr "firma la clave irrevocablemente" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "firma la clave local e irrevocablemente" + #~ msgid "q" #~ msgstr "s" Index: gnupg/po/et.po diff -u gnupg/po/et.po:1.14 gnupg/po/et.po:1.15 --- gnupg/po/et.po:1.14 Tue Dec 14 08:49:27 2004 +++ gnupg/po/et.po Thu Dec 16 11:04:36 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -562,7 +562,7 @@ msgid "secret key already stored on a card\n" msgstr "jätsin vahele: avalik võti on juba olemas\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "välju sellest menüüst" @@ -571,7 +571,7 @@ msgid "show admin commands" msgstr "vastuolulised käsud\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "näita seda abiinfot" @@ -624,7 +624,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Käsklus> " @@ -643,7 +643,7 @@ msgid "Admin commands are not allowed\n" msgstr "kirjutan salajase võtme faili `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Vigane käsklus (proovige \"help\")\n" @@ -688,7 +688,7 @@ msgid "PIN not correctly repeated; try again" msgstr "parooli ei korratud õieti; proovige uuesti" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -698,7 +698,7 @@ msgid "--output doesn't work for this command\n" msgstr "võti --output ei tööta selle käsuga\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -998,59 +998,59 @@ msgid "sign a key locally" msgstr "allkirjasta võti lokaalselt" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "allkirjasta või toimeta võtit" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "genereeri tühistamise sertifikaat" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "ekspordi võtmed" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "ekspordi võtmed võtmeserverisse" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "impordi võtmed võtmeserverist" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "otsi võtmeid võtmeserverist" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "uuenda võtmeid võtmeserverist" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "impordi/mesti võtmed" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "uuenda usalduse andmebaasi" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [failid]|trüki teatelühendid" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1060,51 +1060,51 @@ "Võtmed:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "loo ascii pakendis väljund" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NIMI|krüpti NIMEle" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "kasuta seda kasutaja IDd" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|määra pakkimise tase N (0 blokeerib)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "kasuta kanoonilist tekstimoodi" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "kasuta väljundfailina" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "ole jutukas" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "ära tee mingeid muutusi" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "küsi enne ülekirjutamist" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1112,7 +1112,7 @@ "@\n" "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1162,7 +1162,7 @@ msgid "Pubkey: " msgstr "Avalik võti: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "¦iffer: " @@ -1170,7 +1170,7 @@ msgid "Hash: " msgstr "Räsi: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Pakkimine: " @@ -1254,365 +1254,362 @@ msgid "unknown configuration item `%s'\n" msgstr "tundmatu seade \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MÄRKUS: ignoreerin vana vaikimisi võtmete faili `%s'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "võtmete fail `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "loen võtmeid failist `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ebaturvaliste õiguste tõttu ei laetud ¨ifri laiendust \"%s\"\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei ole lubatud kooditabel\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "ei saa parsida võtmeserveri URI\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "vigased impordi võtmed\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: vigased impordi võtmed\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "vigased impordi võtmed\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: vigased ekspordi võtmed\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "vigased ekspordi võtmed\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path väärtuseks ei õnnestu seada %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "HOIATUS: %s määrab üle %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s ei ole koos lubatud!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s ei oma koos mõtet!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "--pgp2 moodis saate luua ainult eraldiseisvaid või avateksti allkirju\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 moodis ei saa korraga allkirjastada ja krüpteerida\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "teate krüpteerimine --pgp2 moodis nõuab IDEA ¨iffrit\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "valitud lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valitud ¨ifri algoritm ei ole lubatud\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed peab olema suurem, kui 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed peab olema suurem, kui 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "vigane S2K mood; peab olema 0, 1 või 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "vigased vaikimisi eelistused\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "vigased isikliku ¨ifri eelistused\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "vigased isikliku lühendi eelistused\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "vigased isikliku pakkimise eelistused\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ei tööta veel koos %s-ga\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "¨ifri algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "sõnumilühendi algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [failinimi]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [failinimi]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "lahtikrüpteerimine ebaõnnestus: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [failinimi]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [failinimi]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [failinimi]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s ei ole moodis %s lubatud.\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [failinimi]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [failinimi]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [failinimi]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key kasutaja-id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key kasutaja-id" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key kasutaja-id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key kasutaja-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key kasutaja-id [käsud]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kasutaja-id] [võtmehoidla]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "võtmeserverile saatmine ebaõnnestus: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "võtme eksport ebaõnnestus: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "võtmeserveri otsing ebaõnnestus: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "lahtipakendamine ebaõnnestus: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "pakendamine ebaõnnestus: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "vigane räsialgoritm `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[failinimi]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Kirjutage nüüd oma teade ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1620,23 +1617,23 @@ "noteerimise nimes võivad olla ainult trükitavad sümbolid või tühikud\n" "ning lõpus peab olema '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "kasutaja noteerimise nimi peab sisaldama '@' märki\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "noteerimise väärtus ei või sisaldada kontroll sümboleid\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "antud sertifikaadi poliisi URL on vigane\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "antud allkirja poliisi URL on vigane\n" @@ -2493,12 +2490,12 @@ msgstr "Kasutaja ID \"%s\" on tühistatud." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Ei saa allkirjastada.\n" @@ -2699,7 +2696,7 @@ msgid "Really sign? (y/N) " msgstr "Allkirjastan tõesti? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2751,370 +2748,362 @@ msgid "moving a key signature to the correct place\n" msgstr "tõstan võtme allkirja õigesse kohta\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "salvesta ja välju" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "näita sõrmejälge" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "näita võtit ja kasutaja IDd" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "vali kasutaja ID N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "vali sekundaarne võti N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "näita allkirju" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "allkirjasta võti" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "loo eraldiseisev allkiri" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "allkirjasta võti lokaalselt" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "lisa kasutaja ID" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "lisa foto ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "kustuta kasutaja ID" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "lisa sekundaarne võti" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "kustuta sekundaarne võti" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "lisa tühistamise võti" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "kustuta allkirjad" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "muuda aegumise kuupäeva" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "märgi kasutaja ID primaarseks" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "lülita salajaste või avalike võtmete loendi vahel" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "näita eelistusi (ekspert)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "näita eelistusi (detailsena)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "sea eelistuste nimekiri" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "uuendatud eelistused" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "ei saa parsida võtmeserveri URI\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "muuda parooli" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "muuda omaniku usaldust" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "tühista allkirjad" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "tühista kasutaja ID" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "tühista sekundaarne võti" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "blokeeri võti" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "luba võti" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "näita foto ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "viga salajase võtmebloki `%s' lugemisel: %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Salajane võti on kasutatav.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Selle tegamiseks on vaja salajast võtit.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Võti on tühistatud." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Kas allkirjastan tõesti kõik kasutaja IDd? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Vihje: Valige allkirjastamiseks kasutaja\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "tundmatu allkirja klass" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "See käsklus ei ole %s moodis lubatud.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Te peate valima vähemalt ühe kasutaja ID.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Viimast kasutaja ID ei saa kustutada!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Kas kustutan tõesti kõik kasutaja IDd? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Kas eemaldan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Kas eemaldan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Te peata valima vähemalt ühe võtme.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Te peata valima vähemalt ühe võtme.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Kas te tõesti soovite valitud võtmeid kustutada? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Kas te tõesti soovite seda võtit kustutada? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Kas tühistan tõesti kõik valitud kasutaja IDd? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Kas tühistan tõesti selle kasutaja ID? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Kas te tõesti soovite valitud võtmeid tühistada? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Kas te tõesti soovite seda võtit tühistada? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "sea eelistuste nimekiri" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Kas tõesti uuendan seaded? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvestan muutused? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Väljun salvestamata? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "salajase võtme uuendamine ebaõnnestus: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Teatelühend: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Omadused: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Selle võtme võib olla tühistanud %s võti " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (tundlik)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s ei õnnestu luua: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[tühistatud] " -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [aegub: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " usaldus: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "See võti on blokeeritud" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3122,19 +3111,19 @@ "Tuleb tähele panna et kuni te pole programmi uuesti käivitanud, ei pruugi\n" "näidatud võtme kehtivus olla tingimata korrektne.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[tühistatud] " -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3142,7 +3131,7 @@ "HOIATUS: ühtegi kasutaja ID pole märgitud primaarseks. See käsklus võib\n" " põhjustada muu kasutaja ID primaarseks määramist.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3151,45 +3140,45 @@ "HOIATUS: See on PGP2-stiilis võti. Foto ID lisamine võib sundida mõningaid\n" " PGP versioone seda võtit tagasi lükkama.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Kustutan selle korrektse allkirja? (j/E/v)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Kustutan selle vigase allkirja? (j/E/v)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Kustutan selle tundmatu allkirja? (j/E/v)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Kustutatud %d allkiri.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Kustutatud %d allkirja.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Midagi ei kustutatud.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3198,160 +3187,160 @@ "HOIATUS: See on PGP2-stiilis võti. Määratud tühistaja lisamine võib\n" " põhjustada mõningaid PGP versioone seda võtit tagasi lükkama.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Sisestage määratud tühistaja kasutaja ID: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Palun eemaldage salajastelt võtmetelt valikud.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "palun valige ülimalt üks sekundaarne võti.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Muudan sekundaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Muudan primaarse võtme aegumise aega.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3 võtme aegumise aega ei saa muuta.\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Palun valige täpselt üks kasutaja ID.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Olete kindel, et soovite seda kasutada (j/E)? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Kasutaja ID numbriga %d puudub\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Sekundaarne võti numbriga %d puudub\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "kasutaja ID: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " allkirjastanud %08lX %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "See allkiri aegub %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (mitte-eksporditav)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " tühistanud %08lX %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Te asute tühistama järgmisi allkirju:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "salajast võtit pole\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kasutaja ID \"%s\" on juba tühistatud\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n" @@ -3678,7 +3667,7 @@ "Te vajate oma salajase võtme kaitsmiseks parooli.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4228,7 +4217,7 @@ msgid "textmode" msgstr "tekstimood" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "tundmatu" @@ -4436,16 +4425,16 @@ msgid "communication problem with gpg-agent\n" msgstr "probleem gpg-agent programmiga suhtlemisel\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "probleem agendiga - blokeerin agendi kasutamise\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (peamise võtme ID %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4456,41 +4445,41 @@ "\"%.*s\"\n" "%u-bitti %s võti, ID %08lX, loodud %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Korrake parooli\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Sisestage parool\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "liiga pikk parool\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "vigane vastus agendilt\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "katkestatud kasutaja poolt\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem agendiga: agent tagastas 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "pakettmoodis ei saa parooli küsida\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Sisestage parool: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4500,17 +4489,17 @@ "Te vajate kasutaja salajase võtme lahtilukustamiseks\n" "parooli: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bitine %s võti, ID %08lX, loodud %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Korrake parooli: " @@ -5439,120 +5428,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[tühistatud] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[aegunud] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "tundmatu" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "mitte kunagi" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "trustdb järgmine kontroll %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "trustdb kontrolliks puudub vajadus\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "ei leia avalikku võtit %08lX: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "palun tehke --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "kontrollin trustdb faili\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d võtit töödeldud (%d kehtivust puhastatud)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "absoluutselt usaldatavaid võtmeid pole\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n" @@ -5857,14 +5846,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "initsialiseerimata turvalise mäluta ei ole operatsioon võimalik\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(te kasutasite vahest selle töö jaoks valet programmi)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key kasutaja-id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key kasutaja-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "loo eraldiseisev allkiri" + +#~ msgid "sign the key non-revocably" +#~ msgstr "allkirjasta võti kehtetuks mitte-tunnistatavana" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "allkirjasta võti lokaalselt ja kehtetuks mitte-tunnistatavana" + #~ msgid "q" #~ msgstr "v" Index: gnupg/po/fi.po diff -u gnupg/po/fi.po:1.9 gnupg/po/fi.po:1.10 --- gnupg/po/fi.po:1.9 Tue Dec 14 08:49:27 2004 +++ gnupg/po/fi.po Thu Dec 16 11:04:36 2004 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -46,7 +46,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -371,7 +371,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -582,7 +582,7 @@ msgid "secret key already stored on a card\n" msgstr "ohitetaan: salainen avain on jo paikalla\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "ulos tästä valikosta" @@ -591,7 +591,7 @@ msgid "show admin commands" msgstr "ristiriitainen komento\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "näytä tämä ohje" @@ -644,7 +644,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Komento> " @@ -663,7 +663,7 @@ msgid "Admin commands are not allowed\n" msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Komento ei kelpaa (kirjoita \"help\")\n" @@ -708,7 +708,7 @@ msgid "PIN not correctly repeated; try again" msgstr "salasanaa ei toistettu oikein, yritä uudestaan." -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -718,7 +718,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output ei toimi yhdessä tämän komennon kanssa\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1018,59 +1018,59 @@ msgid "sign a key locally" msgstr "allekirjoita avain paikallisesti" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "allekirjoita tai muokkaa avainta" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "luo mitätöintivarmenne" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "vie avaimia" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "vie avaimia palvelimelle" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "nouda avaimia avainpalvelimelta" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "etsi avaimia avainpalvelimelta" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "päivitä kaikki avaimet avainpalvelimelta" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "nouda/liitä avaimia" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "päivitä luottamustietokanta" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [tiedostot]|tulosta viestien tiivisteet" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1080,51 +1080,51 @@ "Valitsimet:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "tuota ascii-koodattu tuloste" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NIMI|salaa vastaanottajalle NIMI" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "käytä tekstimuotoa" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "käytä tulostustiedostona" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "monisanainen" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "älä tee muutoksia" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "kysy ennen ylikirjoittamista" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1133,7 +1133,7 @@ "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-" "sivuilta)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1183,7 +1183,7 @@ msgid "Pubkey: " msgstr "JulkAvain: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Salaus: " @@ -1191,7 +1191,7 @@ msgid "Hash: " msgstr "Tiiviste: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Pakkaus: " @@ -1275,366 +1275,363 @@ msgid "unknown configuration item `%s'\n" msgstr "tuntematon asetus \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "asetustiedosto \"%s\": %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "luetaan asetukset tiedostosta \"%s\"\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "HUOM: %s ei ole normaaliin käyttöön!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ei kelpaa merkistöksi\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "avainpalvelimen URI:iä ei voi jäsentää\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: virheelliset tuontivalitsimet\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "virheelliset tuontivalitsimet\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: virheelliset vientivalitsimet\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "virheelliset vientivalitsimet\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-polkua kohteeseen %s ei voi asettaa\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROITUS: %s korvaa %s:n\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ja %s eivät ole sallittuja yhdessä!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ja %s yhdessä on järjetöntä!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "valittu tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "valittu salausalgoritmi ei kelpaa\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed täytyy olla suurempi kuin 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed täytyy olla suurempi kuin 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth tulee olla välillä 1-255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "virheelliset oletusarvoiset valinnat\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "virheelliset henkilökohtaisen salaimen valinnat\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ja %s eivät vielä toimi yhdessä\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "TrustDB:n alustaminen ei onnistu: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [tiedostonimi]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [tiedostonimi]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "avaus epäonnistui: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [tiedostonimi]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "valitsinta %s ei voi käyttää %s-tilassa\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--allekirjoita [tiedostonimi]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [tiedostonimi]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "valitsinta %s ei voi käyttää %s-tilassa\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [tiedostonimi]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [tiedostonimi]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [tiedostonimi]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key käyttäjätunnus" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key käyttäjätunnus" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrlsign-key käyttäjätunnus" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key käyttäjätunnus" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key käyttäjätunnus [komennot]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "avaimen vienti epäonnistui: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "avainpalvelimen päivitys epäonnistui: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "ascii-koodauksen purku epäonnistui: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "ascii-koodaaminen epäonnistui: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "virheellinen tiivistealgoritmi \"%s\"\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[tiedostonimi]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Kirjoita viestisi...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1642,23 +1639,23 @@ "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai " "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "notaatiosssa ei saa olla erikoismerkkejä\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "annettu varmennekäytännön URL on virheellinen\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "annettu allekirjoituskäytännön URL on virheellinen\n" @@ -2529,12 +2526,12 @@ msgstr "Käyttäjätunnus \"%s\" on mitätöity." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Allekirjoittaminen ei onnistu.\n" @@ -2737,7 +2734,7 @@ msgid "Really sign? (y/N) " msgstr "Varmastiko allekirjoita? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2789,370 +2786,362 @@ msgid "moving a key signature to the correct place\n" msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "tallenna ja lopeta" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "näytä sormenjälki" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "näytä avaimet ja käyttäjätunnukset" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "valitse käyttäjätunnus N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "valitse toissijainen avain N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "näytä allekirjoitukset" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "allekirjoita avain" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "tee erillinen allekirjoitus" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "allekirjoita avain paikallisesti" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "allekirjoita avain mitätöimättömästi" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "allekirjoita avain paikallisesti ja mitätöimättömästi" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "lisää käyttäjätunnus" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "lisää valokuva" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "poista käyttäjätunnus" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "lisää toissijainen avain" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "poista toissijainen avain" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "lisää mitätöintiavain" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "poista allekirjoitus" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "muuta voimassoloaikaa" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "merkitse käyttäjätunnus ensisijaiseksi" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "vaihda salaisten ja julkisten avainten luettelon välillä" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "näytä valinnat (asiantuntija)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "näytä valinnat (monisanaisesti)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "näytä valinnat" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "päivitä valinnat" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "avainpalvelimen URI:iä ei voi jäsentää\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "muuta salasanaa" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "muuta luottamusastetta" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "mitätöi allekirjoitus" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "mitätöi käyttäjätunnus" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "mitätöi toissijainen avain" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "poista avain käytöstä" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "ota avain käyttöön" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "näytä valokuvatunniste" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Salainen avain on saatavilla.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Tähän tarvitaan salainen avain.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Käytä ensin komentoa \"toggle\".\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Avain on mitätöity." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?" -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "tuntematon allekirjoitusluokka" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tätä komentoa ei sallita %s-tilassa.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Varmastiko poista tämä käyttäjätunnus? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Varmastiko poista tämä käyttäjätunnus? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Sinun täytyy valita ainakin yksi avain.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Sinun täytyy valita ainakin yksi avain.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Haluatko varmasti poistaa valitut avaimet? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Haluatko varmasti poistaa tämän avaimen? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Varmastiko mitätöi tämä käyttäjätunnus? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Haluatko varmasti mitätöidä valitut avaimet? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Haluatko varmasti mitätöidä tämän avaimen? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "näytä valinnat" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Varmastiko päivitä valinnat? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Tallenna muutokset? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Lopeta tallentamatta muutoksia?" -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "päivitys epäonnistui: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "salaisen päivitys epäonnistui: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Tiiviste: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Ominaisuudet: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Tämä avain voidaan mitätöidä %s-avaimella " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (luottamuksellinen)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "ei voida luoda kohdetta %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[mitätöity] " -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [vanhenee: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " luottamus: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Tämä avain on poistettu käytöstä" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3160,19 +3149,19 @@ "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n" "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[mitätöity] " -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3180,7 +3169,7 @@ "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi. Tämän \n" "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3189,45 +3178,45 @@ "VAROITUS: Tämä on PGP2-muodon avain. Valokuvan lisääminen voi\n" " saada jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Varmastiko poista oma-allekirjoitus? (k/E)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d allekirjoitus poistettu.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d allekirjoitusta poistettu.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Mitään ei poistettu.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3237,162 +3226,162 @@ "voi\n" " saada jotkin PGP:n versiot hylkäämään avaimen.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Poista salaisten avainten valinnat, kiitos.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Valitse tasan yksi käyttäjätunnus!\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Haluatko varmasti käyttää sitä (k/E)? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Indeksillä %d ei löydy toissijaista avainta\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "käyttäjätunnus: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " %08lX allekirjoitti tämän %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Tämä allekirjoitus vanheni %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Haluatko varmasti mitätöidä sen? (k/E) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (vientiin kelpaamaton)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " %08lX mitätöi tämän %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "salainen avain ei ole saatavilla\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän " "tulevaisuuteen\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3723,7 +3712,7 @@ "Tarvitset salasanan suojaamaan salaista avaintasi.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4282,7 +4271,7 @@ msgid "textmode" msgstr "teksti" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "tuntematon " @@ -4493,16 +4482,16 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agentin kanssa yhteysongelma\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (pääavaimen tunnus %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4513,41 +4502,41 @@ "\"%.*s\"\n" "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Toista salasana\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Syötä salasana\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "salasana on liian pitkä\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "agentin lähettämä vastaus ei kelpaa\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "käyttäjän peruma\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "salasanan kysyminen ei onnistu eräajossa\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Syötä salasana: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4556,17 +4545,17 @@ "\n" "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Toista salasana: " @@ -5519,120 +5508,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[mitätöity] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[vanhentunut] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "tuntematon " -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "ei koskaan" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "seuraava trustdb tarkistus %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "trustdb:n tarkistusta ei tarvita\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "julkista avainta %08lX ei löydy: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "tee --check-trustdb, kiitos\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "tarkistetaan trustdb:tä\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n" @@ -5937,14 +5926,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrlsign-key käyttäjätunnus" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key käyttäjätunnus" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "tee erillinen allekirjoitus" + +#~ msgid "sign the key non-revocably" +#~ msgstr "allekirjoita avain mitätöimättömästi" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "allekirjoita avain paikallisesti ja mitätöimättömästi" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/fr.po diff -u gnupg/po/fr.po:1.68 gnupg/po/fr.po:1.69 --- gnupg/po/fr.po:1.68 Tue Dec 14 08:49:27 2004 +++ gnupg/po/fr.po Thu Dec 16 11:04:36 2004 @@ -5,13 +5,13 @@ # Thanks to Rémi Guyomarch and # for pointing me out some errors. # -# $Id: fr.po,v 1.68 2004/12/14 07:49:27 wk Exp $ +# $Id: fr.po,v 1.69 2004/12/16 10:04:36 wk Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.3.93-cvs\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-11-08 01:13+0100\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -35,7 +35,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -364,7 +364,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "carte OpenPGP n° %s détectée\n" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "impossible de faire cela en mode automatique\n" @@ -562,7 +562,7 @@ msgid "secret key already stored on a card\n" msgstr "la clé secrète est déjà stockée sur une carte\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "quitter ce menu" @@ -570,7 +570,7 @@ msgid "show admin commands" msgstr "indiquer les commandes d'administration" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "afficher cette aide" @@ -620,7 +620,7 @@ msgid "menu to change or unblock the PIN" msgstr "menu pour changer ou déverrouiller le PIN" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Commande> " @@ -636,7 +636,7 @@ msgid "Admin commands are not allowed\n" msgstr "Les commandes d'administration ne sont pas permises\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez «help»)\n" @@ -686,7 +686,7 @@ msgid "PIN not correctly repeated; try again" msgstr "le mot de passe n'a pas été correctement répété ; recommencez." -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -696,7 +696,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output n'est pas compatible avec cette commande\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" @@ -1005,59 +1005,59 @@ msgid "sign a key locally" msgstr "signer une clé localement" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "signer ou éditer une clé" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "générer un certificat de révocation" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exporter les clés" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exporter les clés vers un serveur de clés" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importer les clés d'un serveur de clés" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "chercher les clés avec un serveur de clés" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "mettre à jour les clés depuis un serveur" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importer/fusionner les clés" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "afficher l'état de la carte" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "changer les données d'une carte" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "changer le code PIN d'une carte" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "mettre la base de confiance à jour" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1067,51 +1067,51 @@ "Options:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "créer une sortie ascii avec armure" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOM|chiffrer pour NOM" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou déchiffrer" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 désactive)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "utiliser le mode texte canonique" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "bavard" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "ne rien changer" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "demander avant d'écraser un fichier" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "utiliser strictement le comportement OpenPGP" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "générer des messages compatibles avec PGP 2.x" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1119,7 +1119,7 @@ "@\n" "(Voir la page de manuel pour une liste complète des commandes et options)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1171,7 +1171,7 @@ msgid "Pubkey: " msgstr "Clé publique: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Chiffrement: " @@ -1179,7 +1179,7 @@ msgid "Hash: " msgstr "Hachage: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Compression: " @@ -1287,374 +1287,371 @@ msgid "unknown configuration item `%s'\n" msgstr "élément de configuration `%s' inconnu\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTE: l'ancien fichier d'options par défaut `%s' a été ignoré\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: pas de fichier d'options par défaut `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s n'est pas pour une utilisation normale !\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "l'extension de chiffrement `%s' n'a pas été chargée car ses\n" "permissions sont peu sûres\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, c-format msgid "`%s' is not a valid character set\n" msgstr "`%s' n'est pas un jeu de caractères valide\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 msgid "could not parse keyserver URL\n" msgstr "impossible d'interpréter l'URL du serveur de clés\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: les options du serveur de clés sont invalides\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 msgid "invalid keyserver options\n" msgstr "les options du serveur de clés sont invalides\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: options d'import invalides\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "options d'import invalides\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: options d'export invalides\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "options d'export invalides\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: options de liste invalides\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 msgid "invalid list options\n" msgstr "options de liste invalides\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: options de vérification invalides\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 msgid "invalid verify options\n" msgstr "options de vérification invalides\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossible de mettre le chemin d'exécution à %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENTION: %s remplace %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s n'est pas permis avec %s !\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s n'a aucun sens avec %s !\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "il n'est possible de faire une signature détachée ou en texte clair\n" "qu'en mode --pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "vous ne pouvez pas signer et chiffrer en même temps en mode --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n" "est activé.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "chiffrer un message en mode --pgp2 nécessite l'algorithme de chiffrage IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 msgid "selected compression algorithm is invalid\n" msgstr "l'algorithme de compression sélectionné est invalide\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "la fonction de hachage de certification sélectionnée est invalide\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "«completes-needed» doit être supérieur à 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "«marginals-needed» doit être supérieur à 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth doit être compris entre 1 et 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalide; doit être 0, 1, 2 ou 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalide; doit être 0, 1, 2 ou 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: le mode S2K simple (0) est fortement déconseillé\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide; ce doit être 0, 1 ou 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "préférences par défaut invalides\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "préférences de chiffrement personnelles invalides\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "préférences de hachage personnelles invalides\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "préférences de compression personnelles invalides\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s ne marche pas encore avec %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n" "en mode %s.\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n" "en mode %s.\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n" "en mode %s.\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "impossible d'initialiser la base de confiance: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISSEMENT: des destinataires (-r) ont été donnés alors que le\n" "chiffrement ne se fait pas par clé publique\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "le chiffrement symétrique de `%s' a échoué: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [nom du fichier]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [nom du fichier]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n" "--s2k-mode 0\n" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n" "en mode %s.\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nom du fichier]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key utilisateur" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key utilisateur" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key utilisateur" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key utilisateur" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "l'envoi vers le serveur de clés a échoué: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "la réception depuis le serveur de clés a échoué: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "l'export de la clé a échoué: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "la recherche au sein du serveur de clés a échoué: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "le rafraîchissement par le serveur de clés a échoué: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "la suppression d'une armure a échoué: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "la construction d'une armure a échoué: %s \n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Vous pouvez taper votre message...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1662,23 +1659,23 @@ "le nom d'une notation ne doit comporter que des caractères imprimables\n" "ou des espaces, et se terminer par un signe '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "un nom de notation utilisateur doit contenir le caractère '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "l'URL de politique de certification donnée est invalide\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "l'URL de politique de signature donnée est invalide\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 msgid "the given preferred keyserver URL is invalid\n" msgstr "l'URL du serveur de clés favori qui a été donnée est invalide\n" @@ -2563,12 +2560,12 @@ msgstr "Le nom d'utilisateur \"%s\" est révoqué." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Etes-vous sûr de toujours vouloir le signer ? (o/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Impossible de signer.\n" @@ -2751,7 +2748,7 @@ msgid "Really sign? (y/N) " msgstr "Signer réellement ? (o/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2801,357 +2798,350 @@ msgid "moving a key signature to the correct place\n" msgstr "replacer la signature d'une clé à l'endroit correct\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "enregistrer et quitter" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "afficher l'empreinte" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "lister la clé et les noms d'utilisateurs" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "sélectionner le nom d'utilisateur N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "sélectionner la clé secondaire N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "lister les signatures" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "signer la clé" -#: g10/keyedit.c:1259 -msgid "make a trust signature" -msgstr "faire une signature de confiance" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "signer la clé localement" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "signer la clé de façon non-révocable" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "signer la clé de façon locale et non-révocable" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "ajouter un utilisateur" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "ajouter une photo d'identité" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "enlever un utilisateur" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "ajouter une clé secondaire" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "ajouter une clé à une carte à puce" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "déplacer une clé vers une carte à puce" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "enlever une clé secondaire" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "ajouter une clé de révocation" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "supprimer les signatures" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "changer la date d'expiration" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "marquer le nom d'utilisateur comme principal" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "passer de la liste des clés secrètes aux clés privées et inversement" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "lister les préférences (expert)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "lister les préférences (bavard)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "donner la liste de préférences" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "préférences mises à jour" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 msgid "set preferred keyserver URL" msgstr "indiquer l'URL du serveur de clés préféré" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "changer le mot de passe" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "changer la confiance" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "révoquer les signatures" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "révoquer un nom d'utilisateur" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "révoquer une clé secondaire" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "désactiver une clé" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "activer une clé" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "montrer la photo d'identité" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erreur pendant la lecture du bloc de clé secrète « %s »: %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "La clé secrète est disponible.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Il faut la clé secrète pour faire cela.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Utilisez la commande «toggle» d'abord.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "La clé est révoquée." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 msgid "Really sign all user IDs? (y/N) " msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Aide: Sélectionner les utilisateurs à signer\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "classe de signature inconnue" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Cette commande n'est pas admise en mode %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Vous devez sélectionner au moins un utilisateur.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 msgid "Really remove all selected user IDs? (y/N) " msgstr "Enlever réellement tous les noms d'utilisateurs sélectionnés ? (o/N) " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 msgid "Really remove this user ID? (y/N) " msgstr "Enlever réellement ce nom d'utilisateur ? (o/N) " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 msgid "Really move the primary key? (y/N) " msgstr "Enlever réellement la clé principale ? (o/N) " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 msgid "You must select exactly one key.\n" msgstr "Vous devez sélectionner exactement une clé.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Vous devez sélectionner au moins une clé.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Voulez-vous vraiment supprimer les clés sélectionnées ? (o/N) " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 msgid "Do you really want to delete this key? (y/N) " msgstr "Voulez-vous vraiment supprimer cette clé ? (o/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 msgid "Really revoke all selected user IDs? (y/N) " msgstr "Révoquer réellement tous les noms d'utilisateurs sélectionnés ? (o/N) " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 msgid "Really revoke this user ID? (y/N) " msgstr "Révoquer réellement ce nom d'utilisateur ? (o/N) " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Voulez-vous vraiment révoquer les clés sélectionnées ? (o/N) " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 msgid "Do you really want to revoke this key? (y/N) " msgstr "Voulez-vous vraiment révoquer cette clé ? (o/N) " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" "La confiance du propriétaire peut ne pas être positionnée en utilisant\n" "la base de confiance d'un tiers\n" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 msgid "Set preference list to:\n" msgstr "Changer la liste de préférences en :\n" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Mettre à jour réellement les préférences des noms d'utilisateurs\n" "sélectionnés ? (o/N) " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 msgid "Really update the preferences? (y/N) " msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 msgid "Save changes? (y/N) " msgstr "Enregistrer les changements? (o/N) " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 msgid "Quit without saving? (y/N) " msgstr "Quitter sans enregistrer ? (o/N) " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "la mise à jour a échoué: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "la mise à jour de la clé secrète a échoué: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "La clé n'a pas changé donc la mise à jour est inutile.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Hachage: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Fonctions: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "Serveur de clés: pas-de-modification" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "Serveur de clés préféré: " -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, c-format msgid "This key may be revoked by %s key %s" msgstr "Cette clé peut être révoquée par la clé %s %s" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 msgid "(sensitive)" msgstr "(sensible)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "créé: %s" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "revoqué: %s" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "expiré: %s" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "expire: %s" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, c-format msgid "usage: %s" msgstr "utilisation: %s" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, c-format msgid "trust: %s" msgstr " confiance: %s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "validité: %s" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Cette clé a été désactivée" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "n° de carte: " -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" "Il n'y a pas de préférences dans un nom d'utilisateur du style de\n" "PGP 2.x.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3159,17 +3149,17 @@ "Notez que la validité affichée pour la clé n'est pas nécessairement\n" "correcte tant que vous n'avez pas relancé le programme.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 msgid "revoked" msgstr "revoquée" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 msgid "expired" msgstr "expirée" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3178,7 +3168,7 @@ "Cette commande risque de rendre un autre nom d'utilisateur principal\n" "par défaut.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3188,46 +3178,46 @@ "d'identité peut empêcher certaines versions de PGP d'accepter\n" "cette clé\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Etes-vous sûr de vouloir l'ajouter ? (y/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Vous ne pouvez pas ajouter de photo d'identité à une clé du style PGP2.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Supprimer cette bonne signature ? (o/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Supprimer cette signature invalide ? (o/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Supprimer cette signature inconnue ? (o/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d signature supprimée.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d signatures supprimées\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Rien n'a été supprimé.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3237,165 +3227,165 @@ "désigné peut empêcher certaines versions de PGP d'accepter\n" "cette clé.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Vous ne pouvez pas ajouter de révocateur désigné à une clé de style PGP2.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Entrez le nom d'utilisateur du révocateur désigné: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "impossible d'utiliser une clé de style PGP 2.x comme révocateur\n" "désigné.\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "vous ne pouvez pas utiliser une clé comme son propre révocateur\n" "désigné\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 msgid "this key has already been designated as a revoker\n" msgstr "cette clé à déjà été désignée comme un révocateur\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVERTISSEMENT: l'établissement d'une clé comme révocateur désigné\n" "est irréversible !\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Etes-vous sûr de vouloir établir cette clé comme révocateur\n" "désigné ? (o/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Enlevez les sélections des clés secrètes.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Vous devez sélectionner au plus une clé secondaire.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Changer la date d'expiration d'une clé secondaire.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Changer la date d'expiration de la clé principale.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Vous ne pouvez pas changer la date d'expiration d'une clé v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Pas de signature correspondante dans le porte-clés secret\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Vous devez sélectionner exactement un utilisateur.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "l'auto-signature v3 du nom d'utilisateur « %s » a été ignorée\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "Entrez l'URL de votre serveur de clés favori: " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 msgid "Are you sure you want to replace it? (y/N) " msgstr "Etes-vous sûr de vouloir le remplacer ? (o/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 msgid "Are you sure you want to delete it? (y/N) " msgstr "Etes-vous sûr de vouloir le supprimer ? (o/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Pas d'utilisateur avec l'index %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Pas de clé secondaire avec l'index %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, c-format msgid "user ID: \"%s\"\n" msgstr "nom d'utilisateur: « %s »\n" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "signé par votre clé %s à %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Cette signature a expiré le %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Etes-vous sûr de vouloir toujours le révoquer ? (y/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Générer un certificat de révocation pour cette signature ? (o/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Vous avez signé ces noms d'utilisateurs sur la clé %s:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 msgid " (non-revocable)" msgstr " (non-révocable)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, c-format msgid "revoked by your key %s on %s\n" msgstr "révoqué par votre clé %s à %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Vous êtes sur le point de révoquer ces signatures:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Créer réellement les certificats de révocation ? (o/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "pas de clé secrète\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Le nom d'utilisateur \"%s\" est déjà révoqué.\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n" "dans le futur\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3722,7 +3712,7 @@ "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4284,7 +4274,7 @@ msgid "textmode" msgstr "modetexte" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "inconnu" @@ -4499,16 +4489,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problème de communication avec ssh-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problème avec l'agent - arrêt d'utilisation de l'agent\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, c-format msgid " (main key ID %s)" msgstr " (ID clé principale %s)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4520,40 +4510,40 @@ "\"%.*s\"\n" "clé %u bits %s, ID %s, créée %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Répétez le mot de passe\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Entrez le mot de passe\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "mot de passe trop long\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "réponse de l'agent invalide\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "annulé par l'utilisateur\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 msgid "can't query passphrase in batch mode\n" msgstr "impossible de demander la phrase de passe en mode automatique\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4562,17 +4552,17 @@ "Vous avez besoin d'une phrase de passe pour déverrouiller la\n" "clé secrète pour l'utilisateur: « %s »\n" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "clé de %u bits %s, ID %s, créée le %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr " (sous-clé de la clé principale ID %s)" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Répétez le mot de passe: " @@ -5534,121 +5524,121 @@ msgid "using %s trust model\n" msgstr "utilisation du modèle de confiance %s\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "revoquée" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "expirée" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "inconnu" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 #, fuzzy msgid "[marginal]" msgstr "marginale" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 #, fuzzy msgid "[ultimate]" msgstr "ultime" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "indéfini" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "jamais" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "marginale" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "pleine" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "ultime" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "vérification de la base de confiance inutile\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "" "vérification de la base de confiance inutile avec le modèle de\n" "confiance `%s'\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "" "mise à jour de la base de confiance inutile avec le modèle de\n" "confiance `%s'\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, c-format msgid "public key %s not found: %s\n" msgstr "clé publique %s non trouvée : %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "faites un --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "vérifier la base de confiance\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d clés traitées (%d comptes de validité réinitialisés)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "aucune clé de confiance ultime n'a été trouvée\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "la clé publique de la clé de confiance ultime %s est introuvable\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" "%d marginale(s) nécessaires, %d complète(s) nécessaires, modèle\n" "de confiance %s\n" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" @@ -5656,7 +5646,7 @@ "profondeur: %d valide: %3d signé: %3d\n" "confiance: %d-. %dg. %dn. %dm. %df. %du\n" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5962,16 +5952,31 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "" "l'opération n'est pas possible tant que la mémoire sûre n'est pas\n" "initialisée\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key utilisateur" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key utilisateur" + +#~ msgid "make a trust signature" +#~ msgstr "faire une signature de confiance" + +#~ msgid "sign the key non-revocably" +#~ msgstr "signer la clé de façon non-révocable" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "signer la clé de façon locale et non-révocable" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/gl.po diff -u gnupg/po/gl.po:1.14 gnupg/po/gl.po:1.15 --- gnupg/po/gl.po:1.14 Tue Dec 14 08:49:27 2004 +++ gnupg/po/gl.po Thu Dec 16 11:04:36 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -566,7 +566,7 @@ msgid "secret key already stored on a card\n" msgstr "omítese: a chave secreta xa está presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "saír deste menú" @@ -575,7 +575,7 @@ msgid "show admin commands" msgstr "comandos conflictivos\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "amosar esta axuda" @@ -628,7 +628,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Comando> " @@ -647,7 +647,7 @@ msgid "Admin commands are not allowed\n" msgstr "gravando a chave secreta en `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Comando incorrecto (tente \"help\")\n" @@ -695,7 +695,7 @@ msgid "PIN not correctly repeated; try again" msgstr "o contrasinal non se repetiu correctamente; ténteo de novo" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -705,7 +705,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output non traballa con este comando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1009,59 +1009,59 @@ msgid "sign a key locally" msgstr "asinar unha chave localmente" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "asinar ou editar unha chave" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "xerar un certificado de revocación" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exportar chaves" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exportar chaves a un servidor de chaves" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importar chaves dun servidor de chaves" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "buscar chaves nun servidor de chaves" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "actualizar tódalas chaves dun servidor de chaves" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importar/mesturar chaves" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "actualiza-la base de datos de confianza" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [ficheiros]|visualizar resumos de mensaxes" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1071,51 +1071,51 @@ "Opcións:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "crear saída con armadura en ascii" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifrar para NOME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "empregar este id de usuario para asinar ou descifrar" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "usar modo de texto canónico" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "usar coma ficheiro de saída" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "lareto" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "non facer ningún cambio" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "avisar antes de sobrescribir" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1123,7 +1123,7 @@ "@\n" "(Vexa a páxina man para un listado completo de comandos e opcións)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1175,7 +1175,7 @@ msgid "Pubkey: " msgstr "Pública: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Cifra: " @@ -1183,7 +1183,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Compresión: " @@ -1267,369 +1267,366 @@ msgid "unknown configuration item `%s'\n" msgstr " creouse un novo ficheiro de configuración `%s'\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: ignórase o antigo ficheiro de opcións por defecto `%s'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opcións `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "lendo as opcións de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: ¡%s non é para uso normal!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "non se cargou a extensión de cifrado \"%s\" debido a permisos inseguros\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non é un xogo de caracteres válido\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "opcións de importación non válidas\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opcións de importación non válidas\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "opcións de importación non válidas\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opcións de exportación non válidas\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "opcións de exportación non válidas\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "non se puido estabrecer exec-path a %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s fai que se ignore %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "¡%s non se admite con %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "¡%s non ten sentido empregándoo con %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode crear sinaturas separadas ou en claro no modo --pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "debe empregar ficheiros (e non canalizacións) ao traballar con --pgp2 " "activado.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "para cifrar unha mensaxe en modo --pgp2 precísase da cifra IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de resumo seleccionado non é válido\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifrado seleccionado non é válido\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser superior a 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser superior a 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth debe valer entre 1 e 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "preferencias por defecto non válidas\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "preferencias de cifrado personais non válidas\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "preferencias de resumo personais non válidas\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "preferencias de compresión personais non válidas\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "¡%s aínda non traballa con %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "non se puido inicializa-la base de datos de confianzas: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [ficheiro]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [ficheiro]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "o descifrado fallou: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [ficheiro]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [ficheiro]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [ficheiro]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "non se pode empregar %s no modo %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ficheiro]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [ficheiro]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [ficheiro]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id-de-usuario" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id-de-usuario" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key id-de-usuario" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key id-de-usuario" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-de-usuario [comandos]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "o envío ao servidor de chaves fallou: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "a recepción do servidor de chaves fallou: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "a exportación da chave fallou: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "a busca no servidor de chaves fallou fallou: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "a actualización no servidor de chaves fallou: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "non se puido quita-la armadura: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "non se puido poñe-la armadura: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash non válido `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[ficheiro]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Escriba a súa mensaxe ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1637,23 +1634,23 @@ "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe " "rematar en '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "un nome de notación de usuario debe conte-lo carácter '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "un valor de notación non pode empregar ningún carácter de control\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "o URL de normativa de certificación dado non é válido\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non é válido\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "o URL de normativa de sinaturas dado non é válido\n" @@ -2521,12 +2518,12 @@ msgstr "O ID de usuario \"%s\" está revocado." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¿Está seguro de que quere asinalo? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Non se puido asinar.\n" @@ -2726,7 +2723,7 @@ msgid "Really sign? (y/N) " msgstr "¿Asinar de verdade? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2778,372 +2775,364 @@ msgid "moving a key signature to the correct place\n" msgstr "movendo a sinatura dunha chave ó seu sitio\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "gardar e saír" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "amosar fingerprint" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "listar chave e IDs de usuario" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "selecciona-lo ID de usuario N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "selecciona-la chave secundaria N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "listar sinaturas" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "asina-la chave" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "facer unha sinatura separada" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "asina-la chave localmente" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "asina-la chave de xeito non revocable" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "asina-la chave localmente e de xeito non revocable" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "engadir un ID de usuario" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "engadir unha identificación fotográfica" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "borrar un ID de usuario" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "engadir unha chave secundaria" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "borrar unha chave secundaria" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "engadir unha chave de revocación" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "borrar sinaturas" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "cambia-la fecha de expiración" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "marcar un ID de usuario coma primario" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "cambiar entre o listado de chaves públicas e secretas" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "lista-las preferencias (expertos)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "lista-las preferencias (moitos datos)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "estabrece-la lista de preferencias" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "preferencias actualizadas" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "non se puido analisa-lo URI do servidor de chaves\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "cambia-lo contrasinal" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "cambia-la confianza sobre o dono" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revocar sinaturas" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "revocar un ID de usuario" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revocar unha chave secundaria" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "deshabilitar unha chave" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "habilitar unha chave" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "amosa-la identificación fotográfica" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "A chave secreta está disponible.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Cómpre a chave secreta para facer isto.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor, empregue o comando \"toggle\" antes.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "A chave está revocada." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "¿Seguro de que quere asinar tódolos IDs de usuario? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "clase de sinatura descoñecida" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Non se admite este comando no modo %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Debe seleccionar alomenos un ID de usuario.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "¡Non pode borra-lo último ID de usuario!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "¿Seguro de que quere borrar tódolos IDs de usuario seleccionados? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "¿Seguro de que quere borrar este ID de usuario? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "¿Seguro de que quere borrar este ID de usuario? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Debe seleccionar alomenos unha chave.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Debe seleccionar alomenos unha chave.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "¿Seguro de que quere borra-las chaves seleccionadas? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "¿Seguro de que quere borrar esta chave? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "¿Seguro de que quere revocar tódolos IDs de usuario seleccionados? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "¿Seguro de que quere revocar este ID de usuario? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "¿Realmente quere revoca-las chaves seleccionadas? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "¿Realmente quere revocar esta chave? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "estabrece-la lista de preferencias" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "¿Seguro que quere actualiza-las preferencias dos IDs de usuario " "seleccionados? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "¿Realmente desexa actualiza-las preferencias? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "¿Garda-los cambios? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "¿Saír sin gardar? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "a actualización fallou: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "o segredo da actualización fallou: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "A chave non cambiou, polo que non fai falla actualizar.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Resumo: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Esta chave pode estar revocada por %s chave " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (sensible)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "non foi posible crear %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocada] " -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [caduca: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " confianza: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Esta chave está desactivada" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3151,19 +3140,19 @@ "Teña en conta que a validez da chave amosada non é necesariamente\n" "correcta a menos que reinicie o programa.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[revocada] " -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3171,7 +3160,7 @@ "AVISO: non se marcou ningún ID de usuario coma primario. Esta orde pode\n" " facer que un ID de usuario diferente se converta no primario.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3180,47 +3169,47 @@ "AVISO: Esta é unha chave de estilo PGP2. Se engade unha identificación\n" " fotográfica algunhas versións de PGP han rexeitar esta chave.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "¿Está seguro de que quere engadila? (s/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Non pode engadir unha identificación fotográfica a unha chave de estilo " "PGP2.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "¿Borrar esta sinatura correcta? (s/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Borrada %d sinatura.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Borradas %d sinaturas.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Non se borrou nada.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3230,165 +3219,165 @@ "designado\n" " pode facer que algunhas versións de PGP rexeiten esta chave.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Introduza o ID de usuario do revocador designado: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non " "se pode desfacer!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor, quite as seleccións das chaves secretas.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Por favor, seleccione como máximo unha chave secundaria.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambiando a data de expiración para a chave secundaria.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Cambiando a data de expiración da chave primaria.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Non pode cambia-la data de expiración dunha chave v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Escolla exactamente un ID de usuario.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "¿Está seguro de que quere empregala (s/N)? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Non hai ID de usuario con índice %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Non hai chave secundaria con índice %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuario: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " asinada por %08lX no %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (non exportable)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta sinatura caducou o %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¿Está seguro de que quere revocala? (s/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Asinou estes IDs de usuario: \n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (non exportable)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocada por %08lX no %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Está a punto de revocar estas sinaturas:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "non hai chave secreta\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o ID de usuario \"%s\" xa está revocado\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3718,7 +3707,7 @@ "Necesita un contrasinal para protexe-la súa chave secreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4273,7 +4262,7 @@ msgid "textmode" msgstr "modo texto" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "descoñecido" @@ -4484,16 +4473,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problema co axente - desactivando o emprego do axente\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4504,41 +4493,41 @@ "\"%.*s\"\n" "Chave de %u bits, %s, ID %08lX, creada o %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Repita o contrasinal\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Introduza o contrasinal\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "contrasinal demasiado longo\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "resposta do axente non válida\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "cancelado polo usuario\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Introduza o contrasinal: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4548,17 +4537,17 @@ "Necesita un contrasinal para desbloquea-la chave secreta para\n" "o usuario \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bits, chave %s, ID %08lX, creada %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Repita o contrasinal: " @@ -5510,120 +5499,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[revocada] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[caducada ]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "descoñecido" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "nunca " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "hase comproba-la base de datos de confianza o %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "non se precisa comproba-la base de datos de confianza\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "non se atopou a chave pública %08lX: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "por favor, execute con --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "comprobando a base de datos de confianza\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "procesáronse %d chaves (marcáronse %d contas de validez)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "non se atoparon chaves de confianza absoluta\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n" @@ -5929,14 +5918,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "mire en http://www.gnupg.org/faq.html para obter máis información\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "a operación non é posible sen memoria inicializada como segura\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(pode que usara o programa equivocado para esta tarefa)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key id-de-usuario" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key id-de-usuario" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "facer unha sinatura separada" + +#~ msgid "sign the key non-revocably" +#~ msgstr "asina-la chave de xeito non revocable" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "asina-la chave localmente e de xeito non revocable" + #~ msgid "q" #~ msgstr "s" Index: gnupg/po/hu.po diff -u gnupg/po/hu.po:1.9 gnupg/po/hu.po:1.10 --- gnupg/po/hu.po:1.9 Tue Dec 14 08:49:27 2004 +++ gnupg/po/hu.po Thu Dec 16 11:04:36 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Hungarian \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -353,7 +353,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -564,7 +564,7 @@ msgid "secret key already stored on a card\n" msgstr "Kihagytam: titkos kulcs már jelen van.\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "kilépés ebbõl a menübõl" @@ -573,7 +573,7 @@ msgid "show admin commands" msgstr "Egymásnak ellentmondó parancsok!\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "megmutatja ezt a súgót" @@ -626,7 +626,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Parancs> " @@ -645,7 +645,7 @@ msgid "Admin commands are not allowed\n" msgstr "Írom a titkos kulcsot a %s állományba.\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n" @@ -690,7 +690,7 @@ msgid "PIN not correctly repeated; try again" msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -700,7 +700,7 @@ msgid "--output doesn't work for this command\n" msgstr "Az --output opció nem mûködik ehhez a parancshoz.\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -998,59 +998,59 @@ msgid "sign a key locally" msgstr "kulcs aláírása helyileg" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "kulcs aláírása vagy szerkesztése" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "visszavonási igazolás készítése" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "kulcsok exportálása" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "kulcsok exportálása kulcsszerverre" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "kulcsok importálása kulcsszerverrõl" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "kulcsok keresése kulcsszerveren" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "minden kulcs frissítése kulcsszerverrõl" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "kulcsok importálása/összefûzése" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "bizalmi adatbázis frissítése" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [fájlok]|üzenet kivonatának kiírása" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1060,51 +1060,51 @@ "Opciók:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "ascii páncélozott kimenet létrehozása" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NÉV|titkosítás NÉV részére" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "felh. azonosító aláíráshoz és visszafejtéshez" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|tömörítési szint beállítása N-re (0: tiltás)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "kanonikus szöveges mód használata" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "kimeneti állomány megadása" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "bõbeszédû mód" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "ne csináljon semmi változtatást" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "felülírás elõtt rákérdezés" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1112,7 +1112,7 @@ "@\n" "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1162,7 +1162,7 @@ msgid "Pubkey: " msgstr "Nyilvános kulcsú (pubkey): " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Rejtjelezõ (cipher): " @@ -1170,7 +1170,7 @@ msgid "Hash: " msgstr "Kivonatoló (hash): " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Tömörítõ (compression): " @@ -1254,366 +1254,363 @@ msgid "unknown configuration item `%s'\n" msgstr "\"%s\": ismeretlen konfigurációs elem.\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MEGJEGYZÉS: Figyelmen kívül hagytam a régi opciókat (%s).\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "\"%s\" opciós fájl: %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "Az opciókat a \"%s\" állományból olvasom.\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "A \"%s\" rejtjelezõ bõvítést rossz engedélyek miatt töltöm be.\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nem érvényes karakterkiosztás!\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: Érvénytelen import opciók!\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "Érvénytelen import opciók!\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: Érvénytelen export opciók!\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "Érvénytelen export opciók!\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "FIGYELEM: A program core állományt hozhat létre!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "FIGYELEM: %s hatástalanítja %s-t!\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s és %s nem használható együtt!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s értelmetlen %s mellett!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "Csak különálló és olvashatószöveg-aláírást készíthet --pgp2 módban!\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Nem írhat alá és titkosíthat egyszerre --pgp2 módban!\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Csak állományokat (pipe-ot nem) használhat --pgp2 módban!\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Üzenet titkosítása --pgp2 módban IDEA rejtjelezõt igényel!\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "A kiválasztott rejtjelezõ algoritmus érvénytelen!\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed nagyobb kell legyen 0-nál!\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed nagyobb kell legyen 1-nél!\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth 1 és 255 közé kell essen!\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "Érvénytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "Érvénytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MEGJEGYZÉS: Egyszerû S2K mód (0) erõsen ellenjavallt!\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "Érvénytelen alapértelmezett preferenciák!\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "Érvénytelen személyes rejtjelezõ-preferenciák!\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "Érvénytelen személyes kivonatolópreferenciák!\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "Érvénytelen személyes tömörítõpreferenciák!\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s és %s egyelõre nem használható együtt!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "Lehet, hogy nem használhatja \"%s\" rejtjelezõ algoritmust %s módban!\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "Lehet, hogy nem használhatja \"%s\" kivonatoló algoritmust %s módban!\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Lehet, hogy nem használhatja \"%s\" tömörítõ algoritmust %s módban!\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [fájlnév]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [fájlnév]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Visszafejtés sikertelen: %s.\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [fájlnév]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [fájlnév]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [fájlnév]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [fájlnév]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [fájlnév]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [fájlnév]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key felh-azonosító" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key felh-azonosító" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key felh-azonosító" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key felh-azonosító" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key felh-azonosító [parancsok]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [felh-azonosító] [kulcskarika]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "Küldés a kulcsszerverre sikertelen: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Vétel a kulcsszerverrõl sikertelen: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "Kulcsexportálás sikertelen: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "Keresés a kulcsszerveren sikertelen: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Frissítés a kulcsszerverrõl sikertelen: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "Páncél eltávolítása nem sikerült: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "Páncélozás nem sikerült: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Érvénytelen kivonatoló algoritmus: %s\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[fájlnév]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Kezdheti gépelni az üzenetet...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1621,23 +1618,23 @@ "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = " "jellel kell befejezõdjön.\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "Egy felhasználójelölésnek tartalmaznia kell a \"@\" karaktert!\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "Egy jelölés értékében nem szerepelhet vezérlõkarakter!\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n" @@ -2506,12 +2503,12 @@ msgstr "\"%s\" felhasználói azonosítót visszavonták." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Nem tudom aláírni.\n" @@ -2711,7 +2708,7 @@ msgid "Really sign? (y/N) " msgstr "Valóban aláírja? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2763,370 +2760,362 @@ msgid "moving a key signature to the correct place\n" msgstr "Átrakom a kulcsaláírást a megfelelõ helyre.\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "mentés és kilépés" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "megmutatja az ujjlenyomatot" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "kilistázza a kulcs- és felhasználóazonosítókat" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "N. felhasználói azonosító kiválasztása" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "N. másodlagos kulcs kiválasztása" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "aláírások kilistázása" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "kulcs aláírása" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "különálló aláírás készítése" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "kulcs helyi aláírása" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "kulcs nem visszavonható aláírása" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "kulcs nem visszavonható helyi aláírása" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "felhasználói azonosító hozzáadása" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "fotóazonosító hozzáadása" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "felhasználói azonosító törlése" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "másodlagos kulcs (alkulcs) hozzáadása" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "másodlagos kulcs törlése" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "visszavonó kulcs hozzáadása" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "aláírások törlése" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "lejárat megváltoztatása" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "felhasználóazonosító megjelölése elsõdlegesként" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "váltás a titkos és a nyilvános kulcs listázása között" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "preferenciák listázása (szakértõ)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "preferenciák listázása (részletes)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "preferencialista beállítása" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "preferenciák frissítése" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "jelszóváltoztatás" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "kulcstulajdonos megbízhatóságának beállítása" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "aláírások visszavonása" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "felhasználói azonosító visszavonása" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "másodlagos kulcs visszavonása" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "kulcs tiltása" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "kulcs engedélyezése" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "fotóazonosító megmutatása" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "Hiba \"%s\" titkoskulcs-blokk olvasásakor: %s.\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Titkos kulcs rendelkezésre áll.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Ehhez szükség van a titkos kulcsra.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Kérem, használja elõbb a \"toggle\" parancsot!\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "A kulcsot visszavonták." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Valóban aláírja az összes felhasználóazonosítót? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Javaslat: Válassza ki az aláírni kívánt felhasználóazonosítókat!\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "ismeretlen aláírásosztály" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Ez a parancs %s módban nem engedélyezett.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Legalább egy felhasználóazonosítót ki kell választania!\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Valóban eltávolítja az összes kijelölt felhasználóazonosítót? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Legalább egy kulcsot ki kell választania!\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Legalább egy kulcsot ki kell választania!\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Valóban törli a kiválasztott kulcsokat? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Valóban törli ezt a kulcsot? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Valóban visszavonja az összes kijelölt felhasználóazonosítót? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Valóban visszavonja ezt a felhasználóazonosítót? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Valóban visszavonja a kijelölt kulcsokat? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Valóban visszavonja ezt a kulcsot? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "preferencialista beállítása" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Valóban frissíti a kijelölt felhasználóazonosítók preferenciáit? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Valóban frissítsem a preferenciákat? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Mentsem a változtatásokat? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Kilépjek mentés nélkül? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "Frissítés sikertelen: %s.\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "A kulcs nem változott, nincs szükség frissítésre.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Kivonat: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Jellemzõk: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Ezt a kulcsot a következõ %s kulcs visszavonhatja: " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (érzékeny)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s nem hozható létre: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[visszavont] " -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [lejár: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " bizalom: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Ez a kulcs tiltott." -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3134,19 +3123,19 @@ "Kérem, vegye figyelembe, hogy az itt látható kulcs érvényessége nem\n" "feltétlenül helyes, amíg újra nem indítja a programot!\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[visszavont] " -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3154,7 +3143,7 @@ "FIGYELEM: Nincs kijelölt elsõdleges felhasználóazonosító. Ez a parancs\n" " azt okozhatja, hogy egy másik azonosító lesz elsõdlegesként használva.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3164,45 +3153,45 @@ "okozhatja,\n" " hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Továbbra is hozzá akarja adni? (i/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Törli ezt a jó aláírást? (i/N/k)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Valóban törli ezt az önaláírást? (i/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Töröltem %d aláírást.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nem töröltem semmit.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3212,162 +3201,162 @@ " azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a " "kulcsot!\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Írja be a kijelölt visszavonó felhasználóazonosítóját: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Kérem, távolítsa el a kijelöléseket a titkos kulcsokról!\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Maximum egy másodlagos kulcsot jelöljön ki, kérem!\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Másodlagos kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Elsõdleges kulcs lejárati idejének változtatása.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Nincs megfelelõ aláírás a titkoskulcs-karikán.\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Kérem, válasszon ki pontosan egy felhasználóazonosítót!\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Biztos abban, hogy használni akarja (i/N)? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Nincs %d indexû felhasználóazonosító!\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Nincs %d indexû másodlagos kulcs!\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Felhasználóazonosító: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " aláírva %08lX által %s%s%s idõpontban.\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Ez az aláírás lejárt %s idõpontban.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Biztos benne, hogy mégis visszavonja? (i/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ön aláírta a következõ felhasználóazonosítókat:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (nem exportálható)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " visszavonva %08lX által %s idõpontban.\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "A következõ aláírásokat fogja visszavonni:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "Nincs titkos kulcs.\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "FIGYELEM: A felhasználóazonosítót %d másodperccel a jövõben írták alá.\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n" @@ -3696,7 +3685,7 @@ "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4254,7 +4243,7 @@ msgid "textmode" msgstr "Szövegmódú" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "Ismeretlen módú" @@ -4464,18 +4453,18 @@ msgid "communication problem with gpg-agent\n" msgstr "Kommunikációs probléma a gpg ügynökkel!\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "Probléma van az ügynökkel. Letiltom a használatát.\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr "" " \n" " (fõ kulcsazonosító: %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4487,41 +4476,41 @@ "\"%.*s\"\n" "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Ismételje meg a jelszót!\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Írja be a jelszót!\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "A jelszó túl hosszú!\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "Érvénytelen válasz az ügynöktõl!\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "A felhasználó megszakította a mûveletet.\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "Nem tudok jelszót bekérni kötegelt módban!\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Írja be a jelszót: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4532,17 +4521,17 @@ "használatához:\n" "\"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s." -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Ismételje meg a jelszót: " @@ -5482,120 +5471,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[visszavont] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[lejárt] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "Ismeretlen módú" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "soha " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "A bizalmi adatbázis következõ ellenõrzése: %s.\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "Nincs szükség a bizalmi adatbázis ellenõrzésére.\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "Ellenõrzöm a bizalmi adatbázist.\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "Nem találtam alapvetõen megbízható kulcsot.\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "Nem találom az alapvetõen megbízható %08lX kulcs nyilvános kulcsát!\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n" @@ -5900,14 +5889,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "További információ a http://www.gnupg.org/faq.html címen található.\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "A mûvelet nem lehetséges biztonságos memória nélkül.\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(Lehet, hogy nem a megfelelõ programot használja a feladatra.)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key felh-azonosító" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key felh-azonosító" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "különálló aláírás készítése" + +#~ msgid "sign the key non-revocably" +#~ msgstr "kulcs nem visszavonható aláírása" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "kulcs nem visszavonható helyi aláírása" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/id.po diff -u gnupg/po/id.po:1.19 gnupg/po/id.po:1.20 --- gnupg/po/id.po:1.19 Tue Dec 14 08:49:27 2004 +++ gnupg/po/id.po Thu Dec 16 11:04:36 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -32,7 +32,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -566,7 +566,7 @@ msgid "secret key already stored on a card\n" msgstr "dilewati: kunci pribadi telah ada\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "berhenti dari menu ini" @@ -575,7 +575,7 @@ msgid "show admin commands" msgstr "perintah saling konflik\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "tampilkan bantuan" @@ -628,7 +628,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Perintah> " @@ -647,7 +647,7 @@ msgid "Admin commands are not allowed\n" msgstr "menulis kunci rahasia ke `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Perintah tidak valid (coba \"help\")\n" @@ -692,7 +692,7 @@ msgid "PIN not correctly repeated; try again" msgstr "passphrase tidak diulang dengan benar; coba lagi" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -702,7 +702,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output tidak berfungsi untuk perintah ini\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1002,59 +1002,59 @@ msgid "sign a key locally" msgstr "tandai kunci secara lokal" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "tandai atau edit kunci" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "buat sertifikat revokasi" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "ekspor kunci" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "ekspor kunci ke key server" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "impor kunci dari key server" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "cari kunci di key server" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "update semua kunci dari keyserver" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "impor/gabung kunci" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "perbarui database trust" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [file]|cetak digest pesan" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1064,51 +1064,51 @@ "Pilihan:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "ciptakan output ascii" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NAMA|enkripsi untuk NAMA" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "gunakan id-user ini untuk menandai/dekripsi" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|set tingkat kompresi N (0 tidak ada)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "gunakan mode teks kanonikal" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "gunakan sebagai file output" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "detil" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "jangan buat perubahan" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "tanya sebelum menimpa" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1116,7 +1116,7 @@ "@\n" "(Lihat man page untuk daftar lengkap semua perintah dan option)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1166,7 +1166,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Cipher: " @@ -1174,7 +1174,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Kompresi: " @@ -1258,374 +1258,371 @@ msgid "unknown configuration item `%s'\n" msgstr "Item Konfigurasi tidak dikenal \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "CATATAN: tidak ada file pilihan baku `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "file pilihan `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "membaca pilihan dari `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "CATATAN: %s tidak untuk pemakaian normal!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s bukanlah set karakter yang valid\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opsi impor tidak valid\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "opsi impor tidak valid\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opsi ekspor tidak valid\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "opsi ekspor tidak valid\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "tidak dapat menset path exec ke %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "PERINGATAN: program mungkin membuat file core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "PERINGATAN: %s menimpa %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s tidak dibolehkan dengan %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s tidak masuk akal dengan %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "anda hanya dapat membuat signature detached atau clear saat dalam mode --" "pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --" "pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --" "pgpg2\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "algoritma digest yang dipilih tidak valid\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "algoritma cipher yang dipilih tidak valid\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed harus lebih dari 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed harus lebih dari 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth harus di antara 1 hingga 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "preferensi baku tidak valid\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "preferensi cipher personal tidak valid\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "preferensi digest personal tidak valid\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "preferensi kompresi personal tidak valid\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s belum dapat dipakai dengan %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "gagal inisialisasi TrustDB: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public " "key \n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [namafile]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [namafile]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "dekripsi gagal: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [namafile]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [namafile]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [namafile]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [namafile]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [namafile]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [namafile]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id-user" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id-user" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key user-id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key user-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-user [perintah]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-user] [keyring]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "Pengiriman keyserver gagal: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Penerimaan keyserver gagal: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "Ekspor kunci gagal: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "Pencarian keyserver gagal: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Refresh keyserver gagal: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "gagal dearmoring: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "gagal enarmoring: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritma hash tidak valid `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[namafile]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Teruskan dan ketikkan pesan anda ....\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1633,23 +1630,23 @@ "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, " "dan diakhiri dengan sebuah '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL signature kebijakan yang diberikan tidak valid\n" @@ -2518,12 +2515,12 @@ msgstr "User ID \"%s\" dibatalkan." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Apakah anda yakin masih ingin menandainya? (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr "..Tidak dapat menandai.\n" @@ -2727,7 +2724,7 @@ msgid "Really sign? (y/N) " msgstr "Ditandai? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2779,370 +2776,362 @@ msgid "moving a key signature to the correct place\n" msgstr "memindahkan signature kunci ke tempat yang tepat\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "simpan dan berhenti" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "tampilkan fingerprint" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "tampilkan kunci dan ID user" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "pilih ID user N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "pilih kunci sekunder N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "tampilkan signature" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "tandai kunci" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "buat detached signature" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "tandai kunci secara lokal" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "tandai kunci sebagai tidak dapat dibatalkan" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "tambah sebuah ID user" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "tambah sebuah photo ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "hapus ID user" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "tambah kunci sekunder" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "hapus kunci sekunder" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "tambah kunci pembatalan" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "hapus signature" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "ubah tanggal kadaluarsa" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "tandai ID user sebagai primer" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "ubah tampilan kunci rahasia dan publik" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "tampilkan preferensi (ahli)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "tampilkan preferensi (verbose)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "set daftar preferensi" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "perbarui preferensi" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "tidak dapat memparsing URI keyserver\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "ubah passphrase" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "ubah ownertrust" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "batalkan signature" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "batalkan sebuah ID user" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "batalkan kunci sekunder" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "tiadakan kunci" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "aktifkan kunci" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "tampilkan photo ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "kesalahan membaca keyblock rahasia `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Kunci rahasia tersedia.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Silakan gunakan dulu perintah \"toogle\".\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Kunci dibatalkan" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Tandai ID seluruh user? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Petunjuk: Pilih ID user untuk ditandai\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "kelas signature tidak dikenal" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Anda tidak dapat menghapus ID user terakhir!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Hapus seluruh ID user terpilih? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Hapus ID user ini? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Hapus ID user ini? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Anda harus memilih minimum satu kunci.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Anda harus memilih minimum satu kunci.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Anda ingin menghapus kunci terpilih ini? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Anda ingin menghapus kunci ini? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Benar-benar hapus seluruh ID user terpilih? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Benar-benar hapus ID user ini? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Anda ingin membatalkan kunci terpilih ini? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Anda ingin membatalkan kunci ini? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "set daftar preferensi" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Perbarui preferensi untuk user ID terpilih?" -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Update preferensi?" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Simpan perubahan? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Berhenti tanpa menyimpan? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "gagal memperbarui: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "gagal perbarui rahasia: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Fitur: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Kunci ini dapat dibatalkan oleh kunci %s" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "tidak dapat membuat %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revoked] " -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [berakhir: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " trust: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Kunci ini telah ditiadakan" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3150,19 +3139,19 @@ "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n" "kecuali anda memulai kembali program.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[revoked] " -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3170,7 +3159,7 @@ "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3180,45 +3169,45 @@ "dapat menyebabkan beberapa versi\n" " PGP menolak kunci ini.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Anda tetap ingin menambahkannya? (y/n) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Hapus signature baik ini? (y/T/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Hapus signature tidak valid ini? (y/T/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Hapus signature tidak dikenal ini? (y/T/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Yakin ingin menghapus self-signature ini? (y/T)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Menghapus %d signature.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Tidak ada yang dihapus.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3228,165 +3217,165 @@ "designated dapat\n" "............menyebabkan beberapa versi PGP menolak kunci ini.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Masukkan user ID pihak yang ingin dibatalkan: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan " "sendiri\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat " "dilakukan\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Silakan hapus pilihan dari kunci rahasia.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Silakan pilih maksimum satu kunci sekunder.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Merubah batas waktu untuk kunci sekunder.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Merubah batas waktu untuk kunci primer.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Anda tidak dapat merubah batas waktu kunci v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Tidak ada signature koresponden di ring rahasia\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Anda harus memilih minimum satu ID user.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "melewati self-signature v3 pada user id \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Apakah anda yakin ingin menggunakannya? (y/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Tidak ada ID user dengan index %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Tidak ada kunci sekunder dengan index %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID user: " -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " ditandai oleh %08lX pada %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Kunci ini akan kadaluarsa pada %s \n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Anda tetap ingin membatalkannya? (y/n) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Anda telah menandai ID user ini:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (tidak dapat diekspor)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " dibatalkan oleh %08lX pada %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Anda akan membatalkan signature ini:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Ingin membuat sertifikat pembatalan? (y/T)" -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "tidak ada kunci rahasia\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" telah dibatalkan\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n" @@ -3712,7 +3701,7 @@ "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4265,7 +4254,7 @@ msgid "textmode" msgstr "modeteks" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "tidak dikenal" @@ -4473,16 +4462,16 @@ msgid "communication problem with gpg-agent\n" msgstr "masalah komunikasi dengan gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "masalah dengan agen - tiadakan penggunaan agen\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID kunci utama %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4493,41 +4482,41 @@ "\"%.*s\"\n" "%u-bit %s key, ID %08lX, tercipta %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Ulangi passphrase\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Masukkan passphrase\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "passphrase terlalu panjang\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "respon tidak valid dari agen\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "dibatalkan oleh user\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "tidak dapat meminta password dalam mode batch\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Masukkan passphrase: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4537,17 +4526,17 @@ "Anda perlu passphrase untuk membuka kunci rahasia untuk\n" "pemakai: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bit kunci %s, ID %08lX, tercipta %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " @@ -5487,120 +5476,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[revoked] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[expired] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "tidak dikenal" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "tidak pernah..." -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "pemeriksaan trustdb berikutnya pada %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "tidak perlu memeriksa trustdb\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "kunci publik %08lX tidak ditemukan: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "lakukanlah --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "memeriksa trustdb\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "trust record %lu, tipe %d: gagal menulis: %s\n" @@ -5906,14 +5895,30 @@ msgstr "" "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key user-id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key user-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "buat detached signature" + +#~ msgid "sign the key non-revocably" +#~ msgstr "tandai kunci sebagai tidak dapat dibatalkan" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/it.po diff -u gnupg/po/it.po:1.72 gnupg/po/it.po:1.73 --- gnupg/po/it.po:1.72 Tue Dec 14 08:49:27 2004 +++ gnupg/po/it.po Thu Dec 16 11:04:36 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -30,7 +30,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -356,7 +356,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -568,7 +568,7 @@ msgid "secret key already stored on a card\n" msgstr "saltata: chiave pubblica già presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "abbandona questo menù" @@ -577,7 +577,7 @@ msgid "show admin commands" msgstr "comandi in conflitto\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "mostra questo aiuto" @@ -630,7 +630,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Comando> " @@ -649,7 +649,7 @@ msgid "Admin commands are not allowed\n" msgstr "scrittura della chiave segreta in `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" @@ -694,7 +694,7 @@ msgid "PIN not correctly repeated; try again" msgstr "passphrase non ripetuta correttamente; prova ancora" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -704,7 +704,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output non funziona con questo comando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1013,59 +1013,59 @@ msgid "sign a key locally" msgstr "firma una chiave localmente" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "esporta le chiavi a un key server" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importa le chiavi da un key server" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "cerca delle chiavi su un key server" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "aggiorna tutte le chiavi da un key server" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "aggiorna il database della fiducia" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1075,51 +1075,51 @@ "Opzioni:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifra per NOME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disab.)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "non fa cambiamenti" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "chiede prima di sovrascrivere" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1127,7 +1127,7 @@ "@\n" "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1177,7 +1177,7 @@ msgid "Pubkey: " msgstr "A chiave pubblica: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Cifrari: " @@ -1185,7 +1185,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Compressione: " @@ -1269,371 +1269,368 @@ msgid "unknown configuration item `%s'\n" msgstr "elemento della configurazione sconosciuto \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "" "NOTA: il vecchio file `%s' con le opzioni predefinite è stato ignorato\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "file con le opzioni `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s normalmente non deve essere usato!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "l'estensione crittografica \"%s\" non è stata caricata a causa dei\n" "permessi insicuri.\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s non è un set di caratteri valido\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opzioni di importazione non valide\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "opzioni di importazione non valide\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opzioni di esportazione non valide\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "opzioni di esportazione non valide\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "impossibile impostare exec-path a %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ATTENZIONE: %s ha la precedenza su %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "Non è permesso usare %s con %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "Non ha senso usare %s con %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "nella modalità --pgp2 puoi fare solo firme in chiaro o separate\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "nella modalità --pgp2 non puoi firmare e cifrare contemporaneamente\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "nella modalità --pgp2 è richiesto il cifrario IDEA per cifrare un messaggio\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve essere tra 1 e 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "preferenze predefinite non valide\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "preferenze personali del cifrario non valide\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "preferenze personali del digest non valide\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "preferenze personali di compressione non valide\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s non funziona ancora con %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "non è possibile usare l'algoritmo di cifratura \"%s\" in modalità %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "non è possibile usare l'algoritmo di digest \"%s\" in modalità %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "non è possibile usare l'algoritmo di compressione \"%s\" in modalità %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n" "crittografia a chiave pubblica\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifratura fallita: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "non è possibile usare %s in modalità %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nomefile]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key user-id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key user-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [comandi]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [portachiavi]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "invio al keyserver fallito: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "ricezione dal keyserver fallita: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "esportazione della chiave fallita: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "ricerca nel keyserver fallita: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aggiornamento del keyserver fallito: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Vai avanti e scrivi il messaggio...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1641,23 +1638,23 @@ "il nome di una nota deve essere formato solo da caratteri stampabili o\n" "spazi e terminare con un '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "il valore di una nota non deve usare caratteri di controllo\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "l'URL della politica di certificazione indicato non è valido\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "l'URL della politica di firma indicato non è valido\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "l'URL della politica di firma indicato non è valido\n" @@ -2531,12 +2528,12 @@ msgstr "L'user ID \"%s\" è stato revocato." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Sei ancora sicuro di volerla firmare? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Impossibile firmarla.\n" @@ -2738,7 +2735,7 @@ msgid "Really sign? (y/N) " msgstr "Firmo davvero? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2790,370 +2787,362 @@ msgid "moving a key signature to the correct place\n" msgstr "spostamento della firma di una chiave nel posto corretto\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "salva ed esci" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "mostra le impronte digitali" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "elenca le chiavi e gli user ID" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "scegli l'user ID N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "scegli la chiave secondaria N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "elenca le firme" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "firma la chiave" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "fai una firma separata" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "firma la chiave localmente" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "firma la chiave irrevocabilmente" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "firma la chiave localmente e irrevocabilmente" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "aggiungi un user ID" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "aggiungi un ID fotografico" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "cancella un user ID" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "aggiungi una chiave secondaria" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "cancella una chiave secondaria" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "aggiungi una chiave di revoca" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "cancella le firme" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "cambia la data di scadenza" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "imposta l'user ID come primario" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "elenca le preferenze (per esperti)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "elenca le preferenze (prolisso)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "imposta la lista di preferenze" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "preferenze aggiornate" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "impossibile fare il parsing dell'URI del keyserver\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "cambia la passphrase" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "cambia il valore di fiducia" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revoca firme" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "revoca un user ID" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revoca una chiave secondaria" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "disabilita una chiave" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "abilita una chiave" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "mostra l'ID fotografico" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "errore leggendo il keyblock segreto `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "È disponibile una chiave segreta.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Per fare questo serve la chiave segreta.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Per favore usa prima il comando \"toggle\".\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "La chiave è stata revocata." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Firmo davvero tutti gli user ID? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Suggerimento: seleziona gli user ID da firmare\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "classe della firma sconosciuta" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Questo comando non è permesso in modalità %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Devi selezionare almeno un user ID.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Tolgo davvero tutti gli user ID selezionati? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Tolgo davvero questo user ID? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Tolgo davvero questo user ID? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Devi selezionare almeno una chiave.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Vuoi davvero cancellare le chiavi selezionate? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Vuoi davvero cancellare questa chiave? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Revoco davvero tutti gli user ID selezionati? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Revoco davvero questo user ID? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Vuoi davvero revocare le chiavi selezionate? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Vuoi davvero revocare questa chiave? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "imposta la lista di preferenze" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Aggiorno davvero le preferenze? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvo i cambiamenti? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Esco senza salvare? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "aggiornamento fallito: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "aggiornamento della chiave segreta fallito: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Caratteristiche: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Questa chiave può essere revocata dalla chiave %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (sensibile)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossibile creare %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocata]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[scadenza: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " fiducia: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Questa chiave è stata disabilitata" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3162,19 +3151,19 @@ "corretta\n" "finchè non eseguirai di nuovo il programma.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[revocata]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3183,7 +3172,7 @@ " potrebbe fare diventare un altro user ID il primario " "predefinito.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3192,46 +3181,46 @@ "ATTENZIONE: Questa è una chiave in stile PGP2. Aggiungere un ID fotografico\n" " può causarne il rifiuto da parte di alcune versioni di PGP.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Cancellare questa firma corretta? (s/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Cancellare questa firma non valida? (s/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Cancellare questa firma sconosciuta? (s/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Cancellare davvero questa autofirma? (s/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Cancellata %d firma.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Cancellate %d firme.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Non è stato cancellato nulla.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3241,168 +3230,168 @@ " designato può causarne il rifiuto da parte di alcune versioni\n" " di PGP.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "Non è possibile aggiungere un revocatore designato a una chiave in stile\n" "PGP 2.x.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Inserisci l'user ID del revocatore designato: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "impossibile nominare una chiave come revocatore designato di sè stessa\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "" "ATTENZIONE: questa chiave è stata revocata dal suo revocatore designato!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n" "annullata.\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "" "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Togli le selezioni dalle chiavi segrete.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Seleziona al massimo una chiave secondaria.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Cambio la data di scadenza per una chiave secondaria.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Cambio la data di scadenza per la chiave primaria.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Manca la firma corrispondente nel portachiavi segreto\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Devi selezionare esattamente un user ID.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "salto una autofirma v3 sull'user ID \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Sei sicuro di volerla usare? (s/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Nessun user ID con l'indice %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "user ID: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " firmata da %08lX il %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (non esportabile)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Questa chiave è scaduta il %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creare un certificato di revoca per questa firma? (s/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Non puoi cancellare l'ultimo user ID!\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (non esportabile)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocata da %08lX il %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Stai per revocare queste firme:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Creare davvero i certificati di revoca? (s/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "manca la chiave segreta\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "l'user ID \"%s\" è già stato revocato\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3731,7 +3720,7 @@ "Ti serve una passphrase per proteggere la tua chiave segreta.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4288,7 +4277,7 @@ msgid "textmode" msgstr "modo testo" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "sconosciuto" @@ -4500,16 +4489,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problema di comunicazione con gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problema con l'agent - uso dell'agent disattivato\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (key ID principale %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4520,41 +4509,41 @@ "\"%.*s\"\n" "%u-bit %s key, ID %08lX, created %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Ripeti la passphrase\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Inserisci la passphrase\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "passphrase troppo lunga\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "risposta non valida dall'agent\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "interrotto dall'utente\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con l'agent: ha restituito 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "impossibile chiedere la password in modo batch\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4564,17 +4553,17 @@ "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " @@ -5536,120 +5525,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[revocata]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[scaduta]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "sconosciuto" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "mai " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "il prossimoi controllo del trustdb sarà fatto il %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "non è necessario un controllo del trustdb\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chiave pubblica %08lX non trovata: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "per favore usa --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "controllo il trustdb\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d chiavi processate (%d conteggi di validità azzerati)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "trust record %lu, req type %d: write fallita: %s\n" @@ -5955,14 +5944,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key user-id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key user-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "fai una firma separata" + +#~ msgid "sign the key non-revocably" +#~ msgstr "firma la chiave irrevocabilmente" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "firma la chiave localmente e irrevocabilmente" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/ja.po diff -u gnupg/po/ja.po:1.19 gnupg/po/ja.po:1.20 --- gnupg/po/ja.po:1.19 Tue Dec 14 08:49:27 2004 +++ gnupg/po/ja.po Thu Dec 16 11:04:36 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -33,7 +33,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -349,7 +349,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP¥«¡¼¥Éno. %s¤ò¸¡½Ð\n" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "¤½¤ì¤Ï¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¤Ï¤Ç¤­¤Þ¤»¤ó\n" @@ -543,7 +543,7 @@ msgid "secret key already stored on a card\n" msgstr "ÈëÌ©¸°¤Ï¤â¤¦¥«¡¼¥É¤ËÊݴɤ·¤Æ¤¢¤ê¤Þ¤¹\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "¤³¤Î¥á¥Ë¥å¡¼¤ò½ªÎ»" @@ -551,7 +551,7 @@ msgid "show admin commands" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤òɽ¼¨" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "¤³¤Î¥Ø¥ë¥×¤òɽ¼¨" @@ -599,7 +599,7 @@ msgid "menu to change or unblock the PIN" msgstr "PIN¥Ö¥í¥Ã¥¯¤Î²ò½ü¤äÊѹ¹¤Î¥á¥Ë¥å¡¼" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "¥³¥Þ¥ó¥É> " @@ -615,7 +615,7 @@ msgid "Admin commands are not allowed\n" msgstr "´ÉÍý¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (¡Èhelp¡É¤ò»²¾È)\n" @@ -662,7 +662,7 @@ msgid "PIN not correctly repeated; try again" msgstr "PIN¤ò¤Á¤ã¤ó¤È·«¤êÊÖ¤·¤Æ¤¤¤Þ¤»¤ó¡£ºÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -672,7 +672,7 @@ msgid "--output doesn't work for this command\n" msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ç--output¤Ïµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" @@ -961,59 +961,59 @@ msgid "sign a key locally" msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "¸°¤Ø¤Î½ð̾¤äÊÔ½¸" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "¼º¸ú¾ÚÌÀ½ñ¤òÀ¸À®" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "¸°¤ò½ñ¤­½Ð¤¹" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "¸°¥µ¡¼¥Ð¡¼¤Ë¸°¤ò½ñ¤­½Ð¤¹" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸°¤ò¸¡º÷¤¹¤ë" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÁ´Éô¹¹¿·¤¹¤ë" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "¸°¤ÎÆɹþ¤ß/Ê»¹ç" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "¥«¡¼¥É¾õÂÖ¤òɽ¼¨" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "¥«¡¼¥É¤Î¥Ç¡¼¥¿¤òÊѹ¹" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "¥«¡¼¥É¤ÎPIN¤òÊѹ¹" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|¥¢¥ë¥´¥ê¥º¥à [¥Õ¥¡¥¤¥ë]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤òɽ¼¨" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1023,55 +1023,55 @@ "¥ª¥×¥·¥ç¥ó:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "ASCII·Á¼°¤ÎÊñÁõ¤òºîÀ®" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|̾Á°|¡Ö̾Á°¡×ÍѤ˰Ź沽" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "" "½ð̾¤äÉü¹æ¤Ë¤³¤Î¥æ¡¼¥¶¡¼id\n" "¤ò»ÈÍÑ" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|°µ½Ì¥ì¥Ù¥ë¤òN¤ËÀßÄê\n" "(0¤ÏÈó°µ½Ì)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "Àµ½à¥Æ¥­¥¹¥È¡¦¥â¡¼¥É¤ò»ÈÍÑ" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "¾éĹ" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "̵Êѹ¹" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "¾å½ñ¤­Á°¤Ë³Îǧ" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "¸·Ì©¤ÊOpenPGP¤Î¿¶Éñ¤òºÎÍÑ" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "PGP 2.x¸ß´¹¤Î¥á¥Ã¥»¡¼¥¸¤òÀ¸À®" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1080,7 +1080,7 @@ "(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n" "¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1130,7 +1130,7 @@ msgid "Pubkey: " msgstr "¸ø³«¸°: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "°Å¹æË¡: " @@ -1138,7 +1138,7 @@ msgid "Hash: " msgstr "¥Ï¥Ã¥·¥å: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "°µ½Ì: " @@ -1222,378 +1222,375 @@ msgid "unknown configuration item `%s'\n" msgstr "̤ÃΤι½À®¹àÌÜ¡Ö%s¡×\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "Ãí°Õ: ÀΡ¢´ûÄê¤À¤Ã¤¿¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤Ï¡¢Ìµ»ë¤µ¤ì¤Þ¤¹\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Ãí°Õ: ´ûÄê¤Î¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¡Ö%s¡×: %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "¡Ö%s¡×¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߽Ф·¤Þ¤¹\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "Ãí°Õ: ÉáÄÌ%s¤Ï»È¤¤¤Þ¤»¤ó!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "°ÂÁ´¤Ç¤Ê¤¤µö²Ä¤Î¤¿¤á¡¢°Å¹æË¡³ÈÄ¥¡Ö%s¡×¤ò¥í¡¼¥É¤·¤Þ¤»¤ó\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, c-format msgid "`%s' is not a valid character set\n" msgstr "¡Ö%s¡×¤Ï¡¢Í­¸ú¤Êʸ»ú½¸¹ç¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 msgid "could not parse keyserver URL\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ÎURL¤ò²òÀÏÉÔǽ\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 msgid "invalid keyserver options\n" msgstr "̵¸ú¤Ê¸°¥µ¡¼¥Ð¡¼¡¦¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "̵¸ú¤ÊÆɹþ¤ß¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "̵¸ú¤Ê½ñ½Ð¤·¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 msgid "invalid list options\n" msgstr "̵¸ú¤Ê°ìÍ÷¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 msgid "invalid verify options\n" msgstr "̵¸ú¤Ê¸¡¾Ú¥ª¥×¥·¥ç¥ó¤Ç¤¹\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "exec-path¤ò%s¤ËÀßÄêÉÔǽ\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Î¥³¥¢¡¦¥Õ¥¡¥¤¥ë¤¬¤Ç¤­¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "·Ù¹ð: %s¤Ï%s¤è¤êÍ¥Àè\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s¤Ï%s¤È¤È¤â¤Ë»È¤Ã¤Æ¤â̵°ÕÌ£¤Ç¤¹!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤ÏʬΥ½ð̾¤«¥¯¥ê¥¢½ð̾¤À¤±¤·¤«¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2¥â¡¼¥É¤Ç¤Ï½ð̾¤È°Å¹æ²½¤òƱ»þ¤Ë¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2¤ò»ØÄꤷ¤¿¤é¡¢(¥Ñ¥¤¥×¤Ç¤Ê¤¯) ¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2¥â¡¼¥É¤Î¥á¥Ã¥»¡¼¥¸°Å¹æ²½¤Ç¤Ï¡¢IDEA°Å¹æË¡¤¬É¬ÍפǤ¹\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 msgid "selected compression algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "ÁªÂò¤µ¤ì¤¿¾ÚÌÀ½ñÍ×Ì󥢥르¥ê¥º¥à¤Ï¡¢Ìµ¸ú¤Ç¤¹\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed¤ÏÀµ¤ÎÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed¤Ï1¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth¤Ï1¤«¤é255¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "̵¸ú¤Êdefault-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "̵¸ú¤Êmin-cert-level¡£0¤«1¤«2¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Ãí°Õ: ñ½ã¤ÊS2K¥â¡¼¥É(0)¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "̵¸ú¤ÊS2K¥â¡¼¥É¡£0¤«1¤«3¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "̵¸ú¤Ê´ûÄê¤ÎÁª¹¥\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍѰŹæË¡¤ÎÁª¹¥\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑÍ×Ìó¤ÎÁª¹¥\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "̵¸ú¤Ê¸Ä¿ÍÍÑ°µ½Ì¤ÎÁª¹¥\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s¤Ï%s¤Çµ¡Ç½¤·¤Þ¤»¤ó\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "·Ù¹ð: ¸ø³«¸°°Å¹æ¤ò»È¤ï¤º¤Ë¡¢¼õ¼è¿Í (-r) ¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "¡Ö%s¡×¤ÎÂоΰŹæ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "--symmetric --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "--symmetric --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "--symmetric --sign --encrypt¤ò--s2k-mode 0¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "--symmetric --sign --encrypt¤ò%s¥â¡¼¥É¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key ¥æ¡¼¥¶¡¼id" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¥æ¡¼¥¶¡¼id [¥³¥Þ¥ó¥É]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¥æ¡¼¥¶¡¼id] [¸°ÎØ]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¤Î¼õ¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "¸°¤Î½ñ½Ð¤·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î¸¡º÷¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤Î²óÉü¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÊñÁõ½üµî¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÊñÁõ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "̵¸ú¤Ê¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¡Ö%s¡×¤Ç¤¹\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[¥Õ¥¡¥¤¥ë̾]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤òÂǤäƤ¯¤À¤µ¤¤ ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "" "Ãí¼á̾¤Ë¤Ï°õ»ú²Äǽ¤Êʸ»ú¤«¶õÇò¤Î¤ß¤ò»È¤¤¡¢'='¤Ç½ª¤ï¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "¥æ¡¼¥¶¡¼Ãí¼á̾¤Ï¡¢'@'ʸ»ú¤ò´Þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤ò»È¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿¾ÚÌÀ½ñ¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "¤¢¤¿¤¨¤é¤ì¤¿½ð̾¥Ý¥ê¥·¡¼URL¤Ï̵¸ú¤Ç¤¹\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 msgid "the given preferred keyserver URL is invalid\n" msgstr "»ØÄꤵ¤ì¤¿Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤Ï̵¸ú¤Ç¤¹\n" @@ -2449,12 +2446,12 @@ msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "¤½¤ì¤Ç¤â¤³¤Î¸°¤Ë½ð̾¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " ½ð̾ÉÔǽ¡£\n" @@ -2628,7 +2625,7 @@ msgid "Really sign? (y/N) " msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2680,353 +2677,346 @@ msgid "moving a key signature to the correct place\n" msgstr "¸°¤Î½ð̾¤òÀµ¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤Þ¤¹\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "Êݸ¤·¤Æ½ªÎ»" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "»ØÌæ¤òɽ¼¨" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "¸°¤È¥æ¡¼¥¶¡¼ID¤Î°ìÍ÷" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "¥æ¡¼¥¶¡¼ID N¤ÎÁªÂò" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "Éû¸°N¤ÎÁªÂò" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "½ð̾¤Î°ìÍ÷" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "¸°¤Ø½ð̾" -#: g10/keyedit.c:1259 -msgid "make a trust signature" -msgstr "¿®Íѽð̾¤òºîÀ®" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "¸°¤ØÆâÉôŪ¤Ë½ð̾" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "¥æ¡¼¥¶¡¼ID¤ÎÄɲÃ" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "¥Õ¥©¥ÈID¤ÎÄɲÃ" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "¥æ¡¼¥¶¡¼ID¤Îºï½ü" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "Éû¸°¤ÎÄɲÃ" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Ø¸°¤ÎÄɲÃ" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "¥¹¥Þ¡¼¥È¥«¡¼¥É¤Î¸°¤Ø¤Î°ÜÆ°" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "Éû¸°¤Îºï½ü" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "¼º¸ú¸°¤ÎÄɲÃ" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "½ð̾¤Îºï½ü" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "ËþλÆü¤ÎÊѹ¹" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "¥æ¡¼¥¶¡¼ID¤ò¼ç¤Ë¤¹¤ë" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤Îȿž" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "Áª¹¥¤Î°ìÍ÷ (¥¨¥­¥¹¥Ñ¡¼¥È)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "Áª¹¥¤Î°ìÍ÷ (¾éĹ)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "Áª¹¥¤Î°ìÍ÷¤ò¹¹¿·" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 msgid "set preferred keyserver URL" msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼¤ÎURI¤òÀßÄê" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÊѹ¹" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "½êÍ­¼Ô¿®ÍѤÎÊѹ¹" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "½ð̾¤Î¼º¸ú" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "¥æ¡¼¥¶¡¼ID¤Î¼º¸ú" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "Éû¸°¤Î¼º¸ú" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "¸°¤Î»ÈÍѤò¶Ø»ß¤¹¤ë" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "¸°¤Î»ÈÍѤòµö²Ä¤¹¤ë" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "¥Õ¥©¥ÈID¤òɽ¼¨" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "ÈëÌ©¸°¥Ö¥í¥Ã¥¯¡È%s¡É¤ÎÆɽФ·¥¨¥é¡¼: %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "ÈëÌ©¸°¤¬»ÈÍѤǤ­¤Þ¤¹¡£\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "¤³¤Î¼Â¹Ô¤Ë¤ÏÈëÌ©¸°¤¬¤¤¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "¤Þ¤º¡Ètoggle¡É¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "¸°¤Ï¡¢¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 msgid "Really sign all user IDs? (y/N) " msgstr "ËÜÅö¤ËÁ´¥æ¡¼¥¶¡¼ID¤Ë½ð̾¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "¥³¥Ä: ¤Þ¤º½ð̾¤¹¤ë¥æ¡¼¥¶¡¼ID¤òÁªÂò¤·¤Þ¤¹\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "̤ÃΤνð̾¥¯¥é¥¹¤Ç¤¹" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "%s¥â¡¼¥É¤Ç¤³¤Î¥³¥Þ¥ó¥É¤Ï¶Ø»ß¤Ç¤¹¡£\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¾¯¤Ê¤¯¤È¤â¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "ºÇ¸å¤Î¥æ¡¼¥¶¡¼ID¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 msgid "Really remove all selected user IDs? (y/N) " msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 msgid "Really remove this user ID? (y/N) " msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 msgid "Really move the primary key? (y/N) " msgstr "¤³¤Î¼ç¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 msgid "You must select exactly one key.\n" msgstr "¸°¤ò¤­¤Ã¤«¤ê1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "¸°¤ò¾¯¤Ê¤¯¤È¤â1ËÜÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 msgid "Do you really want to delete this key? (y/N) " msgstr "¤³¤Î¸°¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 msgid "Really revoke all selected user IDs? (y/N) " msgstr "ÁªÂò¤·¤¿Á´¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 msgid "Really revoke this user ID? (y/N) " msgstr "¤³¤Î¥æ¡¼¥¶¡¼ID¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "ÁªÂò¤·¤¿¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 msgid "Do you really want to revoke this key? (y/N) " msgstr "¤³¤Î¸°¤òËÜÅö¤Ë¼º¸ú¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" "ÍøÍѼԻØÄê¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ÎÍøÍÑÃæ¡¢½êÍ­¼Ô¿®ÍѤÏÀßÄꤵ¤ì¤Ê¤¤¤³¤È¤â¤¢¤ê¤Þ" "¤¹¡£\n" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 msgid "Set preference list to:\n" msgstr "Áª¹¥¤Î°ìÍ÷¤òÀßÄê:\n" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "ÁªÂò¤·¤¿¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 msgid "Really update the preferences? (y/N) " msgstr "Áª¹¥¤òËÜÅö¤Ë¹¹¿·¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 msgid "Save changes? (y/N) " msgstr "Êѹ¹¤òÊݸ¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 msgid "Quit without saving? (y/N) " msgstr "Êݸ¤»¤º¤Ë½ªÎ»¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "ÈëÌ©¤Î¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "¸°¤Ï̵Êѹ¹¤Ê¤Î¤Ç¹¹¿·¤ÏÉÔÍפǤ¹¡£\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Í×Ìó: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "µ¡Ç½: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "̵½¤Àµ¸°¥µ¡¼¥Ð¡¼" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼: " -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, c-format msgid "This key may be revoked by %s key %s" msgstr "¤³¤Î¸°¤Ï¡¢%s¸°%s¤Ë¤è¤Ã¤Æ¼º¸ú¤µ¤ì¤¿¤è¤¦¤Ç¤¹" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 msgid "(sensitive)" msgstr "(¥Ç¥ê¥±¡¼¥È)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "ºîÀ®: %s" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "¼º¸ú: %s" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "Ëþλ: %s" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "Ëþλ: %s" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, c-format msgid "usage: %s" msgstr "ÍøÍÑË¡: %s" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, c-format msgid "trust: %s" msgstr "¿®ÍÑ: %s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "Í­¸úÀ­: %s" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "¤³¤Î¸°¤Ï»ÈÍѶػߤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "¥«¡¼¥ÉÈÖ¹æ: " -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x·Á¼°¥æ¡¼¥¶¡¼ID¤ÎÁª¹¥¤¬¡¢¤¢¤ê¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3034,17 +3024,17 @@ "¥×¥í¥°¥é¥à¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç¡¢É½¼¨¤µ¤ì¤¿¸°¤ÎÍ­¸úÀ­¤ÏÀµ¤·¤¯¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤¡¢\n" "¤È¤¤¤¦¤³¤È¤òǰƬ¤Ë¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 msgid "revoked" msgstr "¼º¸ú" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 msgid "expired" msgstr "Ëþλ" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3052,7 +3042,7 @@ "·Ù¹ð: ¼ç¤¿¤ë¥æ¡¼¥¶¡¼ID¤¬¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ê̤Ê\n" " ¥æ¡¼¥¶¡¼ID¤¬¼ç¤Ë¤Ê¤ë¤È²¾Äꤹ¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3061,45 +3051,45 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP2·Á¼°¤Î¸°¤Ç¤¹¡£¥Õ¥©¥ÈID¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "¤½¤ì¤Ç¤âÄɲä·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "PGP2·Á¼°¤Î¸°¤Ë¤Ï¥Õ¥©¥ÈID¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "¤³¤Î̤ÃΤνð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "¤³¤Î¼«¸Ê½ð̾¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«? (y/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3108,154 +3098,154 @@ "·Ù¹ð: ¤³¤ì¤ÏPGP 2.x·Á¼°¤Î¸°¤Ç¤¹¡£»Ø̾¼º¸ú¼Ô¤ÎÄɲäǡ¢°ìÉô¤ÎÈǤÎPGP¤Ï¡¢\n" " ¤³¤Î¸°¤òµñÈݤ¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "PGP 2.x·Á¼°¤Î¸°¤Ë¤Ï»Ø̾¼º¸ú¼Ô¤òÄɲäǤ­¤Þ¤»¤ó¡£\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "»Ø̾¼º¸ú¼Ô¤Î¥æ¡¼¥¶¡¼ID¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "PGP 2.x·Á¼°¤Î¸°¤Ï¡¢»Ø̾¼º¸ú¼Ô¤ËǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "»Ø̾¼º¸ú¼Ô¤Ë¤Ï¡¢¤½¤Î¸°¼«ÂΤòǤ̿¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 msgid "this key has already been designated as a revoker\n" msgstr "¤³¤Î¸°¤Ï¼º¸ú¼Ô¤È¤·¤Æ¤â¤¦»Ø̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "·Ù¹ð: ¤¢¤ë¸°¤ò»Ø̾¼º¸ú¼Ô¤ËÀßÄꤹ¤ë¤È¡¢¸µ¤ËÌ᤻¤Þ¤»¤ó!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "ËÜÅö¤Ë¤³¤Î¸°¤ò»Ø̾¼º¸ú¼Ô¤ËǤ̿¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "ÈëÌ©¸°¤ÎÁªÂò¤ò¤È¤¤¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "¹â¡¹1¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "v3¸°¤ÎÍ­¸ú´ü¸Â¤ÏÊѹ¹¤Ç¤­¤Þ¤»¤ó\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "ÈëÌ©¸°ÎؤËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "¥æ¡¼¥¶¡¼ID¤ò¤­¤Ã¤«¤ê¤Ò¤È¤ÄÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Îv3¼«¸Ê½ð̾¤ò¤È¤Ð¤·¤Þ¤¹\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "Áª¹¥¸°¥µ¡¼¥Ð¡¼URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 msgid "Are you sure you want to replace it? (y/N) " msgstr "ËÜÅö¤Ë¸ò´¹¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 msgid "Are you sure you want to delete it? (y/N) " msgstr "ËÜÅö¤Ëºï½ü¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "%dÈ֤Υ桼¥¶¡¼ID¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "%dÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, c-format msgid "user ID: \"%s\"\n" msgstr "¥æ¡¼¥¶¡¼ID:¡È%s¡É\n" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "%s¤Ç%s%s%s¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (½ñ½Ð¤·ÉÔ²Ä)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "¤³¤Î½ð̾¤Ï%s¤ÇËþλ¤Ç¤¹¡£\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "¤½¤ì¤Ç¤âËÜÅö¤Ë¼º¸ú¤·¤¿¤¤¤Ç¤¹¤«? (y/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "¤³¤Î½ð̾¤Ë¤¿¤¤¤¹¤ë¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¡¼ID¤Ë¸°%s¤Ç½ð̾¤·¤Þ¤·¤¿:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 msgid " (non-revocable)" msgstr " (¼º¸úÉÔ²Ä)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, c-format msgid "revoked by your key %s on %s\n" msgstr "¤¢¤Ê¤¿¤Î¸°%s¤Ç%s¤Ë¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "¤³¤ì¤é¤Î½ð̾¤ò¼º¸ú¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "¼º¸ú¾ÚÌÀ½ñ¤òËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? (y/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "¥æ¡¼¥¶¡¼ID¡È%s¡É¤Ï¡¢¤â¤¦¼º¸ú¤µ¤ì¤Æ¤¤¤Þ¤¹\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "·Ù¹ð: ¥æ¡¼¥¶¡¼ID½ð̾¤¬¡¢%dÉÃ̤Íè¤Ç¤¹\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "%s (Â礭¤µ%ld) ¤Î¸°%s (uid %d) ¤Î¥Õ¥©¥ÈID¤È¤·¤Æɽ¼¨\n" @@ -3576,7 +3566,7 @@ "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4116,7 +4106,7 @@ msgid "textmode" msgstr "¥Æ¥­¥¹¥È¥â¡¼¥É" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "̤ÃΤÎ" @@ -4319,16 +4309,16 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agent¤È¤ÎÄÌ¿®¾ã³²\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, c-format msgid " (main key ID %s)" msgstr " (¼ç¸°ID %s)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4339,40 +4329,40 @@ "\"%.*s\"\n" "%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Ä¹¤¹¤®¤Þ¤¹\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤«¤é¤Î̵¸ú¤Ê±þÅú\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "¥æ¡¼¥¶¡¼¤Ë¤è¤ë¼è¾Ã¤·\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥È¤¬0x%lx¤òÊÖµÑ\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 msgid "can't query passphrase in batch mode\n" msgstr "¥Ð¥Ã¥Á¡¦¥â¡¼¥É¤Ç¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÏÌä¹ç¤»¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4381,17 +4371,17 @@ "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹:¡È%s¡É\n" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u¥Ó¥Ã¥È%s¸°, ID %sºîÀ®ÆüÉÕ¤Ï%s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr " (¼ç¸°ID %s ¤ÎÉû¸°)" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: " @@ -5283,121 +5273,121 @@ msgid "using %s trust model\n" msgstr "%s¿®ÍÑ¥â¥Ç¥ë¤ò»ÈÍÑ\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "¼º¸ú" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "Ëþλ" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "̤ÃΤÎ" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 #, fuzzy msgid "[marginal]" msgstr "¤¢¤ëÄøÅÙ" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 #, fuzzy msgid "[ultimate]" msgstr "ÀäÂÐŪ" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "̤ÄêµÁ" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "̵´ü¸Â" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "¤¢¤ëÄøÅÙ" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "´°Á´" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "ÀäÂÐŪ" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "¼¡²ó¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¸¡ºº¤Ï¡¢%s¤Ç¤¹\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "¿®ÍÑ¥â¥Ç¥ë¡Ö%s¡×¤Ç¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¹¹¿·¤Ï¡¢ÉÔÍפǤ¹\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, c-format msgid "public key %s not found: %s\n" msgstr "¸ø³«¸°%s¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "--check-trustdb¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¸¡ºº\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%dËܤθ°¤ò½èÍý (¤¦¤Á%dËܤÎÍ­¸úÀ­¿ô¤ò¥¯¥ê¥¢)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ¹¤ë¸°%s¤Î¸ø³«¸°¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "ºÇ¾®¤Î¡Ö¤¢¤ëÄøÅ٤ο®ÍÑ¡×%d¡¢ºÇ¾®¤Î¡ÖÁ´ÌÌŪ¿®ÍÑ¡×%d¡¢%s¿®ÍÑ¥â¥Ç¥ë\n" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "¿¼¤µ: %d Í­¸úÀ­: %3d ½ð̾: %3d ¿®ÍÑ: %d-, %dq, %dn, %dm, %df, %du\n" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "" @@ -5701,14 +5691,29 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "¾ÜºÙ¤Ïhttp://www.gnupg.org/faq.html¤ò¤´Í÷¤¯¤À¤µ¤¤\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "½é´ü²½ºÑ¤ß¤Î°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤ÏÁàºî¤Ç¤­¤Þ¤»¤ó\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key ¥æ¡¼¥¶¡¼id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key ¥æ¡¼¥¶¡¼id" + +#~ msgid "make a trust signature" +#~ msgstr "¿®Íѽð̾¤òºîÀ®" + +#~ msgid "sign the key non-revocably" +#~ msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤Ø½ð̾" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "¼º¸ú¤Ç¤­¤Ê¤¤¤è¤¦¸°¤ØÆâÉôŪ¤Ë½ð̾" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/pl.po diff -u gnupg/po/pl.po:1.49 gnupg/po/pl.po:1.50 --- gnupg/po/pl.po:1.49 Tue Dec 14 08:49:27 2004 +++ gnupg/po/pl.po Thu Dec 16 11:04:36 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -40,7 +40,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -370,7 +370,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -583,7 +583,7 @@ msgid "secret key already stored on a card\n" msgstr "pominiêty: klucz prywatny jest ju¿ wpisany\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "wyj¶cie z tego menu" @@ -592,7 +592,7 @@ msgid "show admin commands" msgstr "sprzeczne polecenia\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "ten tekst pomocy" @@ -645,7 +645,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Polecenie> " @@ -664,7 +664,7 @@ msgid "Admin commands are not allowed\n" msgstr "zapisujê klucz tajny w '%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (spróbuj \"help\")\n" @@ -712,7 +712,7 @@ msgid "PIN not correctly repeated; try again" msgstr "has³o nie zosta³o poprawnie powtórzone; jeszcze jedna próba" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -722,7 +722,7 @@ msgid "--output doesn't work for this command\n" msgstr "opcja --output nie dzia³a z tym poleceniem\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1021,59 +1021,59 @@ msgid "sign a key locally" msgstr "z³o¿enie prywatnego podpisu na kluczu" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "podpisanie lub modyfikacja klucza" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "tworzenie certyfikatu uniewa¿nienia klucza" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "eksport kluczy do pliku" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "eksport kluczy do serwera kluczy" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "import kluczy z serwera kluczy" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "szukanie kluczy na serwerze" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "od¶wie¿enie wszystkich kluczy z serwera" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "import/do³±czenie kluczy" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "uaktualnienie bazy zaufania" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [pliki]|skróty wiadomo¶ci" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1083,51 +1083,51 @@ "Opcje:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "opakowanie ASCII pliku wynikowego" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "identyfikator do podpisania lub odszyfrowania" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|poziom kompresji N (0 - bez)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "kanoniczny format tekstowy" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "plik wyj¶ciowy" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "z dodatkowymi informacjami" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "pozostawienie bez zmian" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "pytanie przed nadpisaniem plików" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1135,7 +1135,7 @@ "@\n" "(Pe³n± listê poleceñ i opcji mo¿na znale¼æ w podrêczniku systemowym.)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1186,7 +1186,7 @@ msgid "Pubkey: " msgstr "Asymetryczne: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Symetryczne: " @@ -1194,7 +1194,7 @@ msgid "Hash: " msgstr "Skrótów: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Kompresji: " @@ -1290,369 +1290,366 @@ msgid "unknown configuration item `%s'\n" msgstr "nieznana opcja ,,%s''\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "UWAGA: stary domy¶lny plik opcji ,,%s'' zosta³ zignorowany\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "UWAGA: brak domy¶lnego pliku opcji ,,%s''\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji ,,%s'': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z ,,%s''\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "modu³ szyfru ,,%s'' nie zosta³ za³adowany z powodu niebezpiecznych praw " "dostêpu\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nie jest poprawn± nazw± zestawu znaków\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "niezrozuma³y URI serwera kluczy\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "niepoprawne opcje wczytania kluczy\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "niepoprawne opcje eksportu kluczy\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nie mo¿na ustawiæ ¶cie¿ki programów wykonywalnych na %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "OSTRZE¯ENIE: %s powoduje obej¶cie %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie wolno u¿ywaæ %s z %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nie ma sensu w po³±czeniu z %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "w trybie --pgp2 mo¿na sk³adaæ tylko podpisy oddzielne lub do³±czone do " "tekstu\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "w trybie --pgp2 nie mo¿na jednocze¶nie szyfrowaæ i podpisywaæ\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "w trybie --pgp2 trzeba u¿ywaæ plików a nie potoków.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "szyfrowanie wiadomo¶ci w trybie --pgp2 wymaga modu³u szyfru IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "wybrany algorytm skrótów po¶wiadczeñ jest niepoprawny\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "warto¶æ max-cert-depth musi mie¶ciæ siê w zakresie od 1 do 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "niew³a¶ciwy domy¶lny poziom sprawdzania; musi mieæ warto¶æ 0, 1, 2 lub 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "niew³a¶ciwy minimalny poziom sprawdzania; musi mieæ warto¶æ 0, 1, 2 lub 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "niepoprawny tryb S2K; musi mieæ warto¶æ 0, 1 lub 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "niew³a¶ciwe domy¶lne ustawienia\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "niew³a¶ciwe ustawienia szyfrów\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "niew³a¶ciwe ustawienia skrótów\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "niew³a¶ciwe ustawienia algorytmów kompresji\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s jeszcze nie dzia³a z %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "szyfr ,,%s'' nie jest dostêpny w trybie %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "skrót ,,%s'' nie jest dostêpny w trybie %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "kompresja ,,%s'' nie jest dostêpna w trybie %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "OSTRZE¯ENIE: podano adresatów (-r) w dzia³aniu które ich nie dotyczy\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "b³±d odszyfrowywania: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%s nie jest dostêpne w trybie %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [plik]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key nazwa u¿ytkownika" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key nazwa u¿ytkownika" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key nazwa u¿ytkownika" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrsign-key nazwa u¿ytkownika" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key nazwa u¿ytkownika [polecenia]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "wysy³ka do serwera kluczy nie powiod³a siê: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "odbiór z serwera kluczy nie powiód³ siê: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "eksport kluczy nie powiód³ siê: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "szukanie w serwerze kluczy nie powiod³o siê: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "od¶wie¿enie kluczy z serwera nie powiod³o siê: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "zdjêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu ,%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1660,23 +1657,23 @@ "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki i podkre¶lenia, \n" "i musi koñczyæ siê ,,=''\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "adnotacja u¿ytkownika musi zawieraæ znak '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "tre¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "podany URL regulaminu po¶wiadczania jest niepoprawny\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "podany URL regulaminu podpisów jest niepoprawny\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "podany URL regulaminu podpisów jest niepoprawny\n" @@ -2540,12 +2537,12 @@ msgstr "Identyfikator u¿ytkownika ,,%s'' zosta³ uniewa¿niony." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Czy na pewno chcesz podpisaæ? (t/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Nie da siê z³o¿yæ podpisu.\n" @@ -2746,7 +2743,7 @@ msgid "Really sign? (y/N) " msgstr "Czy na pewno podpisaæ? (t/N) " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2798,371 +2795,363 @@ msgid "moving a key signature to the correct place\n" msgstr "przenoszê podpis klucza na w³a¶ciwe miejsce\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "zapis zmian i wyj¶cie" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "okazanie odcisku klucza" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "lista kluczy i identyfikatorów u¿ytkowników" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "wybór identyfikatora u¿ytkownika N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "wybór podklucza N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "lista podpisów" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "z³o¿enie podpisu na kluczu" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "z³o¿enie podpisu oddzielonego od dokumentu" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "z³o¿enie prywatnego (lokalnego) podpisu na kluczu" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "z³o¿enie na kluczu podpisu nie podlegaj±cego uniewa¿nieniu" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "z³o¿enie na kluczu prywatnego podpisu nie podlegaj±cego uniewa¿nieniu" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "dodanie nowego identyfikatora u¿ytkownika do klucza" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "dodanie zdjêcia u¿ytkownika do klucza" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "usuniêcie identyfikatora u¿ytkownika z klucza" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "dodanie podklucza" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "usuniêcie podklucza" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "wyznaczenie klucza uniewa¿niaj±cego" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "usuniêcie podpisów" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "zmiana daty wa¿no¶ci klucza" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "oznaczenie identyfikatora u¿ytkownika jako g³ównego" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "prze³±czenie pomiêdzy list± kluczy publicznych i prywatnych" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "ustawienia (zaawansowane)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "rozbudowana lista ustawieñ" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "ustawienie opcji klucza" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "aktualizacja ustawieñ klucza" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "niezrozuma³y URI serwera kluczy\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "zmiana has³a klucza" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "zmiana zaufania w³a¶ciciela" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "uniewa¿nienie podpisu" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "uniewa¿nienie identyfikatora u¿ytkownika" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "uniewa¿nienie podklucza" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "wy³±czyæ klucz z u¿ycia" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "w³±czyæ klucz do u¿ycia" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "okazanie identyfikatora - zdjêcia" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "b³±d odczytu bloku klucza tajnego '%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Dostêpny jest klucz tajny.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Najpierw trzeba u¿yæ polecenia \"prze³\".\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Klucz uniewa¿niony." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Podpisaæ wszystkie identyfikatory u¿ytkownika na tym kluczu? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Podpowied¼: wybierz identyfikatory u¿ytkownika do podpisania.\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "nieznana klasa podpisu" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "To polecenie nie jest dostêpne w trybie %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Musisz wybraæ co najmniej jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Nie mo¿esz usun±æ ostatniego identyfikatora u¿ytkownika!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Czy na pewno usun±æ wszystkie wybrane identyfikatory u¿ytkownika? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Czy na pewno usun±æ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Musisz wybraæ co najmniej jeden klucz.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Musisz wybraæ co najmniej jeden klucz.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Czy na pewno chcesz usun±æ wybrane klucze? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Czy na pewno chcesz usun±æ ten klucz? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Czy na pewno uniewa¿niæ wszystkie wybrane identyfikatory u¿ytkownika? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Czy na pewno uniewa¿niæ ten identyfikator u¿ytkownika? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Czy na pewno chcesz uniewa¿niæ wybrane klucze? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Czy na pewno chcesz uniewa¿niæ ten klucz? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "ustawienie opcji klucza" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Czy na pewno zaktualizowaæ ustawienia klucza dla wybranych identyfikatorów? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Czy na pewno usaktualniæ ustawienia? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Zapisaæ zmiany? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Wyj¶æ bez zapisania zmian? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "zapis zmian nie powiód³ siê: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "zapis zmian na kluczu prywatnym nie powiód³ siê: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Klucz nie zosta³ zmieniony wiêc zapis zmian nie jest konieczny.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Skrót: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Ustawienia: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Klucz mo¿e zostaæ uniewa¿niony przez klucz %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (poufne)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "nie mo¿na utworzyæ %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[uniewa¿niony]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [wygasa :%s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [wygasa :%s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " zaufanie: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " zaufanie: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Ten klucz zosta³ wy³±czony z u¿ytku" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Klucze PGP 2.x nie zawieraj± opisu ustawieñ.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3170,19 +3159,19 @@ "Pokazana warto¶æ wiarygodno¶ci klucza mo¿e byæ niepoprawna,\n" "dopóki program nie zostanie uruchomiony ponownie.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[uniewa¿niony]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "data" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3191,7 +3180,7 @@ " jako g³ówny. Wykonanie tego polecenie mo¿e wiêc spowodowaæ\n" " wy¶wietlanie innego identyfikatora jako domy¶lnego g³ównego.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3200,45 +3189,45 @@ "OSTRZE¯ENIE: To jest klucz PGP wersji 2. Dodanie zdjêcia spowoduje, ¿e\n" " niektóre wersje przestan± go rozumieæ.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Czy dalej chcesz je dodaæ? (t/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Do klucza dla PGP 2.x nie mo¿na dodaæ zdjêcia.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Usun±æ ten poprawny podpis? (t/N/w) " -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Usun±æ ten niepoprawny podpis? (t/N/w) " -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Usun±æ ten nieznany podpis? (t/N/w) " -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N) " -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d podpis usuniêty.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d podpisów usuniêtych.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nic nie zosta³o usuniête.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3248,162 +3237,162 @@ " uniewa¿niaj±cego, spowoduje, ¿e niektóre wersje PGP przestan±\n" " go rozumieæ.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Do klucza dla PGP 2.x nie mo¿na wyznaczyæ klucza uniewa¿niaj±cego.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Podaj identyfikator klucza uniewa¿niaj±cego: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "klucza PGP 2.x nie mo¿na wyznaczyæ jako uniewa¿niaj±cego\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nie mo¿na wyznaczuæ klucza do uniewa¿niania jego samego\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony kluczem uniewa¿niaj±cym!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "OSTRZE¯ENIE: nie mo¿na cofn±æ wyznaczenia klucza jako uniewa¿niaj±cego!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Czy na pewno chcesz wyznaczyæ ten klucz jako uniewa¿niaj±cy? (t/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Proszê usun±æ znacznik wyboru z kluczy prywatnych.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Proszê wybraæ tylko jeden podklucz.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Zmiana daty wa¿no¶ci podklucza.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nie mo¿na zmieniæ daty wa¿no¶ci klucza w wersji 3.\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy prywatnych\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Proszê wybraæ dok³adnie jeden identyfikator u¿ytkownika.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominiêty\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Czy na pewno chcesz tego u¿yæ? (t/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Czy na pewno chcesz tego u¿yæ? (t/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Brak podklucza o numerze %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Identyfikator u¿ytkownika: " -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "podpisany przez %08lX w %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Wa¿no¶æ tego klucza wygas³a %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Czy dalej chcesz go uniewa¿niæ? (t/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Te identyfikatory s± podpisane przez Ciebie:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (podpis nieeksportowalny) " -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr "uniewa¿niony przez %08lX w %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "brak klucza tajnego\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "identyfikator u¿ytkownika ,,%s'' zosta³ ju¿ uniewa¿niony\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "OSTRZE¯ENIE: identyfikator u¿ytkownika podpisany za %d sekund (w " "przysz³o¶ci)\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Zdjêcie w formacie %s, rozmiar %ld bajtów, klucz 0x%08lX (id %d).\n" @@ -3734,7 +3723,7 @@ msgstr "" "Musisz podaæ d³ugie, skomplikowane has³o aby ochroniæ swój klucz tajny.\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4293,7 +4282,7 @@ msgid "textmode" msgstr "tekstowy" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "nieznany" @@ -4501,16 +4490,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problem z porozumiewaniem siê z agentem\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problem z agentem - zostaje wy³±czony\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (podklucz %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4521,41 +4510,41 @@ "\"%.*s\".\n" "Klucz o d³ugo¶ci %u bitów, typ %s, numer %08lX, stworzony %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Powtórzone has³o\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Has³o\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "has³o zbyt d³ugie\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "b³êdna odpowied¼ agenta\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "anulowano przez u¿ytkownika\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem agenta: zwróci³ 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Podaj has³o: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4565,17 +4554,17 @@ "Musisz podaæ has³o aby odbezpieczyæ klucz prywatny u¿ytkownika:\n" "\"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "d³ugo¶æ %u bitów, typ %s, numer %08lX, stworzony %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Powtórz has³o: " @@ -5525,120 +5514,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[uniewa¿niony]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[przeterminowany]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "nieznany" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "nigdy " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "nastêpne sprawdzanie bazy odbêdzie siê %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "sprawdzanie bazy jest niepotrzebne\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "klucz publiczny %08lX nie odnaleziony: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "nale¿y uruchomiæ gpg z opcj± ,,--check-trustdb''\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "sprawdzanie bazy zaufania\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "przetworzono %d kluczy (rozwi±zano %d przeliczeñ zaufania)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "brak absolutnie zaufanych kluczy\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powiód³ siê: %s\n" @@ -5943,14 +5932,31 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "obja¶nienie mo¿na przeczytaæ tutaj: http://www.gnupg.org/faq.html\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "bez zabezpieczenia pamiêci nie mo¿na wykonaæ tej operacji\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dlatego zadania)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key nazwa u¿ytkownika" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrsign-key nazwa u¿ytkownika" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "z³o¿enie podpisu oddzielonego od dokumentu" + +#~ msgid "sign the key non-revocably" +#~ msgstr "z³o¿enie na kluczu podpisu nie podlegaj±cego uniewa¿nieniu" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "" +#~ "z³o¿enie na kluczu prywatnego podpisu nie podlegaj±cego uniewa¿nieniu" + #~ msgid "q" #~ msgstr "w" Index: gnupg/po/pt.po diff -u gnupg/po/pt.po:1.14 gnupg/po/pt.po:1.15 --- gnupg/po/pt.po:1.14 Tue Dec 14 08:49:27 2004 +++ gnupg/po/pt.po Thu Dec 16 11:04:36 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -33,7 +33,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -354,7 +354,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -565,7 +565,7 @@ msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "sair deste menu" @@ -574,7 +574,7 @@ msgid "show admin commands" msgstr "comandos em conflito\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "mostra esta ajuda" @@ -627,7 +627,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Comando> " @@ -646,7 +646,7 @@ msgid "Admin commands are not allowed\n" msgstr "a escrever chave privada para `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" @@ -691,7 +691,7 @@ msgid "PIN not correctly repeated; try again" msgstr "a frase secreta não foi repetida corretamente; tente outra vez" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -701,7 +701,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output não funciona para este comando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1001,59 +1001,59 @@ msgid "sign a key locally" msgstr "assinar uma chave localmente" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "assinar ou editar uma chave" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "gerar um certificado de revogação" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exportar chaves" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exportar chaves para um servidor de chaves" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importar chaves de um servidor de chaves" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "procurar chaves num servidor de chaves" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "actualizar todas as chaves a partir de um servidor de chaves" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importar/fundir chaves" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "actualizar a base de dados de confiança" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1063,55 +1063,55 @@ "Opções:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "criar saída com armadura ascii" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOME|cifrar para NOME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "" "usar este identificador de utilizador para\n" "assinar ou decifrar" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|estabelecer nível de compressão N\n" "(0 desactiva)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "usar modo de texto canônico" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "usar como ficheiro de saída" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "detalhado" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "não fazer alterações" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "perguntar antes de sobrepôr" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1119,7 +1119,7 @@ "@\n" "(Veja a página man para uma lista completa de comandos e opções)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1169,7 +1169,7 @@ msgid "Pubkey: " msgstr "Chave pública: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Cifra: " @@ -1177,7 +1177,7 @@ msgid "Hash: " msgstr "Dispersão: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Compressão: " @@ -1261,369 +1261,366 @@ msgid "unknown configuration item `%s'\n" msgstr "criado um novo ficheiro de configuração `%s'\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: o ficheiro antigo de opções por omissão `%s' foi ignorado\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "ficheiro de opções `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "a ler opções de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "a extensão de cifra \"%s\" não foi carregada devido às suas permissões " "inseguras\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "não consegui processar a URI do servidor de chaves\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "opções de importação inválidas\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opções de importação inválidas\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "opções de importação inválidas\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opções de exportação inválidas\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "opções de exportação inválidas\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "não foi possível alterar o exec-path para %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um ficheiro core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVISO: %s sobrepõe %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "só pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "não pode assinar e cifrar ao mesmo tempo no modo --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "deve utilizar ficheiros (e não um 'pipe') quando trabalho no modo --pgp2.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado é inválido\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de cifragem selecionado é inválido\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "preferências por omissão inválidas\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "preferências pessoais de cifra inválidas\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "preferências pessoais de 'digest' inválidas\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "preferências pessoais de compressão inválidas\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar a base de dados de confiança: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [nome_do_ficheiro]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_ficheiro]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decifragem falhou: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_ficheiro]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [nome_do_ficheiro]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_ficheiro]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "não pode utilizar %s enquanto estiver no modo %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nome_do_ficheiro]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_ficheiro]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_ficheiro]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id-utilizador" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizador" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key id-utilizador" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key id-utilizador" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizador [comandos]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de dispersão inválido `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nome_do_ficheiro]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Digite a sua mensagem ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1631,23 +1628,23 @@ "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e " "terminar com um '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação de utilizador não deve conter o caracter '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "a URL de política de certificação dada é inválida\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "a URL de política de assinatura dada é inválida\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "a URL de política de assinatura dada é inválida\n" @@ -2515,12 +2512,12 @@ msgstr "Utilizador \"%s\" está revocado." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Não foi possível assinar.\n" @@ -2722,7 +2719,7 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2774,371 +2771,363 @@ msgid "moving a key signature to the correct place\n" msgstr "a mover a assinatura da chave para o local correcto\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "gravar e sair" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "mostra impressão digital" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "lista chave e identificadores de utilizadores" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "seleciona ID de utilizador N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "seleciona chave secundária N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "assina a chave" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "fazer uma assinatura separada" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "assina a chave localmente" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "assina a chave de forma não-revogável" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "assinar a chave localmente e de forma não revogável" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "adiciona um novo ID de utilizador" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "adiciona um identificador fotográfico" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "remove ID de utilizador" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "remove uma chave secundária" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "adiciona uma chave de revocação" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "remove assinaturas" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "muda a data de validade" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "seleccionar o identificador do utilizador como primário" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "alterna entre listagem de chave secreta e pública" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "lista preferências (perito)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "lista preferências (detalhadamente)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "configurar lista de preferências" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "preferências actualizadas" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "não consegui processar a URI do servidor de chaves\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "muda os valores de confiança" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revoga assinaturas" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "revocar um ID de utilizador" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revoga uma chave secundária" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "desactiva uma chave" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "activa uma chave" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "mostrar identificador fotográfico" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erro na leitura do bloco de chave secreto `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Chave secreta disponível.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "A chave secreta é necessária para fazer isto.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Por favor utilize o comando \"toggle\" primeiro.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "A chave está revogada." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Realmente assinar todos os IDs de utilizador? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestão: Selecione os IDs de utilizador para assinar\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "classe de assinatura desconhecida" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Este comando não é permitido no modo %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de utilizador.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Você não pode remover o último ID de utilizador!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de utilizador seleccionados? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Realmente remover este ID de utilizador? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Realmente remover este ID de utilizador? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Você quer realmente remover as chaves selecionadas? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Você quer realmente remover esta chave? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Realmente revocar todos os IDs de utilizador seleccionados? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Realmente revocar este ID de utilizador? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Você quer realmente revogar as chaves selecionadas? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Você quer realmente revogar esta chave? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "configurar lista de preferências" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Realmente actualizar as preferências para os utilizadores seleccionados?" -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Realmente actualizar as preferências?" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Gravar alterações? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Sair sem gravar? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "actualização falhou: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "actualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma actualização é necessária.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "'Digest': " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Características: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Esta chave pode ser revogada pela chave %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (sensível)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[expira: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " confiança: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Esta chave foi desactivada" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3146,25 +3135,25 @@ "Não se esqueça que a validade de chave mostrada não é necessáriamente a\n" "correcta a não ser que reinicie o programa.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "revkey" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3173,46 +3162,46 @@ "AVISO: Esta chave é do tipo PGP2. Se adicionar um identificador fotográfico\n" " algumas versão do PGP podem rejeitá-la.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Apagar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Apagar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Apagar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3221,161 +3210,161 @@ "AVISO: Esta chave é do tipo PGP 2.x. Se adicionar um revogador designado\n" " algumas versão do PGP podem rejeitá-la.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Insira o ID de utilizador do revogador escolhido: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 #, fuzzy msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "não pode escolher uma chave como revogadora de si mesmo\n" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as selecções das chaves secretas.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Por favor seleccione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "A modificar a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Modificar a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Você não pode modificar a data de validade de uma chave v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Seleccione exactamente um identificador de utilizador.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de utilizador com índice %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de utilizador: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " assinado por %08lX em %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (não-exportável)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Esta assinatura expirou em %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Tem a certeza de que quer revogá-la de qualquer forma? (s/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Assinou estes identificadores de utilizadores:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (não-exportável)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente criar os certificados de revogação? (s/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "o utilizador com o id \"%s\" já está revocado\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3707,7 +3696,7 @@ "Você precisa de uma frase secreta para proteger a sua chave.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4263,7 +4252,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 #, fuzzy msgid "unknown" msgstr "versão desconhecida" @@ -4473,16 +4462,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problemas na comunicação com o gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problema com o agente - a desactivar a utilização deste\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4495,41 +4484,41 @@ "\"%.*s\"\n" "chave %u bits %s, ID %08lx, criada %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Repita a frase secreta\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Insira a frase secreta\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "frase secreta demasiado longa\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "resposta do agente inválida\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "cancelado pelo utilizador\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema com o agente: o agente returnou 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "impossível pedir senha em modo não-interactivo\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4539,17 +4528,17 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "utilizador: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -5487,122 +5476,122 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "revkey" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "expire" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "versão desconhecida" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "proxima verificação da base de dados de confiança a %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "não é necessária uma verificação da base de dados de confiança\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública %08lX não encontrada: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "a verificar a base de dados de confiança\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "" "chave pública da chave absolutamente de confiança %08lX não encontrada\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "chave pública da chave absolutamente de confiança %08lX não encontrada\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n" @@ -5908,14 +5897,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "por favor veja http://www.gnupg.org/faq.html para mais informações\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "a operação não é possível sem memória segura inicializada\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key id-utilizador" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key id-utilizador" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "fazer uma assinatura separada" + +#~ msgid "sign the key non-revocably" +#~ msgstr "assina a chave de forma não-revogável" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "assinar a chave localmente e de forma não revogável" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/pt_BR.po diff -u gnupg/po/pt_BR.po:1.51 gnupg/po/pt_BR.po:1.52 --- gnupg/po/pt_BR.po:1.51 Tue Dec 14 08:49:27 2004 +++ gnupg/po/pt_BR.po Thu Dec 16 11:04:36 2004 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -37,7 +37,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -359,7 +359,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -571,7 +571,7 @@ msgid "secret key already stored on a card\n" msgstr "ignorado: a chave secreta já está presente\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "sair deste menu" @@ -580,7 +580,7 @@ msgid "show admin commands" msgstr "comandos conflitantes\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "mostra esta ajuda" @@ -633,7 +633,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Comando> " @@ -653,7 +653,7 @@ msgstr "escrevendo certificado privado para `%s'\n" # help ou ajuda ??? -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Comando inválido (tente \"help\")\n" @@ -701,7 +701,7 @@ msgid "PIN not correctly repeated; try again" msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -711,7 +711,7 @@ msgid "--output doesn't work for this command\n" msgstr "" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1011,61 +1011,61 @@ msgid "sign a key locally" msgstr "assinar uma chave localmente" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "assinar ou editar uma chave" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "gerar um certificado de revogação" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exportar chaves" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exportar chaves para um servidor" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importar chaves de um servidor" -#: g10/g10.c:392 +#: g10/g10.c:390 #, fuzzy msgid "search for keys on a key server" msgstr "exportar chaves para um servidor" -#: g10/g10.c:394 +#: g10/g10.c:392 #, fuzzy msgid "update all keys from a keyserver" msgstr "importar chaves de um servidor" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importar/fundir chaves" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "atualizar o banco de dados de confiabilidade" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1075,61 +1075,61 @@ "Opções:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "criar saída com armadura ascii" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NOME|criptografar para NOME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "" "usar este identificador de usuário para\n" "assinar ou descriptografar" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|estabelecer nível de compressão N\n" "(0 desabilita)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "usar modo de texto canônico" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "usar como arquivo de saída" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "detalhado" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "não fazer alterações" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" msgstr "" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1179,7 +1179,7 @@ msgid "Pubkey: " msgstr "" -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "" @@ -1187,7 +1187,7 @@ msgid "Hash: " msgstr "" -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 #, fuzzy msgid "Compression: " msgstr "Comentário: " @@ -1272,376 +1272,371 @@ msgid "unknown configuration item `%s'\n" msgstr "%s: novo arquivo de opções criado\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, fuzzy, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opções `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTA: %s não é para uso normal!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s não é um conjunto de caracteres válido\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, fuzzy, c-format msgid "%s:%d: invalid import options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 #, fuzzy msgid "invalid import options\n" msgstr "armadura inválida" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, fuzzy, c-format msgid "%s:%d: invalid export options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 #, fuzzy msgid "invalid export options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "armadura inválida" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "AVISO: `%s' é um arquivo vazio\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "chaveiro inválido" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "AVISO: O programa pode criar um arquivo core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s não é permitido com %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 #, fuzzy msgid "selected certification digest algorithm is invalid\n" msgstr "o algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth deve estar na entre 1 e 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 #, fuzzy msgid "invalid default preferences\n" msgstr "lista preferências" -#: g10/g10.c:2767 +#: g10/g10.c:2775 #, fuzzy msgid "invalid personal cipher preferences\n" msgstr "lista preferências" -#: g10/g10.c:2771 +#: g10/g10.c:2779 #, fuzzy msgid "invalid personal digest preferences\n" msgstr "lista preferências" -#: g10/g10.c:2775 +#: g10/g10.c:2783 #, fuzzy msgid "invalid personal compress preferences\n" msgstr "lista preferências" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s não faz sentido com %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "o algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "descriptografia falhou: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" -#: g10/g10.c:3091 +#: g10/g10.c:3099 #, fuzzy msgid "--sign --symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id-usuário" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id-usuário" -#: g10/g10.c:3141 -#, fuzzy -msgid "--nrsign-key user-id" -msgstr "--sign-key id-usuário" - -#: g10/g10.c:3145 -#, fuzzy -msgid "--nrlsign-key user-id" -msgstr "--sign-key id-usuário" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-usuário [comandos]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "get_dir_record: search_record falhou: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "enumeração de chaves secretas falhou: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" # "hash" poderia ser "espalhamento", mas não fica claro -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de hash inválido `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 #, fuzzy msgid "" "a notation name must have only printable characters or spaces, and end with " @@ -1650,26 +1645,26 @@ "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e " "terminar com '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 #, fuzzy msgid "a user notation name must contain the '@' character\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "um valor de notação não deve usar caracteres de controle\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 #, fuzzy msgid "the given certification policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 #, fuzzy msgid "the given signature policy URL is invalid\n" msgstr "a URL de política dada é inválida\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "a URL de política dada é inválida\n" @@ -2483,13 +2478,13 @@ msgstr "A chave é protegida.\n" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 #, fuzzy msgid "Are you sure you still want to sign it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr "" @@ -2670,7 +2665,7 @@ msgid "Really sign? (y/N) " msgstr "Realmente assinar? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2724,612 +2719,602 @@ msgid "moving a key signature to the correct place\n" msgstr "movendo a assinatura da chave para o local correto\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "gravar e sair" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "mostra impressão digital" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "lista chave e identificadores de usuários" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "seleciona ID de usuário N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "seleciona chave secundária N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "lista assinaturas" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "assina a chave" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "fazer uma assinatura separada" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "assina a chave localmente" -#: g10/keyedit.c:1261 -#, fuzzy -msgid "sign the key non-revocably" -msgstr "assina a chave localmente" - -#: g10/keyedit.c:1262 -#, fuzzy -msgid "sign the key locally and non-revocably" -msgstr "assina a chave localmente" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 #, fuzzy msgid "add a photo ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "remove ID de usuário" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "remove uma chave secundária" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 #, fuzzy msgid "add a revocation key" msgstr "adiciona nova chave secundária" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "remove assinaturas" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "muda a data de validade" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "alterna entre listagem de chave secreta e pública" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 #, fuzzy msgid "list preferences (expert)" msgstr "lista preferências" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 #, fuzzy msgid "list preferences (verbose)" msgstr "lista preferências" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 #, fuzzy msgid "set preference list" msgstr "lista preferências" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 #, fuzzy msgid "updated preferences" msgstr "lista preferências" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 msgid "set preferred keyserver URL" msgstr "" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "muda a frase secreta" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "muda os valores de confiança" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revoga assinaturas" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 #, fuzzy msgid "revoke a user ID" msgstr "adiciona um novo ID de usuário" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revoga uma chave secundária" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "desativa uma chave" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "ativa uma chave" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Chave secreta disponível.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "A chave secreta é necessária para fazer isto.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 #, fuzzy msgid "Key is revoked." msgstr "A chave é protegida.\n" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Realmente assinar todos os IDs de usuário? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestão: Selecione os IDs de usuário para assinar\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "classe de assinatura desconhecida" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Você não pode remover o último ID de usuário!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Você deve selecionar pelo menos uma chave.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Você realmente quer remover as chaves selecionadas? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Você realmente quer remover esta chave? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Realmente remover este ID de usuário? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Você realmente quer revogar as chaves selecionadas? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Você realmente quer revogar esta chave? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "lista preferências" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Realmente remover todos os IDs de usuário selecionados? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvar alterações? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Sair sem salvar? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "atualização falhou: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "atualização da chave secreta falhou: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Chave não alterada, nenhuma atualização é necessária.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "" -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "" -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 msgid "(sensitive)" msgstr "" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "impossível criar %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "revkey" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "A chave expira em %s\n" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr "trust" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr "trust" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Esta chave foi desativada" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "revkey" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" " of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 #, fuzzy msgid "Are you sure you still want to add it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Deletar esta assinatura válida? (s/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Deletar esta assinatura inválida? (s/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Deletar esta assinatura desconhecida? (s/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Realmente remover esta auto-assinatura? (s/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d assinatura removida.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d assinaturas removidas.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nada removido.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" " some versions of PGP to reject this key.\n" msgstr "" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 #, fuzzy msgid "Enter the user ID of the designated revoker: " msgstr "Digite o tamanho da chave" -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Por favor remova as seleções das chaves secretas.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Por favor selecione no máximo uma chave secundária.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Modificando a data de validade para uma chave secundária.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Modificando a data de validade para uma chave primária.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Você não pode modificar a data de validade de uma chave v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 #, fuzzy msgid "Please select exactly one user ID.\n" msgstr "Você precisa selecionar pelo menos um ID de usuário.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Nenhum ID de usuário com índice %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID de usuário: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " assinado por %08lX em %s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr "" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, fuzzy, c-format msgid "This signature expired on %s.\n" msgstr "Esta chave não é protegida.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 #, fuzzy msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Você tem certeza de que quer este tamanho de chave? " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 #, fuzzy msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Você assinou estes IDs de usuário:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr "assinar uma chave localmente" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revogado por %08lX em %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Você está prestes a revogar estas assinaturas:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 #, fuzzy msgid "Really create the revocation certificates? (y/N) " msgstr "Realmente gerar os certificados de revogação? (s/N)" -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "nenhuma chave secreta\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, fuzzy, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "A chave é protegida.\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3665,7 +3650,7 @@ "Você precisa de uma frase secreta para proteger sua chave.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "" @@ -4230,7 +4215,7 @@ msgid "textmode" msgstr "" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 #, fuzzy msgid "unknown" msgstr "versão desconhecida" @@ -4438,16 +4423,16 @@ msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID principal da chave %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4459,44 +4444,44 @@ "usuário: \"%.*s\"\n" "%u-bit %s chave, ID %08lX, criada %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 #, fuzzy msgid "Repeat passphrase\n" msgstr "Repita a frase secreta: " -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 #, fuzzy msgid "Enter passphrase\n" msgstr "Digite a frase secreta: " -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 #, fuzzy msgid "passphrase too long\n" msgstr "linha muito longa\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "impossível pedir senha em modo não-interativo\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4506,17 +4491,17 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "usuário: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -5448,122 +5433,122 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "revkey" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "expire" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "versão desconhecida" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 #, fuzzy msgid "no need for a trustdb check\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, fuzzy, c-format msgid "next trustdb check due at %s\n" msgstr "inserção de registro de confiança falhou: %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "%s: não é um banco de dados de confiabilidade\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "chave pública não encontrada" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 #, fuzzy msgid "checking the trustdb\n" msgstr "muda os valores de confiança" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 #, fuzzy msgid "no ultimately trusted keys found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "Certificados que levam a uma chave confiada plenamente:\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "registro de confiança %lu, tipo %d: escrita falhou: %s\n" @@ -5874,14 +5859,34 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "a operação não é possível sem memória segura inicializada\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(você pode ter usado o programa errado para esta tarefa)\n" +#, fuzzy +#~ msgid "--nrsign-key user-id" +#~ msgstr "--sign-key id-usuário" + +#, fuzzy +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--sign-key id-usuário" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "fazer uma assinatura separada" + +#, fuzzy +#~ msgid "sign the key non-revocably" +#~ msgstr "assina a chave localmente" + +#, fuzzy +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "assina a chave localmente" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/ro.po diff -u gnupg/po/ro.po:1.9 gnupg/po/ro.po:1.10 --- gnupg/po/ro.po:1.9 Tue Dec 14 08:49:27 2004 +++ gnupg/po/ro.po Thu Dec 16 11:04:36 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-06-17 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -34,7 +34,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -361,7 +361,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -572,7 +572,7 @@ msgid "secret key already stored on a card\n" msgstr "sãritã: cheia secretã deja prezentã\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "ieºi din acest meniu" @@ -581,7 +581,7 @@ msgid "show admin commands" msgstr "comenzi în conflict\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "afiºeazã acest mesaj" @@ -634,7 +634,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Comandã> " @@ -653,7 +653,7 @@ msgid "Admin commands are not allowed\n" msgstr "scriu cheia secretã în `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Comandã invalidã (încercaþi \"ajutor\")\n" @@ -698,7 +698,7 @@ msgid "PIN not correctly repeated; try again" msgstr "fraza-parolã nu a fost repetatã corect; mai încercaþi o datã" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -708,7 +708,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output nu merge pentru aceastã comandã\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1010,59 +1010,59 @@ msgid "sign a key locally" msgstr "semneazã o cheie local" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "semneazã sau editeazã o cheie" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "genereazã un certificat de revocare" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exportã chei" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exportã chei pentru un server de chei" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importã chei de la un server de chei" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "cautã pentru chei pe un server de chei" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "actualizeazã toate cheile de la un server de chei" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importã/combinã chei" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "actualizeazã baza de date de încredere" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [fiºiere]|afiºeazã rezumate mesaje" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1072,51 +1072,51 @@ "Opþiuni:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "creazã ieºire în armurã ascii" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NUME|cifrare pentru NUME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "foloseºte acest id-utilizator pentru a semna sau decripta" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|seteazã nivel de compresie N (0 deactiveazã)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "foloseºte modul text canonic" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "foloseºte ca fiºier ieºire" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "locvace" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "nu face nici o schimbare" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "întreabã înainte de a suprascrie" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1124,7 +1124,7 @@ "@\n" "(Aratã pagina man pentru o listã completã a comenzilor ºi opþiunilor)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1174,7 +1174,7 @@ msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Cifru: " @@ -1182,7 +1182,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Compresie: " @@ -1278,373 +1278,370 @@ msgid "unknown configuration item `%s'\n" msgstr "articol configurare necunoscut \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTÃ: fisier opþiuni implicite vechi `%s' ignorat\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTÃ: nici un fiºier opþiuni implicit `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "fiºier opþiuni `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "citesc opþiuni din `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTÃ: %s nu este pentru o folosire normalã!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "extensie cifru \"%s\" nu a fost încãrcat din cauza permisiunilor nesigure " "(unsafe)\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nu este un set de carectere valid\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "nu am putut interpreta URI pentru serverul de chei\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: opþiuni import invalide\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "opþiuni import invalide\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: opþiuni import invalide\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "opþiuni import invalide\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: opþiuni export invalide\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "opþiuni export invalide\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nu pot seta cale-execuþie ca %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "AVERTISMENT: programul ar putea crea un fiºier core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "AVERTISMENT: %s înlocuieºte %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s nu este permis cu %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nu are sens cu %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "puteþi crea doar semnãturi detaºate sau în clar câtã vreme sunteþi în modul " "--pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "" "nu puteþi semna ºi cifra în acelaºi timp câtã vreme sunteþi în modul --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "" "trebuie sã folosiþi fiºiere (ºi nu un pipe) când lucraþi cu modul --pgp2 " "activat.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "cifrarea unui mesaj în modul --pgp2 necesitã un cifru IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "algoritm rezumat selectat este invalid\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "algoritm cifrare selectat este invalid\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "algoritm rezumat certificare selectat este invalid\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed trebuie sã fie mai mare decât 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed trebuie sã fie mai mare decât 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth trebuie sã fie în intervalul 1..255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "default-cert-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "min-cert-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTÃ: modul S2K simplu (0) este contraindicat cu insistenþã\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mod S2K invalid; trebuie sã fie 0, 1 sau 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "preferinþe implicite invalide\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "preferinþe cifrare personale invalide\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "preferinþe rezumat personale invalide\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "preferinþe compresie personale invalide\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s nu merge încã cu %s!\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "nu puteþi folosi algoritmul de cifrare \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "nu puteþi folosi algorimul de rezumat \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "nu puteþi folosi algoritmul de compresie \"%s\" câtã vreme în modul %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "am eºuat sã iniþializez TrustDB:%s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "AVERTISMENT: destinatari (-r) furnizaþi fãrã a folosi cifrare cu cheie " "publicã\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [nume_fiºier]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [nume_fiºier]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "decriptarea a eºuat: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [nume_fiºier]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [nume_fiºier]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [nume_fiºier]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "nu puteþi folosi %s câtã vreme în modul %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [nume_fiºier]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [nume_fiºier]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [nume_fiºier]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id-utilizator" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id-utilizator" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key id-utilizator" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key id-utilizator" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id-utilizator [comenzi]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "trimitere server de chei eºuatã: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "recepþie server de chei eºuatã: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "export cheie eºuat: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "cãutare server de chei eºuatã: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "actualizare server de chei eºuatã: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminarea armurii a eºuat: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "punerea armurii a eºuat: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritm hash invalid `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[nume_fiºier]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Daþi-i drumul ºi scrieþi mesajul ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1652,24 +1649,24 @@ "un nume de notaþie trebuie sã conþinã numai caractere imprimabile sau spaþii " "ºi sã se termine cu un '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "un nume de notaþie utilizator trebuie sã conþinã caracterul '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "" "o valoare de notaþie trebuie sã nu foloseascã nici un caracter de control\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "URL-ul politicii de certificare furnizat este invalid\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "URL-ul politicii de semnãturi furnizat este invalid\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "URL-ul politicii de semnãturi furnizat este invalid\n" @@ -2538,12 +2535,12 @@ msgstr "ID utilizator \"%s\" a fost revocat." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã ºtergeþi permanent \"%s\"? (d/N)" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Nu pot semna.\n" @@ -2747,7 +2744,7 @@ msgid "Really sign? (y/N) " msgstr "Doriþi cu adevãrat sã semnaþi?" -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2799,372 +2796,364 @@ msgid "moving a key signature to the correct place\n" msgstr "mut o semnãturã de cheie în locul corect\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "salveazã ºi terminã" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "afiºeazã amprenta" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "enumerã chei ºi ID-uri utilizator" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "selecteazã ID utilizator N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "selecteazã cheie secundarã N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "enumerã semnãturi" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "semneazã cheia" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "creazã o semnãturã detaºatã" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "semneazã cheia local" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "semneazã cheia irevocabil" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "semneazã cheia local ºi irevocabil" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "adaugã un ID utilizator" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "adaugã o pozã ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "ºterge ID utilizator" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "adaugã o cheie secundarã" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "ºterge o cheie secundarã" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "adaugã o cheie de revocare" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "ºterge semnãturi" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "schimbã data de expirare" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "marcheazã ID-ul utilizator ca primar" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "comutã între listele de chei secrete ºi publice" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "enumerã preferinþele (expert)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "afiºeazã preferinþele (detaliat)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "seteazã lista de preferinþe" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "preferinþe actualizate" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "nu am putut interpreta URI pentru serverul de chei\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "schimbã fraza-parolã" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "schimbã încrederea pentru proprietar" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revocã semnãturi" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "revocã un ID utilizator" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revocã o cheie secundarã" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "deactiveazã o cheie" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "activeazã o cheie" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "aratã o pozã ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "eroare la citire keyblock secret `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Cheia secretã este disponibilã.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Aveþi nevoie de cheia secretã pentru a face aceasta.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Vã rugãm folosiþi mai întâi comanda \"toggle\".\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Cheia este revocatã." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Semnaþi într-adevãr toate ID-urile utilizator? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Sugestie: Selectaþi ID-ul utilizator de semnat\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "clasã semnãturi necunoscutã" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Aceastã comandã nu este permisã în modul %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Trebuie mai întâi sã selectaþi cel puþin un ID utilizator.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Nu puteþi ºterge ultimul ID utilizator!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "ªtergeþi într-adevãr toate ID-urile utilizator selectate? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "ªtergeþi într-adevãr acest ID utilizator? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "ªtergeþi într-adevãr acest ID utilizator? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Trebuie sã selectaþi cel puþin o cheie.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Trebuie sã selectaþi cel puþin o cheie.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Doriþi într-adevãr sã ºtergeþi cheile selectate? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Doriþi într-adevãr sã ºtergeþi aceastã cheie? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi toate ID-urile utilizator selectate? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi acest ID utilizator? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi cheile selectate? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Doriþi într-adevãr sã revocaþi aceastã cheie? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "seteazã lista de preferinþe" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Doriþi într-adevãr sã actualizaþi preferinþele pentru ID-urile utilizator " "selectate? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Doriþi într-adevãr sã actualizaþi preferinþele? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Salvaþi schimbãrile? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Terminaþi fãrã a salva? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "actualizarea a eºuat: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "actualizarea secretului a eºuat: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Cheia nu a fost schimbatã aºa cã nici o actualizare a fost necesarã.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Rezumat: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Capabilitãþi: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Aceastã cheie poate fi revocatã de cheia %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (senzitiv)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "nu pot crea %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revocatã] " -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [expirã: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [expirã: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " încredere: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " încredere: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Aceastã cheie a fost deactivatã" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Nu existã nici o preferinþã pentru un ID utilizator stil PGP 2.x.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3172,19 +3161,19 @@ "Vã rugãm observaþi cã validitatea cheii arãtate nu este în mod necesar\n" "corectã dacã nu reporniþi programul.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[revocatã] " -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expira" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3193,7 +3182,7 @@ " Aceastã comandã poate cauza ca un alt ID utilizator\n" " sã devinã ID-ul utilizator primar presupus.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3202,45 +3191,45 @@ "AVERTISMENT: Aceasta este o cheie stil PGP2. Adãugarea unei poze ID poate\n" " cauza unele versiuni de PGP sã respingã aceastã cheie.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Sunteþi încã sigur(ã) cã doriþi sã o adãugaþi? (d/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nu puteþi adãuga o pozã ID la o cheie stil PGP2.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã bunã? (d/N/t)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã invalidã? (d/N/t)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "ªtergeþi aceastã semnãturã necunoscutã? (d/N/t)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "ªtergeþi într-adevãr aceastã auto-semnãturã? (d/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Am ºters %d semnãturã.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Am ºters %d semnãturi.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Nu am ºters nimic.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3250,34 +3239,34 @@ "revocator desemnat poate face ca unele versiuni de PGP sã respingã " "cheia.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nu puteþi adãuga un revocator desemnat la o cheie stil PGP 2.x.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Introduceþi ID-ul utilizator al revocatorului desemnat: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "nu puteþi desemna o cheie ca propriul sãu revocator desemnat\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "AVERTISMENT: Aceastã cheie a fost revocatã revocatorul desemnat!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi " "anulatã!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3285,129 +3274,129 @@ "Sunteþi sigur(ã) cã doriþi sã desemnaþi aceastã cheie ca ºi revocator " "desemnat? (d/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Vã rugãm ºtergeþi selecþiile din cheile secrete.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Vã rugãm selectaþi cel mult o cheie secundarã.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Schimbarea timpului de expirare pentru o cheie secundarã.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Schimbarea timpului de expirare pentru o cheie primarã.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nu puteþi schimba data de expirare a unei chei v3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Nici o semnãturã corespunzãtoare în inelul secret\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Vã rugãm selectaþi exact un ID utilizator.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "auto-semnãturi v3 sãrite pentru ID-ul utilizator \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã o folosiþi (d/N)? " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Sunteþi sigur(ã) cã doriþi sã o folosiþi (d/N)? " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Nici un ID utilizator cu indicele %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Nici o cheie secundarã cu indicele %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "ID utilizator: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " semnatã de %08lX la %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (non-exportabilã)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Aceastã semnãturã a expirat pe %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Sunteþi încã sigur(ã) cã doriþi sã o revocaþi? (d/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Creaþi un certificat de revocare pentru aceastã semnãturã? (d/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Aþi semnat aceste ID-uri utilizator:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (non-exportabilã)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revocat de %08lX la %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Sunteþi pe cale sã revocaþi aceste semnãturi:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Doriþi într-adevãr sã creaþi certificatele de revocare? (d/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "nici o cheie secretã\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "ID-ul utilizator \"%s\" este deja revocat\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "AVERTISMENT: o semnãturã ID utilizator este datatã %d secunde în viitor\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Afiºez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n" @@ -3736,7 +3725,7 @@ "Aveþi nevoie de o frazã-parolã pentru a vã proteja cheia secretã.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4291,7 +4280,7 @@ msgid "textmode" msgstr "modtext" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "necunoscut" @@ -4503,16 +4492,16 @@ msgid "communication problem with gpg-agent\n" msgstr "probleme de comunicare cu gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problemã cu agentul - deactivez folosirea agentului\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (ID cheie principalã %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4524,41 +4513,41 @@ "\"%.*s\"\n" "%u-bit cheia %s, ID %08lX, creatã %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Repetaþi fraza-parolã\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Introduceþi fraza-parolã\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "frazã-parolã prea lungã\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "rãspuns invalid de la agent\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "anulatã de utilizator\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemã cu agentul: agentul returneazã 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "nu pot cere parola în modul batch\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Introduceþi fraza-parolã: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4568,17 +4557,17 @@ "Aveþi nevoie de o frazã-parolã pentru a descuia cheia\n" "secretã pentru utilizator: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "cheia %2$s de %1$u-biþi, ID %3$08lX, creatã %4$s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Repetaþi fraza-parolã: " @@ -5519,120 +5508,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[revocatã] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[expiratã] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "necunoscut" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "niciodatã " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "urmãtoarea verificare pentru trustdb programatã pe %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "nu e nevoie de o verificare pentru trustdb\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "cheia publicã %08lX nu a fost gãsitã: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "vã rugãm faceþi un --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "verific trustdb\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d chei procesate (%d numãrãtori valide anulate)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "nu am gãsit nici o cheie cu încredere supremã\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "cheia publicã a cheii cu încredere supremã %08lX nu a fost gãsitã\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "înregistrare încredere %lu, tip %d: scrierea a eºuat: %s\n" @@ -5937,15 +5926,31 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "vedeþi http://www.gnupg.org/faq.html pentru informaþii suplimentare\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "" "operaþia nu este posibilã fãrã memorie protejatã (secure) iniþializatã\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(aþi folosit probabil un program nepotrivit pentru aceastã sarcinã)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key id-utilizator" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key id-utilizator" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "creazã o semnãturã detaºatã" + +#~ msgid "sign the key non-revocably" +#~ msgstr "semneazã cheia irevocabil" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "semneazã cheia local ºi irevocabil" + #~ msgid "q" #~ msgstr "t" Index: gnupg/po/ru.po diff -u gnupg/po/ru.po:1.52 gnupg/po/ru.po:1.53 --- gnupg/po/ru.po:1.52 Tue Dec 14 08:49:27 2004 +++ gnupg/po/ru.po Thu Dec 16 11:04:35 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GnuPG 1.2.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2003-12-23 19:24+0100\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -31,7 +31,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -566,7 +566,7 @@ msgid "secret key already stored on a card\n" msgstr "пропущено: Ñекретный ключ уже имеетÑÑ\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "выйти из Ñтого меню" @@ -575,7 +575,7 @@ msgid "show admin commands" msgstr "неÑовмеÑтимые команды\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "показать Ñту Ñправку" @@ -628,7 +628,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Команда> " @@ -647,7 +647,7 @@ msgid "Admin commands are not allowed\n" msgstr "Ñохранение Ñекретного ключа в `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° (ÑпиÑок команд: \"help\")\n" @@ -692,7 +692,7 @@ msgid "PIN not correctly repeated; try again" msgstr "повторный ввод Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚ÐµÐ½; попробуйте еще раз" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -702,7 +702,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output не работает Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ команды\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -997,59 +997,59 @@ msgid "sign a key locally" msgstr "подпиÑать ключ локально" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "подпиÑать или редактировать ключ" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "Ñоздать Ñертификат отзыва" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "ÑкÑпортировать ключи" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "ÑкÑпортировать ключи на Ñервер ключей" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "импортировать ключи Ñ Ñервера ключей" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "иÑкать ключи на Ñервере ключей" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "обновить вÑе ключи Ñ Ñервера ключей" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "импортировать/объединить ключи" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "обновить таблицу доверий" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [files]|вывеÑти Ñ…Ñши файлов" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1059,51 +1059,51 @@ "Параметры:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "вывод в ASCII формате" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NAME|зашифровать Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ NAME" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "иÑпользовать данный User ID Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ð½Ð¸Ñ Ð¸ раÑшифрованиÑ" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|уÑтановить уровень ÑÐ¶Ð°Ñ‚Ð¸Ñ N (по умолчанию - 0)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "иÑпользовать каноничеÑкий текÑтовый режим" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "вывод в указанный файл" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "подробно" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "не делать никаких изменений" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "ÑпроÑить перед перезапиÑью" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1111,7 +1111,7 @@ "@\n" "(См. документацию Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ полного Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ð¼Ð¸ и параметрами)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1164,7 +1164,7 @@ msgid "Pubkey: " msgstr "С открытым ключом: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Симметричные шифры: " @@ -1172,7 +1172,7 @@ msgid "Hash: " msgstr "Ð¥Ñш-функции: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Ðлгоритмы ÑжатиÑ: " @@ -1256,367 +1256,364 @@ msgid "unknown configuration item `%s'\n" msgstr "файл конфигурации Ñодержит неизвеÑтный параметр \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "ЗÐМЕЧÐÐИЕ: файл наÑтроек Ñтарого формата `%s' проигнорирован\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ЗÐМЕЧÐÐИЕ: файл наÑтроек `%s' не обнаружен\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "файл наÑтроек `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "наÑтройки взÑÑ‚Ñ‹ из файла `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "ЗÐМЕЧÐÐИЕ: %s не предназначен Ð´Ð»Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ð³Ð¾ иÑпользованиÑ!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "раÑширение шифра \"%s\" не загружено вÑледÑтвие небезопаÑных прав доÑтупа\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° Ñимволов\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "не могу проанализировать URI Ñервера ключей\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: недопуÑтимые параметры импорта\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "недопуÑтимые параметры импорта\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: недопуÑтимые параметры импорта\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "недопуÑтимые параметры импорта\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "недопуÑтимые параметры ÑкÑпорта\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "не могу определить путь запуÑка Ð´Ð»Ñ %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "Ð’ÐИМÐÐИЕ: возможно Ñоздание файла дампа памÑти!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "Ð’ÐИМÐÐИЕ: %s заменит %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s недопуÑтимо иÑпользовать Ñ %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s не имеет ÑмыÑла ÑовмеÑтно Ñ %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "Можно Ñделать только отделенную или прозрачную подпиÑÑŒ в режиме --pgp2\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "Ð’Ñ‹ не можете одновременно подпиÑать и зашифровать в режиме --pgp2\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "Ð’Ñ‹ должны иÑпользовать файлы (а не каналы (pipe)) в режиме --pgp2.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "Ð´Ð»Ñ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²ÐºÐ¸ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² режиме --pgp2 требуетÑÑ ÑˆÐ¸Ñ„Ñ€ IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "выбран неверный алгоритм шифрованиÑ\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-функциÑ\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "выбран неверный алгоритм шифрованиÑ\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "выбрана Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð´Ð»Ñ Ñертификации\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed должен быть больше 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed должен быть больше 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "недопуÑтимый default-cert-level; должен быть 0, 1, 2 или 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "недопуÑтимый min-cert-level; должен быть 1, 2 или 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ЗÐМЕЧÐÐИЕ: проÑтой (0) режим S2K Ñтрого не рекомендуетÑÑ\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "недопуÑтимый режим S2K; должно быть 0, 1 или 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "недопуÑтимые Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð°\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ…Ñш-функции\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "недопуÑтимые перÑональные Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð°Ð»Ð³Ð¾Ñ€Ð¸Ñ‚Ð¼Ð¾Ð² ÑжатиÑ\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s не работает пока Ñ %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать шифрование \"%s\" в режиме %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñ…Ñш-функцию \"%s\" в режиме %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать Ñжатие \"%s\" в режиме %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Ñбой инициализации таблицы доверий: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "Ð’ÐИМÐÐИЕ: получатели (-r) заданы без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ " "ключом\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "Ñбой раÑшифрованиÑ: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать %s в режиме %s\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "Ð’Ñ‹ не можете иÑпользовать %s в режиме %s\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key user-id" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key user-id" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "неудача при отправке на Ñервер ключей: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "неудача при получении Ñ Ñервера ключей: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "не удалоÑÑŒ ÑкÑпортировать ключ: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "неудача при поиÑке на Ñервере ключей: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "неудача при обновлении на Ñервере ключей: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð· ASCII формата: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² ASCII формат: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ñ…Ñш-Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[filename]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Ðабирайте Ваше Ñообщение ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1624,23 +1621,23 @@ "Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать только печатные Ñимволы или пробелы,и " "заканчиватьÑÑ Ð·Ð½Ð°ÐºÐ¾Ð¼ '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "Ð¸Ð¼Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ñодержать '@' Ñимвол\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "значение Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ñ Ð½Ðµ должно Ñодержать управлÑющие Ñимволы\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "заданный URL правил Ñертификации неверен\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "заданный URL правил подпиÑи неверен\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "заданный URL правил подпиÑи неверен\n" @@ -2497,12 +2494,12 @@ msgstr "User ID \"%s\" отозван." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите Ñто подпиÑать? (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Ðе могу подпиÑать.\n" @@ -2704,7 +2701,7 @@ msgid "Really sign? (y/N) " msgstr "ДейÑтвительно подпиÑать? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2756,370 +2753,362 @@ msgid "moving a key signature to the correct place\n" msgstr "перемещение подпиÑи ключа в правильное меÑто\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "Ñохранить и выйти" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "показать отпечаток" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "вывеÑти ÑпиÑок ключей и User ID" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "выбрать User ID N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "выбрать вторичный ключ N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "вывеÑти ÑпиÑок подпиÑей" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "подпиÑать ключ" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "Ñоздать отделенную (detached) подпиÑÑŒ" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "локально подпиÑать ключ" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "подпиÑать ключ без возможноÑти отзыва" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "подпиÑать ключ локально и без возможноÑти отзыва" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "добавить User ID" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "добавить фото ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "удалить User ID" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "добавить вторичный ключ" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "удалить вторичный ключ" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "добавить ключ отзыва" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "удалить подпиÑÑŒ" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "Ñменить Ñрок дейÑтвиÑ" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "пометить User ID как главный" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "переключение между открытым и закрытым ключами" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "ÑпиÑок предпочтений (ÑкÑпертам)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "ÑпиÑок предпочтений (подробный)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "уÑтановить предпочтениÑ" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "обновить предпочтениÑ" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "не могу проанализировать URI Ñервера ключей\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "Ñменить пароль" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "изменить уровень Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "отзыв подпиÑей" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "отзыв User ID" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "отзыв подключей" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "отключить ключ" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "включить ключ" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "показать фото ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "ошибка Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñекретного блока ключа `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Секретный ключ доÑтупен.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Ð”Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ дейÑÑ‚Ð²Ð¸Ñ Ð½ÑƒÐ¶ÐµÐ½ Ñекретный ключ.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Сначала воÑпользуйтеÑÑŒ командой \"toggle\".\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Ключ отозван." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите подпиÑать ВСЕ User ID? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "ПодÑказка: Выберите User IDs Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "неизвеÑтный клаÑÑ Ð¿Ð¾Ð´Ð¿Ð¸Ñи" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Ð”Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° не допуÑтима в режиме %s.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Ð’Ñ‹ должны выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один User ID.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Ð’Ñ‹ не можете удалить поÑледний User ID!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить ВСЕ выбранные User IDs? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить данный User ID? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить данный User ID? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Ð’Ñ‹ должны выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один ключ.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Ð’Ñ‹ должны выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один ключ.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить выбранные ключи? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить данный ключ? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "ДейÑтвительно отозвать ВСЕ выбранные User ID? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "ДейÑтвительно отозвать данный User ID? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите отозвать выбранные ключи? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите отозвать данный ключ? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "уÑтановить предпочтениÑ" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "ДейÑтвительно обновить Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… User ID? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "ДейÑтвительно обновить предпочтениÑ? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Сохранить изменениÑ? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Выйти без ÑохранениÑ? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "Ñбой при обновлении: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "Ñбой при обновлений Ñекретного ключа: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "ключ не изменÑлÑÑ - обновление не нужно.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Ð¥Ñш-функции: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Опции: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Данный ключ может быть отозван ключом %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "не могу Ñоздать %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[отозван]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [годен до: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [годен до: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " доверие: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " доверие: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Данный ключ отключен" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Ðе может быть предпочтений в PGP 2.x-Ñтиле User ID.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3127,19 +3116,19 @@ "Заметьте, что показанные Ñтепени доÑтоверноÑти могут быть неверными,\n" "пока Ð’Ñ‹ не перезапуÑтите программу.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[отозван]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3147,7 +3136,7 @@ "Ð’ÐИМÐÐИЕ: нет User ID отмеченного как главный. Ð”Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° может\n" " иÑпользовать другой User ID в качеÑтве главного.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3156,45 +3145,45 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP2. Добавление фото ID может в некоторых верÑиÑÑ…\n" " PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите добавить Ñто? (y/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Ð’Ñ‹ можете не добавлÑÑ‚ÑŒ фото ID в ключ PGP2-типа.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Удалить данную дейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Удалить данную недейÑтвительную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Удалить данную неизвеÑтную подпиÑÑŒ? (y/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "ДейÑтвительно удалить данную ÑамоподпиÑÑŒ? (y/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Удалена %d подпиÑÑŒ.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Удалено %d подпиÑи.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Ðичего не удалено.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3203,159 +3192,159 @@ "Ð’ÐИМÐÐИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n" " может в некоторых верÑиÑÑ… PGP вызвать выбраковку ключа.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Ð’Ñ‹ не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Укажите User ID ключа, назначенного отзывающим: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð½Ð°Ð·Ð½Ð°Ñ‡Ð¸Ñ‚ÑŒ PGP 2.x ключ, как назначенный отзывающим\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "ключ не может быть назначен отзывающим Ñам ÑебÑ\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "Ð’ÐИМÐÐИЕ: Данный ключ отозван отзывающим ключом!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "Ð’ÐИМÐÐИЕ: назначение ключа отзывающим не возможно будет отменить!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите назначить данный ключ отзывающим? (y/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Снимите выделение Ñ Ñекретного ключа.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Выделите не более одного вторичного ключа.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Смена Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ ключа.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Смена Ñрока дейÑÑ‚Ð²Ð¸Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð³Ð¾ ключа\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Ð’Ñ‹ не можете изменить Ñрок дейÑÑ‚Ð²Ð¸Ñ v3 ключа\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Ðет ÑоответÑтвующей подпиÑи в ÑвÑзке Ñекретных\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Выберите только один User ID.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "пропуÑк v3 ÑамоподпиÑи на User ID \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите иÑпользовать его? (y/N)" -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Ð’Ñ‹ дейÑтвительно хотите иÑпользовать его? (y/N)" -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Ðет User ID Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Ðет вторичного ключа Ñ Ð¸Ð½Ð´ÐµÐºÑом %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "User ID: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " подпиÑан %08lX %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (не ÑкÑпортируемаÑ)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Срок подпиÑи закончилÑÑ %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Ð’Ñ‹ уверены, что хотите отозвать? (y/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Создать Ñертификат отзыва Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ подпиÑи? (y/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Ð’Ñ‹ подпиÑали данные User ID:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (не ÑкÑпортируемаÑ)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " отозван %08lX %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Ð’Ñ‹ отзываете Ñледующие подпиÑи:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "ДейÑтвительно Ñоздать Ñертификат отзыва? (y/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "нет Ñекретного ключа\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "User ID \"%s\" уже отозван\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "Ð’ÐИМÐÐИЕ: User ID подпиÑÑŒ датирована %d Ñекундами в будущем\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Показ %s фото ID размера %ld Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° 0x%08lX (uid %d)\n" @@ -3683,7 +3672,7 @@ "Ð”Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ Ñекретного ключа необходим пароль.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4236,7 +4225,7 @@ msgid "textmode" msgstr "текÑтовый" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "неизвеÑтен" @@ -4443,16 +4432,16 @@ msgid "communication problem with gpg-agent\n" msgstr "коммуникационный проблемы Ñ gpg-agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼ - иÑпользование агента отключено\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (главный идентификатор ключа %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4463,41 +4452,41 @@ "\"%.*s\"\n" "%u-бит %s ключ, ID %08lX, Ñоздан %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Повторите пароль\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Введите пароль\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "пароль Ñлишком длинный\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "неверный ответ от агента\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "прервано пользователем\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼: агент вернул 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "не могу получить пароль в пакетном режиме\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Введите пароль: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4507,17 +4496,17 @@ "Ðеобходим пароль Ð´Ð»Ñ Ð´Ð¾Ñтупа к Ñекретному ключу пользователÑ:\n" "\"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-бит %s ключ, ID %08lX, Ñоздан %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Повторите пароль: " @@ -5439,120 +5428,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[отозван]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[проÑрочен]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "неизвеÑтен" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "никогда " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "Ñрок Ñледующей проверки таблицы доверий %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "нет необходимоÑти в проверке таблицы доверий\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "открытый ключ %08lX не найден: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "выполните --check-trustdb, пожалуйÑта\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "проверка таблицы доверий\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d ключей обработано (%d дейÑвующих запиÑей очищено)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "не найдено абÑолютно доверÑемых ключей\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "открытый ключ Ð´Ð»Ñ Ð°Ð±Ñолютно доверÑемого ключа %08lX не найден\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "запиÑÑŒ о доверии %lu, тип %d: ошибка запиÑи: %s\n" @@ -5857,16 +5846,32 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñм. http://www.gnupg.org/faq.html\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð° без инициализации защищённой памÑти\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "" "(возможно, Ð’Ñ‹ иÑпользуете неподходÑщее программное обеÑпечение\n" "Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ задачи)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key user-id" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key user-id" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "Ñоздать отделенную (detached) подпиÑÑŒ" + +#~ msgid "sign the key non-revocably" +#~ msgstr "подпиÑать ключ без возможноÑти отзыва" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "подпиÑать ключ локально и без возможноÑти отзыва" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/sk.po diff -u gnupg/po/sk.po:1.9 gnupg/po/sk.po:1.10 --- gnupg/po/sk.po:1.9 Tue Dec 14 08:49:27 2004 +++ gnupg/po/sk.po Thu Dec 16 11:04:35 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -29,7 +29,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -351,7 +351,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -562,7 +562,7 @@ msgid "secret key already stored on a card\n" msgstr "preskoèené: tajný kµúè je u¾ v databáze\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "ukonèi» toto menu" @@ -571,7 +571,7 @@ msgid "show admin commands" msgstr "konfliktné príkazy\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "ukáza» túto pomoc" @@ -624,7 +624,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Príkaz> " @@ -643,7 +643,7 @@ msgid "Admin commands are not allowed\n" msgstr "zapisujem tajný kµúè do `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Neplatný príkaz (skúste \"help\")\n" @@ -688,7 +688,7 @@ msgid "PIN not correctly repeated; try again" msgstr "heslo nie je zopakované správne; skúste to znovu" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -698,7 +698,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output pre tento príkaz nefunguje\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -998,59 +998,59 @@ msgid "sign a key locally" msgstr "podpísa» kµúè lokálne" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "podpísa» alebo modifikova» kµúè" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "vytvori» revokaèný certifikát" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exportova» kµúèe" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exportova» kµúèe na server kµúèov" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importova» kµúèe zo servera kµúèov" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "vyhµada» kµúèe na serveri kµúèov" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "aktualizova» v¹etky kµúèe zo servera kµúèov" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importova»/zlúèi» kµúèe" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "aktualizova» databázu dôvery" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [súbory]|vypí¹ hash" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1060,55 +1060,55 @@ "Mo¾nosti:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "vytvor výstup zakódovaný pomocou ASCII" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|MENO|¹ifrova» pre MENO" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "" "pou¾i» toto id u¾ívateµa na podpísanie\n" " alebo de¹ifrovanie" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "" "|N|nastavi» úroveò komprimácie N (0 - ¾iadna\n" " komprimácia)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "pou¾i» kánonický textový mód" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "pou¾i» ako výstupný súbor" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "s dodatoènými informáciami" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "nevykona» ¾iadne zmeny" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "vy¾iada» potvrdenie pred prepísaním" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1117,7 +1117,7 @@ "(Pou¾ite manuálové stránky pre kompletný zoznam v¹etkých príkazov a " "mo¾ností)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1169,7 +1169,7 @@ msgid "Pubkey: " msgstr "Verejné kµúèe: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "©ifry: " @@ -1177,7 +1177,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Kompresia: " @@ -1264,372 +1264,369 @@ msgid "unknown configuration item `%s'\n" msgstr "neznáma polo¾ka konfigurácie \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "POZNÁMKA: starý implicitný súbor s mo¾nos»ami `%s ignorovaný'\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "POZNÁMKA: neexistuje implicitný súbor s mo¾nos»ami `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "súbor s mo¾nos»ami `%s': %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "èítam mo¾nosti z `%s'\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "POZNÁMKA: %s nie je pre normálne pou¾itie!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "" "¹ifra \"%s\" nebola nahraná, preto¾e prístupové práva nie sú nastavené " "bezpeène\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s nie je platná znaková sada\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "neplatný parameter pre import\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: neplatný parameter pre import\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "neplatný parameter pre import\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: neplatný parameter pre export\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "neplatný parameter pre export\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "nemo¾no nastavi» exec-path na %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "VAROVANIE: program mô¾e vytvori» súbor core!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VAROVANIE: %s prepí¹e %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "Nie je dovolené pou¾íva» %s s %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s nedáva s %s zmysel!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "v móde --pgp2 mô¾ete vytvára» len oddelené podpisy alebo podpisy èitateµné " "ako text\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "v móde --pgp2 nemo¾no súèasne ¹ifrova» a podpisova»\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "v móde --pgp2 musíte pou¾i» súbor (nie rúru).\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¹ifrovanie správ v móde --pgp2 vy¾aduje algoritmus IDEA\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "vybraný ¹ifrovací algoritmus je neplatný\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "vybraný hashovací algoritmus je neplatný\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "polo¾ka completes-needed musí by» väè¹ia ako 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "polo¾ka marginals-needed musí by» väè¹ia ako 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "polo¾ka max-cert-depth musí by» v rozmedzí od 1 do 255\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "neplatná implicitná úroveò certifikácie; musí by» 0, 1, 2 alebo 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "neplatná minimálna úroveò certifikácie; musí by» 0, 1, 2 alebo 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "POZNÁMKA: jednoduchý mód S2K (0) je dôrazne nedoporuèovaný\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "neplatný mód S2K; musí by» 0, 1 alebo 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "neplatné defaultné predvoµby\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre ¹ifrovanie\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre hashovanie\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "neplatné u¾ívateµské predvoµby pre kompresiu\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s e¹te nepracuje s %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» ¹ifrovací algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» hashovací algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "nemô¾ete pou¾i» kompresný algoritmus \"%s\" v móde %s\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "nemô¾em inicializova» databázu dôvery: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VAROVANIE: daný adresát (-r) bez pou¾itia ¹ifrovania s verejným kµúèom\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [meno súboru]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [meno súboru]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "de¹ifrovanie zlyhalo: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [meno súboru]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "" "pou¾itie %s nie je v móde %s dovolené\n" "\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [meno súboru]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [meno súboru]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "" "pou¾itie %s nie je v móde %s dovolené\n" "\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [meno súboru]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [meno súboru]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [meno súboru]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key id u¾ívateµa" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key id u¾ívateµa" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key id u¾ívateµa" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key id u¾ívateµa" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key id u¾ívateµa [príkazy]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [id u¾ívateµa] [súbor s kµúèmi (keyring)]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "nepodarilo posla» kµúè na server: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "nepodarilo sa prija» kµúè zo servera: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "nepodaril sa export kµúèa: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "nepodarilo sa nájs» server: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "aktualizácia servera zlyhala: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "kódovanie do ASCII formátu zlyhalo: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "neplatný hashovací algoritmus `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[meno súboru]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Zaènite písa» svoju správu ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1637,23 +1634,23 @@ "meno mô¾e obsahova» len písmená, èíslice, bodky, podèiarníky alebo medzery a " "konèi» s '='\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "hodnota musí obsahova» znak '@'\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "hodnota nesmie obsahova» ¾iadne kontrolné znaky\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "zadané URL pre certifikaènú politiku je neplatné\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "zadané URL pre podpisovú politiku je neplatné\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "zadané URL pre podpisovú politiku je neplatné\n" @@ -2523,12 +2520,12 @@ msgstr "U¾ívateµské ID \"%s\" je revokované." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Ste si istý, ¾e stále chcete podpísa» tento kµúè? (a/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Nemo¾no podpísa».\n" @@ -2732,7 +2729,7 @@ msgid "Really sign? (y/N) " msgstr "Skutoène podpísa»? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2784,370 +2781,362 @@ msgid "moving a key signature to the correct place\n" msgstr "presúvam podpis kµúèa na správne miesto\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "ulo¾i» a ukonèi»" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "vypísa» fingerprint" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "vypísa» zoznam kµúèov a id u¾ívateµov" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "vyberte identifikátor u¾ívateµa N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "vyberte sekundárny kµúè N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "vypísa» zoznam podpisov" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "podpísa» kµúè" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "vytvori» podpis oddelený od dokumentu" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "podpísa» kµúè lokálne" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "podpísa» kµúè bez mo¾nosti odvola» podpis (non-revocably)" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "podpísa» kµúè lokálne a bez mo¾nosti odvola» podpis (non-revocably)" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "prida» identifikátor u¾ívateµa" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "prida» fotografické ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "zmaza» identifikátor u¾ívateµa" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "prida» sekundárny kµúè" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "zmaza» sekundárny kµúè" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "prida» revokaèný kµúè" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "zmaza» podpisy" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "zmeni» dobu platnosti" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "oznaèi» u¾ívateµské ID ako primárne" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "prepnú» medzi vypísaním zoznamu tajných a verejných kµúèov" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "vypísa» zoznam predvolieb (pre expertov)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "vypísa» zoznam predvolieb (podrobne)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "nastavi» zoznam predvolieb" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "aktualizova» predvoµby" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "nemo¾no pou¾i» URI servera kµúèov - chyba analýzy URI\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "zmeni» heslo" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "zmeni» dôveryhodnos» vlastníka kµúèa" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "revokova» podpisy" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "revokova» identifikátor u¾ívateµa" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "revokova» sekundárny kµúè" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "nastavi» kµúè ako neplatný (disable)" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "nastavi» kµúè ako platný (enable)" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "ukáza» fotografické ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "chyba pri èítaní bloku tajného kµúèa `%s': %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Tajný kµúè je dostupný.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Na vykonanie tejto operácie je potrebný tajný kµúè.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Prosím, najskôr pou¾ite príkaz \"toggle\" (prepnú»).\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Kµúè revokovaný." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Skutoène podpísa» v¹etky id u¾ívateµa? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Nápoveda: Vyberte id u¾ívateµa na podpísanie\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "neznáma trieda podpisu" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Tento príkaz nie je v módoch %s dovolený.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Musíte vybra» aspoò jedno id u¾ívateµa.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Nemô¾ete zmaza» posledné id u¾ívateµa!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Skutoène odstráni» v¹etky vybrané id u¾ívateµa? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Skutoène odstráni» toto id u¾ívateµa? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Skutoène odstráni» toto id u¾ívateµa? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Musíte vybra» aspoò jeden kµúè.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Musíte vybra» aspoò jeden kµúè.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Skutoène chcete zmaza» vybrané kµúèe? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Skutoène chcete zmaza» tento kµúè? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Skutoène revokova» v¹etky vybrané id u¾ívateµa? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Skutoène revokova» toto id u¾ívateµa? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Skutoène chcete revokova» vybrané kµúèe? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Skutoène chcete revokova» tento kµúè? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "nastavi» zoznam predvolieb" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "Skutoène aktualizova» predvoµby pre vybrané id u¾ívateµa? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Skutoène aktualizova» predvoµby? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Ulo¾i» zmeny? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Ukonèi» bez ulo¾enia? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "aktualizácia zlyhala: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "aktualizácia tajného kµúèa zlyhala: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "kµúè nebol zmenený, tak¾e nie je potrebné ho aktualizova».\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Charakteristiky: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Tento kµúè mô¾e by» revokovaný kµúèom %s " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr "(citlivá informácia)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s: nemô¾em vytvori»: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[revokované]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [platnos» skonèí: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " dôvera: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Tento kµúè bol oznaèený za neplatný (disabled)" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "U¾ívateµské ID vo formáte PGP 2.x nemá ¾iadne predvoµby\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3155,19 +3144,19 @@ "Prosím nezabúdajte, ¾e zobrazované údaje o platnosti kµúèov nemusia\n" "by» správne, pokiaµ znovu nespustíte program.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[revokované]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3175,7 +3164,7 @@ "VAROVANIE: ¾iadne ID u¾ívateµa nebolo oznaèené ako primárne. Tento príkaz\n" "spôsobí, ¾e iné ID u¾ívateµa sa bude pova¾ova» primárne.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3184,45 +3173,45 @@ "VAROVANIE: Toto je PGP2 kµúè. Pridanie fotografického ID mô¾e v niektorých\n" " verziách PGP vies» k odmietnutiu tohto kµúèa.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Ste si istý, ¾e ho chcete stále prida»? (a/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Nemali by ste pridáva» fotografické ID k PGP2 kµúèu.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Zmaza» tento dobrý podpis? (a/N/u)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Zmaza» tento neplatný podpis? (a/N/u)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Zmaza» tento neznámy podpis? (a/N/u)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Skutoène zmaza» tento podpis podpísaný sebou samým? (a/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Zmazaný %d podpis.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Zmazaných %d podpisov.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Niè nebolo zmaznané.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3231,159 +3220,159 @@ "VAROVANIE: Toto je PGP2 kµúè. Pridanie fotografického ID mô¾e v niektorých\n" " verziách PGP vies» k odmietnutiu tohoto kµúèa.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Nemali by ste pridáva» fotografické ID k PGP2 kµúèu.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Vlo¾te identifikátor u¾ívateµa povereného revokáciou: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "kµúè vo formáte PGP 2.x nemo¾no poveri» revokáciou\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "kµúè nemo¾no poveri» revokáciou ním samým\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VAROVANIE: Tento kµúè bol revokovaný jeho urèeným revokátorom/!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VAROVANIE: oznaèenie kµúèa ako revokovací u¾ nemô¾e by» zru¹ené!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "Ste si istý, ¾e chcete oznaèi» tento kµúè ako revokovací? (a/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Prosím, odstráòte výber z tajných kµúèov.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Prosím, vyberte najviac jeden sekundárny kµúè.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Mením dobu platnosti sekundárneho kµúèa.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Mením dobu platnosti primárneho kµúèa.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Nemô¾ete zmeni» dobu platnosti kµúèa verzie 3\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "V súbore tajných kµúèov chýba zodpovedajúci podpis\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Prosím, vyberte práve jedno id u¾ívateµa.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "preskoèený v3 podpis kµúèa ním samým u u¾ívateµského id \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Ste si istý, ¾e ho chcete pou¾i»? (a/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Ste si istý, ¾e ho chcete pou¾i»? (a/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Neexistuje identifikátor u¾ívateµa s indexom %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Neexistuje sekundárny kµúè s indexom %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "id u¾ívateµa: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " podpísané %08lX v %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Platnos» podpisu vypr¹í %s.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Ste si istý, ¾e ho chcete stále revokova»? (a/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vytvori» pre tento podpis revokaèný certifikát? (a/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Podpísali ste nasledujúce identifikátory u¾ívateµa:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (nexeportovateµné)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " revokované %08lX v %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Chystáte sa revokova» tieto podpisy:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Skutoène vytvori» revokaèné certifikáty? (a/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "neexistuje tajný kµúè\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "u¾ívateµské ID \"%s\" je u¾ revokované\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "VAROVANIE: podpis pou¾ivateµkého ID vznikol %d sekund v budúcnosti\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3712,7 +3701,7 @@ "Na ochranu Vá¹ho tajného kµúèa musíte zada» heslo.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4272,7 +4261,7 @@ msgid "textmode" msgstr "textový mód" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "neznáme" @@ -4480,16 +4469,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problém v komunikácii s gpg-agentom\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentom - pou¾ívanie agenta vypnuté\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (hlavné ID kµúèa %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4500,41 +4489,41 @@ "\"%.*s\"\n" "kµúè s då¾kou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Opakova» heslo\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Vlo¾i» heslo\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "heslo je príli¹ dlhé\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "neplatná reakcia od agenta\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "zru¹ené u¾ívateµom\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentom: agent vracia 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "v dávkovom re¾ime sa nemô¾em pýta» na heslo\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4544,17 +4533,17 @@ "Musíte pozna» heslo, aby ste odomkli tajný kµúè pre\n" "u¾ívateµa: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "då¾ka %u bitov, typ %s, ID %08lX, vytvorený %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -5495,120 +5484,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[revokované]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[expirované]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "neznáme" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "nikdy " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "dal¹ia kontrola databázy dôvery %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "nie je nutné kontrolova» databázu dôvery\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "verejný kµúè %08lX nebol nájdený: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "prosím vykonajte --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "kontrolujem databázu dôvery\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d kµúèov spracovaných (%d poètov platnosti vymazaných)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "neboli nájdené ¾iadne absolútne dôveryhodné kµúèe\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "verejný kµúè k absolútne dôveryhodnému kµúèu %08lX nebol nájdený\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n" @@ -5913,14 +5902,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "Viac informácií nájdete na adrese http://www.gnupg.org/faq.html\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "vykonanie operácie nie je mo¾né bez inicializovanej bezpeènej pamäte\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(pravdepodobne ste na túto úlohu pou¾ili nesprávny program)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key id u¾ívateµa" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key id u¾ívateµa" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "vytvori» podpis oddelený od dokumentu" + +#~ msgid "sign the key non-revocably" +#~ msgstr "podpísa» kµúè bez mo¾nosti odvola» podpis (non-revocably)" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "podpísa» kµúè lokálne a bez mo¾nosti odvola» podpis (non-revocably)" + #~ msgid "q" #~ msgstr "u" Index: gnupg/po/sv.po diff -u gnupg/po/sv.po:1.19 gnupg/po/sv.po:1.20 --- gnupg/po/sv.po:1.19 Tue Dec 14 08:49:27 2004 +++ gnupg/po/sv.po Thu Dec 16 11:04:35 2004 @@ -17,13 +17,13 @@ # who sends his thanks to André Dahlqvist # and to his wife Olivia . # -# $Id: sv.po,v 1.19 2004/12/14 07:49:27 wk Exp $ +# $Id: sv.po,v 1.20 2004/12/16 10:04:35 wk Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.6\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-12-01 17:49+0100\n" "Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" @@ -47,7 +47,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -376,7 +376,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -586,7 +586,7 @@ msgid "secret key already stored on a card\n" msgstr "hoppade över: hemlig nyckel finns redan\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "avsluta denna meny" @@ -595,7 +595,7 @@ msgid "show admin commands" msgstr "motstridiga kommandon\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "visa denna hjälp" @@ -649,7 +649,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Kommando> " @@ -666,7 +666,7 @@ msgid "Admin commands are not allowed\n" msgstr "" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Felaktigt kommando (försök med \"help\")\n" @@ -712,7 +712,7 @@ msgstr "lösenmeningen upprepades inte korrekt; försök igen." # se förra kommentaren -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -722,7 +722,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output kan inte användas för detta kommando\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1029,60 +1029,60 @@ msgid "sign a key locally" msgstr "signera en nyckel lokalt" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "signera eller redigera en nyckel" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "generera ett spärrcertifikat" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "exportera nycklar" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "exportera nycklar till en nyckelserver" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "importera nycklar frÃ¥n en nyckelserver" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "sök efter nycklar hos en nyckelserver" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "uppdatera alla nycklar nycklar frÃ¥n en nyckelserver" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "importera/slÃ¥ ihop nycklar" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "uppdatera tillitsdatabasen" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [filer]|skriv ut kontrollsummor" # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil. -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1092,53 +1092,53 @@ "Flaggor:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "skapa utdata med ett ascii-skal" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|NAMN|kryptera för NAMN" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "använd denna användaridentitet för att signera eller dekryptera" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|sätt kompressionsnivÃ¥n till N (0 för att stänga av kompression)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "använd \"ursprunglig text\"-läget" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "använd som fil för utdata" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "utförlig" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "gör inga ändringar" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "FrÃ¥ga före ersättning" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" # inställningar istället för flaggor? # Nej, här är det bruksanvisningen för kommandoraden. -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1146,7 +1146,7 @@ "@\n" "(Se manualsidan för en komplett lista pÃ¥ alla kommandon och flaggor)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1199,7 +1199,7 @@ msgid "Pubkey: " msgstr "öppen nyckel: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Chiffer: " @@ -1207,7 +1207,7 @@ msgid "Hash: " msgstr "Kontrollsumma: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Komprimering: " @@ -1292,379 +1292,376 @@ msgid "unknown configuration item `%s'\n" msgstr "okänt configurationspost \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "OBS: inställningsfilen \"%s\" saknas\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "inställningsfil \"%s\": %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "läser inställningar frÃ¥n \"%s\"\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "OBS: %s är inte för normal användning!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s är ingen giltig teckentabell\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "kunde inte tolka nyckelserver-URI\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s: felaktiga importinställningar %d\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "felaktiga importinställningar\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s: felaktiga importinställningar %d\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "felaktiga importinställningar\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s: felaktiga exportinställningar %d\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "felaktiga exportinställningar\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunde inte sätta exec-sökvägen till %s\n" # Programmet skapar en avbildning (image) av minnet för att lättare kunna spÃ¥ra fel. -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "VARNING: %s gäller istället för %s\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s är inte tillÃ¥ten tillsammans med %s!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "det är ingen poäng att använda %s tillsammans med %s!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "" "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n" "i --pgp2-läge\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "du mÃ¥ste använda filer (och inte rör) i --pgp2-läge\n" # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard. -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "" "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "den valda krypteringsalgoritmen är felaktig\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen är felaktig\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "den valda krypteringsalgoritmen är felaktig\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "den valda kontrollsummealgoritmen är felaktig\n" # antalet betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "variabeln \"completes-needed\" mÃ¥ste ha ett värde som är större än 0\n" # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "variabeln \"marginals-needed\" mÃ¥ste vara större än 1\n" # Hur djupt GnuPG ska leta i Web-of-trust. -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "variabeln \"max-cert-depth\" mÃ¥ste ha ett värde mellan 1 och 255\n" # Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "" "felaktigt standardvärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" # Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "" "felaktigt minimivärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" # S2K har med krypteringen av hemliga nyckeln att göra -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "felaktigt S2K-läge; mÃ¥ste vara 0, 1 eller 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "felaktiga standardinställningar\n" # Du kan ange de algoritmer du föredrar i prioritetsordning. DÃ¥ avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel). -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s fungerar ännu inte med %s\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "" "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [filnamn]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [filnamn]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "dekrypteringen misslyckades: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [filnamn]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "du kan inte använda %s när du är i %s läge\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [filnamn]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [filnamn]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "du kan inte använda %s när du är i %s läge\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnamn]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [filnamn]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [filnamn]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key användaridentitet" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key användaridentitet" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key användaridentitet" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key användaridentitet" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key användaridentitet [kommandon]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "Sändning till nyckelservern misslyckades: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "Hämtning frÃ¥n nyckelservern misslyckades: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "Export av nyckeln misslyckades: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "Sökning pÃ¥ nyckelservern misslyckades: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "Uppdatering av nyckeln frÃ¥n en nyckelserver misslyckades: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "misslyckades med att ta bort ASCII-skalet: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "misslyckades med att skapa ASCII-skal: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "felaktig kontrollsummealgoritm `%s'\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[filnamn]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Skriv ditt meddelande här ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1675,23 +1672,23 @@ # user notation name?? # Werner: # That is an OpenPGP notation name not registered with IANA. -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "ett användarnoteringsnamn mÃ¥ste innehÃ¥lla '@'-tecknet\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "ett notationsvärde fÃ¥r inte inehÃ¥lla nÃ¥gra kontrolltecken\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n" @@ -2588,12 +2585,12 @@ msgstr "Användar-ID \"%s\" är spärrat." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Vill du verkligen fortfarande signera den? (j/N)" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Kan inte signera.\n" @@ -2802,7 +2799,7 @@ msgid "Really sign? (y/N) " msgstr "Vill du verkligen signera? " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2854,373 +2851,365 @@ msgid "moving a key signature to the correct place\n" msgstr "flyttar en nyckelsignatur till den rätta platsen\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "spara och avsluta" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "visa fingeravtryck" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "visa en lista pÃ¥ nycklar och användaridentiteter" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "välj användaridentitet N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "välj undernyckel N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "visa en lista pÃ¥ signaturer" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "signera nyckeln" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "skapa signatur i en separat fil" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "signera nyckeln lokalt" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "signera nyckeln utan möjlighet att Ã¥terkalla signaturen" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "signera en nyckel lokalt utan möjlighet till Ã¥terkallelse" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "lägg till en användaridentitet" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "lägg till ett foto som användaridentitet" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "ta bort en användaridentitet" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "lägg till en undernyckel" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "ta bort en undernyckel" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "lägg till en spärrnyckel" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "ta bort signaturer" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "ändra utgÃ¥ngsdatum" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "markera användaridentiteten som huvudidentitet" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "hoppa mellan att visa en lista pÃ¥ hemliga eller öppna nycklar" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "visa en lista pÃ¥ inställningar (expertläge)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "visa en lista pÃ¥ inställningar (utförligt)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "ange inställningslista" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "uppdaterat inställningar" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "kunde inte tolka nyckelserver-URI\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "ändra lösenmening" # originalet borde ha ett value -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "ändra ägartillitsvärdet" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "Ã¥terkalla signaturer" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "spärra en användaridentitet" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "spärra en undernyckel" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "stäng av en nyckel" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "aktivera en nyckel" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "visa foto-ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Den hemliga nyckeln finns tillgänglig.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Den hemliga nyckeln behövs för att göra detta.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "Använd kommandot \"toggle\" först.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Nyckeln är spärrad." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Vill du verkligen signera alla användaridentiteter? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Tips: Välj de användarID:n du vill signera\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "okänd signaturklass" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Detta kommando är inte tillÃ¥tet när du är i %s-läge.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en användaridentitet.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Du kan inte ta bort den sista användaridentiteten!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Vill du verkligen ta bort alla valda användaridentiteter? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Vill du verkligen ta bort denna användaridentitet? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Vill du verkligen radera denna egensignatur? (j/N)" -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en nyckel.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en nyckel.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Vill du verkligen ta bort valda nycklar? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Vill du verkligen ta bort denna nyckel? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Vill du verkligen spärra alla valda användaridentiteter? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Vill du verkligen spärra denna användaridentitet? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Vill du verkligen spärra de valda nycklarna? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Vill du verkligen spärra denna nyckel? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "ange inställningslista" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Vill du verkligen ändra inställningarna?" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "Spara ändringarna? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Avsluta utan att spara? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "uppdateringen misslyckades: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "misslyckades med att uppdatera hemligheten: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Nyckeln är oförändrad sÃ¥ det behövs ingen uppdatering.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Sammandrag: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Funktioner: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "Denna nyckel kan spärras av nyckeln %s" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (känsligt)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "kan inte skapa %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[spärrad]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[gÃ¥r ut: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[gÃ¥r ut: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, c-format msgid "usage: %s" msgstr "" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " tillit: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Denna nyckel har stängts av" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "" "Du kan inte ange nÃ¥gra inställningar för ett användar-ID av PGP 2.x-typ.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3228,19 +3217,19 @@ "Obs! Den visade nyckelgiltigheten kan vara felaktig\n" "om du inte startar om programmet.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[spärrad]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3249,7 +3238,7 @@ "Detta kommando kan göra att ett annat användar-ID antas\n" "vara huvudidentitet.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3259,46 +3248,46 @@ "vissa versioner\n" " av PGP avvisa denna nyckel.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Vill du verkligen fortfarande lägga till den? (j/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Vill du radera denna korrekta signatur? (j/N/a)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Vill du radera denna okända signatur? (j/N/a)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Vill du verkligen radera denna egensignatur? (j/N)" # skulle lika gärna kunna heta 1 signatur va? -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "Raderade %d signatur.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "Raderade %d signaturer.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Ingenting raderat.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3307,33 +3296,33 @@ "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna " "nyckel inte användas i vissa versioner av PGP.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "Du fÃ¥r inte ange en spärrnyckel för en PGP 2-nyckel.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "Ange användar-ID för spärrnyckeln: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "det gÃ¥r inte att använda en PGP 2-nyckel som spärrnyckel\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "VARNING: det gÃ¥r aldrig att ändra om du utser en spärrnyckel!\n" # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad) -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3341,135 +3330,135 @@ "Är du verkligen säker pÃ¥ att du vill utse denna nyckel till spärrnyckel? (j/" "N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Tag bort markeringar frÃ¥n de hemliga nycklarna.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Välj som högst en undernyckel.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Ändrar giltighetstid för en undernyckel.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Ändrar giltighetstid för huvudnyckeln.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Du mÃ¥ste välja bara en användaridentitet.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "hoppar över v3 egensignatur pÃ¥ användar-id \"%s\"\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" # Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Vill du verkligen använda det (j/N)?" # Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Vill du verkligen använda det (j/N)?" -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "Ingen användaridentitet med index %d\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "Ingen undernyckel med index %d\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "användaridentitet: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" "\"\n" "signerad med din nyckel %08lX %s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Denna signatur gick ut den %s.\n" # nyckel? signatur? -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Vill du verkligen spärra denna nyckel? (j/N)" -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Du har signerat följande användaridentiteter:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (icke exporterbar)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " spärrad av %08lX %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Du stÃ¥r i begrepp att Ã¥terkalla dessa signaturer:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "ingen hemlig nyckel\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "Användar-ID \"%s\" är redan spärrad\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "" "VARNING: en signatur pÃ¥ ett användar-ID är daterad %d sekunder in i " "framtiden\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n" @@ -3801,7 +3790,7 @@ "Du behöver en lösenmening för att skydda din hemliga nyckel\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4365,7 +4354,7 @@ msgid "textmode" msgstr "textläge" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "okänd" @@ -4575,16 +4564,16 @@ msgid "communication problem with gpg-agent\n" msgstr "problem vid kommunikation med GPG-Agent\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "problem med GPG-Agent, stänger av den\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (huvudnyckelns identitet %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4595,41 +4584,41 @@ "användaren: \"%.*s\"\n" "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Repetera lösenmeningen\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Ange lösenmening\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "lösenmeningen är för lÃ¥ng\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "felaktigt svar frÃ¥n GPG-Agent\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "avbruten av användaren\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "kan inte frÃ¥ga efter lösenmening i batch-läge\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Ange lösenmening: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4639,17 +4628,17 @@ "Du behöver en lösenmening för att lÃ¥sa upp den hemliga nyckeln för\n" "användaren: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bits %s-nyckel, ID %08lX, skapad %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Repetera lösenmeningen: " @@ -5629,124 +5618,124 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[spärrad]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[Giltighetstiden har gÃ¥tt ut]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "okänd" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "aldrig" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "hittade inte den öppna nyckeln %08lX :%s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n" # originalet borde ha ett value -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "kontrollerar tillitsdatabasen\n" # Vad är detta!? -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d nycklar behandlade (%d validity counts rensade)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "hittade inga nycklar med förbehÃ¥llslöst förtroende\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "" "Hittar inte den öppna nyckeln tillhörande den förbehÃ¥llslöst betrodda " "nyckeln %08lX \n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n" @@ -6052,14 +6041,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "se http://www.gnupg.org/faq.html för mer information\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "operationen är inte möjlig utan tillgÃ¥ng till säkert minne\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha använt fel program för denna uppgift)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key användaridentitet" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key användaridentitet" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "skapa signatur i en separat fil" + +#~ msgid "sign the key non-revocably" +#~ msgstr "signera nyckeln utan möjlighet att Ã¥terkalla signaturen" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "signera en nyckel lokalt utan möjlighet till Ã¥terkallelse" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/tr.po diff -u gnupg/po/tr.po:1.15 gnupg/po/tr.po:1.16 --- gnupg/po/tr.po:1.15 Tue Dec 14 08:49:27 2004 +++ gnupg/po/tr.po Thu Dec 16 11:04:35 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-07-08 08:10+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -32,7 +32,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -355,7 +355,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -568,7 +568,7 @@ msgid "secret key already stored on a card\n" msgstr "atlandı: gizli anahtar zaten var\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "bu menüden çık" @@ -577,7 +577,7 @@ msgid "show admin commands" msgstr "çeliÅŸen komutlar\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "bunu gösterir " @@ -630,7 +630,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "Komut> " @@ -649,7 +649,7 @@ msgid "Admin commands are not allowed\n" msgstr "gizli anahtarı `%s'e yazıyor\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n" @@ -696,7 +696,7 @@ "ikinci kez yazdığınız anahtar parolası ilkiyle aynı deÄŸil; iÅŸlem " "tekrarlanacak" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -706,7 +706,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output seçeneÄŸi bu komutla çalışmaz\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -1007,59 +1007,59 @@ msgid "sign a key locally" msgstr "bir anahtarı yerel olarak imzalar" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "bir anahtarı düzenler ve imzalar" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "bir yürürlükten kaldırma sertifikası üretir" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "anahtarları gönderir" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "anahtarları bir anahtar sunucusuna gönderir" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "anahtarları bir anahtar sunucusundan indirir" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "bir anahtar sunucusunda anahtarları arar" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "anahtarları bir anahtar sunucusundan günceller" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "anahtarları indirir/katıştırır" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "güvence veritabanını günceller" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1069,51 +1069,51 @@ "Seçenekler:\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "ascii zırhlı çıktı oluÅŸturur" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|Ä°SÄ°M|Ä°SÄ°M için ÅŸifreleme yapar" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "imzalamak ya da ÅŸifre çözmek için bu kullanıcı kimliÄŸi kullanılır" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "kurallı metin kipini kullanır" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "çıktı dosyası olarak kullanılır" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "çok detaylı" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "hiçbir deÄŸiÅŸiklik yapmaz" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "üzerine yazmadan önce sorar" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1121,7 +1121,7 @@ "@\n" "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1171,7 +1171,7 @@ msgid "Pubkey: " msgstr "GenAnah: " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "Åžifre: " @@ -1179,7 +1179,7 @@ msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "Sıkıştırma: " @@ -1263,364 +1263,361 @@ msgid "unknown configuration item `%s'\n" msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "BÄ°LGÄ°: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "BÄ°LGÄ°: \"%s\" öntanımlı seçenek dosyası yok\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "seçenek dosyası \"%s\": %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "\"%s\"den seçenekler okunuyor\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "BÄ°LGÄ°: %s normal kullanım için deÄŸil!\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "ÅŸifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s geçerli bir karakter seti deÄŸil\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "anahtar sunucusunun adresi çözümlenemedi\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: geçersiz içselleÅŸtirme seçenekleri\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "içselleÅŸtirme seçenekleri geçersiz\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d geçersiz dışsallaÅŸtırma seçenekleri\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "dışsallaÅŸtırma seçenekleri geçersiz\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "UYARI: program bir \"core\" dosyası oluÅŸturabilir!\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "UYARI: %s %s'i aşıyor\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ile %s birlikte kullanılmaz!\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s, %s ile etkisiz olur!\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "--pgp2 kipinde aynı anda hem imzalama hem de ÅŸifreleme yapamazsınız\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "--pgp2 kipinde ileti ÅŸifrelemesi IDEA ÅŸifresi gerektirir\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "seçilen özümleme algoritması geçersiz\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "seçilen ÅŸifre algoritması geçersiz\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "\"completes-needed\" 0 dan büyük olmalı\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "\"marginals-needed\" 1 den büyük olmalı\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "asgari sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "öntanımlı tercihler geçersiz\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "kiÅŸisel ÅŸifre tercihleri geçersiz\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "kiÅŸisel özümleme tercihleri geçersiz\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "kiÅŸisel sıkıştırma tercihleri geçersiz\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s henüz %s ile çalışmıyor\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s ÅŸifreleme algoritması kullanılamayabilir.\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s özümleme algoritması kullanılamayabilir.\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "%2$s kipindeyken %1$s sıkıştırma algoritması kullanılamayabilir.\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "\"TrustDB\" güvence veritabanı baÅŸlangıç aÅŸamasında baÅŸarısız: %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "UYARI: alıcılar (-r) genel anahtar ÅŸifrelemesi kullanılmadan belirtilmiÅŸ\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [dosyaismi]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [dosyaismi]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "ÅŸifre çözme baÅŸarısız: %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [dosyaismi]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [dosyaismi]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [dosyaismi]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [DOSYA]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [dosyaismi]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [dosyaismi]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key kullanıcı-kimliÄŸi" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key KULL-KML" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key KULL-KML" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key kullanıcı-kimliÄŸi [komutlar]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [kullanıcı-kimliÄŸi] [anahtar-zinciri]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "key export baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search baÅŸarısızlığa uÄŸradı: %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh baÅŸarısız: %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "zırhın kaldırılması baÅŸarısız: %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "zırhlama baÅŸarısız: %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "`%s' hash algoritması geçersiz\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[dosyaismi]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "Ä°letinizi yazın ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1628,23 +1625,23 @@ "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve " "sonuna bir '=' gelir.\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "bir niteleme deÄŸerinde kontrol karakterleri kullanılamaz\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "belirtilen sertifika güvence adresi geçersiz\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "belirtilen imza güvence adresi geçersiz\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "belirtilen imza güvence adresi geçersiz\n" @@ -2504,12 +2501,12 @@ msgstr "Kullanıcı kimliÄŸi \"%s\" yürürlükten kaldırıldı." #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " Ä°mzalanamıyor.\n" @@ -2711,7 +2708,7 @@ msgid "Really sign? (y/N) " msgstr "Gerçekten imzalayacak mısınız? (e/H) " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2765,373 +2762,365 @@ msgid "moving a key signature to the correct place\n" msgstr "bir anahtar imzası doÄŸru yere taşınıyor\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "kaydet ve çık" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "parmak izini gösterir" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "anahtarı ve kullanıcı kimliÄŸini gösterir" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "N kullanıcı kimliÄŸini seçer" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "N yardımcı anahtarını seçer" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "imzaları listeler" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "anahtarı imzalar" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "bağımsız bir imza yapar" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "anahtarı yerel olarak imzala" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "yürürlükten kaldırılamayan imza yapar" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "yürürlükten kaldırılamayan yerel imza yapar" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "bir kullanıcı kimliÄŸi ekler" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "bir foto kimliÄŸi ekler" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "kullanıcı kimliÄŸini siler" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "bir yardımcı anahtar ekler" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "bir yardımcı anahtar siler" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "bir yürürlükten kaldırma anahtarı ekler" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "imzaları siler" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "son kullanım tarihini deÄŸiÅŸtirir" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "kullanıcı kimliÄŸini asıl olarak imler" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "genel ve gizli anahtar listeleri arasında yer deÄŸiÅŸtirir" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "tercihleri listeler (uzman)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "tercihleri listeler (ayrıntılı)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "tercih listesi oluÅŸturmak için" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "güncelenmiÅŸ tercihler" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "anahtar sunucusunun adresi çözümlenemedi\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "anahtar parolasını deÄŸiÅŸtirir" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "sahibiningüvencesini deÄŸiÅŸtirir" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "imzaları yürürlükten kaldırır" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "bir kullanıcı kimliÄŸi yürürlükten kaldırır" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "bir yardımcı anahtarı yürürlükten kaldırır" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "bir anahtarı iptal eder" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "bir anahtarı kullanıma sokar" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "foto kimliÄŸini gösterir" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "gizli anahtar bloÄŸu `%s' okunurken hata oluÅŸtu: %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "Gizli anahtar mevcut.\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "Bunu yapmak için gizli anahtar gerekli.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "Anahtar yürürlükten kaldırıldı." -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "Ä°pucu: Ä°mzalamak için bir kullanıcı kimliÄŸi seçiniz\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "bilinmeyen imza sınıfı" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "%s kipindeyken bu komut kullanılamaz.\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "En az bir kullanıcı kimliÄŸi seçmelisiniz.\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "Son kullanıcı kimliÄŸini silemezsiniz!\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "Bu kullanıcı kimliÄŸi gerçekten silinecek mi? " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "Bu kullanıcı kimliÄŸi gerçekten silinecek mi? " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "En az bir anahtar seçmelisiniz.\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "En az bir anahtar seçmelisiniz.\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "Bu kullanıcı kimliÄŸi gerçekten iptal edilecek mi? " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "tercih listesi oluÅŸturmak için" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "" "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor " "musunuz? " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "Kaydetmeden çıkılsın mı? " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "gizliyi güncelleme baÅŸarısız: %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "Güncelleme gereÄŸi olmadığından anahtar deÄŸiÅŸmedi.\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "Özümlenen: " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "Özellikler: " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "" "Bu anahtar %s tarafından ÅŸu anahtarla yürürlükten kaldırılmış olabilir: " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " (duyarlı)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "%s oluÅŸturulamıyor: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[yürürlükten kaldırıldı] " -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr "[son kullanma tarihi: %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr "[son kullanma tarihi: %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " güvencesi: %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " güvencesi: %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "Bu anahtar iptal edilmiÅŸti" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "Bir PGP 2.x tarzı kullanıcı kimliÄŸine uygun tercih yok.\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3139,19 +3128,19 @@ "Gösterilen anahtarın, uygulamayı yeniden baÅŸlatıncaya kadar, gerekli\n" "doÄŸrulukta olmayacağını lütfen gözönüne alınız.\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[yürürlükten kaldırıldı] " -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3160,7 +3149,7 @@ " baÅŸka bir kullanıcı kimliÄŸinin birincil varsayılmasına sebep " "olabilir.\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3169,45 +3158,45 @@ "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliÄŸi eklenmesi bu anahtarın\n" " bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "Onu yine de eklemek istiyor musunuz? (e/H) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "PGP2 tarzı bir anahtara bir foto kimliÄŸi ekleyemeyebilirsiniz.\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "Bu geçersiz imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "%d imza silindi.\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "Hiçbir ÅŸey silinmedi.\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3217,41 +3206,41 @@ " eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n" " ile sonuçlanabilir.\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "" "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı " "ekleyemeyebilirsiniz.\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "" "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliÄŸini giriniz: " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "" "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı " "olarak atanamaz\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "" "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak " "kullanamazsınız\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "" "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar baÅŸka amaçla\n" " kullanılamaz!\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " @@ -3259,130 +3248,130 @@ "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediÄŸinizden emin " "misiniz? (e/H): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "Bir yardımcı anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "Asıl anahtar için son kullanma tarihi deÄŸiÅŸtiriliyor.\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "Bir v3 anahtarının son kullanma tarihini deÄŸiÅŸtiremezsiniz\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "kullanıcı kimliÄŸi \"%s\" için v3 öz-imzası atlanıyor\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "Onu kullanmak istediÄŸinizden emin misiniz? (e/H) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "%d endeksine sahip kullanıcı kimliÄŸi yok\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "%d endeksine sahip yardımcı anahtar yok\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "Kullanıcı kimliÄŸi: \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " %08lX ile %s%s%s de imzalanmış\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "Bu anahtarın geçerliliÄŸi %s de bitti.\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" "Bu imza için bir yürürlükten kaldırma sertifikası oluÅŸturulsun mu? (e/H) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (dışarda geçersiz)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " %08lX tarafından %s de yürürlükten kaldırılmış\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "" "Bu yürürlükten kaldırma sertifikalarını gerçekten oluÅŸturacak mısınız? (e/H) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "gizli anahtar yok\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "kullanıcı kimliÄŸi \"%s\" zaten iptal edilmiÅŸti\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "UYARI: bir kullanıcı kimliÄŸi imzası %d saniye gelecekte oluÅŸturuldu\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" @@ -3714,7 +3703,7 @@ "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4273,7 +4262,7 @@ msgid "textmode" msgstr "metinkipi" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "bilinmeyen" @@ -4484,16 +4473,16 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ile haberleÅŸme problemi\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (asıl anahtar kimliÄŸi %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4504,41 +4493,41 @@ "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n" "%u bitlik %s anahtarı, kimlik %08lX, oluÅŸturulan %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "Parolayı tekrar yazınız\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "Anahtar parolasını giriniz\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "Parola çok uzun\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "yanıt geçersiz\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "kullanıcı tarafından durduruldu\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "önceden tanımlanmış iÅŸlemler kipinde (batchmode) parola sorgulanamaz\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "Anahtar parolasını girin: " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4548,19 +4537,19 @@ "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n" "Anahtarın sahibi: \"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "" "%u bitlik %s anahtarı, %08lX kimliÄŸi ile\n" "%s tarihinde üretilmiÅŸ" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "Tekrar: " @@ -5501,120 +5490,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[yürürlükten kaldırıldı] " -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[süresi doldu] " -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "bilinmeyen" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "asla " -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "sonraki güvence veritabanı denetimi %s de\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "bir güvence veritabanı denetimi gereksiz\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "%08lX genel anahtarı yok: %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "lütfen bir --check-trustdb yapın\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "güvence veritabanı denetleniyor\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "son derece güvenli bir anahtar yok\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "son derece güvenli %08lX genel anahtarı yok\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma baÅŸarısız: %s\n" @@ -5921,14 +5910,30 @@ "Daha geniÅŸ bilgi edinmek için http://www.gnupg.org/faq.html adresine " "bakınız\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "güvenli bellek hazırlanmadan iÅŸlem yapmak mümkün deÄŸil\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key KULL-KML" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key KULL-KML" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "bağımsız bir imza yapar" + +#~ msgid "sign the key non-revocably" +#~ msgstr "yürürlükten kaldırılamayan imza yapar" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "yürürlükten kaldırılamayan yerel imza yapar" + #~ msgid "q" #~ msgstr "k" Index: gnupg/po/zh_CN.po diff -u gnupg/po/zh_CN.po:1.9 gnupg/po/zh_CN.po:1.10 --- gnupg/po/zh_CN.po:1.9 Tue Dec 14 08:49:27 2004 +++ gnupg/po/zh_CN.po Thu Dec 16 11:04:35 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2004-11-08 21:30+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" @@ -31,7 +31,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -345,7 +345,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "检测到 OpenPGP å¡å· %s\n" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "在批处ç†æ¨¡å¼ä¸­æ— æ³•å®Œæˆæ­¤æ“作\n" @@ -539,7 +539,7 @@ msgid "secret key already stored on a card\n" msgstr "ç§é’¥å·²å­˜å‚¨åœ¨å¡ä¸Š\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "离开这个èœå•" @@ -547,7 +547,7 @@ msgid "show admin commands" msgstr "显示管ç†å‘˜å‘½ä»¤" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "显示这份在线说明" @@ -595,7 +595,7 @@ msgid "menu to change or unblock the PIN" msgstr "æ›´æ”¹æˆ–è§£é” PIN çš„èœå•" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "命令> " @@ -611,7 +611,7 @@ msgid "Admin commands are not allowed\n" msgstr "ä¸å…许使用管ç†å‘˜å‘½ä»¤\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(å°è¯•â€œhelpâ€)\n" @@ -658,7 +658,7 @@ msgid "PIN not correctly repeated; try again" msgstr "PIN å†æ¬¡è¾“入时与首次输入ä¸ç¬¦ï¼›è¯·å†è¯•ä¸€æ¬¡" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -668,7 +668,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output 在这个命令中ä¸èµ·ä½œç”¨\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" @@ -955,59 +955,59 @@ msgid "sign a key locally" msgstr "为æŸæŠŠå¯†é’¥æ·»åŠ æœ¬åœ°ç­¾å­—" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "编辑æŸæŠŠå¯†é’¥æˆ–为其添加签字" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "生æˆä¸€ä»½åŠé”€è¯ä¹¦" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "导出密钥" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "把密钥导出到æŸä¸ªå…¬é’¥æœåŠ¡å™¨ä¸Š" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "从公钥æœåŠ¡å™¨ä¸Šå¯¼å…¥å¯†é’¥" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "在公钥æœåŠ¡å™¨ä¸Šæœå¯»å¯†é’¥" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "从公钥æœåŠ¡å™¨æ›´æ–°æ‰€æœ‰çš„本地密钥" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "导入/åˆå¹¶å¯†é’¥" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "打å°å¡çŠ¶æ€" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "更改å¡ä¸Šçš„æ•°æ®" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "更改å¡çš„ PIN" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "更新信任度数æ®åº“" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|算法 [文件]|使用指定的散列算法打å°æŠ¥æ–‡æ•£åˆ—值" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1017,51 +1017,51 @@ "选项：\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "è¾“å‡ºç» ASCII å°è£…" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|æŸç”²|为收件者“æŸç”²â€åŠ å¯†" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "使用这个用户标识æ¥ç­¾å­—或解密" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|设定压缩等级为 N (0 表示ä¸åŽ‹ç¼©)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "使用标准的文本模å¼" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "指定输出文件" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "详细模å¼" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "ä¸åšä»»ä½•æ”¹å˜" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "覆盖å‰å…ˆè¯¢é—®" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "行为严格éµå¾ª OpenPGP 定义" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "生æˆä¸Ž PGP 2.x 兼容的报文" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1069,7 +1069,7 @@ "@\n" "(请å‚考在线说明以获得所有命令和选项的完整清å•)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1121,7 +1121,7 @@ msgid "Pubkey: " msgstr "公钥：" -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "对称加密：" @@ -1129,7 +1129,7 @@ msgid "Hash: " msgstr "散列：" -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "压缩：" @@ -1213,377 +1213,374 @@ msgid "unknown configuration item `%s'\n" msgstr "未知的é…置项‘%s’\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "注æ„：旧å¼çš„默认é…置文件‘%s’已被忽略\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "注æ„：没有默认é…置文件‘%s’\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "é…置文件‘%s’：%s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "从‘%s’读å–选项\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "注æ„：一般情况下ä¸ä¼šç”¨åˆ° %sï¼\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "对称加算密法扩展模å—‘%s’因为æƒé™ä¸å®‰å…¨è€Œæœªè¢«è½½å…¥\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„字符集\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 msgid "could not parse keyserver URL\n" msgstr "无法解æžå…¬é’¥æœåŠ¡å™¨ URL\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 msgid "invalid keyserver options\n" msgstr "无效的公钥æœåŠ¡å™¨é€‰é¡¹\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s：%d：无效的校验选项\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 msgid "invalid verify options\n" msgstr "无效的校验选项\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法把è¿è¡Œè·¯å¾„è®¾æˆ %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "警告：程åºå¯èƒ½ä¼šåˆ›å»ºæ ¸å¿ƒå†…存转储ï¼\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 会使得 %s 失效\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ä¸å¯ä¸Ž %s 并用\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用无æ„义ï¼\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "您åªæœ‰åœ¨ --pgp2 模å¼ä¸‹æ‰èƒ½åšåˆ†ç¦»å¼æˆ–明文签字\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "您在 --pgp2 模å¼ä¸‹æ—¶ï¼Œä¸èƒ½åŒæ—¶ç­¾å­—和加密\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "å¯ç”¨ --pgp2 时您应该åªä½¿ç”¨æ–‡ä»¶ï¼Œè€Œéžç®¡é“\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模å¼ä¸‹åŠ å¯†æŠ¥æ–‡éœ€è¦ IDEA 算法\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "所选的对称加密算法无效\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "所选的è¯ä¹¦æ•£åˆ—算法无效\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "需è¦çš„完全å¯ä¿¡ç­¾å­—数一定è¦å¤§äºŽ 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "需è¦çš„勉强å¯ä¿¡ç­¾å­—数一定è¦å¤§äºŽ 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大认è¯æ·±åº¦ä¸€å®šè¦ä»‹äºŽ 1 å’Œ 255 之间\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认验è¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 0，1，2 或 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最å°éªŒè¯çº§åˆ«ï¼›ä¸€å®šè¦æ˜¯ 1，2 或 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "注æ„：强烈ä¸å»ºè®®ä½¿ç”¨ç®€å•çš„ S2K 模å¼(0)\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模å¼ï¼›å¿…须是 0，1 或 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "无效的默认首选项\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "无效的个人对称加密算法首选项\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "无效的个人散列算法首选项\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s å°šä¸èƒ½å’Œ %s 并用\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’对称加密算法\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’散列算法\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨â€˜%s’压缩算法\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "åˆå§‹åŒ–信任度数æ®åº“失败：%s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [文件å]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [文件å]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [文件å]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [文件å]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric -encrypt\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [文件å]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [文件å]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [文件å]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --sign --encrypt æ—¶ä¸èƒ½ä½¿ç”¨ --s2k-mode 0\n" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "您ä¸èƒ½åœ¨ %s 模å¼ä¸‹ä½¿ç”¨ --symmetric --sign -encrypt\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [文件å]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [文件å]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [文件å]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key 用户标识" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key 用户标识" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key 用户标识" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key 用户标识" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key 用户标识 [指令]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, c-format msgid "keyserver send failed: %s\n" msgstr "上传至公钥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥æœåŠ¡å™¨æŽ¥æ”¶å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, c-format msgid "keyserver search failed: %s\n" msgstr "æœå¯»å…¬é’¥æœåŠ¡å™¨å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "从公钥æœåŠ¡å™¨æ›´æ–°å¤±è´¥ï¼š%s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开 ASCII å°è£…失败：%s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行 ASCII å°è£…失败：%s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "无效的‘%s’散列算法\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[文件å]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "请开始键入您的报文……\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "标记å称必须åªå«æœ‰å¯æ‰“å°çš„字符或空格，并以一个“=â€æ¥ç»“å°¾\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "用户标记å称一定è¦å«æœ‰â€œ@â€å­—符\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "标记值一定ä¸èƒ½ä½¿ç”¨ä»»ä½•çš„控制字符\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "给定的的验è¯ç­–ç•¥ URL 无效\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "给定的签字策略 URL 无效\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 msgid "the given preferred keyserver URL is invalid\n" msgstr "给定的首选公钥æœåŠ¡å™¨ URL 无效\n" @@ -2423,12 +2420,12 @@ msgstr "用户标识“%sâ€å·²è¢«åŠé”€ã€‚" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "您ä»ç„¶æƒ³è¦ä¸ºå®ƒç­¾å­—å—？(y/N)" #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " 无法添加签字。\n" @@ -2602,7 +2599,7 @@ msgid "Really sign? (y/N) " msgstr "真的è¦ç­¾å­—å—？(y/N)" -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2653,374 +2650,367 @@ msgid "moving a key signature to the correct place\n" msgstr "正在把密钥的签字移动到正确的ä½ç½®åŽ»\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "ä¿å­˜å¹¶ç¦»å¼€" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "显示指纹" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "列出密钥和用户标识" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "选择用户标识 N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "选择å­é’¥ N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "列出签字" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "为密钥添加签字" -#: g10/keyedit.c:1259 -msgid "make a trust signature" -msgstr "生æˆä¸€ä»½ä¿¡ä»»çš„签字" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "为密钥添加本地签字" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "为密钥添加ä¸å¯åŠé”€ç­¾å­—" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "为密钥添加ä¸å¯åŠé”€çš„本地签字" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "增加一个用户标识" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "增加一个照片标识" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "删除一个用户/照片标识" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "增加一把å­é’¥" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "在智能å¡ä¸Šæ·»åŠ ä¸€æŠŠå¯†é’¥" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "将一把密钥移动到智能å¡ä¸Š" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "删除一把å­é’¥" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "增加一把åŠé”€å¯†é’¥" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "删除签字" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "更改使用期é™" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "设定首选用户标识" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "在ç§é’¥å’Œå…¬é’¥æ¸…å•é—´åˆ‡æ¢" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "列出首选项(专家模å¼)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "列出首选项(详细模å¼)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "设定首选项" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "更新过的首选项" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 msgid "set preferred keyserver URL" msgstr "设定首选公钥æœåŠ¡å™¨çš„ URL" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "更改密ç " -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "更改信任度" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "åŠé”€ç­¾å­—" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "åŠé”€ä¸€ä¸ªç”¨æˆ·æ ‡è¯†" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "åŠé”€ä¸€æŠŠå­é’¥" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "ç¦ç”¨ä¸€æŠŠå¯†é’¥" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "å¯ç”¨ä¸€æŠŠå¯†é’¥" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "显示照片标识" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "读å–ç§é’¥åŒºå—“%sâ€æ—¶å‡ºé”™ï¼š%s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "ç§é’¥å¯ç”¨ã€‚\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "è¦æœ‰ç§é’¥æ‰èƒ½è¿™ä¹ˆåšã€‚\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "请先使用“toggleâ€æŒ‡ä»¤ã€‚\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "密钥已被åŠé”€ã€‚" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 msgid "Really sign all user IDs? (y/N) " msgstr "真的为所有的用户标识签字å—？(y/N)" -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "æ示：选择è¦æ·»åŠ ç­¾å­—的用户标识\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "未知的签字等级" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "在 %s 模å¼ä¸­ä¸å…许使用这个指令。\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "您至少得选择一个用户标识。\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "您ä¸èƒ½åˆ é™¤æœ€åŽä¸€ä¸ªç”¨æˆ·æ ‡è¯†ï¼\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 msgid "Really remove all selected user IDs? (y/N) " msgstr "真的è¦åˆ é™¤æ‰€æœ‰è¢«é€‰æ‹©çš„用户标识å—？(y/N)" -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 msgid "Really remove this user ID? (y/N) " msgstr "真的è¦åˆ é™¤è¿™ä¸ªç”¨æˆ·æ ‡è¯†å—？(y/N)" -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 msgid "Really move the primary key? (y/N) " msgstr "真的è¦åˆ é™¤ä¸»é’¥å—？(y/N)" -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 msgid "You must select exactly one key.\n" msgstr "您必须指定一把密钥。\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "您必须选择至少一把密钥。\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "您真的想è¦åˆ é™¤è¢«é€‰æ‹©çš„密钥å—？(y/N)" -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 msgid "Do you really want to delete this key? (y/N) " msgstr "您真的è¦åˆ é™¤è¿™æŠŠå¯†é’¥å—？(y/N)" -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 msgid "Really revoke all selected user IDs? (y/N) " msgstr "真的è¦åŠé”€æ‰€æœ‰è¢«é€‰æ‹©çš„用户标识å—？(y/N)" -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 msgid "Really revoke this user ID? (y/N) " msgstr "真的è¦åŠé”€è¿™ä¸ªç”¨æˆ·æ ‡è¯†å—？(y/N)" -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "您真的想è¦åŠé”€è¢«é€‰æ‹©çš„密钥å—？(y/N)" -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 msgid "Do you really want to revoke this key? (y/N) " msgstr "您真的想è¦åŠé”€è¿™æŠŠå¯†é’¥å—？(y/N)" -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "使用用户æ供的信任度数æ®åº“时信任度å¯èƒ½å¹¶æœªè¢«è®¾å®š\n" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 msgid "Set preference list to:\n" msgstr "设为首选项列表为：\n" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "真的è¦æ›´æ–°è¢«é€‰æ‹©ç”¨æˆ·æ ‡è¯†çš„首选项å—？(y/N)" -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 msgid "Really update the preferences? (y/N) " msgstr "真的è¦æ›´æ–°é¦–选项å—？(y/N)" -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 msgid "Save changes? (y/N) " msgstr "è¦ä¿å­˜å˜åŠ¨å—？(y/N)" -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 msgid "Quit without saving? (y/N) " msgstr "è¦ä¸ä¿å­˜è€Œç¦»å¼€å—？(y/N)" -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "æ›´æ–°ç§é’¥å¤±è´¥ï¼š%s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "密钥没有å˜åŠ¨æ‰€ä»¥ä¸éœ€è¦æ›´æ–°ã€‚\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "散列：" -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "特点：" -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "公钥æœåŠ¡å™¨ä¸å¯å˜é€ " -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "首选公钥æœåŠ¡å™¨ï¼š" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这把密钥å¯è¢« %s 密钥 %s åŠé”€" -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 msgid "(sensitive)" msgstr " (æ•æ„Ÿçš„)" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "å·²åŠé”€ï¼š%s" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, c-format msgid "expired: %s" msgstr "已过期：%s" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, c-format msgid "usage: %s" msgstr "å¯ç”¨äºŽï¼š%s" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "这把密钥已ç»è¢«ç¦ç”¨" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "å¡å·ï¼š" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x æ ·å¼çš„用户标识没有首选项。\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "请注æ„，在您é‡å¯ç¨‹åºä¹‹å‰ï¼Œæ˜¾ç¤ºçš„密钥有效性未必正确，\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 msgid "revoked" msgstr "å·²åŠé”€" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" "警告：没有首选用户标识。此指令å¯èƒ½å‡å®šä¸€ä¸ªä¸åŒçš„用户标识为首选用户标识。\n" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3029,45 +3019,45 @@ "警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" " 增加照片标识å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP ä¸èƒ½è¯†åˆ«è¿™æŠŠå¯†é’¥ã€‚\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定ä»ç„¶æƒ³è¦å¢žåŠ å—？(y/N)" -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您ä¸å¯ä»¥æŠŠç…§ç‰‡æ ‡è¯†å¢žåŠ åˆ° PGP2 æ ·å¼çš„密钥里。\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签字å—？(y/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签字å—？(y/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签字å—？(y/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "真的è¦åˆ é™¤è¿™ä¸ªè‡ªèº«ç­¾å­—å—？(y/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "å·²ç»åˆ é™¤äº† %d 个签字。\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "å·²ç»åˆ é™¤äº† %d 个签字。\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3076,160 +3066,160 @@ "警告：这是一把 PGP2 æ ·å¼çš„密钥。\n" " 增加指定åŠé”€è€…å¯èƒ½ä¼šå¯¼è‡´æŸäº›ç‰ˆæœ¬çš„ PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "您ä¸å¯ä»¥ä¸º PGP 2.x æ ·å¼çš„密钥添加指定åŠé”€è€…。\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定åŠé”€è€…的用户标识：" -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "无法将 PGP 2.x æ ·å¼çš„密钥设为指定åŠé”€è€…\n" # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "您ä¸èƒ½å°†æŸæŠŠå¯†é’¥è®¾ä¸ºå®ƒè‡ªå·±çš„指定åŠé”€è€…\n" # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 msgid "this key has already been designated as a revoker\n" msgstr "这把密钥已被指定为一个åŠé”€è€…\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将æŸæŠŠå¯†é’¥æŒ‡æ´¾ä¸ºæŒ‡å®šåŠé”€è€…çš„æ“作无法撤销ï¼\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "您确定è¦å°†è¿™æŠŠå¯†é’¥è®¾ä¸ºæŒ‡å®šåŠé”€è€…å—？(y/N)：" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "请从ç§é’¥ä¸­åˆ é™¤é€‰æ‹©ã€‚\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "请至多选择一把å­é’¥ã€‚\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "正在å˜æ›´å­é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "正在å˜æ›´ä¸»é’¥çš„使用期é™ã€‚\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "您ä¸èƒ½å˜æ›´v3密钥的使用期é™\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "在ç§é’¥çŽ¯é‡Œæ²¡æœ‰ä¸€è‡´çš„签字\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "请精确地选择一个用户标识。\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识“%sâ€çš„ v3 自身签字\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选的公钥æœåŠ¡å™¨çš„ URL：" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定è¦æ›¿æ¢å®ƒå—？(y/N)" -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定è¦åˆ é™¤å®ƒå—？(y/N)" -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "没有索引为 %d çš„å­é’¥\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, c-format msgid "user ID: \"%s\"\n" msgstr "用户标识：“%sâ€\n" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (ä¸å¯å¯¼å‡º)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "这份签字已在 %s 过期。\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您ä»ç„¶æƒ³è¦åŠé”€å®ƒå—？(y/N)" -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "è¦ä¸ºè¿™ä»½ç­¾å­—生æˆä¸€ä»½åŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已ç»ä¸ºè¿™äº›å¯†é’¥ %s 上的这些用户标识添加签字：\n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 msgid " (non-revocable)" msgstr " (ä¸å¯åŠé”€)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 于 %s åŠé”€\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "您正在åŠé”€è¿™äº›ç­¾å­—：\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "真的è¦ç”ŸæˆåŠé”€è¯ä¹¦å—？(y/N)" -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "没有ç§é’¥\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识“%sâ€å·²ç»è¢«åŠé”€ã€‚\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告：有一份用户标识签字的日期标记为 %d 秒åŽçš„未æ¥\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在显示 %s 照片标识(大å°ä¸º %ld，属于密钥 %s，用户标识 %d)\n" @@ -3550,7 +3540,7 @@ "您需è¦ä¸€ä¸ªå¯†ç æ¥ä¿æŠ¤æ‚¨çš„ç§é’¥ã€‚\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4089,7 +4079,7 @@ msgid "textmode" msgstr "文本模å¼" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "未知" @@ -4292,16 +4282,16 @@ msgid "communication problem with gpg-agent\n" msgstr "与 gpg-agent 通讯有问题\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "代ç†ç¨‹åºçš„问题――正在åœç”¨ä»£ç†ç¨‹åº\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, c-format msgid " (main key ID %s)" msgstr "(ä¸»é’¥åŒ™å· %s)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4312,57 +4302,57 @@ "“%.*sâ€\n" "%u ä½çš„ %s å¯†é’¥ï¼Œé’¥åŒ™å· %s，建立于 %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "请å†è¾“入一次密ç \n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "请输入密ç \n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "密ç å¤ªé•¿\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "代ç†ç¨‹åºå“应无效\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "用户å–消\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "代ç†ç¨‹åºçš„问题：代ç†ç¨‹åºè¿”回 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 msgid "can't query passphrase in batch mode\n" msgstr "在批处ç†æ¨¡å¼ä¸­æ— æ³•æŸ¥è¯¢å¯†ç \n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "请输入密ç ï¼š" -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" msgstr "您需è¦è¾“入密ç ï¼Œæ‰èƒ½è§£å¼€è¿™ä¸ªç”¨æˆ·çš„ç§é’¥ï¼šâ€œ%sâ€\n" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u ä½çš„ %s å¯†é’¥ï¼Œé’¥åŒ™å· %s，建立于 %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr " (主钥 %s çš„å­é’¥)" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "请å†è¾“入一次密ç ï¼š" @@ -5249,122 +5239,122 @@ msgid "using %s trust model\n" msgstr "使用 %s 信任模型\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "å·²åŠé”€" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "已过期" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "未知" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 #, fuzzy msgid "[marginal]" msgstr "勉强" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 #, fuzzy msgid "[ultimate]" msgstr "ç»å¯¹" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "未定义" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 msgid "never" msgstr "从ä¸" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "勉强" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "完全" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "ç»å¯¹" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任度数æ®åº“检查将于 %s 进行\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ£€æŸ¥ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "使用‘%s’信任模型时ä¸éœ€è¦æ›´æ–°ä¿¡ä»»åº¦æ•°æ®åº“\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, c-format msgid "public key %s not found: %s\n" msgstr "找ä¸åˆ°å…¬é’¥ %s：%s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "正在检查信任度数æ®åº“\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "å·²ç»å¤„ç†äº† %d 把密钥(共计已解决了 %d 份的有效性)\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "没有找到任何ç»å¯¹ä¿¡ä»»çš„密钥\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "ç»å¯¹ä¿¡ä»»çš„密钥 %s 的公钥未被找到\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "éœ€è¦ %d 份勉强信任和 %d 份完全信任，%s 信任模型\n" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "无法更新信任度数æ®åº“版本记录：写入失败：%s\n" @@ -5666,14 +5656,29 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信æ¯\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "安全内存未åˆå§‹åŒ–，ä¸èƒ½è¿›è¡Œæ“作\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(您å¯èƒ½ä½¿ç”¨äº†é”™è¯¯çš„程åºæ¥å®Œæˆæ­¤é¡¹ä»»åŠ¡)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key 用户标识" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key 用户标识" + +#~ msgid "make a trust signature" +#~ msgstr "生æˆä¸€ä»½ä¿¡ä»»çš„签字" + +#~ msgid "sign the key non-revocably" +#~ msgstr "为密钥添加ä¸å¯åŠé”€ç­¾å­—" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "为密钥添加ä¸å¯åŠé”€çš„本地签字" + #~ msgid "q" #~ msgstr "q" Index: gnupg/po/zh_TW.po diff -u gnupg/po/zh_TW.po:1.9 gnupg/po/zh_TW.po:1.10 --- gnupg/po/zh_TW.po:1.9 Tue Dec 14 08:49:27 2004 +++ gnupg/po/zh_TW.po Thu Dec 16 11:04:35 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-14 08:40+0100\n" +"POT-Creation-Date: 2004-12-16 10:56+0100\n" "PO-Revision-Date: 2003-05-13 15:48+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -33,7 +33,7 @@ #: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3225 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -353,7 +353,7 @@ msgid "OpenPGP card no. %s detected\n" msgstr "" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1315 +#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 #: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 #, fuzzy msgid "can't do this in batch mode\n" @@ -564,7 +564,7 @@ msgid "secret key already stored on a card\n" msgstr "¤w¸õ¹L¡G¨pÆ_¤w¸g¦s¦b\n" -#: g10/card-util.c:1250 g10/keyedit.c:1245 +#: g10/card-util.c:1250 g10/keyedit.c:1285 msgid "quit this menu" msgstr "Â÷¶}³o­Ó¿ï³æ" @@ -573,7 +573,7 @@ msgid "show admin commands" msgstr "«ü¥O©¼¦¹¥Ù¬Þ\n" -#: g10/card-util.c:1253 g10/keyedit.c:1248 +#: g10/card-util.c:1253 g10/keyedit.c:1288 msgid "show this help" msgstr "Åã¥Ü³o¥÷½u¤W»¡©ú" @@ -626,7 +626,7 @@ msgid "menu to change or unblock the PIN" msgstr "" -#: g10/card-util.c:1333 g10/keyedit.c:1398 +#: g10/card-util.c:1333 g10/keyedit.c:1436 msgid "Command> " msgstr "«ü¥O> " @@ -645,7 +645,7 @@ msgid "Admin commands are not allowed\n" msgstr "¥¿¦b±N¨pÆ_¼g¦Ü `%s'\n" -#: g10/card-util.c:1455 g10/keyedit.c:1865 +#: g10/card-util.c:1455 g10/keyedit.c:1928 msgid "Invalid command (try \"help\")\n" msgstr "µL®Äªº«ü¥O (¸Õ¸Õ¬Ý \"help\")\n" @@ -690,7 +690,7 @@ msgid "PIN not correctly repeated; try again" msgstr "±K½X¦ê¦A¦¸¿é¤J®É¨S¦³¥¿½T­«½Æ¡F½Ð¦A¸Õ¤@¦¸" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3575 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -700,7 +700,7 @@ msgid "--output doesn't work for this command\n" msgstr "--output ¦b³o­Ó©R¥O¤¤¨S¦³§@¥Î\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2919 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 #: g10/revoke.c:226 #, fuzzy, c-format msgid "key \"%s\" not found: %s\n" @@ -992,59 +992,59 @@ msgid "sign a key locally" msgstr "¶È¦b¥»¦añ¸p¬Y§âª÷Æ_" -#: g10/g10.c:385 +#: g10/g10.c:383 msgid "sign or edit a key" msgstr "ñ¸p©Î½s¿è¬Y§âª÷Æ_" -#: g10/g10.c:386 +#: g10/g10.c:384 msgid "generate a revocation certificate" msgstr "²£¥Í¤@¥÷ºM¾P¾ÌÃÒ" -#: g10/g10.c:388 +#: g10/g10.c:386 msgid "export keys" msgstr "¶×¥Xª÷Æ_" -#: g10/g10.c:389 +#: g10/g10.c:387 msgid "export keys to a key server" msgstr "§âª÷Æ_¶×¥X¦Ü¬Y­Óª÷Æ_¦øªA¾¹¤W" -#: g10/g10.c:390 +#: g10/g10.c:388 msgid "import keys from a key server" msgstr "±q¬Y­Óª÷Æ_¦øªA¾¹¤W¶×¤Jª÷Æ_" -#: g10/g10.c:392 +#: g10/g10.c:390 msgid "search for keys on a key server" msgstr "¦b¬Y­Óª÷Æ_¦øªA¾¹¤W·j´Mª÷Æ_" -#: g10/g10.c:394 +#: g10/g10.c:392 msgid "update all keys from a keyserver" msgstr "±q¬Y­Óª÷Æ_¦øªA¾¹¤W§ó·s©Ò¦³ªºª÷Æ_" -#: g10/g10.c:397 +#: g10/g10.c:395 msgid "import/merge keys" msgstr "¶×¤J/¦X¨Öª÷Æ_" -#: g10/g10.c:400 +#: g10/g10.c:398 msgid "print the card status" msgstr "" -#: g10/g10.c:401 +#: g10/g10.c:399 msgid "change data on a card" msgstr "" -#: g10/g10.c:402 +#: g10/g10.c:400 msgid "change a card's PIN" msgstr "" -#: g10/g10.c:410 +#: g10/g10.c:408 msgid "update the trust database" msgstr "§ó·s«H¥ô¸ê®Æ®w" -#: g10/g10.c:417 +#: g10/g10.c:415 msgid "|algo [files]|print message digests" msgstr "|ºtºâªk [ÀÉ®×]|¦L¥X°T®§ºK­n" -#: g10/g10.c:421 g10/gpgv.c:65 +#: g10/g10.c:419 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -1054,51 +1054,51 @@ "¿ï¶µ¡G\n" " " -#: g10/g10.c:423 +#: g10/g10.c:421 msgid "create ascii armored output" msgstr "«Ø¥ß¥H ASCII «Ê¸Ë¹Lªº¿é¥X" -#: g10/g10.c:425 +#: g10/g10.c:423 msgid "|NAME|encrypt for NAME" msgstr "|¦W¦r|¥H¡u¦W¦r¡v§@¬°¥[±K¹ï¶H" -#: g10/g10.c:436 +#: g10/g10.c:434 msgid "use this user-id to sign or decrypt" msgstr "¨Ï¥Î³o­Ó¨Ï¥ÎªÌ ID ¨Óñ¸p©Î¸Ñ±K" -#: g10/g10.c:437 +#: g10/g10.c:435 msgid "|N|set compress level N (0 disables)" msgstr "|N|³]©wÀ£ÁYµ¥¯Å¬° N (0 ªí¥Ü¤£À£ÁY)" -#: g10/g10.c:442 +#: g10/g10.c:440 msgid "use canonical text mode" msgstr "¨Ï¥Î¼Ð·Çªº¤å¦r¼Ò¦¡" -#: g10/g10.c:452 +#: g10/g10.c:450 msgid "use as output file" msgstr "·í§@¿é¥XÀɮרӨϥÎ" -#: g10/g10.c:454 g10/gpgv.c:67 +#: g10/g10.c:452 g10/gpgv.c:67 msgid "verbose" msgstr "Åo­ö¼Ò¦¡" -#: g10/g10.c:465 +#: g10/g10.c:463 msgid "do not make any changes" msgstr "¤£­n°µ¥ô¦ó§ïÅÜ" -#: g10/g10.c:466 +#: g10/g10.c:464 msgid "prompt before overwriting" msgstr "Âмg«e¥ý¸ß°Ý" -#: g10/g10.c:507 +#: g10/g10.c:505 msgid "use strict OpenPGP behavior" msgstr "" -#: g10/g10.c:508 +#: g10/g10.c:506 msgid "generate PGP 2.x compatible messages" msgstr "" -#: g10/g10.c:533 +#: g10/g10.c:532 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1106,7 +1106,7 @@ "@\n" "(½Ð°Ñ·Ó½u¤W»¡©ú­¶­±¨Ó¨ú±o©Ò¦³©R¥O©M¿ï¶µªº§¹¾ã²M³æ)\n" -#: g10/g10.c:536 +#: g10/g10.c:535 msgid "" "@\n" "Examples:\n" @@ -1156,7 +1156,7 @@ msgid "Pubkey: " msgstr "¤½Æ_¡G " -#: g10/g10.c:756 g10/keyedit.c:1902 +#: g10/g10.c:756 g10/keyedit.c:1965 msgid "Cipher: " msgstr "½s±Kªk¡G " @@ -1164,7 +1164,7 @@ msgid "Hash: " msgstr "Âø´ê¡G " -#: g10/g10.c:768 g10/keyedit.c:1948 +#: g10/g10.c:768 g10/keyedit.c:2011 msgid "Compression: " msgstr "À£ÁY¡G " @@ -1248,387 +1248,384 @@ msgid "unknown configuration item `%s'\n" msgstr "·sªº³]©wÀÉ `%s' ³Q«Ø¥ß¤F\n" -#: g10/g10.c:1797 +#: g10/g10.c:1798 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "½Ðª`·N¡G¦³ªº¹w³]¿ï¶µÀÉ `%s' ¤w³Q©¿²¤\n" -#: g10/g10.c:1839 +#: g10/g10.c:1840 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "½Ðª`·N¡G¨S¦³¹w³]¿ï¶µÀÉ `%s'\n" -#: g10/g10.c:1843 +#: g10/g10.c:1844 #, c-format msgid "option file `%s': %s\n" msgstr "¿ï¶µÀÉ `%s' ¡G %s\n" -#: g10/g10.c:1850 +#: g10/g10.c:1851 #, c-format msgid "reading options from `%s'\n" msgstr "±q `%s' Ū¨ú¿ï¶µ\n" -#: g10/g10.c:2066 g10/g10.c:2582 g10/g10.c:2593 +#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "½Ðª`·N¡G¤@¯ë±¡ªp¤U¤£·|¥Î¨ì %s¡I\n" -#: g10/g10.c:2079 +#: g10/g10.c:2078 #, fuzzy, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "½s±Kªk©µ¦ù¼Ò²Õ \"%s\" ¦]¬°³\¥i¤£¦w¥þ¦Ó¥¼³Q¸ü¤J\n" -#: g10/g10.c:2291 +#: g10/g10.c:2292 #, fuzzy, c-format msgid "`%s' is not a valid character set\n" msgstr "%s ¤£¬O¤@­Ó¦³®Äªº¦r¤¸¶°\n" -#: g10/g10.c:2310 g10/keyedit.c:3435 +#: g10/g10.c:2311 g10/keyedit.c:3498 #, fuzzy msgid "could not parse keyserver URL\n" msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n" -#: g10/g10.c:2316 +#: g10/g10.c:2317 #, fuzzy, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2319 +#: g10/g10.c:2320 #, fuzzy msgid "invalid keyserver options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2326 +#: g10/g10.c:2327 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2329 +#: g10/g10.c:2330 msgid "invalid import options\n" msgstr "µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2336 +#: g10/g10.c:2337 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2339 +#: g10/g10.c:2340 msgid "invalid export options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2346 +#: g10/g10.c:2347 #, fuzzy, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2349 +#: g10/g10.c:2350 #, fuzzy msgid "invalid list options\n" msgstr "µL®Äªº¶×¤J¿ï¶µ\n" -#: g10/g10.c:2371 +#: g10/g10.c:2372 #, fuzzy, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2374 +#: g10/g10.c:2375 #, fuzzy msgid "invalid verify options\n" msgstr "µL®Äªº¶×¥X¿ï¶µ\n" -#: g10/g10.c:2381 +#: g10/g10.c:2382 #, c-format msgid "unable to set exec-path to %s\n" msgstr "µLªk§â°õ¦æÀɸô®|³]¦¨ %s\n" -#: g10/g10.c:2571 +#: g10/g10.c:2572 msgid "WARNING: program may create a core file!\n" msgstr "ĵ§i¡Gµ{¦¡¥i¯à·|¶É¦L¥X®Ö¤ßÀÉ¡I\n" -#: g10/g10.c:2575 +#: g10/g10.c:2576 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ĵ§i¡G %s ·|¨Ï±o %s ¥¢®Ä\n" -#: g10/g10.c:2584 +#: g10/g10.c:2585 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s ¤£³Q¤¹³\¸ò %s ¨Ö¥Î\n" -#: g10/g10.c:2587 +#: g10/g10.c:2588 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n" -#: g10/g10.c:2608 +#: g10/g10.c:2602 +#, c-format +msgid "will not run with insecure memory due to %s" +msgstr "" + +#: g10/g10.c:2616 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "©p¬é¦³¦b --pgp2 ¼Ò¦¡¤UÅׯవ¥X¤ÀÂ÷¦¡©Î©ú¤åñ³¹\n" -#: g10/g10.c:2614 +#: g10/g10.c:2622 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "©p¦b --pgp2 ¼Ò¦¡¤U®É¡A¤£¯à¦P®Éñ¸p©M¥[±K\n" -#: g10/g10.c:2620 +#: g10/g10.c:2628 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "±Ò¥Î --pgp2 ®É©p¬éÀ³¸Ó¨Ï¥ÎÀɮסA¦Ó«DºÞ¹D\n" -#: g10/g10.c:2633 +#: g10/g10.c:2641 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "¦b --pgp2 ¼Ò¦¡¤U¥[±K°T®§»Ý­n IDEA ½s±Kªk\n" -#: g10/g10.c:2703 g10/g10.c:2727 +#: g10/g10.c:2711 g10/g10.c:2735 msgid "selected cipher algorithm is invalid\n" msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n" -#: g10/g10.c:2709 g10/g10.c:2733 +#: g10/g10.c:2717 g10/g10.c:2741 msgid "selected digest algorithm is invalid\n" msgstr "©Ò¿ïªººK­nºtºâªkµL®Ä\n" -#: g10/g10.c:2715 +#: g10/g10.c:2723 #, fuzzy msgid "selected compression algorithm is invalid\n" msgstr "©Ò¿ïªº½s±KºtºâªkµL®Ä\n" -#: g10/g10.c:2721 +#: g10/g10.c:2729 msgid "selected certification digest algorithm is invalid\n" msgstr "©Ò¿ïªº¾ÌÃÒºK­nºtºâªkµL®Ä\n" -#: g10/g10.c:2736 +#: g10/g10.c:2744 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ¤@©w­n¤j©ó 0\n" -#: g10/g10.c:2738 +#: g10/g10.c:2746 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ¤@©w­n¤j©ó 1\n" -#: g10/g10.c:2740 +#: g10/g10.c:2748 #, fuzzy msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth ¤@©w­n¤¶©ó 1 ©M 255 ¤§¶¡\n" -#: g10/g10.c:2742 +#: g10/g10.c:2750 #, fuzzy msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n" -#: g10/g10.c:2744 +#: g10/g10.c:2752 #, fuzzy msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "µL®Äªº default-check-level ¡F¤@©w­n¬O 0 ¡B 1 ¡B 2 ©Î 3\n" -#: g10/g10.c:2747 +#: g10/g10.c:2755 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "½Ðª`·N¡G±j¯P¤£«Øij¨Ï¥Î³æ¯Âªº S2K ¼Ò¦¡ (0)\n" -#: g10/g10.c:2751 +#: g10/g10.c:2759 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "µL®Äªº S2K ¼Ò¦¡¡F¤@©w­n¬O 0 ¡B 1 ©Î 3\n" -#: g10/g10.c:2758 +#: g10/g10.c:2766 msgid "invalid default preferences\n" msgstr "µL®Äªº¹w³]°¾¦n\n" -#: g10/g10.c:2767 +#: g10/g10.c:2775 msgid "invalid personal cipher preferences\n" msgstr "µL®Äªº­Ó¤H½s±Kªk°¾¦n\n" -#: g10/g10.c:2771 +#: g10/g10.c:2779 msgid "invalid personal digest preferences\n" msgstr "µL®Äªº­Ó¤HºK­n°¾¦n\n" -#: g10/g10.c:2775 +#: g10/g10.c:2783 msgid "invalid personal compress preferences\n" msgstr "µL®Äªº­Ó¤HÀ£ÁY°¾¦n\n" -#: g10/g10.c:2808 +#: g10/g10.c:2816 #, fuzzy, c-format msgid "%s does not yet work with %s\n" msgstr "%s ¸ò %s ©ñ¦b¤@°_¨S¦³·N¸q¡I\n" -#: g10/g10.c:2855 +#: g10/g10.c:2863 #, fuzzy, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2860 +#: g10/g10.c:2868 #, fuzzy, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2865 +#: g10/g10.c:2873 #, fuzzy, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:2961 +#: g10/g10.c:2969 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "«H¥ô¸ê®Æ®w±Ò©l¥¢±Ñ¡G %s\n" -#: g10/g10.c:2972 +#: g10/g10.c:2980 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "ĵ§i¡Gµ¹©wªº¦¬¥óªÌ (-r) ¥¼¨Ï¥Î¤½Æ_¥[±K\n" -#: g10/g10.c:2983 +#: g10/g10.c:2991 msgid "--store [filename]" msgstr "--store [ÀɦW]" -#: g10/g10.c:2990 +#: g10/g10.c:2998 msgid "--symmetric [filename]" msgstr "--symmetric [ÀɦW]" -#: g10/g10.c:2992 +#: g10/g10.c:3000 #, fuzzy, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "¸Ñ±K¥¢±Ñ¡G %s\n" -#: g10/g10.c:3002 +#: g10/g10.c:3010 msgid "--encrypt [filename]" msgstr "--encrypt [ÀɦW]" -#: g10/g10.c:3015 +#: g10/g10.c:3023 #, fuzzy msgid "--symmetric --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3017 +#: g10/g10.c:3025 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3020 +#: g10/g10.c:3028 #, fuzzy, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:3038 +#: g10/g10.c:3046 msgid "--sign [filename]" msgstr "--sign [ÀɦW]" -#: g10/g10.c:3051 +#: g10/g10.c:3059 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3066 +#: g10/g10.c:3074 #, fuzzy msgid "--symmetric --sign --encrypt [filename]" msgstr "--sign --encrypt [ÀɦW]" -#: g10/g10.c:3068 +#: g10/g10.c:3076 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/g10.c:3071 +#: g10/g10.c:3079 #, fuzzy, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "©p¤£¸Ó±N %s ¥Î©ó %s ¼Ò¦¡¤¤\n" -#: g10/g10.c:3091 +#: g10/g10.c:3099 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [ÀɦW]" -#: g10/g10.c:3100 +#: g10/g10.c:3108 msgid "--clearsign [filename]" msgstr "--clearsign [ÀɦW]" -#: g10/g10.c:3125 +#: g10/g10.c:3133 msgid "--decrypt [filename]" msgstr "--decrypt [ÀɦW]" -#: g10/g10.c:3133 +#: g10/g10.c:3141 msgid "--sign-key user-id" msgstr "--sign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3137 +#: g10/g10.c:3145 msgid "--lsign-key user-id" msgstr "--lsign-key ¨Ï¥ÎªÌID" -#: g10/g10.c:3141 -msgid "--nrsign-key user-id" -msgstr "--nrsign-key ¨Ï¥ÎªÌID" - -#: g10/g10.c:3145 -msgid "--nrlsign-key user-id" -msgstr "--nrlsign-key ¨Ï¥ÎªÌID" - -#: g10/g10.c:3169 +#: g10/g10.c:3166 msgid "--edit-key user-id [commands]" msgstr "--edit-key ¨Ï¥ÎªÌID [«ü¥O]" -#: g10/g10.c:3240 +#: g10/g10.c:3237 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [¨Ï¥ÎªÌID] [Æ_°Í°é]" -#: g10/g10.c:3277 +#: g10/g10.c:3274 #, fuzzy, c-format msgid "keyserver send failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3279 +#: g10/g10.c:3276 #, fuzzy, c-format msgid "keyserver receive failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3281 +#: g10/g10.c:3278 #, fuzzy, c-format msgid "key export failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3292 +#: g10/g10.c:3289 #, fuzzy, c-format msgid "keyserver search failed: %s\n" msgstr "²£¥Íª÷Æ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3302 +#: g10/g10.c:3299 #, fuzzy, c-format msgid "keyserver refresh failed: %s\n" msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n" -#: g10/g10.c:3343 +#: g10/g10.c:3340 #, c-format msgid "dearmoring failed: %s\n" msgstr "¸Ñ¶}«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:3351 +#: g10/g10.c:3348 #, c-format msgid "enarmoring failed: %s\n" msgstr "¶i¦æ«Ê¸Ë¥¢±Ñ¡G %s\n" -#: g10/g10.c:3438 +#: g10/g10.c:3435 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "µL®Äªº `%s' Âø´êºtºâªk\n" -#: g10/g10.c:3561 +#: g10/g10.c:3558 msgid "[filename]" msgstr "[ÀɦW]" -#: g10/g10.c:3565 +#: g10/g10.c:3562 msgid "Go ahead and type your message ...\n" msgstr "½Ð¶}©lÁä¤J©pªº°T®§ ...\n" -#: g10/g10.c:3855 +#: g10/g10.c:3852 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "¼Ð°O¦WºÙ¤@©w­n±Ä¥Î¥i¦L¥Xªº¦r²Å©ÎªÅ¥Õ¡A¨Ã¥H¤@­Ó¡u=¡v¨Óµ²§À\n" -#: g10/g10.c:3863 +#: g10/g10.c:3860 msgid "a user notation name must contain the '@' character\n" msgstr "¨Ï¥ÎªÌ¼Ð°O¦WºÙ¤@©w­n§t¦³¡u@¡v¦r²Å\n" -#: g10/g10.c:3873 +#: g10/g10.c:3870 msgid "a notation value must not use any control characters\n" msgstr "¼Ð°O­È¤@©w¤£¯à¨Ï¥Î¥ô¦óªº±±¨î¦r²Å\n" -#: g10/g10.c:3907 +#: g10/g10.c:3904 msgid "the given certification policy URL is invalid\n" msgstr "µ¹©wªºªº¾ÌÃÒ­ì«h URL µL®Ä\n" -#: g10/g10.c:3909 +#: g10/g10.c:3906 msgid "the given signature policy URL is invalid\n" msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n" -#: g10/g10.c:3942 +#: g10/g10.c:3939 #, fuzzy msgid "the given preferred keyserver URL is invalid\n" msgstr "µ¹©wªºÃ±³¹­ì«h URL µL®Ä\n" @@ -2470,12 +2467,12 @@ msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C" #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1487 +#: g10/keyedit.c:857 g10/keyedit.c:1543 msgid "Are you sure you still want to sign it? (y/N) " msgstr "©p¤´µM·Q­nñ¸p¥¦¶Ü¡H (y/N) " #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1493 +#: g10/keyedit.c:1549 msgid " Unable to sign.\n" msgstr " µLªkñ¸p¡C\n" @@ -2673,7 +2670,7 @@ msgid "Really sign? (y/N) " msgstr "¯uªº­nñ¸p¶Ü¡H " -#: g10/keyedit.c:1028 g10/keyedit.c:3883 g10/keyedit.c:3974 g10/keyedit.c:4047 +#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -2725,370 +2722,362 @@ msgid "moving a key signature to the correct place\n" msgstr "¥¿¦b§âª÷Æ_ªºÃ±³¹·h²¾¨ì¥¿½Tªº¦ì¸m¥h\n" -#: g10/keyedit.c:1247 +#: g10/keyedit.c:1287 msgid "save and quit" msgstr "Àx¦s¨ÃÂ÷¶}" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1290 msgid "show fingerprint" msgstr "Åã¥Ü«ü¯¾" -#: g10/keyedit.c:1251 +#: g10/keyedit.c:1291 msgid "list key and user IDs" msgstr "¦C¥Xª÷Æ_©M¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:1253 +#: g10/keyedit.c:1293 msgid "select user ID N" msgstr "¨Ï¥ÎªÌ ID ¿ï¤F N" -#: g10/keyedit.c:1254 +#: g10/keyedit.c:1294 msgid "select secondary key N" msgstr "¿ï¾Ü¦¸Æ_ N" -#: g10/keyedit.c:1255 +#: g10/keyedit.c:1295 msgid "list signatures" msgstr "¦C¥Xñ³¹" -#: g10/keyedit.c:1257 +#: g10/keyedit.c:1297 msgid "sign the key" msgstr "ñ¸pª÷Æ_" -#: g10/keyedit.c:1259 -#, fuzzy -msgid "make a trust signature" -msgstr "«Ø¥ß¤@¥÷¤ÀÂ÷¦¡Ã±³¹" - -#: g10/keyedit.c:1260 +#: g10/keyedit.c:1301 msgid "sign the key locally" msgstr "¶È¦b¥»¦añ¸pª÷Æ_" -#: g10/keyedit.c:1261 -msgid "sign the key non-revocably" -msgstr "¥H¤£¥iºM¾P¼Ò¦¡Ã±¸pª÷Æ_" - -#: g10/keyedit.c:1262 -msgid "sign the key locally and non-revocably" -msgstr "¥H¤£¥iºM¾P¼Ò¦¡¦b¥»¦añ¸pª÷Æ_" - -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1303 msgid "add a user ID" msgstr "¼W¥[¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1304 msgid "add a photo ID" msgstr "¼W¥[¤@­Ó·Ó¤ù ID" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1305 msgid "delete user ID" msgstr "§R°£¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1308 msgid "add a secondary key" msgstr "¼W¥[¤@§â¦¸Æ_" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1310 msgid "add a key to a smartcard" msgstr "" -#: g10/keyedit.c:1273 +#: g10/keyedit.c:1311 msgid "move a key to a smartcard" msgstr "" -#: g10/keyedit.c:1275 +#: g10/keyedit.c:1313 msgid "delete a secondary key" msgstr "§R°£¤@§â¦¸Æ_" -#: g10/keyedit.c:1276 +#: g10/keyedit.c:1314 msgid "add a revocation key" msgstr "¼W¥[¤@§âºM¾Pª÷Æ_" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1315 msgid "delete signatures" msgstr "§R°£Ã±³¹" -#: g10/keyedit.c:1278 +#: g10/keyedit.c:1316 msgid "change the expire date" msgstr "§ó§ï¨Ï¥Î´Á­­" -#: g10/keyedit.c:1279 +#: g10/keyedit.c:1317 msgid "flag user ID as primary" msgstr "§â¨Ï¥ÎªÌ ID ¼Ð°O¬°¥D­n" -#: g10/keyedit.c:1280 +#: g10/keyedit.c:1318 msgid "toggle between secret and public key listing" msgstr "§â¨pÆ_©M¤½Æ_²M³æô¦b¤@°_" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1320 msgid "list preferences (expert)" msgstr "¦C¥X°¾¦n (±M®a¼Ò¦¡)" -#: g10/keyedit.c:1284 +#: g10/keyedit.c:1321 msgid "list preferences (verbose)" msgstr "¦C¥X°¾¦n (Åo­ö¼Ò¦¡)" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1322 msgid "set preference list" msgstr "³]©w°¾¦n²M³æ" -#: g10/keyedit.c:1286 +#: g10/keyedit.c:1323 msgid "updated preferences" msgstr "§ó·s¹Lªº°¾¦n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1324 #, fuzzy msgid "set preferred keyserver URL" msgstr "µLªk¤ÀªRª÷Æ_¦øªA¾¹ URI\n" -#: g10/keyedit.c:1288 +#: g10/keyedit.c:1325 msgid "change the passphrase" msgstr "§ó§ï±K½X¦ê" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1326 msgid "change the ownertrust" msgstr "§ó§ï¥DÆ[«H¥ô" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1327 msgid "revoke signatures" msgstr "ºM¾Pñ³¹" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1328 msgid "revoke a user ID" msgstr "ºM¾P¤@­Ó¨Ï¥ÎªÌ ID" -#: g10/keyedit.c:1292 +#: g10/keyedit.c:1329 msgid "revoke a secondary key" msgstr "ºM¾P¤@§â¦¸Æ_" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1330 msgid "disable a key" msgstr "¸T¥Î¤@§âª÷Æ_" -#: g10/keyedit.c:1294 +#: g10/keyedit.c:1331 msgid "enable a key" msgstr "±Ò¥Î¤@§âª÷Æ_" -#: g10/keyedit.c:1295 +#: g10/keyedit.c:1332 msgid "show photo ID" msgstr "Åã¥Ü·Ó¤ù ID" -#: g10/keyedit.c:1348 +#: g10/keyedit.c:1386 #, fuzzy, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "Ū¨úª÷Æ_°Ï¶ô `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keyedit.c:1366 +#: g10/keyedit.c:1404 msgid "Secret key is available.\n" msgstr "¨pÆ_¥i¥Î¡C\n" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1481 msgid "Need the secret key to do this.\n" msgstr "­n¦³¨pÆ_Åׯà³o»ò°µ¡C\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1489 msgid "Please use the command \"toggle\" first.\n" msgstr "½Ð¥ý¨Ï¥Î \"toggle\" «ü¥O¡C\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1537 msgid "Key is revoked." msgstr "ª÷Æ_¤w¸g³QºM¾P¤F¡C" -#: g10/keyedit.c:1501 +#: g10/keyedit.c:1557 #, fuzzy msgid "Really sign all user IDs? (y/N) " msgstr "¯uªº­nñ¸p©Ò¦³ªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1503 +#: g10/keyedit.c:1560 msgid "Hint: Select the user IDs to sign\n" msgstr "´£¥Ü¡G¿ï¾Ü­nñ¸pªº¨Ï¥ÎªÌ ID\n" -#: g10/keyedit.c:1528 +#: g10/keyedit.c:1568 +#, fuzzy, c-format +msgid "Unknown signature type `%s'\n" +msgstr "¥¼ª¾ªºÃ±³¹¼h¯Å" + +#: g10/keyedit.c:1591 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "¦b %s ¼Ò¦¡¤¤¤£¤¹³\¨Ï¥Î³o­Ó«ü¥O¡C\n" -#: g10/keyedit.c:1550 g10/keyedit.c:1570 g10/keyedit.c:1673 +#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 msgid "You must select at least one user ID.\n" msgstr "©p¦Ü¤Ö±o¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n" -#: g10/keyedit.c:1552 +#: g10/keyedit.c:1615 msgid "You can't delete the last user ID!\n" msgstr "©p¤£¯à§R°£³Ì«á¤@­Ó¨Ï¥ÎªÌ ID ¡I\n" -#: g10/keyedit.c:1554 +#: g10/keyedit.c:1617 #, fuzzy msgid "Really remove all selected user IDs? (y/N) " msgstr "¯uªº­n²¾°£©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1555 +#: g10/keyedit.c:1618 #, fuzzy msgid "Really remove this user ID? (y/N) " msgstr "¯uªº­n²¾°£³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1605 +#: g10/keyedit.c:1668 #, fuzzy msgid "Really move the primary key? (y/N) " msgstr "¯uªº­n²¾°£³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1680 #, fuzzy msgid "You must select exactly one key.\n" msgstr "©p¦Ü¤Ö¥²¶·¿ï¾Ü¤@§âª÷Æ_¡C\n" -#: g10/keyedit.c:1637 g10/keyedit.c:1692 +#: g10/keyedit.c:1700 g10/keyedit.c:1755 msgid "You must select at least one key.\n" msgstr "©p¦Ü¤Ö¥²¶·¿ï¾Ü¤@§âª÷Æ_¡C\n" -#: g10/keyedit.c:1640 +#: g10/keyedit.c:1703 #, fuzzy msgid "Do you really want to delete the selected keys? (y/N) " msgstr "©p¯uªº·Q­n§R°£³Q¿ï¾Üªºª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1641 +#: g10/keyedit.c:1704 #, fuzzy msgid "Do you really want to delete this key? (y/N) " msgstr "©p¯uªº­n§R°£³o§âª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1739 #, fuzzy msgid "Really revoke all selected user IDs? (y/N) " msgstr "¯uªº­nºM¾P©Ò¦³³Q¿ï¾Üªº¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1677 +#: g10/keyedit.c:1740 #, fuzzy msgid "Really revoke this user ID? (y/N) " msgstr "¯uªº­nºM¾P³o­Ó¨Ï¥ÎªÌ ID ¶Ü¡H " -#: g10/keyedit.c:1696 +#: g10/keyedit.c:1759 #, fuzzy msgid "Do you really want to revoke the selected keys? (y/N) " msgstr "©p¯uªº·Q­nºM¾P³o¨Ç³Q¿ï¾Üªºª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1697 +#: g10/keyedit.c:1760 #, fuzzy msgid "Do you really want to revoke this key? (y/N) " msgstr "©p¯uªº·Q­nºM¾P³o§âª÷Æ_¶Ü¡H " -#: g10/keyedit.c:1736 +#: g10/keyedit.c:1799 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" -#: g10/keyedit.c:1768 +#: g10/keyedit.c:1831 #, fuzzy msgid "Set preference list to:\n" msgstr "³]©w°¾¦n²M³æ" -#: g10/keyedit.c:1774 +#: g10/keyedit.c:1837 #, fuzzy msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "¯uªº­n§ó·s³Q¿ï¾Ü¨Ï¥ÎªÌ ID ªº°¾¦n¶Ü¡H " -#: g10/keyedit.c:1776 +#: g10/keyedit.c:1839 #, fuzzy msgid "Really update the preferences? (y/N) " msgstr "¯uªº­n§ó·s°¾¦n¶Ü¡H " -#: g10/keyedit.c:1826 +#: g10/keyedit.c:1889 #, fuzzy msgid "Save changes? (y/N) " msgstr "­nÀx¦sÅܧó¶Ü¡H " -#: g10/keyedit.c:1829 +#: g10/keyedit.c:1892 #, fuzzy msgid "Quit without saving? (y/N) " msgstr "­n¤£Àx¦s¦ÓÂ÷¶}¶Ü¡H " -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1902 #, c-format msgid "update failed: %s\n" msgstr "§ó·s¥¢±Ñ¡G %s\n" -#: g10/keyedit.c:1846 +#: g10/keyedit.c:1909 #, c-format msgid "update secret failed: %s\n" msgstr "§ó·s¨pÆ_¥¢±Ñ¡G %s\n" -#: g10/keyedit.c:1853 +#: g10/keyedit.c:1916 msgid "Key not changed so no update needed.\n" msgstr "ª÷Æ_¨S¦³Åܧó©Ò¥H¤£»Ý­n§ó·s¡C\n" -#: g10/keyedit.c:1925 +#: g10/keyedit.c:1988 msgid "Digest: " msgstr "ºK­n¡G " -#: g10/keyedit.c:1977 +#: g10/keyedit.c:2040 msgid "Features: " msgstr "¯SÂI¡G " -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2051 msgid "Keyserver no-modify" msgstr "" -#: g10/keyedit.c:2003 g10/keylist.c:244 +#: g10/keyedit.c:2066 g10/keylist.c:244 msgid "Preferred keyserver: " msgstr "" -#: g10/keyedit.c:2246 +#: g10/keyedit.c:2309 #, fuzzy, c-format msgid "This key may be revoked by %s key %s" msgstr "³o§âª÷Æ_¥i¯à³Q %s ª÷Æ_ºM¾P¤F " -#: g10/keyedit.c:2252 +#: g10/keyedit.c:2315 #, fuzzy msgid "(sensitive)" msgstr " ¡]¾÷±Kªº¡^" -#: g10/keyedit.c:2268 g10/keyedit.c:2324 g10/keyedit.c:2436 g10/keyedit.c:2451 +#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 #: g10/keyserver.c:366 #, fuzzy, c-format msgid "created: %s" msgstr "µLªk«Ø¥ß %s: %s\n" -#: g10/keyedit.c:2271 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 #, fuzzy, c-format msgid "revoked: %s" msgstr "[¤wºM¾P]" -#: g10/keyedit.c:2273 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 #, fuzzy, c-format msgid "expired: %s" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keyedit.c:2275 g10/keyedit.c:2326 g10/keyedit.c:2438 g10/keyedit.c:2453 +#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 #: g10/keyserver.c:372 g10/mainproc.c:935 #, fuzzy, c-format msgid "expires: %s" msgstr " [¦³®Ä´Á­­¡G %s]" -#: g10/keyedit.c:2277 +#: g10/keyedit.c:2340 #, fuzzy, c-format msgid "usage: %s" msgstr " «H¥ô¡G %c/%c" -#: g10/keyedit.c:2292 +#: g10/keyedit.c:2355 #, fuzzy, c-format msgid "trust: %s" msgstr " «H¥ô¡G %c/%c" -#: g10/keyedit.c:2296 +#: g10/keyedit.c:2359 #, c-format msgid "validity: %s" msgstr "" -#: g10/keyedit.c:2303 +#: g10/keyedit.c:2366 msgid "This key has been disabled" msgstr "³o§âª÷Æ_¤w¸g³Q¸T¥Î¤F" -#: g10/keyedit.c:2331 +#: g10/keyedit.c:2394 msgid "card-no: " msgstr "" -#: g10/keyedit.c:2398 +#: g10/keyedit.c:2461 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x «¬ºAªº¨Ï¥ÎªÌ ID ¨S¦³°¾¦n¡C\n" -#: g10/keyedit.c:2406 +#: g10/keyedit.c:2469 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3096,25 +3085,25 @@ "½Ðª`·NÅã¥Ü¥X¨Óªºª÷Æ_¦³®Ä©Ê¤£»Ý­n§ó¥¿¡A\n" "°£«D©p­«·s°õ¦æµ{¦¡¡C\n" -#: g10/keyedit.c:2470 g10/keyserver.c:376 g10/mainproc.c:1575 -#: g10/trustdb.c:1163 +#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/trustdb.c:1164 #, fuzzy msgid "revoked" msgstr "[¤wºM¾P]" -#: g10/keyedit.c:2472 g10/keyserver.c:380 g10/mainproc.c:1577 -#: g10/trustdb.c:530 +#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/trustdb.c:531 #, fuzzy msgid "expired" msgstr "expire" -#: g10/keyedit.c:2537 +#: g10/keyedit.c:2600 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -#: g10/keyedit.c:2597 +#: g10/keyedit.c:2660 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3123,45 +3112,45 @@ "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[·Ó¤ù ID ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2602 g10/keyedit.c:2880 +#: g10/keyedit.c:2665 g10/keyedit.c:2943 msgid "Are you sure you still want to add it? (y/N) " msgstr "©p½T©w¤´µM·Q­n¼W¥[¶Ü¡H (y/N) " -#: g10/keyedit.c:2608 +#: g10/keyedit.c:2671 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "©p¤£¥i¥H§â·Ó¤ù ID ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2811 msgid "Delete this good signature? (y/N/q)" msgstr "§R°£³o­Ó§¹¦nªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2758 +#: g10/keyedit.c:2821 msgid "Delete this invalid signature? (y/N/q)" msgstr "§R°£³o­ÓµL®ÄªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2762 +#: g10/keyedit.c:2825 msgid "Delete this unknown signature? (y/N/q)" msgstr "§R°£³o­Ó¥¼ª¾ªºÃ±³¹¶Ü¡H (y/N/q)" -#: g10/keyedit.c:2768 +#: g10/keyedit.c:2831 msgid "Really delete this self-signature? (y/N)" msgstr "¯uªº­n§R°£³o­Ó¦Û§Úñ³¹¶Ü¡H (y/N)" -#: g10/keyedit.c:2782 +#: g10/keyedit.c:2845 #, c-format msgid "Deleted %d signature.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2783 +#: g10/keyedit.c:2846 #, c-format msgid "Deleted %d signatures.\n" msgstr "¤w¸g§R°£¤F %d ­Óñ³¹¡C\n" -#: g10/keyedit.c:2786 +#: g10/keyedit.c:2849 msgid "Nothing deleted.\n" msgstr "¨S¦³ªF¦è³Q§R°£¡C\n" -#: g10/keyedit.c:2875 +#: g10/keyedit.c:2938 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3170,159 +3159,159 @@ "ĵ§i¡G³o¬O¤@§â PGP2 «¬ºAªºª÷Æ_¡C\n" " ¼W¥[«ü©wºM¾PªÌ¥i¯à·|¾É­P¬Y¨Çª©¥»ªº PGP »é¦^³o§âª÷Æ_¡C\n" -#: g10/keyedit.c:2886 +#: g10/keyedit.c:2949 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "©p¤£¥i¥H§â«ü©wºM¾PªÌ¼W¥[¨ì PGP2 «¬ºAªºª÷Æ_¸Ì¡C\n" -#: g10/keyedit.c:2906 +#: g10/keyedit.c:2969 msgid "Enter the user ID of the designated revoker: " msgstr "¿é¤J«ü©wºM¾PªÌªº¨Ï¥ÎªÌ ID ¡G " -#: g10/keyedit.c:2929 +#: g10/keyedit.c:2992 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "µLªk±N PGP 2.x «¬ºAªºª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ\n" -#: g10/keyedit.c:2944 +#: g10/keyedit.c:3007 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "©p¤£¯à«ü¬£¬Y§âª÷Æ_¬°¥¦¦Û¤vªº«ü©wºM¾PªÌ\n" -#: g10/keyedit.c:2966 +#: g10/keyedit.c:3029 #, fuzzy msgid "this key has already been designated as a revoker\n" msgstr "ĵ§i¡G³o§âª÷Æ_¤w¸g³Q¥¦ªº«ù¦³¤HºM¾P¤F¡I\n" -#: g10/keyedit.c:2985 +#: g10/keyedit.c:3048 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "ĵ§i¡G¤@¥¹§â¬Y§âª÷Æ_«ü¬£¬°«ü©wºM¾PªÌ«á¡A´NµLªk¤Ï®¬¤F¡I\n" -#: g10/keyedit.c:2991 +#: g10/keyedit.c:3054 #, fuzzy msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "©p½T©w­n«ü¬£³o§âª÷Æ_¬°«ü©wºM¾PªÌ¶Ü¡H (y/N): " -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3115 msgid "Please remove selections from the secret keys.\n" msgstr "½Ð±q¨pÆ_¤¤²¾°£¿ï¾Ü¡C\n" -#: g10/keyedit.c:3058 +#: g10/keyedit.c:3121 msgid "Please select at most one secondary key.\n" msgstr "½Ð¦Ü¦h¿ï¾Ü¤@§â¦¸Æ_¡C\n" -#: g10/keyedit.c:3062 +#: g10/keyedit.c:3125 msgid "Changing expiration time for a secondary key.\n" msgstr "¥¿¦bÅܧó¬Y§â¦¸Æ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:3065 +#: g10/keyedit.c:3128 msgid "Changing expiration time for the primary key.\n" msgstr "¥¿¦bÅܧó¥DÆ_ªº¨Ï¥Î´Á­­¡C\n" -#: g10/keyedit.c:3111 +#: g10/keyedit.c:3174 msgid "You can't change the expiration date of a v3 key\n" msgstr "©p¤£¯àÅܧó v3 ª÷Æ_ªº¨Ï¥Î´Á­­\n" -#: g10/keyedit.c:3127 +#: g10/keyedit.c:3190 msgid "No corresponding signature in secret ring\n" msgstr "¦b¨pÆ_°é¸Ì¨S¦³¤@­PªºÃ±³¹\n" -#: g10/keyedit.c:3207 +#: g10/keyedit.c:3270 msgid "Please select exactly one user ID.\n" msgstr "½Ðºë½T¦a¿ï¾Ü¤@­Ó¨Ï¥ÎªÌ ID ¡C\n" -#: g10/keyedit.c:3246 g10/keyedit.c:3356 g10/keyedit.c:3475 +#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 #, fuzzy, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "¥¿¦b¨Ï¥ÎªÌ ID \"%s\" ¸õ¹L v3 ¦Û§Úñ³¹\n" -#: g10/keyedit.c:3417 +#: g10/keyedit.c:3480 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3559 #, fuzzy msgid "Are you sure you want to replace it? (y/N) " msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3497 +#: g10/keyedit.c:3560 #, fuzzy msgid "Are you sure you want to delete it? (y/N) " msgstr "©p½T©w­n¥Î¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3622 #, c-format msgid "No user ID with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¨Ï¥ÎªÌ ID\n" -#: g10/keyedit.c:3605 +#: g10/keyedit.c:3668 #, c-format msgid "No secondary key with index %d\n" msgstr "¯Á¤Þ %d ¨S¦³¦¸Æ_\n" -#: g10/keyedit.c:3722 +#: g10/keyedit.c:3785 #, fuzzy, c-format msgid "user ID: \"%s\"\n" msgstr "¨Ï¥ÎªÌ ID¡G \"" -#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832 +#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 #, fuzzy, c-format msgid "signed by your key %s on %s%s%s\n" msgstr " ¥Ñ %08lX ñ¸p©ó %s%s%s\n" -#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834 +#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 msgid " (non-exportable)" msgstr " (¤£¥i¶×¥X)" -#: g10/keyedit.c:3731 +#: g10/keyedit.c:3794 #, c-format msgid "This signature expired on %s.\n" msgstr "³o¥÷ñ¸p¤w¸g¦b %s ¹L´Á¤F¡C\n" -#: g10/keyedit.c:3735 +#: g10/keyedit.c:3798 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "©p½T©w©p¤´µM·Q­nºM¾P¥¦¶Ü¡H (y/N) " -#: g10/keyedit.c:3739 +#: g10/keyedit.c:3802 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "­n¬°³o¥÷ñ³¹«Ø¥ß¤@¥÷ºM¾P¾ÌÃҶܡH (y/N) " -#: g10/keyedit.c:3766 +#: g10/keyedit.c:3829 #, fuzzy, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "©p¤w¸gñ¸p¤F³o¨Ç¨Ï¥ÎªÌ ID¡G \n" -#: g10/keyedit.c:3792 +#: g10/keyedit.c:3855 #, fuzzy msgid " (non-revocable)" msgstr " (¤£¥i¶×¥X)" -#: g10/keyedit.c:3799 +#: g10/keyedit.c:3862 #, fuzzy, c-format msgid "revoked by your key %s on %s\n" msgstr " ¥Ñ %08lX ºM¾P©ó %s\n" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3884 msgid "You are about to revoke these signatures:\n" msgstr "©p¥¿¦bºM¾P³o¨Çñ³¹¡G\n" -#: g10/keyedit.c:3841 +#: g10/keyedit.c:3904 msgid "Really create the revocation certificates? (y/N) " msgstr "¯uªº­n«Ø¥ßºM¾P¾ÌÃҶܡH (y/N) " -#: g10/keyedit.c:3871 +#: g10/keyedit.c:3934 msgid "no secret key\n" msgstr "¨S¦³¨pÆ_\n" -#: g10/keyedit.c:3941 +#: g10/keyedit.c:4004 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "¨Ï¥ÎªÌ ID \"%s\" ¤w¸g³QºM¾P¤F¡C\n" -#: g10/keyedit.c:3958 +#: g10/keyedit.c:4021 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "ĵ§i¡G¦³¤@¥÷¨Ï¥ÎªÌ ID ñ³¹ªº¤é´Á¼Ð°O¬° %d ¬í«áªº¥¼¨Ó\n" -#: g10/keyedit.c:4127 +#: g10/keyedit.c:4190 #, fuzzy, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "¥¿¦bÅã¥Ü %s ¤Ø¤o¬° %ld ªºª÷Æ_ 0x%08lX (uid %d) ªº·Ó¤ù ID\n" @@ -3649,7 +3638,7 @@ "©p»Ý­n¤@­Ó±K½X¦ê¨Ó«OÅ@©pªº¨pÆ_¡C\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1102 +#: g10/keygen.c:1819 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4199,7 +4188,7 @@ msgid "textmode" msgstr "¤å¦r¼Ò¦¡" -#: g10/mainproc.c:1672 g10/trustdb.c:529 +#: g10/mainproc.c:1672 g10/trustdb.c:530 msgid "unknown" msgstr "¥¼ª¾" @@ -4405,16 +4394,16 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ªº³q°T°ÝÃD\n" -#: g10/passphrase.c:597 g10/passphrase.c:933 g10/passphrase.c:1045 +#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 msgid "problem with the agent - disabling agent use\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD ¢w ¥¿¦b°±¥Î¥N²zµ{¦¡\n" -#: g10/passphrase.c:701 g10/passphrase.c:1206 +#: g10/passphrase.c:700 g10/passphrase.c:1205 #, fuzzy, c-format msgid " (main key ID %s)" msgstr " (¥D­nª÷Æ_ ID %08lX)" -#: g10/passphrase.c:715 +#: g10/passphrase.c:714 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4425,41 +4414,41 @@ "\"%.*s\"\n" "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s%s\n" -#: g10/passphrase.c:740 +#: g10/passphrase.c:739 msgid "Repeat passphrase\n" msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê\n" -#: g10/passphrase.c:742 +#: g10/passphrase.c:741 msgid "Enter passphrase\n" msgstr "½Ð¿é¤J±K½X¦ê\n" -#: g10/passphrase.c:780 +#: g10/passphrase.c:779 msgid "passphrase too long\n" msgstr "±K½X¦ê¤Óªø\n" -#: g10/passphrase.c:793 +#: g10/passphrase.c:792 msgid "invalid response from agent\n" msgstr "¥N²zµ{¦¡¶Ç¦^µL®Äªº¦^À³\n" -#: g10/passphrase.c:808 g10/passphrase.c:927 +#: g10/passphrase.c:807 g10/passphrase.c:926 msgid "cancelled by user\n" msgstr "¥Ñ¨Ï¥ÎªÌ¨ú®ø¤F\n" -#: g10/passphrase.c:813 g10/passphrase.c:1016 +#: g10/passphrase.c:812 g10/passphrase.c:1015 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD¡G¥N²zµ{¦¡¶Ç¦^ 0x%lx\n" -#: g10/passphrase.c:1097 g10/passphrase.c:1259 +#: g10/passphrase.c:1096 g10/passphrase.c:1258 #, fuzzy msgid "can't query passphrase in batch mode\n" msgstr "¦b§å¦¸¼Ò¦¡¤¤µLªk¸ß°Ý±K½X\n" -#: g10/passphrase.c:1104 g10/passphrase.c:1264 +#: g10/passphrase.c:1103 g10/passphrase.c:1263 msgid "Enter passphrase: " msgstr "½Ð¿é¤J±K½X¦ê¡G " -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1186 #, fuzzy, c-format msgid "" "You need a passphrase to unlock the secret key for\n" @@ -4469,17 +4458,17 @@ "©p»Ý­n¤U¦C¨Ï¥ÎªÌªº±K½X¦ê¡AÅׯà¸Ñ¶}¨pÆ_¡G\n" "\"" -#: g10/passphrase.c:1193 +#: g10/passphrase.c:1192 #, fuzzy, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s" -#: g10/passphrase.c:1202 +#: g10/passphrase.c:1201 #, c-format msgid " (subkey on main key ID %s)" msgstr "" -#: g10/passphrase.c:1268 +#: g10/passphrase.c:1267 msgid "Repeat passphrase: " msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê¡G " @@ -5388,120 +5377,120 @@ msgid "using %s trust model\n" msgstr "" -#: g10/trustdb.c:503 +#: g10/trustdb.c:504 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "" -#: g10/trustdb.c:505 +#: g10/trustdb.c:506 #, fuzzy msgid "[ revoked]" msgstr "[¤wºM¾P]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:508 g10/trustdb.c:513 #, fuzzy msgid "[ expired]" msgstr "[¤w¹L´Á]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:512 #, fuzzy msgid "[ unknown]" msgstr "¥¼ª¾" -#: g10/trustdb.c:513 +#: g10/trustdb.c:514 msgid "[ undef ]" msgstr "" -#: g10/trustdb.c:514 +#: g10/trustdb.c:515 msgid "[marginal]" msgstr "" -#: g10/trustdb.c:515 +#: g10/trustdb.c:516 msgid "[ full ]" msgstr "" -#: g10/trustdb.c:516 +#: g10/trustdb.c:517 msgid "[ultimate]" msgstr "" -#: g10/trustdb.c:531 +#: g10/trustdb.c:532 msgid "undefined" msgstr "" -#: g10/trustdb.c:532 +#: g10/trustdb.c:533 #, fuzzy msgid "never" msgstr "¥Ã»·¤£¹L´Á" -#: g10/trustdb.c:533 +#: g10/trustdb.c:534 msgid "marginal" msgstr "" -#: g10/trustdb.c:534 +#: g10/trustdb.c:535 msgid "full" msgstr "" -#: g10/trustdb.c:535 +#: g10/trustdb.c:536 msgid "ultimate" msgstr "" -#: g10/trustdb.c:575 +#: g10/trustdb.c:576 msgid "no need for a trustdb check\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:581 g10/trustdb.c:2142 +#: g10/trustdb.c:582 g10/trustdb.c:2143 #, c-format msgid "next trustdb check due at %s\n" msgstr "¤U¦¸«H¥ô¸ê®Æ®wÀˬd±N©ó %s ¶i¦æ\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:591 #, fuzzy, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:606 #, fuzzy, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "¤£»Ý­nÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:823 g10/trustdb.c:1261 +#: g10/trustdb.c:824 g10/trustdb.c:1262 #, fuzzy, c-format msgid "public key %s not found: %s\n" msgstr "¤½Æ_ %08lX ¨S¦³³Q§ä¨ì¡G %s\n" -#: g10/trustdb.c:1018 +#: g10/trustdb.c:1019 msgid "please do a --check-trustdb\n" msgstr "½Ð°µ¤@¦¸ --check-trustdb\n" -#: g10/trustdb.c:1022 +#: g10/trustdb.c:1023 msgid "checking the trustdb\n" msgstr "¥¿¦bÀˬd«H¥ô¸ê®Æ®w\n" -#: g10/trustdb.c:1886 +#: g10/trustdb.c:1887 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "¤w¸g³B²z¤F %d §âª÷Æ_¡]¦@­p¤w¸Ñ¨M¤F %d ¥÷¦³®Ä©Ê¡^\n" -#: g10/trustdb.c:1950 +#: g10/trustdb.c:1951 msgid "no ultimately trusted keys found\n" msgstr "¨S¦³§ä¨ì¥ô¦ó¹ý©³«H¥ôªºª÷Æ_\n" -#: g10/trustdb.c:1964 +#: g10/trustdb.c:1965 #, fuzzy, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "¹ý©³«H¥ôª÷Æ_ %08lX ªº¤½Æ_¨S¦³³Q§ä¨ì\n" -#: g10/trustdb.c:1987 +#: g10/trustdb.c:1988 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "" -#: g10/trustdb.c:2073 +#: g10/trustdb.c:2074 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" -#: g10/trustdb.c:2148 +#: g10/trustdb.c:2149 #, fuzzy, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "«H¥ô°O¿ý %lu ¡AÃþ§O %d: ¼g¤J¥¢±Ñ¡G %s\n" @@ -5807,14 +5796,30 @@ msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "½Ð°Ñ¦Ò http://www.gnupg.org/faq.html ¤W¶i¤@¨Bªº¸ê°T\n" -#: util/secmem.c:340 +#: util/secmem.c:343 msgid "operation is not possible without initialized secure memory\n" msgstr "©|¥¼±Ò¥Î¦w¥þªº°O¾ÐÅé«e¡A¤£¥i¯à¶i¦æ¾Þ§@\n" -#: util/secmem.c:341 +#: util/secmem.c:344 msgid "(you may have used the wrong program for this task)\n" msgstr "(¤]³\©p¿ï¿ùµ{¦¡¨Ó°µ³o¥ó¨Æ¤F)\n" +#~ msgid "--nrsign-key user-id" +#~ msgstr "--nrsign-key ¨Ï¥ÎªÌID" + +#~ msgid "--nrlsign-key user-id" +#~ msgstr "--nrlsign-key ¨Ï¥ÎªÌID" + +#, fuzzy +#~ msgid "make a trust signature" +#~ msgstr "«Ø¥ß¤@¥÷¤ÀÂ÷¦¡Ã±³¹" + +#~ msgid "sign the key non-revocably" +#~ msgstr "¥H¤£¥iºM¾P¼Ò¦¡Ã±¸pª÷Æ_" + +#~ msgid "sign the key locally and non-revocably" +#~ msgstr "¥H¤£¥iºM¾P¼Ò¦¡¦b¥»¦añ¸pª÷Æ_" + #~ msgid "q" #~ msgstr "q" From cvs at cvs.gnupg.org Fri Dec 17 11:51:08 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Jan 28 12:16:54 2005 Subject: dirmngr/po (de.po dirmngr.pot) Message-ID: Date: Friday, December 17, 2004 @ 11:55:41 Author: wk Path: /cvs/dirmngr/dirmngr/po Modified: de.po dirmngr.pot Translation update -------------+ de.po | 522 +++++++++++++++++++++++++++++++--------------------------- dirmngr.pot | 519 +++++++++++++++++++++++++++++++-------------------------- 2 files changed, 562 insertions(+), 479 deletions(-) Index: dirmngr/po/de.po diff -u dirmngr/po/de.po:1.9 dirmngr/po/de.po:1.10 --- dirmngr/po/de.po:1.9 Thu Nov 25 12:37:38 2004 +++ dirmngr/po/de.po Fri Dec 17 11:55:40 2004 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: dirmngr 0.9.0\n" "Report-Msgid-Bugs-To: gpa-dev@gnupg.org\n" -"POT-Creation-Date: 2004-11-24 15:35+0100\n" -"PO-Revision-Date: 2004-11-24 18:15+0100\n" +"POT-Creation-Date: 2004-12-17 11:40+0100\n" +"PO-Revision-Date: 2004-12-17 11:50+0100\n" "Last-Translator: Werner Koch \n" "Language-Team: de\n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgid "can't access directory `%s': %s\n" msgstr "Fehler beim Zugriff auf das Verzeichnis `%s': %s\n" -#: src/certcache.c:323 src/crlcache.c:2142 src/ldap.c:605 +#: src/certcache.c:323 src/crlcache.c:2173 src/ldap.c:615 #, c-format msgid "can't open `%s': %s\n" msgstr "`%s' kann nicht geöffnet werden: %s\n" @@ -65,54 +65,64 @@ msgid "certificate `%s' already cached\n" msgstr "Zertifikat `%s' ist bereits im Cache\n" -#: src/certcache.c:356 +#: src/certcache.c:357 #, c-format msgid "certificate `%s' loaded\n" msgstr "Zertifikat `%s' wurde geladen\n" -#: src/certcache.c:358 +#: src/certcache.c:361 +#, c-format +msgid "SHA1 fingerprint = %s\n" +msgstr "SHA1 Fingerabdruck=%s\n" + +#: src/certcache.c:366 #, c-format msgid "error loading certificate `%s': %s\n" msgstr "Fehler beim Laden des Zertifikats `%s': %s\n" -#: src/certcache.c:432 +#: src/certcache.c:440 #, c-format msgid "permanently loaded certificates: %u\n" msgstr " dauerhaft geladene Zertifikate: %u\n" -#: src/certcache.c:434 +#: src/certcache.c:442 #, c-format msgid " runtime cached certificates: %u\n" msgstr "zur Laufzeit geladene Zertifikate: %u\n" -#: src/certcache.c:449 src/dirmngr-client.c:297 +#: src/certcache.c:457 src/dirmngr-client.c:317 msgid "certificate already cached\n" msgstr "Zertifikat ist bereits im Cache\n" -#: src/certcache.c:451 +#: src/certcache.c:459 msgid "certificate cached\n" msgstr "Zertifikat wurde gecachet\n" -#: src/certcache.c:453 src/dirmngr-client.c:301 +#: src/certcache.c:461 src/dirmngr-client.c:321 #, c-format msgid "error caching certificate: %s\n" msgstr "Fehler beim Cachen des Zertifikats: %s\n" -#: src/certcache.c:563 src/crlcache.c:1396 +#: src/certcache.c:526 +#, c-format +msgid "invalid SHA1 fingerprint string `%s'\n" +msgstr "ungültiger SHA1 Fingerabdruck `%s'\n" + +#: src/certcache.c:612 src/crlcache.c:1396 #, c-format msgid "error fetching certificate for issuer: %s\n" msgstr "Fehler beim Holen des Zertifikats für den Issuer: %s\n" -#: src/certcache.c:574 src/crlcache.c:1412 +#: src/certcache.c:623 src/crlcache.c:1412 #, c-format msgid "invalid issuer certificate: %s\n" msgstr "Ungültiges Issuer-Zertifikat: %s\n" -#: src/certcache.c:655 src/validate.c:288 +#: src/certcache.c:704 src/validate.c:312 msgid "no issuer found in certificate\n" msgstr "Im Zertifikat ist kein Herausgeber enthalten\n" -#: src/certcache.c:665 +#: src/certcache.c:714 #, c-format msgid "error getting authorityKeyIdentifier: %s\n" msgstr "Fehler beim Holen des \"authorityKeyIdentifier\": %s\n" @@ -205,7 +215,7 @@ msgid "unsupported record type in `%s' line %u skipped\n" msgstr "Nicht unterstützter Datensatztyp in `%s', Zeile %u übergangen\n" -#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1196 +#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1203 #, c-format msgid "error reading `%s': %s\n" msgstr "Fehler beim Lesen von `%s': %s\n" @@ -377,7 +387,7 @@ msgid "error getting data from cache file: %s\n" msgstr "Fehler beim Holen der Daten aus der Cache-Datei: %s\n" -#: src/crlcache.c:1435 src/validate.c:636 +#: src/crlcache.c:1435 src/validate.c:669 #, c-format msgid "unknown hash algorithm `%s'\n" msgstr "Ungültige Hashmethode `%s'\n" @@ -387,133 +397,138 @@ msgid "gcry_md_open for algorithm %d failed: %s\n" msgstr "gcry_md_open für Methode %d fehlgeschlagen: %s\n" -#: src/crlcache.c:1476 src/crlcache.c:1493 +#: src/crlcache.c:1478 src/crlcache.c:1497 msgid "got an invalid S-expression from libksba\n" msgstr "Ungültige S-Expression von Libksba erhalten\n" -#: src/crlcache.c:1483 src/crlcache.c:1500 src/misc.c:432 +#: src/crlcache.c:1485 src/crlcache.c:1504 src/misc.c:432 #, c-format msgid "converting S-expression failed: %s\n" msgstr "Konvertierung der S-Expression fehlgeschlagen: %s\n" -#: src/crlcache.c:1515 src/ocsp.c:343 +#: src/crlcache.c:1519 src/ocsp.c:343 #, c-format msgid "creating S-expression failed: %s\n" msgstr "Erzeugen der S-Expression fehlgeschlagen: %s\n" -#: src/crlcache.c:1567 +#: src/crlcache.c:1573 #, c-format msgid "ksba_crl_parse failed: %s\n" msgstr "ksba_crl_parse fehlgeschlagen: %s\n" -#: src/crlcache.c:1583 -#, c-format -msgid "no issuer found in CRL: %s\n" -msgstr "In der CRL wurde kein Issuer gefunden: %s\n" - -#: src/crlcache.c:1601 +#: src/crlcache.c:1587 #, c-format msgid "error getting update times of CRL: %s\n" msgstr "Die \"Update Times\" konnte nicht aus der CRL bestimmt werden: %s\n" -#: src/crlcache.c:1608 +#: src/crlcache.c:1594 #, c-format msgid "update times of this CRL: this=%s next=%s\n" msgstr "Die \"Update Times\" dieser CRL sind: this=%s next=%s\n" -#: src/crlcache.c:1627 +#: src/crlcache.c:1611 #, c-format msgid "error getting CRL item: %s\n" msgstr "Fehler beim Holen eines CRL Items: %s\n" -#: src/crlcache.c:1642 +#: src/crlcache.c:1626 #, c-format msgid "error inserting item into temporary cache file: %s\n" msgstr "Fehler beim Einfügen eines Items in die temporäre Cache-Datei: %s\n" -#: src/crlcache.c:1660 +#: src/crlcache.c:1648 +#, c-format +msgid "no issuer found in CRL: %s\n" +msgstr "In der CRL wurde kein Issuer gefunden: %s\n" + +#: src/crlcache.c:1661 +msgid "locating CRL issuer certificate by authorityKeyIdentifier\n" +msgstr "" +"CRL Herausgeberzertifikat wird über \"authorityKeyIdentifier\" geholt\n" + +#: src/crlcache.c:1690 #, c-format msgid "CRL signature verification failed: %s\n" msgstr "Signaturprüfung der CRL ist fehlgeschlagen: %s\n" -#: src/crlcache.c:1668 +#: src/crlcache.c:1698 #, c-format msgid "error checking validity of CRL signing certificate: %s\n" msgstr "Fehler beim Püfen des CRL Signierzertifikats: %s\n" -#: src/crlcache.c:1793 +#: src/crlcache.c:1824 #, c-format msgid "ksba_crl_new failed: %s\n" msgstr "ksba_crl_new fehlgeschlagen: %s\n" -#: src/crlcache.c:1800 +#: src/crlcache.c:1831 #, c-format msgid "ksba_crl_set_reader failed: %s\n" msgstr "ksba_crl_set_reader fehlgeschlagen: %s\n" -#: src/crlcache.c:1823 +#: src/crlcache.c:1854 #, c-format msgid "removed stale temporary cache file `%s'\n" msgstr "Die alte temporäre Cache-Datei `%s' wurde entfernt\n" -#: src/crlcache.c:1826 +#: src/crlcache.c:1857 #, c-format msgid "problem removing stale temporary cache file `%s': %s\n" msgstr "Problem beim Löschen der alten temporären Cache-Datei `%s': %s\n" -#: src/crlcache.c:1836 +#: src/crlcache.c:1867 #, c-format msgid "error creating temporary cache file `%s': %s\n" msgstr "Fehler beim Erzeugen der temporären Cache-Datei `%s': %s\n" -#: src/crlcache.c:1846 +#: src/crlcache.c:1877 #, c-format msgid "crl_parse_insert failed: %s\n" msgstr "crl_parse_insert fehlgeschlagen: %s\n" -#: src/crlcache.c:1855 +#: src/crlcache.c:1886 #, c-format msgid "error finishing temporary cache file `%s': %s\n" msgstr "Fehler beim Fertigstellen der temporären Cache-Datei `%s': %s\n" -#: src/crlcache.c:1862 +#: src/crlcache.c:1893 #, c-format msgid "error closing temporary cache file `%s': %s\n" msgstr "Fehler beim Schliessen der temporären Cache-Datei `%s': %s\n" -#: src/crlcache.c:1887 +#: src/crlcache.c:1918 #, c-format msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n" msgstr "" "WARNUNG: Neue CRL ist immer noch zu alt; sie verfiel am %s - wird trotzdem " "geladen\n" -#: src/crlcache.c:1891 +#: src/crlcache.c:1922 #, c-format msgid "new CRL still too old; it expired on %s\n" msgstr "Neue CRL ist immer noch zu alt; sie verviel am %s\n" -#: src/crlcache.c:1907 +#: src/crlcache.c:1938 #, c-format msgid "unknown crtical CRL extension %s\n" msgstr "Unbekannte kritische CRL Erweiterung %s\n" -#: src/crlcache.c:1917 +#: src/crlcache.c:1948 #, c-format msgid "error reading CRL extensions: %s\n" msgstr "Fehler beim Lesen einer CRL Erweiterung: %s\n" -#: src/crlcache.c:1951 +#: src/crlcache.c:1982 #, c-format msgid "creating cache file `%s'\n" msgstr "Cache-Datei `%s' wird erzeugt\n" -#: src/crlcache.c:1955 +#: src/crlcache.c:1986 #, c-format msgid "problem renaming `%s' to `%s': %s\n" msgstr "Problem beim Umbenennen von `%s' nach `%s': %s\n" -#: src/crlcache.c:1969 +#: src/crlcache.c:2000 msgid "" "updating the DIR file failed - cache entry will get lost with the next " "program start\n" @@ -521,12 +536,12 @@ "Update der Cache-Verzeichnissdatei fehlgeschlagen - Cache Eintrag wird mit " "dem nächste Programmstart verloren gehen\n" -#: src/crlcache.c:2005 +#: src/crlcache.c:2036 #, c-format msgid "Begin CRL dump (retrieved via %s)\n" msgstr "Anfang CRL Ausgabe (geholt via %s)\n" -#: src/crlcache.c:2025 +#: src/crlcache.c:2056 #, c-format msgid "" " ERROR: The CRL will not be used because it was still too old after an " @@ -534,7 +549,7 @@ msgstr "" " FEHLER: Die CRL wird nicht benutzt, da sie trotz eines Updates zu alt war!\n" -#: src/crlcache.c:2027 +#: src/crlcache.c:2058 #, c-format msgid "" " ERROR: The CRL will not be used due to an unknown critical extension!\n" @@ -542,58 +557,63 @@ " FEHLER: Die CRL wird nicht benutzt, da sie eine unbekannte kritische CRL " "Erweiterung trägt!\n" -#: src/crlcache.c:2029 +#: src/crlcache.c:2060 #, c-format msgid " ERROR: The CRL will not be used\n" msgstr " FEHLER: Die CRL wird nicht benutzt\n" -#: src/crlcache.c:2036 +#: src/crlcache.c:2067 #, c-format msgid " ERROR: This cached CRL may has been tampered with!\n" msgstr "" " FEHLER: Diese zwischengespeicherte CRL ist möglicherweise abgeändert " "worden!\n" -#: src/crlcache.c:2053 +#: src/crlcache.c:2084 msgid " WARNING: invalid cache record length\n" msgstr " WARNUNG: Ungültige Länge eines Cache-Datensatzes\n" -#: src/crlcache.c:2060 +#: src/crlcache.c:2091 #, c-format msgid "problem reading cache record: %s\n" msgstr "Problem beim Lesen eines Cache-Datensatzes: %s\n" -#: src/crlcache.c:2071 +#: src/crlcache.c:2102 #, c-format msgid "problem reading cache key: %s\n" msgstr "Problem beim Lesen eines Cache Schlüssels: %s\n" -#: src/crlcache.c:2102 +#: src/crlcache.c:2133 #, c-format msgid "error reading cache entry from db: %s\n" msgstr "Fehler beim Lesen eine Cache Eintrags aus der DB: %s\n" -#: src/crlcache.c:2105 +#: src/crlcache.c:2136 #, c-format msgid "End CRL dump\n" msgstr "Ende CRL Ausgabe\n" -#: src/crlcache.c:2217 +#: src/crlcache.c:2182 src/crlfetch.c:97 src/ldap.c:683 +#, c-format +msgid "error initializing reader object: %s\n" +msgstr "Fehler beim Initialisieren des \"reader\" Objekts: %s\n" + +#: src/crlcache.c:2260 #, c-format msgid "crl_fetch via DP failed: %s\n" msgstr "crl_fetch über den DP fehlgeschlagen: %s\n" -#: src/crlcache.c:2224 +#: src/crlcache.c:2269 #, c-format msgid "crl_cache_insert via DP failed: %s\n" msgstr "crl_cache_insert über den DP fehlgeschlagen: %s\n" -#: src/crlcache.c:2255 +#: src/crlcache.c:2302 #, c-format msgid "crl_fetch via issuer failed: %s\n" msgstr "crl_fetch über den Issuer fehlgeschlagen: %s\n" -#: src/crlcache.c:2263 +#: src/crlcache.c:2312 #, c-format msgid "crl_cache_insert via issuer failed: %s\n" msgstr "crl_cache_insert über den Issuer fehlgeschlagen: %s\n" @@ -617,11 +637,6 @@ msgid "error retrieving `%s': http status %u\n" msgstr "Fehler beim Holen von `%s': HTTP Status %u\n" -#: src/crlfetch.c:97 src/ldap.c:673 -#, c-format -msgid "error initializing reader object: %s\n" -msgstr "Fehler beim Initialisieren des \"reader\" Objekts: %s\n" - #: src/crlfetch.c:165 #, c-format msgid "Certificate search not possible due to disabled %s\n" @@ -673,11 +688,11 @@ "Optionen:\n" " " -#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:73 +#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:76 msgid "verbose" msgstr "ausführlich" -#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:74 +#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:77 msgid "be somewhat more quiet" msgstr "etwas weniger Ausgaben erzeugen" @@ -737,55 +752,55 @@ msgid "ignore certificate contained OCSP service URLs" msgstr "Ãœbergehe im Zertifikat enthaltene OCSP Service URLs" -#: src/dirmngr.c:140 +#: src/dirmngr.c:144 msgid "|URL|redirect all HTTP requests to URL" msgstr "|URL|Leite alle HTTP Anfragen über URL" -#: src/dirmngr.c:142 +#: src/dirmngr.c:146 msgid "|HOST|use HOST for LDAP queries" msgstr "|HOST|Benutze HOST für LDAP Anfragen" -#: src/dirmngr.c:144 +#: src/dirmngr.c:148 msgid "do not use fallback hosts with --ldap-proxy" msgstr "Keine Benuztung der Rückgriffshosts mit --ldap-proxy" -#: src/dirmngr.c:147 +#: src/dirmngr.c:151 msgid "|FILE|read LDAP server list from FILE" msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI" -#: src/dirmngr.c:149 +#: src/dirmngr.c:153 msgid "add new servers discovered in CRL distribution points to serverlist" msgstr "Füge neue Server aus den CRL Distribution Points der Serverliste hinzu" -#: src/dirmngr.c:151 src/dirmngr_ldap.c:75 +#: src/dirmngr.c:155 src/dirmngr_ldap.c:78 msgid "|N|set LDAP timeout to N seconds" msgstr "|N|Setze das LDAP Timeout auf N Sekunden" -#: src/dirmngr.c:153 +#: src/dirmngr.c:157 msgid "|URL|use OCSP responder at URL" msgstr "|URL|Benutze den OCSP Reponder mit dieser URL" -#: src/dirmngr.c:154 +#: src/dirmngr.c:158 msgid "|FPR|OCSP response signed by FPR" msgstr "|FPR|OCSP Antwort ist durch FPR signiert" -#: src/dirmngr.c:157 +#: src/dirmngr.c:161 msgid "|N|do not return more than N items in one query" msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben" -#: src/dirmngr.c:159 +#: src/dirmngr.c:163 msgid "|FILE|listen on socket FILE" msgstr "|DATEI|Anfragen auf Socket DATEI annehmen" -#: src/dirmngr.c:214 src/dirmngr-client.c:126 src/dirmngr_ldap.c:134 +#: src/dirmngr.c:218 src/dirmngr-client.c:128 src/dirmngr_ldap.c:140 msgid "Please report bugs to .\n" msgstr "Berichte über Bugs (Programmfehler) bitte an .\n" -#: src/dirmngr.c:218 +#: src/dirmngr.c:222 msgid "Usage: dirmngr [options] (-h for help)" msgstr "Gebrauch: dirmnr [Optionen] [Kommando [Argumente]]" -#: src/dirmngr.c:221 +#: src/dirmngr.c:225 msgid "" "Syntax: dirmngr [options] [command [args]]\n" "LDAP and OCSP access for GnuPG\n" @@ -793,179 +808,179 @@ "Syntax: dirmngr [Optionen] [Kommando [Argumente]]\n" "LDAP und OCSP Zugriff für GnuPG\n" -#: src/dirmngr.c:292 +#: src/dirmngr.c:296 #, c-format msgid "invalid debug-level `%s' given\n" msgstr "Ungültige Debugebene '%s' angegeben\n" -#: src/dirmngr.c:293 +#: src/dirmngr.c:297 #, c-format msgid "valid debug levels are: %s\n" msgstr "Gültige Debugebenen sind: %s\n" -#: src/dirmngr.c:331 +#: src/dirmngr.c:335 msgid "usage: dirmngr [options] " msgstr "Gebrauch: dirmngr [Optionen] " -#: src/dirmngr.c:356 +#: src/dirmngr.c:360 #, c-format msgid "error spawning ldap wrapper ripper thread: %s\n" msgstr "Fehler beim Starten des LDAP Wrapper Thread: %s\n" -#: src/dirmngr.c:476 src/dirmngr.c:486 +#: src/dirmngr.c:490 src/dirmngr.c:500 #, c-format msgid "%s is too old (need %s, have %s)\n" msgstr "%s ist zu alt (benötige %s, habe %s)\n" -#: src/dirmngr.c:587 +#: src/dirmngr.c:597 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Voreingestellte Optionendatei `%s' nicht vorhanden\n" -#: src/dirmngr.c:592 src/dirmngr.c:1253 +#: src/dirmngr.c:602 src/dirmngr.c:1260 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei `%s': %s\n" -#: src/dirmngr.c:600 +#: src/dirmngr.c:610 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden von `%s' gelesen\n" -#: src/dirmngr.c:706 +#: src/dirmngr.c:710 #, c-format msgid "WARNING: running with faked system time %s\n" msgstr "WARNUNG: Prozess läuft mit getürkter Systemzeit %s\n" -#: src/dirmngr.c:782 +#: src/dirmngr.c:786 msgid "colons are not allowed in the socket name\n" msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n" -#: src/dirmngr.c:787 +#: src/dirmngr.c:791 msgid "name of socket too long\n" msgstr "Name des Sockets ist zu lang\n" -#: src/dirmngr.c:794 +#: src/dirmngr.c:798 #, c-format msgid "can't create socket: %s\n" msgstr "Fehler beim Erzeugen des Sockets: %s\n" -#: src/dirmngr.c:813 +#: src/dirmngr.c:817 #, c-format msgid "error binding socket to `%s': %s\n" msgstr "Fehler beim Binden des Sockets an `%s': %s\n" -#: src/dirmngr.c:822 +#: src/dirmngr.c:826 #, c-format msgid "listen() failed: %s\n" msgstr "listen() fehlgeschlagen: %s\n" -#: src/dirmngr.c:828 +#: src/dirmngr.c:832 #, c-format msgid "listening on socket `%s'\n" msgstr "Anfragen werden auf Socket `%s' engegengenommen\n" -#: src/dirmngr.c:834 +#: src/dirmngr.c:838 #, c-format msgid "fork failed: %s\n" msgstr "fork() fehlgeschlagen: %s\n" -#: src/dirmngr.c:852 +#: src/dirmngr.c:856 msgid "out of core\n" msgstr "Nicht genügend Hauptspeicher vorhanden\n" -#: src/dirmngr.c:891 +#: src/dirmngr.c:895 #, c-format msgid "setsid() failed: %s\n" msgstr "setsid() fehlgeschlagen: %s\n" -#: src/dirmngr.c:901 +#: src/dirmngr.c:905 #, c-format msgid "chdir to / failed: %s\n" msgstr "chdir nach / fehlgeschlagen: %s\n" -#: src/dirmngr.c:950 +#: src/dirmngr.c:954 #, c-format msgid "fetching CRL from `%s' failed: %s\n" msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n" -#: src/dirmngr.c:956 +#: src/dirmngr.c:960 #, c-format msgid "processing CRL from `%s' failed: %s\n" msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n" -#: src/dirmngr.c:1100 +#: src/dirmngr.c:1107 #, c-format msgid "error opening `%s': %s\n" msgstr "Fehler beim Öffnen von `%s': %s\n" -#: src/dirmngr.c:1117 +#: src/dirmngr.c:1124 #, c-format msgid "%s:%u: line too long - skipped\n" msgstr "%s:%u: Zeile ist zu lang - übergangen\n" -#: src/dirmngr.c:1145 +#: src/dirmngr.c:1152 #, c-format msgid "%s:%u: no hostname given\n" msgstr "%s:%u: Kein Hostname angegeben\n" -#: src/dirmngr.c:1164 +#: src/dirmngr.c:1171 #, c-format msgid "%s:%u: password given without user\n" msgstr "%s:%u: Passwort angegeben ohne Username\n" -#: src/dirmngr.c:1185 +#: src/dirmngr.c:1192 #, c-format msgid "%s:%u: skipping this line\n" msgstr "%s:%u: Diese Zeile wird übersprungen\n" -#: src/dirmngr.c:1285 +#: src/dirmngr.c:1292 msgid "SIGHUP received - re-reading configuration and flushing caches\n" msgstr "" "SIGHUP empfangen - lese die Konfiguration erneut und lösche die Caches\n" -#: src/dirmngr.c:1299 +#: src/dirmngr.c:1306 msgid "SIGUSR2 received - no action defined\n" msgstr "SIGUSR2 empfangen - keine Aktion definiert\n" -#: src/dirmngr.c:1304 +#: src/dirmngr.c:1311 msgid "SIGTERM received - shutting down ...\n" msgstr "SIGTERM empfangen - wird heruntergefahren ...\n" -#: src/dirmngr.c:1306 +#: src/dirmngr.c:1313 #, c-format msgid "SIGTERM received - still %d active connections\n" msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n" -#: src/dirmngr.c:1311 +#: src/dirmngr.c:1318 msgid "shutdown forced\n" msgstr "Herunterfahren wurde erzwungen\n" -#: src/dirmngr.c:1319 +#: src/dirmngr.c:1326 msgid "SIGINT received - immediate shutdown\n" msgstr "SIGINT empfangen - wird sofort heruntergefahren\n" -#: src/dirmngr.c:1326 +#: src/dirmngr.c:1333 #, c-format msgid "signal %d received - no action defined\n" msgstr "Signal %d empfangen - keine Aktion definiert\n" -#: src/dirmngr.c:1340 +#: src/dirmngr.c:1347 #, c-format msgid "handler for fd %d started\n" msgstr "Routine für fd %d gestartet\n" -#: src/dirmngr.c:1345 +#: src/dirmngr.c:1352 #, c-format msgid "handler for fd %d terminated\n" msgstr "Routine für fd %d beendet\n" -#: src/dirmngr.c:1401 +#: src/dirmngr.c:1408 #, c-format msgid "accept failed: %s - waiting 1s\n" msgstr "accept() fehlgeschlagen: %s - warte 1s\n" -#: src/dirmngr.c:1408 +#: src/dirmngr.c:1415 #, c-format msgid "error spawning connection handler: %s\n" msgstr "Fehler beim Starten des Verbindungshandler: %s\n" @@ -990,92 +1005,102 @@ msgid "network write failed: %s\n" msgstr "Schreiben auf dem Netzwerk fehlgeschlagen: %s\n" -#: src/ldap.c:125 +#: src/ldap.c:132 #, c-format msgid "invalid char 0x%02x in host name - not added\n" msgstr "Ungültiges Zeichen 0x%02X im Hostnamen - nicht hinzugefügt\n" -#: src/ldap.c:129 +#: src/ldap.c:136 #, c-format msgid "adding `%s:%d' to the ldap server list\n" msgstr "`%s:%d' wird der LDAP Serverliste hinzugefügt\n" -#: src/ldap.c:132 src/misc.c:652 +#: src/ldap.c:139 src/misc.c:687 #, c-format msgid "malloc failed: %s\n" msgstr "malloc() fehlgeschlagen: %s\n" -#: src/ldap.c:207 +#: src/ldap.c:214 #, c-format msgid "error printing log line: %s\n" msgstr "Fehler beim Schreiben einer Logzeile: %s\n" -#: src/ldap.c:253 +#: src/ldap.c:260 #, c-format msgid "select failed: %s\n" msgstr "select() fehlgeschlagen: %s\n" -#: src/ldap.c:279 +#: src/ldap.c:286 #, c-format msgid "error reading log from ldap wrapper %d: %s\n" msgstr "Fehler beim Lesen des Logs vom LDAP Wrapper %d: %s\n" -#: src/ldap.c:306 +#: src/ldap.c:313 #, c-format msgid "waiting for ldap wrapper %d failed: %s\n" msgstr "Warten auf den LDAP Wrapper %d fehlgeschlagen: %s\n" -#: src/ldap.c:311 +#: src/ldap.c:318 #, c-format msgid "ldap wrapper %d ready: terminated\n" msgstr "LDAP Wrapper %d fertig: abgebrochen\n" -#: src/ldap.c:314 +#: src/ldap.c:321 +#, c-format +msgid "ldap wrapper %d ready: timeout\n" +msgstr "LDAP Wrapper %d fertig: Zeitüberschreitung\n" + +#: src/ldap.c:324 #, c-format msgid "ldap wrapper %d ready: exit status %d\n" msgstr "LDAP Wrapper %d fertig: Beendigungsstatus %d\n" -#: src/ldap.c:327 +#: src/ldap.c:337 #, c-format msgid "ldap wrapper %d stalled - killing\n" msgstr "LDAP Wrapper %d versackt - abgeschossen\n" -#: src/ldap.c:380 src/ldap.c:401 +#: src/ldap.c:390 src/ldap.c:411 #, c-format msgid "reading from ldap wrapper %d failed: %s\n" msgstr "Lesen vom LDAP Wrapper %d fehlgeschlagen: %s\n" -#: src/ldap.c:546 src/ldap.c:552 +#: src/ldap.c:556 src/ldap.c:562 #, c-format msgid "error creating a pipe: %s\n" msgstr "Fehler beim Erzeugen einer Pipe: %s\n" -#: src/ldap.c:562 +#: src/ldap.c:572 #, c-format msgid "error forking process: %s\n" msgstr "Fehler beim Forken eines Prozesses: %s\n" -#: src/ldap.c:610 src/ldap.c:617 src/ldap.c:624 +#: src/ldap.c:620 src/ldap.c:627 src/ldap.c:634 #, c-format msgid "dup2 failed in child: %s\n" msgstr "dup2() im Kindprozess fehlgeschlagen: %s\n" -#: src/ldap.c:642 +#: src/ldap.c:652 #, c-format msgid "error running `%s': %s\n" msgstr "Fehler beim Ausführen von `%s': %s\n" -#: src/ldap.c:654 +#: src/ldap.c:664 #, c-format msgid "error allocating memory: %s\n" msgstr "Fehler beim Allozieren von Speicher: %s\n" -#: src/ldap.c:1101 +#: src/ldap.c:696 +#, c-format +msgid "ldap wrapper %d started\n" +msgstr "LDAP Wrapper %d gestartet\n" + +#: src/ldap.c:1160 #, c-format msgid "start_cert_fetch: invalid pattern `%s'\n" msgstr "start_cert_fetch: Ungültiges Muster `%s'\n" -#: src/ldap.c:1239 +#: src/ldap.c:1298 msgid "ldap_search hit the size limit of the server\n" msgstr "ldap_search erreichte die Größengrenze des Servers\n" @@ -1083,21 +1108,21 @@ msgid "invalid canonical S-expression found\n" msgstr "Ungültige kanonische S-Expression gefunden\n" -#: src/misc.c:452 +#: src/misc.c:452 src/misc.c:486 #, c-format msgid "gcry_md_open failed: %s\n" msgstr "gcry_md_open fehlgeschlagen: %s\n" -#: src/misc.c:457 +#: src/misc.c:457 src/misc.c:491 #, c-format msgid "oops: ksba_cert_hash failed: %s\n" msgstr "Nanu: ksba_cert_hash fehlgeschlagen: %s\n" -#: src/misc.c:491 +#: src/misc.c:526 msgid "[none]" msgstr "[nichts]" -#: src/misc.c:668 +#: src/misc.c:703 msgid "bad URL encoding detected\n" msgstr "Fehlerhafte URL Kodierung erkannt\n" @@ -1159,93 +1184,93 @@ msgid "only SHA-1 is supported for OCSP responses\n" msgstr "Lediglich SHA-1 wird bei OCSP Antworten unterstützt\n" -#: src/ocsp.c:385 +#: src/ocsp.c:387 msgid "no suitable certificate found to verify the OCSP response\n" msgstr "" "Kein benutzbares Zertifikat zur Ãœberprüfung der OCSP Antwort gefunden\n" -#: src/ocsp.c:421 src/validate.c:419 +#: src/ocsp.c:424 src/validate.c:459 #, c-format msgid "issuer certificate not found: %s\n" msgstr "Herausgeberzertifikat nicht gefunden: %s\n" -#: src/ocsp.c:431 +#: src/ocsp.c:434 msgid "caller did not return the target certificate\n" msgstr "Aufrufer gab das Ziel Zertifikat nicht zurück\n" -#: src/ocsp.c:438 +#: src/ocsp.c:441 msgid "caller did not return the issuing certificate\n" msgstr "Aufrufer gab das Issuer Zertifikat nicht zurück\n" -#: src/ocsp.c:448 +#: src/ocsp.c:451 #, c-format msgid "failed to allocate OCSP context: %s\n" msgstr "Fehler beim Bereitstellen eines OCSP Kontext: %s\n" -#: src/ocsp.c:482 +#: src/ocsp.c:485 #, c-format msgid "can't get authorityInfoAccess: %s\n" msgstr "authorityInfoAccess kann nicht geholt werden: %s\n" -#: src/ocsp.c:489 +#: src/ocsp.c:492 msgid "no default OCSP responder defined\n" msgstr "Kein voreingestellter OCSP Responder definiert\n" -#: src/ocsp.c:495 +#: src/ocsp.c:498 msgid "no default OCSP signer defined\n" msgstr "Kein voreingestellter OCSP \"Signer\" definiert\n" -#: src/ocsp.c:502 +#: src/ocsp.c:505 #, c-format msgid "using default OCSP responder `%s'\n" msgstr "Der voreingestellte OCSP Responder `%s' wird benutzt\n" -#: src/ocsp.c:507 +#: src/ocsp.c:510 #, c-format msgid "using OCSP responder `%s'\n" msgstr "Der OCSP Responder `%s' wird benutzt\n" -#: src/ocsp.c:514 +#: src/ocsp.c:517 #, c-format msgid "failed to establish a hashing context for OCSP: %s\n" msgstr "Kontext zum Hashen von OCSP kann nicht erzeugt werden: %s\n" -#: src/ocsp.c:544 +#: src/ocsp.c:547 #, c-format msgid "error getting OCSP status for target certificate: %s\n" msgstr "Fehler beim Holen des OCSP Status für das Zielzertifikat: %s\n" -#: src/ocsp.c:551 +#: src/ocsp.c:554 #, c-format msgid "certificate status is: %s (this=%s next=%s)\n" msgstr "Zertifikatstatus ist: %s (this=%s next=%s)\n" -#: src/ocsp.c:552 +#: src/ocsp.c:555 msgid "good" msgstr "Gut" -#: src/ocsp.c:553 +#: src/ocsp.c:556 msgid "revoked" msgstr "Widerrufen" -#: src/ocsp.c:554 +#: src/ocsp.c:557 msgid "unknown" msgstr "Unbekannt" -#: src/ocsp.c:555 +#: src/ocsp.c:558 msgid "none" msgstr "Kein" -#: src/ocsp.c:558 +#: src/ocsp.c:561 #, c-format msgid "certificate has been revoked at: %s due to: %s\n" msgstr "Zertifikat wurde widerrufen am: %s wegen: %s\n" -#: src/ocsp.c:591 +#: src/ocsp.c:594 msgid "OCSP responder returned an too old status\n" msgstr "OCSP Responder gab einen zu alten Status zurück\n" -#: src/ocsp.c:601 +#: src/ocsp.c:606 msgid "OCSP responder returned a non-current status\n" msgstr "OCSP Responder gab einen nicht aktuellen Status zurück\n" @@ -1314,115 +1339,119 @@ msgid "Assuan processing failed: %s\n" msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n" -#: src/validate.c:92 +#: src/validate.c:93 #, c-format msgid "critical certificate extension %s is not supported" msgstr "Die kritische Zertifikaterweiterung %s wird nicht unterstützt" -#: src/validate.c:152 +#: src/validate.c:153 msgid "note: non-critical certificate policy not allowed" msgstr "Notiz: Die unkritische Zertifikatrichtlinie ist nicht erlaubt" -#: src/validate.c:157 +#: src/validate.c:158 msgid "certificate policy not allowed" msgstr "Die Zertifikatrichtlinie ist nicht erlaubt" -#: src/validate.c:177 +#: src/validate.c:178 msgid "issuer certificate is not marked as a CA" msgstr "Das Herausgeberzertifikat ist nicht für eine CA gekennzeichnet" -#: src/validate.c:302 +#: src/validate.c:208 +msgid "CRL checking too deeply nested\n" +msgstr "CRL Ãœberprüfung ist zu tief geschachtelt\n" + +#: src/validate.c:326 #, c-format msgid "certificate with invalid validity: %s" msgstr "Zertifikat mit unzulässiger Gültigkeit: %s" -#: src/validate.c:320 +#: src/validate.c:344 msgid "certificate not yet valid" msgstr "Das Zertifikat ist noch nicht gültig" -#: src/validate.c:331 +#: src/validate.c:355 msgid "certificate has expired" msgstr "Das Zertifikat ist abgelaufen" -#: src/validate.c:360 +#: src/validate.c:384 msgid "selfsigned certificate has a BAD signature" msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur" -#: src/validate.c:378 +#: src/validate.c:402 msgid "root certificate is not marked trusted" msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert" -#: src/validate.c:380 +#: src/validate.c:404 #, c-format msgid "fingerprint=%s\n" msgstr "Fingerprint=%s\n" -#: src/validate.c:386 +#: src/validate.c:410 #, c-format msgid "checking trustworthiness of root certificate failed: %s\n" msgstr "" "Prüfung der Vertrauenswürdigkeit des Wurzelzertifikats fehlgeschlagen: %s\n" -#: src/validate.c:401 +#: src/validate.c:441 msgid "certificate chain too long\n" msgstr "Der Zertifikatkette ist zu lang\n" -#: src/validate.c:413 +#: src/validate.c:453 msgid "issuer certificate not found" msgstr "Herausgeberzertifikat nicht gefunden" -#: src/validate.c:439 +#: src/validate.c:479 msgid "certificate has a BAD signature" msgstr "Das Zertifikat hat eine FALSCHE Signatur" -#: src/validate.c:463 +#: src/validate.c:503 msgid "found another possible matching CA certificate - trying again" msgstr "" "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche " "nochmal" -#: src/validate.c:488 +#: src/validate.c:528 #, c-format msgid "certificate chain longer than allowed by CA (%d)" msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)" -#: src/validate.c:725 +#: src/validate.c:758 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA benötigt eine 160 Bit Hashmethode\n" -#: src/validate.c:832 +#: src/validate.c:865 msgid "no key usage specified - assuming all usages\n" msgstr "" "Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n" -#: src/validate.c:842 +#: src/validate.c:875 #, c-format msgid "error getting key usage information: %s\n" msgstr "Fehler beim holen der Schlüsselbenutzungsinformationen: %s\n" -#: src/validate.c:852 +#: src/validate.c:885 msgid "certificate should have not been used for certification\n" msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n" -#: src/validate.c:864 +#: src/validate.c:897 msgid "certificate should have not been used for OCSP response signing\n" msgstr "" "Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden " "sollen\n" -#: src/validate.c:875 +#: src/validate.c:908 msgid "certificate should have not been used for encryption\n" msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n" -#: src/validate.c:877 +#: src/validate.c:910 msgid "certificate should have not been used for signing\n" msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n" -#: src/validate.c:878 +#: src/validate.c:911 msgid "certificate is not usable for encryption\n" msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n" -#: src/validate.c:879 +#: src/validate.c:912 msgid "certificate is not usable for signing\n" msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n" @@ -1446,12 +1475,16 @@ msgid "lookup a certificate" msgstr "Zertifikat auffinden" -#: src/dirmngr-client.c:130 +#: src/dirmngr-client.c:71 +msgid "load a CRL into the dirmngr" +msgstr "CRL in den Dirmngr laden" + +#: src/dirmngr-client.c:132 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n" msgstr "" "Gebrauch: dirmngr-client [Optionen] [Zertdatei|Muster] (-h für Hilfe)\n" -#: src/dirmngr-client.c:134 +#: src/dirmngr-client.c:136 msgid "" "Syntax: dirmngr-client [options] [certfile|pattern]\n" "Test an X.509 certificate against a CRL or do an OCSP check\n" @@ -1464,89 +1497,98 @@ "The Prozess gibt 0 zurück wenn das Zertifikat gültig ist, 1 wenn es nicht\n" "gültig ist und weitere Werte bei anderen Fehlern.\n" -#: src/dirmngr-client.c:220 +#: src/dirmngr-client.c:224 #, c-format msgid "error reading certificate from stdin: %s\n" msgstr "Fehler beim Lesen des Zertifikats von der Standardeingabe: %s\n" -#: src/dirmngr-client.c:227 +#: src/dirmngr-client.c:231 #, c-format msgid "error reading certificate from `%s': %s\n" msgstr "Fehler beim Lesen des Zertifikats von `%s': %s\n" -#: src/dirmngr-client.c:241 +#: src/dirmngr-client.c:245 msgid "certificate too large to make any sense\n" msgstr "Zertifikat ist zu groß um Sinnvoll zu sein\n" -#: src/dirmngr-client.c:260 +#: src/dirmngr-client.c:264 #, c-format msgid "lookup failed: %s\n" msgstr "Aufsuchen fehlgeschlagen: %s\n" -#: src/dirmngr-client.c:287 +#: src/dirmngr-client.c:279 +#, c-format +msgid "loading CRL `%s' failed: %s\n" +msgstr "Laden der CRL von `%s' fehlgeschlagen: %s\n" + +#: src/dirmngr-client.c:307 msgid "a dirmngr daemon is up and running\n" msgstr "Ein dirmngr ist vorhanden und aktiv\n" -#: src/dirmngr-client.c:309 +#: src/dirmngr-client.c:329 #, c-format msgid "validation of certificate failed: %s\n" msgstr "Prüfung des Zertifikats fehlgeschlagen: %s\n" -#: src/dirmngr-client.c:316 +#: src/dirmngr-client.c:336 msgid "certificate is valid\n" msgstr "Zertifikat ist gültig\n" -#: src/dirmngr-client.c:322 +#: src/dirmngr-client.c:342 msgid "certificate has been revoked\n" msgstr "Zertifikat wurde widerrufen\n" -#: src/dirmngr-client.c:327 +#: src/dirmngr-client.c:347 #, c-format msgid "certificate check failed: %s\n" msgstr "Zertifikatprüfung fehlgeschlagen: %s\n" -#: src/dirmngr-client.c:338 +#: src/dirmngr-client.c:358 #, c-format msgid "got status: `%s'\n" msgstr "Erhielt Status: `%s'\n" -#: src/dirmngr-client.c:353 +#: src/dirmngr-client.c:373 #, c-format msgid "error writing base64 encoding: %s\n" msgstr "Fehler beim Schreiben der Base-64 Darstellung: %s\n" -#: src/dirmngr-client.c:385 +#: src/dirmngr-client.c:405 msgid "apparently no running dirmngr\n" msgstr "Offensichtlich ist kein Dirmngr vorhanden\n" -#: src/dirmngr-client.c:390 +#: src/dirmngr-client.c:410 msgid "no running dirmngr - starting one\n" msgstr "Dirmngr läuft nicht - ein neuer wird gestartet\n" -#: src/dirmngr-client.c:423 +#: src/dirmngr-client.c:443 msgid "malformed DIRMNGR_INFO environment variable\n" msgstr "Fehlerhafte DIRMNGR_INFO Variable\n" -#: src/dirmngr-client.c:438 +#: src/dirmngr-client.c:458 #, c-format msgid "dirmngr protocol version %d is not supported\n" msgstr "Dirmngr Protocol Version %d wird nicht unterstützt\n" -#: src/dirmngr-client.c:454 +#: src/dirmngr-client.c:474 msgid "can't connect to the dirmngr - trying fall back\n" msgstr "Verbindung zum Dirmngr nicht möglich - Rückfallmethode wird versucht\n" -#: src/dirmngr-client.c:462 +#: src/dirmngr-client.c:482 #, c-format msgid "can't connect to the dirmngr: %s\n" msgstr "Verbindung zum Dirmngr nicht möglich: %s\n" -#: src/dirmngr-client.c:545 +#: src/dirmngr-client.c:565 #, c-format msgid "unsupported inquiry `%s'\n" msgstr "Nicht unterstützte INQUIRY `%s'\n" -#: src/dirmngr-client.c:626 +#: src/dirmngr-client.c:657 +msgid "absolute file name expected\n" +msgstr "Absoluter Dateiname erwartet\n" + +#: src/dirmngr-client.c:700 #, c-format msgid "looking up `%s'\n" msgstr "Auffinden von `%s'\n" @@ -1556,51 +1598,51 @@ msgid "error allocating enough memory: %s\n" msgstr "Fehler beim Allozieren von genügend Speicher: %s\n" -#: src/dirmngr_ldap.c:76 +#: src/dirmngr_ldap.c:79 msgid "return all values in a record oriented format" msgstr "Alle Werte in einem Record Format zurückgeben" -#: src/dirmngr_ldap.c:79 +#: src/dirmngr_ldap.c:82 msgid "|NAME|ignore host part and connect through NAME" msgstr "|NAME|Host Teil ignorieren und über NAME verbinden" -#: src/dirmngr_ldap.c:80 +#: src/dirmngr_ldap.c:83 msgid "|NAME|connect to host NAME" msgstr "|NAME|Verbinde mit dem Host NAME" -#: src/dirmngr_ldap.c:81 +#: src/dirmngr_ldap.c:84 msgid "|N|connect to port N" msgstr "|N|Verbinde mit dem Port N" -#: src/dirmngr_ldap.c:82 +#: src/dirmngr_ldap.c:85 msgid "|NAME|use user NAME for authentication" msgstr "|NAME|Benutze NAME zur Authentifizierung" -#: src/dirmngr_ldap.c:83 +#: src/dirmngr_ldap.c:86 msgid "|PASS|use password PASS for authentication" msgstr "Benutze Passwort PASS zur Authentifizierung" -#: src/dirmngr_ldap.c:85 +#: src/dirmngr_ldap.c:88 msgid "take password from $DIRMNGR_LDAP_PASS" msgstr "Nimm das Passwort von $DIRMNGR_LDAP_PASS" -#: src/dirmngr_ldap.c:86 +#: src/dirmngr_ldap.c:89 msgid "|STRING|query DN STRING" msgstr "|STRING|Frage den DN STRING ab" -#: src/dirmngr_ldap.c:87 +#: src/dirmngr_ldap.c:90 msgid "|STRING|use STRING as filter expression" msgstr "|STRING|Benutze STRING als Filterausdruck" -#: src/dirmngr_ldap.c:88 +#: src/dirmngr_ldap.c:91 msgid "|STRING|return the attribute STRING" msgstr "|STRING|Gib das Attribut STRING zurück" -#: src/dirmngr_ldap.c:138 +#: src/dirmngr_ldap.c:144 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n" msgstr "Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n" -#: src/dirmngr_ldap.c:141 +#: src/dirmngr_ldap.c:147 msgid "" "Syntax: dirmngr_ldap [options] [URL]\n" "Internal LDAP helper for Dirmngr.\n" @@ -1610,112 +1652,112 @@ "Internes LDAP Hilfprogramm für Drimngr.\n" "Interface und Optionen können sich mit jedem Release ändern.\n" -#: src/dirmngr_ldap.c:230 +#: src/dirmngr_ldap.c:249 #, c-format msgid "invalid port number %d\n" msgstr "Ungültige Portnummer %d\n" -#: src/dirmngr_ldap.c:261 +#: src/dirmngr_ldap.c:310 #, c-format msgid "scanning result for attribute `%s'\n" msgstr "Absuchen des Ergebnisses nach Attribut `%s'\n" -#: src/dirmngr_ldap.c:268 src/dirmngr_ldap.c:328 src/dirmngr_ldap.c:352 -#: src/dirmngr_ldap.c:363 src/dirmngr_ldap.c:473 +#: src/dirmngr_ldap.c:317 src/dirmngr_ldap.c:379 src/dirmngr_ldap.c:403 +#: src/dirmngr_ldap.c:414 src/dirmngr_ldap.c:526 #, c-format msgid "error writing to stdout: %s\n" msgstr "Fehler beim Schreiben auf Standardausgabe: %s\n" -#: src/dirmngr_ldap.c:282 +#: src/dirmngr_ldap.c:331 #, c-format msgid " available attribute `%s'\n" msgstr " verfügbare Attribute `%s'\n" -#: src/dirmngr_ldap.c:307 +#: src/dirmngr_ldap.c:358 #, c-format msgid "attribute `%s' not found\n" msgstr "Attribut `%s' nicht gefunden\n" -#: src/dirmngr_ldap.c:313 +#: src/dirmngr_ldap.c:364 #, c-format msgid "found attribute `%s'\n" msgstr "Attribut `%s' gefunden\n" -#: src/dirmngr_ldap.c:410 +#: src/dirmngr_ldap.c:461 #, c-format msgid "processing url `%s'\n" msgstr "Verarbeiten der URL `%s'\n" -#: src/dirmngr_ldap.c:412 +#: src/dirmngr_ldap.c:463 #, c-format msgid " user `%s'\n" msgstr " Benutzer `%s'\n" -#: src/dirmngr_ldap.c:414 +#: src/dirmngr_ldap.c:465 #, c-format msgid " pass `%s'\n" msgstr " Passwort `%s'\n" -#: src/dirmngr_ldap.c:416 +#: src/dirmngr_ldap.c:467 #, c-format msgid " host `%s'\n" msgstr " Host `%s'\n" -#: src/dirmngr_ldap.c:417 +#: src/dirmngr_ldap.c:468 #, c-format msgid " port %d\n" msgstr " Port %d\n" -#: src/dirmngr_ldap.c:419 +#: src/dirmngr_ldap.c:470 #, c-format msgid " DN `%s'\n" msgstr " DN `%s'\n" -#: src/dirmngr_ldap.c:421 +#: src/dirmngr_ldap.c:472 #, c-format msgid " filter `%s'\n" msgstr " Filter `%s'\n" -#: src/dirmngr_ldap.c:426 src/dirmngr_ldap.c:429 +#: src/dirmngr_ldap.c:477 src/dirmngr_ldap.c:480 #, c-format msgid " attr `%s'\n" msgstr " Attribut `%s'\n" -#: src/dirmngr_ldap.c:435 +#: src/dirmngr_ldap.c:486 #, c-format msgid "no host name in `%s'\n" msgstr "Kein Hostname in `%s'\n" -#: src/dirmngr_ldap.c:440 +#: src/dirmngr_ldap.c:491 #, c-format msgid "no attribute given for query `%s'\n" msgstr "Kein Attribut für Abfrage `%s' angegeben\n" -#: src/dirmngr_ldap.c:446 +#: src/dirmngr_ldap.c:497 msgid "WARNING: using first attribute only\n" msgstr "WARNUNG: Es wird nur das erste Attribut benutzt\n" -#: src/dirmngr_ldap.c:452 +#: src/dirmngr_ldap.c:504 #, c-format msgid "LDAP init to `%s:%d' failed: %s\n" msgstr "LDAP Initialisierung von `%s:%d' fehlgeschlagen: %s\n" -#: src/dirmngr_ldap.c:458 +#: src/dirmngr_ldap.c:510 #, c-format msgid "binding to `%s:%d' failed: %s\n" msgstr "Anbindung an `%s:%d' fehlgeschlagen: %s\n" -#: src/dirmngr_ldap.c:480 +#: src/dirmngr_ldap.c:533 #, c-format msgid "searching `%s' failed: %s\n" msgstr "Suche mit `%s' fehlgeschlagen: %s\n" -#: src/dirmngr_ldap.c:508 +#: src/dirmngr_ldap.c:564 #, c-format msgid "`%s' is not an LDAP URL\n" msgstr "`%s' ist kein LDAP URL\n" -#: src/dirmngr_ldap.c:514 +#: src/dirmngr_ldap.c:570 #, c-format msgid "`%s' is an invalid LDAP URL\n" msgstr "`%s' ist ein ungültiger LDAP URL\n" Index: dirmngr/po/dirmngr.pot diff -u dirmngr/po/dirmngr.pot:1.7 dirmngr/po/dirmngr.pot:1.8 --- dirmngr/po/dirmngr.pot:1.7 Wed Nov 24 15:44:01 2004 +++ dirmngr/po/dirmngr.pot Fri Dec 17 11:55:41 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: gpa-dev@gnupg.org\n" -"POT-Creation-Date: 2004-11-24 15:35+0100\n" +"POT-Creation-Date: 2004-12-17 11:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgid "can't access directory `%s': %s\n" msgstr "" -#: src/certcache.c:323 src/crlcache.c:2142 src/ldap.c:605 +#: src/certcache.c:323 src/crlcache.c:2173 src/ldap.c:615 #, c-format msgid "can't open `%s': %s\n" msgstr "" @@ -66,54 +66,64 @@ msgid "certificate `%s' already cached\n" msgstr "" -#: src/certcache.c:356 +#: src/certcache.c:357 #, c-format msgid "certificate `%s' loaded\n" msgstr "" -#: src/certcache.c:358 +#: src/certcache.c:361 +#, c-format +msgid "SHA1 fingerprint = %s\n" +msgstr "" + +#: src/certcache.c:366 #, c-format msgid "error loading certificate `%s': %s\n" msgstr "" -#: src/certcache.c:432 +#: src/certcache.c:440 #, c-format msgid "permanently loaded certificates: %u\n" msgstr "" -#: src/certcache.c:434 +#: src/certcache.c:442 #, c-format msgid " runtime cached certificates: %u\n" msgstr "" -#: src/certcache.c:449 src/dirmngr-client.c:297 +#: src/certcache.c:457 src/dirmngr-client.c:317 msgid "certificate already cached\n" msgstr "" -#: src/certcache.c:451 +#: src/certcache.c:459 msgid "certificate cached\n" msgstr "" -#: src/certcache.c:453 src/dirmngr-client.c:301 +#: src/certcache.c:461 src/dirmngr-client.c:321 #, c-format msgid "error caching certificate: %s\n" msgstr "" -#: src/certcache.c:563 src/crlcache.c:1396 +#: src/certcache.c:526 +#, c-format +msgid "invalid SHA1 fingerprint string `%s'\n" +msgstr "" + +#: src/certcache.c:612 src/crlcache.c:1396 #, c-format msgid "error fetching certificate for issuer: %s\n" msgstr "" -#: src/certcache.c:574 src/crlcache.c:1412 +#: src/certcache.c:623 src/crlcache.c:1412 #, c-format msgid "invalid issuer certificate: %s\n" msgstr "" -#: src/certcache.c:655 src/validate.c:288 +#: src/certcache.c:704 src/validate.c:312 msgid "no issuer found in certificate\n" msgstr "" -#: src/certcache.c:665 +#: src/certcache.c:714 #, c-format msgid "error getting authorityKeyIdentifier: %s\n" msgstr "" @@ -206,7 +216,7 @@ msgid "unsupported record type in `%s' line %u skipped\n" msgstr "" -#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1196 +#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1203 #, c-format msgid "error reading `%s': %s\n" msgstr "" @@ -367,7 +377,7 @@ msgid "error getting data from cache file: %s\n" msgstr "" -#: src/crlcache.c:1435 src/validate.c:636 +#: src/crlcache.c:1435 src/validate.c:669 #, c-format msgid "unknown hash algorithm `%s'\n" msgstr "" @@ -377,204 +387,213 @@ msgid "gcry_md_open for algorithm %d failed: %s\n" msgstr "" -#: src/crlcache.c:1476 src/crlcache.c:1493 +#: src/crlcache.c:1478 src/crlcache.c:1497 msgid "got an invalid S-expression from libksba\n" msgstr "" -#: src/crlcache.c:1483 src/crlcache.c:1500 src/misc.c:432 +#: src/crlcache.c:1485 src/crlcache.c:1504 src/misc.c:432 #, c-format msgid "converting S-expression failed: %s\n" msgstr "" -#: src/crlcache.c:1515 src/ocsp.c:343 +#: src/crlcache.c:1519 src/ocsp.c:343 #, c-format msgid "creating S-expression failed: %s\n" msgstr "" -#: src/crlcache.c:1567 +#: src/crlcache.c:1573 #, c-format msgid "ksba_crl_parse failed: %s\n" msgstr "" -#: src/crlcache.c:1583 -#, c-format -msgid "no issuer found in CRL: %s\n" -msgstr "" - -#: src/crlcache.c:1601 +#: src/crlcache.c:1587 #, c-format msgid "error getting update times of CRL: %s\n" msgstr "" -#: src/crlcache.c:1608 +#: src/crlcache.c:1594 #, c-format msgid "update times of this CRL: this=%s next=%s\n" msgstr "" -#: src/crlcache.c:1627 +#: src/crlcache.c:1611 #, c-format msgid "error getting CRL item: %s\n" msgstr "" -#: src/crlcache.c:1642 +#: src/crlcache.c:1626 #, c-format msgid "error inserting item into temporary cache file: %s\n" msgstr "" -#: src/crlcache.c:1660 +#: src/crlcache.c:1648 +#, c-format +msgid "no issuer found in CRL: %s\n" +msgstr "" + +#: src/crlcache.c:1661 +msgid "locating CRL issuer certificate by authorityKeyIdentifier\n" +msgstr "" + +#: src/crlcache.c:1690 #, c-format msgid "CRL signature verification failed: %s\n" msgstr "" -#: src/crlcache.c:1668 +#: src/crlcache.c:1698 #, c-format msgid "error checking validity of CRL signing certificate: %s\n" msgstr "" -#: src/crlcache.c:1793 +#: src/crlcache.c:1824 #, c-format msgid "ksba_crl_new failed: %s\n" msgstr "" -#: src/crlcache.c:1800 +#: src/crlcache.c:1831 #, c-format msgid "ksba_crl_set_reader failed: %s\n" msgstr "" -#: src/crlcache.c:1823 +#: src/crlcache.c:1854 #, c-format msgid "removed stale temporary cache file `%s'\n" msgstr "" -#: src/crlcache.c:1826 +#: src/crlcache.c:1857 #, c-format msgid "problem removing stale temporary cache file `%s': %s\n" msgstr "" -#: src/crlcache.c:1836 +#: src/crlcache.c:1867 #, c-format msgid "error creating temporary cache file `%s': %s\n" msgstr "" -#: src/crlcache.c:1846 +#: src/crlcache.c:1877 #, c-format msgid "crl_parse_insert failed: %s\n" msgstr "" -#: src/crlcache.c:1855 +#: src/crlcache.c:1886 #, c-format msgid "error finishing temporary cache file `%s': %s\n" msgstr "" -#: src/crlcache.c:1862 +#: src/crlcache.c:1893 #, c-format msgid "error closing temporary cache file `%s': %s\n" msgstr "" -#: src/crlcache.c:1887 +#: src/crlcache.c:1918 #, c-format msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n" msgstr "" -#: src/crlcache.c:1891 +#: src/crlcache.c:1922 #, c-format msgid "new CRL still too old; it expired on %s\n" msgstr "" -#: src/crlcache.c:1907 +#: src/crlcache.c:1938 #, c-format msgid "unknown crtical CRL extension %s\n" msgstr "" -#: src/crlcache.c:1917 +#: src/crlcache.c:1948 #, c-format msgid "error reading CRL extensions: %s\n" msgstr "" -#: src/crlcache.c:1951 +#: src/crlcache.c:1982 #, c-format msgid "creating cache file `%s'\n" msgstr "" -#: src/crlcache.c:1955 +#: src/crlcache.c:1986 #, c-format msgid "problem renaming `%s' to `%s': %s\n" msgstr "" -#: src/crlcache.c:1969 +#: src/crlcache.c:2000 msgid "" "updating the DIR file failed - cache entry will get lost with the next " "program start\n" msgstr "" -#: src/crlcache.c:2005 +#: src/crlcache.c:2036 #, c-format msgid "Begin CRL dump (retrieved via %s)\n" msgstr "" -#: src/crlcache.c:2025 +#: src/crlcache.c:2056 #, c-format msgid "" " ERROR: The CRL will not be used because it was still too old after an " "update!\n" msgstr "" -#: src/crlcache.c:2027 +#: src/crlcache.c:2058 #, c-format msgid "" " ERROR: The CRL will not be used due to an unknown critical extension!\n" msgstr "" -#: src/crlcache.c:2029 +#: src/crlcache.c:2060 #, c-format msgid " ERROR: The CRL will not be used\n" msgstr "" -#: src/crlcache.c:2036 +#: src/crlcache.c:2067 #, c-format msgid " ERROR: This cached CRL may has been tampered with!\n" msgstr "" -#: src/crlcache.c:2053 +#: src/crlcache.c:2084 msgid " WARNING: invalid cache record length\n" msgstr "" -#: src/crlcache.c:2060 +#: src/crlcache.c:2091 #, c-format msgid "problem reading cache record: %s\n" msgstr "" -#: src/crlcache.c:2071 +#: src/crlcache.c:2102 #, c-format msgid "problem reading cache key: %s\n" msgstr "" -#: src/crlcache.c:2102 +#: src/crlcache.c:2133 #, c-format msgid "error reading cache entry from db: %s\n" msgstr "" -#: src/crlcache.c:2105 +#: src/crlcache.c:2136 #, c-format msgid "End CRL dump\n" msgstr "" -#: src/crlcache.c:2217 +#: src/crlcache.c:2182 src/crlfetch.c:97 src/ldap.c:683 +#, c-format +msgid "error initializing reader object: %s\n" +msgstr "" + +#: src/crlcache.c:2260 #, c-format msgid "crl_fetch via DP failed: %s\n" msgstr "" -#: src/crlcache.c:2224 +#: src/crlcache.c:2269 #, c-format msgid "crl_cache_insert via DP failed: %s\n" msgstr "" -#: src/crlcache.c:2255 +#: src/crlcache.c:2302 #, c-format msgid "crl_fetch via issuer failed: %s\n" msgstr "" -#: src/crlcache.c:2263 +#: src/crlcache.c:2312 #, c-format msgid "crl_cache_insert via issuer failed: %s\n" msgstr "" @@ -598,11 +617,6 @@ msgid "error retrieving `%s': http status %u\n" msgstr "" -#: src/crlfetch.c:97 src/ldap.c:673 -#, c-format -msgid "error initializing reader object: %s\n" -msgstr "" - #: src/crlfetch.c:165 #, c-format msgid "Certificate search not possible due to disabled %s\n" @@ -649,11 +663,11 @@ " " msgstr "" -#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:73 +#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:76 msgid "verbose" msgstr "" -#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:74 +#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:77 msgid "be somewhat more quiet" msgstr "" @@ -713,232 +727,232 @@ msgid "ignore certificate contained OCSP service URLs" msgstr "" -#: src/dirmngr.c:140 +#: src/dirmngr.c:144 msgid "|URL|redirect all HTTP requests to URL" msgstr "" -#: src/dirmngr.c:142 +#: src/dirmngr.c:146 msgid "|HOST|use HOST for LDAP queries" msgstr "" -#: src/dirmngr.c:144 +#: src/dirmngr.c:148 msgid "do not use fallback hosts with --ldap-proxy" msgstr "" -#: src/dirmngr.c:147 +#: src/dirmngr.c:151 msgid "|FILE|read LDAP server list from FILE" msgstr "" -#: src/dirmngr.c:149 +#: src/dirmngr.c:153 msgid "add new servers discovered in CRL distribution points to serverlist" msgstr "" -#: src/dirmngr.c:151 src/dirmngr_ldap.c:75 +#: src/dirmngr.c:155 src/dirmngr_ldap.c:78 msgid "|N|set LDAP timeout to N seconds" msgstr "" -#: src/dirmngr.c:153 +#: src/dirmngr.c:157 msgid "|URL|use OCSP responder at URL" msgstr "" -#: src/dirmngr.c:154 +#: src/dirmngr.c:158 msgid "|FPR|OCSP response signed by FPR" msgstr "" -#: src/dirmngr.c:157 +#: src/dirmngr.c:161 msgid "|N|do not return more than N items in one query" msgstr "" -#: src/dirmngr.c:159 +#: src/dirmngr.c:163 msgid "|FILE|listen on socket FILE" msgstr "" -#: src/dirmngr.c:214 src/dirmngr-client.c:126 src/dirmngr_ldap.c:134 +#: src/dirmngr.c:218 src/dirmngr-client.c:128 src/dirmngr_ldap.c:140 msgid "Please report bugs to .\n" msgstr "" -#: src/dirmngr.c:218 +#: src/dirmngr.c:222 msgid "Usage: dirmngr [options] (-h for help)" msgstr "" -#: src/dirmngr.c:221 +#: src/dirmngr.c:225 msgid "" "Syntax: dirmngr [options] [command [args]]\n" "LDAP and OCSP access for GnuPG\n" msgstr "" -#: src/dirmngr.c:292 +#: src/dirmngr.c:296 #, c-format msgid "invalid debug-level `%s' given\n" msgstr "" -#: src/dirmngr.c:293 +#: src/dirmngr.c:297 #, c-format msgid "valid debug levels are: %s\n" msgstr "" -#: src/dirmngr.c:331 +#: src/dirmngr.c:335 msgid "usage: dirmngr [options] " msgstr "" -#: src/dirmngr.c:356 +#: src/dirmngr.c:360 #, c-format msgid "error spawning ldap wrapper ripper thread: %s\n" msgstr "" -#: src/dirmngr.c:476 src/dirmngr.c:486 +#: src/dirmngr.c:490 src/dirmngr.c:500 #, c-format msgid "%s is too old (need %s, have %s)\n" msgstr "" -#: src/dirmngr.c:587 +#: src/dirmngr.c:597 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "" -#: src/dirmngr.c:592 src/dirmngr.c:1253 +#: src/dirmngr.c:602 src/dirmngr.c:1260 #, c-format msgid "option file `%s': %s\n" msgstr "" -#: src/dirmngr.c:600 +#: src/dirmngr.c:610 #, c-format msgid "reading options from `%s'\n" msgstr "" -#: src/dirmngr.c:706 +#: src/dirmngr.c:710 #, c-format msgid "WARNING: running with faked system time %s\n" msgstr "" -#: src/dirmngr.c:782 +#: src/dirmngr.c:786 msgid "colons are not allowed in the socket name\n" msgstr "" -#: src/dirmngr.c:787 +#: src/dirmngr.c:791 msgid "name of socket too long\n" msgstr "" -#: src/dirmngr.c:794 +#: src/dirmngr.c:798 #, c-format msgid "can't create socket: %s\n" msgstr "" -#: src/dirmngr.c:813 +#: src/dirmngr.c:817 #, c-format msgid "error binding socket to `%s': %s\n" msgstr "" -#: src/dirmngr.c:822 +#: src/dirmngr.c:826 #, c-format msgid "listen() failed: %s\n" msgstr "" -#: src/dirmngr.c:828 +#: src/dirmngr.c:832 #, c-format msgid "listening on socket `%s'\n" msgstr "" -#: src/dirmngr.c:834 +#: src/dirmngr.c:838 #, c-format msgid "fork failed: %s\n" msgstr "" -#: src/dirmngr.c:852 +#: src/dirmngr.c:856 msgid "out of core\n" msgstr "" -#: src/dirmngr.c:891 +#: src/dirmngr.c:895 #, c-format msgid "setsid() failed: %s\n" msgstr "" -#: src/dirmngr.c:901 +#: src/dirmngr.c:905 #, c-format msgid "chdir to / failed: %s\n" msgstr "" -#: src/dirmngr.c:950 +#: src/dirmngr.c:954 #, c-format msgid "fetching CRL from `%s' failed: %s\n" msgstr "" -#: src/dirmngr.c:956 +#: src/dirmngr.c:960 #, c-format msgid "processing CRL from `%s' failed: %s\n" msgstr "" -#: src/dirmngr.c:1100 +#: src/dirmngr.c:1107 #, c-format msgid "error opening `%s': %s\n" msgstr "" -#: src/dirmngr.c:1117 +#: src/dirmngr.c:1124 #, c-format msgid "%s:%u: line too long - skipped\n" msgstr "" -#: src/dirmngr.c:1145 +#: src/dirmngr.c:1152 #, c-format msgid "%s:%u: no hostname given\n" msgstr "" -#: src/dirmngr.c:1164 +#: src/dirmngr.c:1171 #, c-format msgid "%s:%u: password given without user\n" msgstr "" -#: src/dirmngr.c:1185 +#: src/dirmngr.c:1192 #, c-format msgid "%s:%u: skipping this line\n" msgstr "" -#: src/dirmngr.c:1285 +#: src/dirmngr.c:1292 msgid "SIGHUP received - re-reading configuration and flushing caches\n" msgstr "" -#: src/dirmngr.c:1299 +#: src/dirmngr.c:1306 msgid "SIGUSR2 received - no action defined\n" msgstr "" -#: src/dirmngr.c:1304 +#: src/dirmngr.c:1311 msgid "SIGTERM received - shutting down ...\n" msgstr "" -#: src/dirmngr.c:1306 +#: src/dirmngr.c:1313 #, c-format msgid "SIGTERM received - still %d active connections\n" msgstr "" -#: src/dirmngr.c:1311 +#: src/dirmngr.c:1318 msgid "shutdown forced\n" msgstr "" -#: src/dirmngr.c:1319 +#: src/dirmngr.c:1326 msgid "SIGINT received - immediate shutdown\n" msgstr "" -#: src/dirmngr.c:1326 +#: src/dirmngr.c:1333 #, c-format msgid "signal %d received - no action defined\n" msgstr "" -#: src/dirmngr.c:1340 +#: src/dirmngr.c:1347 #, c-format msgid "handler for fd %d started\n" msgstr "" -#: src/dirmngr.c:1345 +#: src/dirmngr.c:1352 #, c-format msgid "handler for fd %d terminated\n" msgstr "" -#: src/dirmngr.c:1401 +#: src/dirmngr.c:1408 #, c-format msgid "accept failed: %s - waiting 1s\n" msgstr "" -#: src/dirmngr.c:1408 +#: src/dirmngr.c:1415 #, c-format msgid "error spawning connection handler: %s\n" msgstr "" @@ -963,92 +977,102 @@ msgid "network write failed: %s\n" msgstr "" -#: src/ldap.c:125 +#: src/ldap.c:132 #, c-format msgid "invalid char 0x%02x in host name - not added\n" msgstr "" -#: src/ldap.c:129 +#: src/ldap.c:136 #, c-format msgid "adding `%s:%d' to the ldap server list\n" msgstr "" -#: src/ldap.c:132 src/misc.c:652 +#: src/ldap.c:139 src/misc.c:687 #, c-format msgid "malloc failed: %s\n" msgstr "" -#: src/ldap.c:207 +#: src/ldap.c:214 #, c-format msgid "error printing log line: %s\n" msgstr "" -#: src/ldap.c:253 +#: src/ldap.c:260 #, c-format msgid "select failed: %s\n" msgstr "" -#: src/ldap.c:279 +#: src/ldap.c:286 #, c-format msgid "error reading log from ldap wrapper %d: %s\n" msgstr "" -#: src/ldap.c:306 +#: src/ldap.c:313 #, c-format msgid "waiting for ldap wrapper %d failed: %s\n" msgstr "" -#: src/ldap.c:311 +#: src/ldap.c:318 #, c-format msgid "ldap wrapper %d ready: terminated\n" msgstr "" -#: src/ldap.c:314 +#: src/ldap.c:321 +#, c-format +msgid "ldap wrapper %d ready: timeout\n" +msgstr "" + +#: src/ldap.c:324 #, c-format msgid "ldap wrapper %d ready: exit status %d\n" msgstr "" -#: src/ldap.c:327 +#: src/ldap.c:337 #, c-format msgid "ldap wrapper %d stalled - killing\n" msgstr "" -#: src/ldap.c:380 src/ldap.c:401 +#: src/ldap.c:390 src/ldap.c:411 #, c-format msgid "reading from ldap wrapper %d failed: %s\n" msgstr "" -#: src/ldap.c:546 src/ldap.c:552 +#: src/ldap.c:556 src/ldap.c:562 #, c-format msgid "error creating a pipe: %s\n" msgstr "" -#: src/ldap.c:562 +#: src/ldap.c:572 #, c-format msgid "error forking process: %s\n" msgstr "" -#: src/ldap.c:610 src/ldap.c:617 src/ldap.c:624 +#: src/ldap.c:620 src/ldap.c:627 src/ldap.c:634 #, c-format msgid "dup2 failed in child: %s\n" msgstr "" -#: src/ldap.c:642 +#: src/ldap.c:652 #, c-format msgid "error running `%s': %s\n" msgstr "" -#: src/ldap.c:654 +#: src/ldap.c:664 #, c-format msgid "error allocating memory: %s\n" msgstr "" -#: src/ldap.c:1101 +#: src/ldap.c:696 +#, c-format +msgid "ldap wrapper %d started\n" +msgstr "" + +#: src/ldap.c:1160 #, c-format msgid "start_cert_fetch: invalid pattern `%s'\n" msgstr "" -#: src/ldap.c:1239 +#: src/ldap.c:1298 msgid "ldap_search hit the size limit of the server\n" msgstr "" @@ -1056,21 +1080,21 @@ msgid "invalid canonical S-expression found\n" msgstr "" -#: src/misc.c:452 +#: src/misc.c:452 src/misc.c:486 #, c-format msgid "gcry_md_open failed: %s\n" msgstr "" -#: src/misc.c:457 +#: src/misc.c:457 src/misc.c:491 #, c-format msgid "oops: ksba_cert_hash failed: %s\n" msgstr "" -#: src/misc.c:491 +#: src/misc.c:526 msgid "[none]" msgstr "" -#: src/misc.c:668 +#: src/misc.c:703 msgid "bad URL encoding detected\n" msgstr "" @@ -1132,92 +1156,92 @@ msgid "only SHA-1 is supported for OCSP responses\n" msgstr "" -#: src/ocsp.c:385 +#: src/ocsp.c:387 msgid "no suitable certificate found to verify the OCSP response\n" msgstr "" -#: src/ocsp.c:421 src/validate.c:419 +#: src/ocsp.c:424 src/validate.c:459 #, c-format msgid "issuer certificate not found: %s\n" msgstr "" -#: src/ocsp.c:431 +#: src/ocsp.c:434 msgid "caller did not return the target certificate\n" msgstr "" -#: src/ocsp.c:438 +#: src/ocsp.c:441 msgid "caller did not return the issuing certificate\n" msgstr "" -#: src/ocsp.c:448 +#: src/ocsp.c:451 #, c-format msgid "failed to allocate OCSP context: %s\n" msgstr "" -#: src/ocsp.c:482 +#: src/ocsp.c:485 #, c-format msgid "can't get authorityInfoAccess: %s\n" msgstr "" -#: src/ocsp.c:489 +#: src/ocsp.c:492 msgid "no default OCSP responder defined\n" msgstr "" -#: src/ocsp.c:495 +#: src/ocsp.c:498 msgid "no default OCSP signer defined\n" msgstr "" -#: src/ocsp.c:502 +#: src/ocsp.c:505 #, c-format msgid "using default OCSP responder `%s'\n" msgstr "" -#: src/ocsp.c:507 +#: src/ocsp.c:510 #, c-format msgid "using OCSP responder `%s'\n" msgstr "" -#: src/ocsp.c:514 +#: src/ocsp.c:517 #, c-format msgid "failed to establish a hashing context for OCSP: %s\n" msgstr "" -#: src/ocsp.c:544 +#: src/ocsp.c:547 #, c-format msgid "error getting OCSP status for target certificate: %s\n" msgstr "" -#: src/ocsp.c:551 +#: src/ocsp.c:554 #, c-format msgid "certificate status is: %s (this=%s next=%s)\n" msgstr "" -#: src/ocsp.c:552 +#: src/ocsp.c:555 msgid "good" msgstr "" -#: src/ocsp.c:553 +#: src/ocsp.c:556 msgid "revoked" msgstr "" -#: src/ocsp.c:554 +#: src/ocsp.c:557 msgid "unknown" msgstr "" -#: src/ocsp.c:555 +#: src/ocsp.c:558 msgid "none" msgstr "" -#: src/ocsp.c:558 +#: src/ocsp.c:561 #, c-format msgid "certificate has been revoked at: %s due to: %s\n" msgstr "" -#: src/ocsp.c:591 +#: src/ocsp.c:594 msgid "OCSP responder returned an too old status\n" msgstr "" -#: src/ocsp.c:601 +#: src/ocsp.c:606 msgid "OCSP responder returned a non-current status\n" msgstr "" @@ -1286,109 +1310,113 @@ msgid "Assuan processing failed: %s\n" msgstr "" -#: src/validate.c:92 +#: src/validate.c:93 #, c-format msgid "critical certificate extension %s is not supported" msgstr "" -#: src/validate.c:152 +#: src/validate.c:153 msgid "note: non-critical certificate policy not allowed" msgstr "" -#: src/validate.c:157 +#: src/validate.c:158 msgid "certificate policy not allowed" msgstr "" -#: src/validate.c:177 +#: src/validate.c:178 msgid "issuer certificate is not marked as a CA" msgstr "" -#: src/validate.c:302 +#: src/validate.c:208 +msgid "CRL checking too deeply nested\n" +msgstr "" + +#: src/validate.c:326 #, c-format msgid "certificate with invalid validity: %s" msgstr "" -#: src/validate.c:320 +#: src/validate.c:344 msgid "certificate not yet valid" msgstr "" -#: src/validate.c:331 +#: src/validate.c:355 msgid "certificate has expired" msgstr "" -#: src/validate.c:360 +#: src/validate.c:384 msgid "selfsigned certificate has a BAD signature" msgstr "" -#: src/validate.c:378 +#: src/validate.c:402 msgid "root certificate is not marked trusted" msgstr "" -#: src/validate.c:380 +#: src/validate.c:404 #, c-format msgid "fingerprint=%s\n" msgstr "" -#: src/validate.c:386 +#: src/validate.c:410 #, c-format msgid "checking trustworthiness of root certificate failed: %s\n" msgstr "" -#: src/validate.c:401 +#: src/validate.c:441 msgid "certificate chain too long\n" msgstr "" -#: src/validate.c:413 +#: src/validate.c:453 msgid "issuer certificate not found" msgstr "" -#: src/validate.c:439 +#: src/validate.c:479 msgid "certificate has a BAD signature" msgstr "" -#: src/validate.c:463 +#: src/validate.c:503 msgid "found another possible matching CA certificate - trying again" msgstr "" -#: src/validate.c:488 +#: src/validate.c:528 #, c-format msgid "certificate chain longer than allowed by CA (%d)" msgstr "" -#: src/validate.c:725 +#: src/validate.c:758 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" -#: src/validate.c:832 +#: src/validate.c:865 msgid "no key usage specified - assuming all usages\n" msgstr "" -#: src/validate.c:842 +#: src/validate.c:875 #, c-format msgid "error getting key usage information: %s\n" msgstr "" -#: src/validate.c:852 +#: src/validate.c:885 msgid "certificate should have not been used for certification\n" msgstr "" -#: src/validate.c:864 +#: src/validate.c:897 msgid "certificate should have not been used for OCSP response signing\n" msgstr "" -#: src/validate.c:875 +#: src/validate.c:908 msgid "certificate should have not been used for encryption\n" msgstr "" -#: src/validate.c:877 +#: src/validate.c:910 msgid "certificate should have not been used for signing\n" msgstr "" -#: src/validate.c:878 +#: src/validate.c:911 msgid "certificate is not usable for encryption\n" msgstr "" -#: src/validate.c:879 +#: src/validate.c:912 msgid "certificate is not usable for signing\n" msgstr "" @@ -1412,11 +1440,15 @@ msgid "lookup a certificate" msgstr "" -#: src/dirmngr-client.c:130 +#: src/dirmngr-client.c:71 +msgid "load a CRL into the dirmngr" +msgstr "" + +#: src/dirmngr-client.c:132 msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n" msgstr "" -#: src/dirmngr-client.c:134 +#: src/dirmngr-client.c:136 msgid "" "Syntax: dirmngr-client [options] [certfile|pattern]\n" "Test an X.509 certificate against a CRL or do an OCSP check\n" @@ -1424,89 +1456,98 @@ "not valid and other error codes for general failures\n" msgstr "" -#: src/dirmngr-client.c:220 +#: src/dirmngr-client.c:224 #, c-format msgid "error reading certificate from stdin: %s\n" msgstr "" -#: src/dirmngr-client.c:227 +#: src/dirmngr-client.c:231 #, c-format msgid "error reading certificate from `%s': %s\n" msgstr "" -#: src/dirmngr-client.c:241 +#: src/dirmngr-client.c:245 msgid "certificate too large to make any sense\n" msgstr "" -#: src/dirmngr-client.c:260 +#: src/dirmngr-client.c:264 #, c-format msgid "lookup failed: %s\n" msgstr "" -#: src/dirmngr-client.c:287 +#: src/dirmngr-client.c:279 +#, c-format +msgid "loading CRL `%s' failed: %s\n" +msgstr "" + +#: src/dirmngr-client.c:307 msgid "a dirmngr daemon is up and running\n" msgstr "" -#: src/dirmngr-client.c:309 +#: src/dirmngr-client.c:329 #, c-format msgid "validation of certificate failed: %s\n" msgstr "" -#: src/dirmngr-client.c:316 +#: src/dirmngr-client.c:336 msgid "certificate is valid\n" msgstr "" -#: src/dirmngr-client.c:322 +#: src/dirmngr-client.c:342 msgid "certificate has been revoked\n" msgstr "" -#: src/dirmngr-client.c:327 +#: src/dirmngr-client.c:347 #, c-format msgid "certificate check failed: %s\n" msgstr "" -#: src/dirmngr-client.c:338 +#: src/dirmngr-client.c:358 #, c-format msgid "got status: `%s'\n" msgstr "" -#: src/dirmngr-client.c:353 +#: src/dirmngr-client.c:373 #, c-format msgid "error writing base64 encoding: %s\n" msgstr "" -#: src/dirmngr-client.c:385 +#: src/dirmngr-client.c:405 msgid "apparently no running dirmngr\n" msgstr "" -#: src/dirmngr-client.c:390 +#: src/dirmngr-client.c:410 msgid "no running dirmngr - starting one\n" msgstr "" -#: src/dirmngr-client.c:423 +#: src/dirmngr-client.c:443 msgid "malformed DIRMNGR_INFO environment variable\n" msgstr "" -#: src/dirmngr-client.c:438 +#: src/dirmngr-client.c:458 #, c-format msgid "dirmngr protocol version %d is not supported\n" msgstr "" -#: src/dirmngr-client.c:454 +#: src/dirmngr-client.c:474 msgid "can't connect to the dirmngr - trying fall back\n" msgstr "" -#: src/dirmngr-client.c:462 +#: src/dirmngr-client.c:482 #, c-format msgid "can't connect to the dirmngr: %s\n" msgstr "" -#: src/dirmngr-client.c:545 +#: src/dirmngr-client.c:565 #, c-format msgid "unsupported inquiry `%s'\n" msgstr "" -#: src/dirmngr-client.c:626 +#: src/dirmngr-client.c:657 +msgid "absolute file name expected\n" +msgstr "" + +#: src/dirmngr-client.c:700 #, c-format msgid "looking up `%s'\n" msgstr "" @@ -1516,163 +1557,163 @@ msgid "error allocating enough memory: %s\n" msgstr "" -#: src/dirmngr_ldap.c:76 +#: src/dirmngr_ldap.c:79 msgid "return all values in a record oriented format" msgstr "" -#: src/dirmngr_ldap.c:79 +#: src/dirmngr_ldap.c:82 msgid "|NAME|ignore host part and connect through NAME" msgstr "" -#: src/dirmngr_ldap.c:80 +#: src/dirmngr_ldap.c:83 msgid "|NAME|connect to host NAME" msgstr "" -#: src/dirmngr_ldap.c:81 +#: src/dirmngr_ldap.c:84 msgid "|N|connect to port N" msgstr "" -#: src/dirmngr_ldap.c:82 +#: src/dirmngr_ldap.c:85 msgid "|NAME|use user NAME for authentication" msgstr "" -#: src/dirmngr_ldap.c:83 +#: src/dirmngr_ldap.c:86 msgid "|PASS|use password PASS for authentication" msgstr "" -#: src/dirmngr_ldap.c:85 +#: src/dirmngr_ldap.c:88 msgid "take password from $DIRMNGR_LDAP_PASS" msgstr "" -#: src/dirmngr_ldap.c:86 +#: src/dirmngr_ldap.c:89 msgid "|STRING|query DN STRING" msgstr "" -#: src/dirmngr_ldap.c:87 +#: src/dirmngr_ldap.c:90 msgid "|STRING|use STRING as filter expression" msgstr "" -#: src/dirmngr_ldap.c:88 +#: src/dirmngr_ldap.c:91 msgid "|STRING|return the attribute STRING" msgstr "" -#: src/dirmngr_ldap.c:138 +#: src/dirmngr_ldap.c:144 msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n" msgstr "" -#: src/dirmngr_ldap.c:141 +#: src/dirmngr_ldap.c:147 msgid "" "Syntax: dirmngr_ldap [options] [URL]\n" "Internal LDAP helper for Dirmngr.\n" "Interface and options may change without notice.\n" msgstr "" -#: src/dirmngr_ldap.c:230 +#: src/dirmngr_ldap.c:249 #, c-format msgid "invalid port number %d\n" msgstr "" -#: src/dirmngr_ldap.c:261 +#: src/dirmngr_ldap.c:310 #, c-format msgid "scanning result for attribute `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:268 src/dirmngr_ldap.c:328 src/dirmngr_ldap.c:352 -#: src/dirmngr_ldap.c:363 src/dirmngr_ldap.c:473 +#: src/dirmngr_ldap.c:317 src/dirmngr_ldap.c:379 src/dirmngr_ldap.c:403 +#: src/dirmngr_ldap.c:414 src/dirmngr_ldap.c:526 #, c-format msgid "error writing to stdout: %s\n" msgstr "" -#: src/dirmngr_ldap.c:282 +#: src/dirmngr_ldap.c:331 #, c-format msgid " available attribute `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:307 +#: src/dirmngr_ldap.c:358 #, c-format msgid "attribute `%s' not found\n" msgstr "" -#: src/dirmngr_ldap.c:313 +#: src/dirmngr_ldap.c:364 #, c-format msgid "found attribute `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:410 +#: src/dirmngr_ldap.c:461 #, c-format msgid "processing url `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:412 +#: src/dirmngr_ldap.c:463 #, c-format msgid " user `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:414 +#: src/dirmngr_ldap.c:465 #, c-format msgid " pass `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:416 +#: src/dirmngr_ldap.c:467 #, c-format msgid " host `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:417 +#: src/dirmngr_ldap.c:468 #, c-format msgid " port %d\n" msgstr "" -#: src/dirmngr_ldap.c:419 +#: src/dirmngr_ldap.c:470 #, c-format msgid " DN `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:421 +#: src/dirmngr_ldap.c:472 #, c-format msgid " filter `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:426 src/dirmngr_ldap.c:429 +#: src/dirmngr_ldap.c:477 src/dirmngr_ldap.c:480 #, c-format msgid " attr `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:435 +#: src/dirmngr_ldap.c:486 #, c-format msgid "no host name in `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:440 +#: src/dirmngr_ldap.c:491 #, c-format msgid "no attribute given for query `%s'\n" msgstr "" -#: src/dirmngr_ldap.c:446 +#: src/dirmngr_ldap.c:497 msgid "WARNING: using first attribute only\n" msgstr "" -#: src/dirmngr_ldap.c:452 +#: src/dirmngr_ldap.c:504 #, c-format msgid "LDAP init to `%s:%d' failed: %s\n" msgstr "" -#: src/dirmngr_ldap.c:458 +#: src/dirmngr_ldap.c:510 #, c-format msgid "binding to `%s:%d' failed: %s\n" msgstr "" -#: src/dirmngr_ldap.c:480 +#: src/dirmngr_ldap.c:533 #, c-format msgid "searching `%s' failed: %s\n" msgstr "" -#: src/dirmngr_ldap.c:508 +#: src/dirmngr_ldap.c:564 #, c-format msgid "`%s' is not an LDAP URL\n" msgstr "" -#: src/dirmngr_ldap.c:514 +#: src/dirmngr_ldap.c:570 #, c-format msgid "`%s' is an invalid LDAP URL\n" msgstr "" From cvs at cvs.gnupg.org Tue Dec 21 20:00:20 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Jan 28 12:17:04 2005 Subject: GNUPG-1-9-BRANCH gnupg (25 files) Message-ID: Date: Tuesday, December 21, 2004 @ 20:05:15 Author: wk Path: /cvs/gnupg/gnupg Tag: GNUPG-1-9-BRANCH Added: agent/preset-passphrase.c doc/gnupg-badge-openpgp.eps doc/gnupg-badge-openpgp.jpg doc/sysnotes.texi Modified: agent/ChangeLog agent/Makefile.am agent/agent.h agent/cache.c agent/command.c agent/gpg-agent.c common/ChangeLog common/simple-pwquery.c common/simple-pwquery.h doc/ChangeLog doc/Makefile.am doc/gnupg.texi doc/gpg-agent.texi doc/gpgsm.texi doc/scdaemon.texi doc/tools.texi jnlib/w32-afunix.c sm/ChangeLog sm/gpgsm.c tools/ChangeLog tools/gpgconf-comp.c * preset-passphrase.c (preset_passphrase): Handle --passphrase. * Makefile.am (gpg_preset_passphrase_LDADD): Reorder libs so that pwquery may use stuff from jnlib. Conditionally add -lwsock2 (gpg_protect_tool_LDADD): Ditto. * preset-passphrase.c (main): Use default_homedir(). (main) [W32]: Initialize sockets. * simple-pwquery.c (agent_open) [W32]: Implement for W32. (readline) [W32]: Use recv instead of read. (writen) [W32]: Use send instead of write. (my_stpcpy): Define a stpcpy replacement so that this file continues to be self-contained. (agent_send_all_options) [W32]: Don't call ttyname. * gnupg-badge-openpgp.eps, gnupg-badge-openpgp.jpg: New * gnupg.texi: Add a logo. * sysnotes.texi: New. * gpgsm.c (main): Use default_homedir(). (main) [W32]: Default to disabled CRL checks. * gpgconf-comp.c (get_config_pathname) [DOSISH]: Detect absolute pathnames with a drive letter. -----------------------------+ agent/ChangeLog | 29 agent/Makefile.am | 18 agent/agent.h | 1 agent/cache.c | 9 agent/command.c | 61 agent/gpg-agent.c | 5 agent/preset-passphrase.c | 293 + common/ChangeLog | 14 common/simple-pwquery.c | 124 common/simple-pwquery.h | 3 doc/ChangeLog | 6 doc/Makefile.am | 7 doc/gnupg-badge-openpgp.eps | 7798 ++++++++++++++++++++++++++++++++++++++++++ doc/gnupg-badge-openpgp.jpg | <> doc/gnupg.texi | 10 doc/gpg-agent.texi | 2 doc/gpgsm.texi | 2 doc/scdaemon.texi | 2 doc/sysnotes.texi | 107 doc/tools.texi | 504 ++ jnlib/w32-afunix.c | 7 sm/ChangeLog | 1 sm/gpgsm.c | 3 tools/ChangeLog | 5 tools/gpgconf-comp.c | 6 25 files changed, 8987 insertions(+), 31 deletions(-) Index: gnupg/agent/ChangeLog diff -u gnupg/agent/ChangeLog:1.59.2.53 gnupg/agent/ChangeLog:1.59.2.54 --- gnupg/agent/ChangeLog:1.59.2.53 Tue Dec 21 11:03:00 2004 +++ gnupg/agent/ChangeLog Tue Dec 21 20:05:15 2004 @@ -1,8 +1,33 @@ 2004-12-21 Werner Koch + * preset-passphrase.c (preset_passphrase): Handle --passphrase. + + * Makefile.am (gpg_preset_passphrase_LDADD): Reorder libs so that + pwquery may use stuff from jnlib. Conditionally add -lwsock2 + (gpg_protect_tool_LDADD): Ditto. + + * preset-passphrase.c (main): Use default_homedir(). + (main) [W32]: Initialize sockets. + +2004-12-21 Marcus Brinkmann + + * Makefile.am (libexec_PROGRAMS): Add gpg-preset-passphrase. + (gpg_preset_passphrase_SOURCES, gpg_preset_passphrase_LDADD): New + targets. + * agent.h (opt): New member allow_cache_passphrase. + * cache.c (housekeeping): Check if R->ttl is not negative. + (agent_put_cache): Allow ttl to be negative. + * command.c (parse_hexstring): Allow something to follow the + hexstring. + (cmd_cache_passphrase): New function. + (register_commands): Add it. + * gpg-agent.c: Handle --allow-preset-passphrase. + * preset-passphrase.c: New file. + +2004-12-21 Werner Koch + * gpg-agent.c (main): Use default_homedir(). - * protect-tool.c (main): Ditto. - + * protect-tool.c (main): Ditto. 2004-12-20 Werner Koch Index: gnupg/agent/Makefile.am diff -u gnupg/agent/Makefile.am:1.22.2.4 gnupg/agent/Makefile.am:1.22.2.5 --- gnupg/agent/Makefile.am:1.22.2.4 Thu Sep 30 16:34:33 2004 +++ gnupg/agent/Makefile.am Tue Dec 21 20:05:15 2004 @@ -19,7 +19,7 @@ ## Process this file with automake to produce Makefile.in bin_PROGRAMS = gpg-agent -libexec_PROGRAMS = gpg-protect-tool +libexec_PROGRAMS = gpg-protect-tool gpg-preset-passphrase AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl @@ -53,8 +53,20 @@ protect.c \ minip12.c minip12.h -gpg_protect_tool_LDADD = ../jnlib/libjnlib.a \ - ../common/libcommon.a ../common/libsimple-pwquery.a \ +gpg_protect_tool_LDADD = ../common/libsimple-pwquery.a \ + ../jnlib/libjnlib.a ../common/libcommon.a \ $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@ +if HAVE_W32_SYSTEM +gpg_protect_tool_LDADD += -lwsock32 +endif +gpg_preset_passphrase_SOURCES = \ + preset-passphrase.c + +gpg_preset_passphrase_LDADD = ../common/libsimple-pwquery.a \ + ../jnlib/libjnlib.a ../common/libcommon.a \ + $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@ +if HAVE_W32_SYSTEM +gpg_preset_passphrase_LDADD += -lwsock32 +endif Index: gnupg/agent/agent.h diff -u gnupg/agent/agent.h:1.32.2.11 gnupg/agent/agent.h:1.32.2.12 --- gnupg/agent/agent.h:1.32.2.11 Mon Dec 20 09:32:56 2004 +++ gnupg/agent/agent.h Tue Dec 21 20:05:15 2004 @@ -63,6 +63,7 @@ int ignore_cache_for_signing; int allow_mark_trusted; + int allow_preset_passphrase; int keep_tty; /* don't switch the TTY (for pinentry) on request */ int keep_display; /* don't switch the DISPLAY (for pinentry) on request */ } opt; Index: gnupg/agent/cache.c diff -u gnupg/agent/cache.c:1.10.2.1 gnupg/agent/cache.c:1.10.2.2 --- gnupg/agent/cache.c:1.10.2.1 Fri Aug 20 15:43:14 2004 +++ gnupg/agent/cache.c Tue Dec 21 20:05:15 2004 @@ -39,7 +39,7 @@ ITEM next; time_t created; time_t accessed; - int ttl; /* max. lifetime given in seonds */ + int ttl; /* max. lifetime given in seonds, -1 one means infinite */ int lockcount; struct secret_data_s *pw; char key[1]; @@ -88,7 +88,8 @@ /* first expire the actual data */ for (r=thecache; r; r = r->next) { - if (!r->lockcount && r->pw && r->accessed + r->ttl < current) + if (!r->lockcount && r->pw + && r->ttl >= 0 && r->accessed + r->ttl < current) { if (DBG_CACHE) log_debug (" expired `%s' (%ds after last access)\n", @@ -118,7 +119,7 @@ Expire old and unused entries after 30 minutes */ for (rprev=NULL, r=thecache; r; ) { - if (!r->pw && r->accessed + 60*30 < current) + if (!r->pw && r->ttl >= 0 && r->accessed + 60*30 < current) { if (r->lockcount) { @@ -194,7 +195,7 @@ log_debug ("agent_put_cache `%s'\n", key); housekeeping (); - if (ttl < 1) + if (ttl == 1) ttl = opt.def_cache_ttl; if (!ttl) return 0; Index: gnupg/agent/command.c diff -u gnupg/agent/command.c:1.25.2.8 gnupg/agent/command.c:1.25.2.9 --- gnupg/agent/command.c:1.25.2.8 Mon Dec 20 09:32:56 2004 +++ gnupg/agent/command.c Tue Dec 21 20:05:15 2004 @@ -141,7 +141,7 @@ /* parse the hash value */ for (p=string, n=0; hexdigitp (p); p++, n++) ; - if (*p) + if (*p != ' ' && *p != '\t' && *p) return set_error (Parameter_Error, "invalid hexstring"); if ((n&1)) return set_error (Parameter_Error, "odd number of digits"); @@ -741,6 +741,64 @@ return map_to_assuan_status (rc); } +/* PRESET_PASSPHRASE + + Set the cached passphrase/PIN for the key identified by the keygrip + to passwd for the given time, where -1 means infinite and 0 means + the default (currently only a timeout of -1 is allowed, which means + to never expire it). If passwd is not provided, ask for it via the + pinentry module. */ +static int +cmd_preset_passphrase (ASSUAN_CONTEXT ctx, char *line) +{ + int rc; + unsigned char grip[20]; + char *grip_clear = NULL; + char *passphrase = NULL; + int ttl; + + if (!opt.allow_preset_passphrase) + return gpg_error (GPG_ERR_NOT_SUPPORTED); + + rc = parse_keygrip (ctx, line, grip); + if (rc) + return rc; + + /* FIXME: parse_keygrip should return a tail pointer. */ + grip_clear = line; + while (*line && (*line != ' ' && *line != '\t')) + line++; + if (!*line) + return map_to_assuan_status (gpg_error (GPG_ERR_MISSING_VALUE)); + *line = '\0'; + line++; + while (*line && (*line == ' ' || *line == '\t')) + line++; + + /* Currently, only infinite timeouts are allowed. */ + ttl = -1; + if (line[0] != '-' || line[1] != '1') + return map_to_assuan_status (gpg_error (GPG_ERR_NOT_IMPLEMENTED)); + line++; + line++; + while (!(*line != ' ' && *line != '\t')) + line++; + + /* If there is a passphrase, use it. Currently, a passphrase is + required. */ + if (*line) + passphrase = line; + else + return map_to_assuan_status (gpg_error (GPG_ERR_NOT_IMPLEMENTED)); + + rc = agent_put_cache (grip_clear, passphrase, ttl); + + if (rc) + log_error ("command preset_passwd failed: %s\n", gpg_strerror (rc)); + + return map_to_assuan_status (rc); +} + /* SCD @@ -837,6 +895,7 @@ { "PKDECRYPT", cmd_pkdecrypt }, { "GENKEY", cmd_genkey }, { "GET_PASSPHRASE", cmd_get_passphrase }, + { "PRESET_PASSPHRASE", cmd_preset_passphrase }, { "CLEAR_PASSPHRASE", cmd_clear_passphrase }, { "GET_CONFIRMATION", cmd_get_confirmation }, { "LISTTRUSTED", cmd_listtrusted }, Index: gnupg/agent/gpg-agent.c diff -u gnupg/agent/gpg-agent.c:1.31.2.29 gnupg/agent/gpg-agent.c:1.31.2.30 --- gnupg/agent/gpg-agent.c:1.31.2.29 Tue Dec 21 11:03:00 2004 +++ gnupg/agent/gpg-agent.c Tue Dec 21 20:05:15 2004 @@ -89,6 +89,7 @@ oIgnoreCacheForSigning, oAllowMarkTrusted, + oAllowPresetPassphrase, oKeepTTY, oKeepDISPLAY }; @@ -141,6 +142,8 @@ N_("do not use the PIN cache when signing")}, { oAllowMarkTrusted, "allow-mark-trusted", 0, N_("allow clients to mark keys as \"trusted\"")}, + { oAllowPresetPassphrase, "allow-preset-passphrase", 0, + N_("allow presetting passphrase")}, {0} }; @@ -392,6 +395,8 @@ case oAllowMarkTrusted: opt.allow_mark_trusted = 1; break; + case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break; + default: return 0; /* not handled */ } Index: gnupg/agent/preset-passphrase.c diff -u /dev/null gnupg/agent/preset-passphrase.c:1.1.2.1 --- /dev/null Tue Dec 21 20:05:15 2004 +++ gnupg/agent/preset-passphrase.c Tue Dec 21 20:05:15 2004 @@ -0,0 +1,293 @@ +/* preset-passphrase.c - A tool to preset a passphrase. + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef HAVE_LOCALE_H +#include +#endif +#ifdef HAVE_LANGINFO_CODESET +#include +#endif +#ifdef HAVE_DOSISH_SYSTEM +#include /* for setmode() */ +#endif +#ifdef HAVE_W32_SYSTEM +#include /* To initialize the sockets. fixme */ +#endif + +#define JNLIB_NEED_LOG_LOGV +#include "agent.h" +#include "minip12.h" +#include "simple-pwquery.h" +#include "i18n.h" +#include "sysutils.h" + + +enum cmd_and_opt_values +{ aNull = 0, + oVerbose = 'v', + oPassphrase = 'P', + + oPreset = 'c', + oForget = 'f', + + oNoVerbose = 500, + + oHomedir, + +aTest }; + + +static const char *opt_homedir; +static const char *opt_passphrase; + +static ARGPARSE_OPTS opts[] = { + + { 301, NULL, 0, N_("@Options:\n ") }, + + { oVerbose, "verbose", 0, "verbose" }, + { oPassphrase, "passphrase", 2, "|STRING|use passphrase STRING" }, + { oPreset, "preset", 256, "preset passphrase"}, + { oForget, "forget", 256, "forget passphrase"}, + + { oHomedir, "homedir", 2, "@" }, + {0} +}; + + +static const char * +my_strusage (int level) +{ + const char *p; + switch (level) + { + case 11: p = "gpg-preset-passphrase (GnuPG)"; + break; + case 13: p = VERSION; break; + case 17: p = PRINTABLE_OS_NAME; break; + case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n"); + break; + case 1: + case 40: + p = _("Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"); + break; + case 41: + p = _("Syntax: gpg-preset-passphrase [options] KEYGRIP\n" + "Password cache maintenance\n"); + break; + + default: p = NULL; + } + return p; +} + + + +static void +i18n_init (void) +{ +#ifdef USE_SIMPLE_GETTEXT + set_gettext_file( PACKAGE_GT ); +#else +#ifdef ENABLE_NLS + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE_GT, LOCALEDIR); + textdomain (PACKAGE_GT); +#endif +#endif +} + + +static gpg_error_t +map_spwq_error (int err) +{ + switch (err) + { + case 0: + return 0; + case SPWQ_OUT_OF_CORE: + return gpg_error_from_errno (ENOMEM); + case SPWQ_IO_ERROR: + return gpg_error_from_errno (EIO); + case SPWQ_PROTOCOL_ERROR: + return gpg_error (GPG_ERR_PROTOCOL_VIOLATION); + case SPWQ_ERR_RESPONSE: + return gpg_error (GPG_ERR_INV_RESPONSE); + case SPWQ_NO_AGENT: + return gpg_error (GPG_ERR_NO_AGENT); + case SPWQ_SYS_ERROR: + return gpg_error_from_errno (errno); + case SPWQ_GENERAL_ERROR: + default: + return gpg_error (GPG_ERR_GENERAL); + } +} + + +static void +preset_passphrase (const char *keygrip) +{ + int rc; + char *line; + /* FIXME: Use secure memory. */ + char passphrase[500]; + + if (!opt_passphrase) + { + rc = read (0, passphrase, sizeof (passphrase) - 1); + if (rc < 0) + { + log_error ("reading passphrase failed: %s\n", + gpg_strerror (gpg_error_from_errno (errno))); + return; + } + passphrase[rc] = '\0'; + line = strchr (passphrase, '\n'); + if (line) + { + line--; + if (line > passphrase && line[-1] == '\r') + line--; + *line = '\0'; + } + + /* FIXME: How to handle empty passwords? */ + } + + rc = asprintf (&line, "PRESET_PASSPHRASE %s -1 %s\n", keygrip, + opt_passphrase? opt_passphrase : passphrase); + if (rc < 0) + { + log_error ("caching passphrase failed: %s\n", + gpg_strerror (gpg_error_from_errno (errno))); + return; + } + if (!opt_passphrase) + wipememory (passphrase, sizeof (passphrase)); + + rc = map_spwq_error (simple_query (line)); + if (rc) + { + log_error ("caching passphrase failed: %s\n", gpg_strerror (rc)); + return; + } + + wipememory (line, strlen (line)); + free (line); +} + + +static void +forget_passphrase (const char *keygrip) +{ + int rc; + char *line; + + rc = asprintf (&line, "CLEAR_PASSPHRASE %s\n", keygrip); + if (rc < 0) + { + log_error ("clearing passphrase failed: %s\n", + gpg_strerror (gpg_error_from_errno (errno))); + return; + } + free (line); +} + + +int +main (int argc, char **argv) +{ + ARGPARSE_ARGS pargs; + int cmd = 0; + const char *keygrip = NULL; + + set_strusage (my_strusage); + log_set_prefix ("gpg-preset-passphrase", 1); + + /* Try to auto set the character set. */ + set_native_charset (NULL); + +#ifdef HAVE_W32_SYSTEM + /* Fixme: Need to initialize the Windows sockets: This should be + moved to another place and we should make sure that it won't get + doen twice, like when Pth is used too. */ + { + WSADATA wsadat; + WSAStartup (0x202, &wsadat); + } +#endif + + i18n_init (); + + opt_homedir = default_homedir (); + + pargs.argc = &argc; + pargs.argv = &argv; + pargs.flags= 1; /* (do not remove the args) */ + while (arg_parse (&pargs, opts) ) + { + switch (pargs.r_opt) + { + case oVerbose: opt.verbose++; break; + case oHomedir: opt_homedir = pargs.r.ret_str; break; + + case oPreset: cmd = oPreset; break; + case oForget: cmd = oForget; break; + case oPassphrase: opt_passphrase = pargs.r.ret_str; break; + + default : pargs.err = 2; break; + } + } + if (log_get_errorcount(0)) + exit(2); + + if (argc == 1) + keygrip = *argv; + else + usage (1); + + if (cmd == oPreset) + preset_passphrase (keygrip); + else if (cmd == oForget) + forget_passphrase (keygrip); + else + log_error ("one of the options --preset or --forget must be given\n"); + + agent_exit (0); + return 8; /*NOTREACHED*/ +} + + +void +agent_exit (int rc) +{ + rc = rc? rc : log_get_errorcount(0)? 2 : 0; + exit (rc); +} Index: gnupg/common/ChangeLog diff -u gnupg/common/ChangeLog:1.30.2.40 gnupg/common/ChangeLog:1.30.2.41 --- gnupg/common/ChangeLog:1.30.2.40 Tue Dec 21 13:44:42 2004 +++ gnupg/common/ChangeLog Tue Dec 21 20:05:15 2004 @@ -1,5 +1,19 @@ 2004-12-21 Werner Koch + * simple-pwquery.c (agent_open) [W32]: Implement for W32. + (readline) [W32]: Use recv instead of read. + (writen) [W32]: Use send instead of write. + (my_stpcpy): Define a stpcpy replacement so that this file + continues to be self-contained. + (agent_send_all_options) [W32]: Don't call ttyname. + +2004-12-21 Marcus Brinkmann + + * simple-pwquery.h (simple_query): Add prototype. + * simple-pwquery.c (simple_query): New function. + +2004-12-21 Werner Koch + * signal.c (got_fatal_signal, got_usr_signal) (got_fatal_signal) [DOSISH]: Don't build. * simple-gettext.c: Include sysutils.h Index: gnupg/common/simple-pwquery.c diff -u gnupg/common/simple-pwquery.c:1.1.2.7 gnupg/common/simple-pwquery.c:1.1.2.8 --- gnupg/common/simple-pwquery.c:1.1.2.7 Wed Dec 15 15:15:09 2004 +++ gnupg/common/simple-pwquery.c Tue Dec 21 20:05:15 2004 @@ -1,5 +1,5 @@ /* simple-pwquery.c - A simple password query cleint for gpg-agent - * Copyright (C) 2002 Free Software Foundation, Inc. + * Copyright (C) 2002, 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -40,6 +40,10 @@ #ifdef HAVE_LOCALE_H #include #endif +#ifdef HAVE_W32_SYSTEM +#include "../jnlib/w32-afunix.h" +#endif + #define SIMPLE_PWQUERY_IMPLEMENTATION 1 #include "simple-pwquery.h" @@ -63,6 +67,25 @@ #endif + + + + +#ifndef HAVE_STPCPY +static char * +my_stpcpy(char *a,const char *b) +{ + while( *b ) + *a++ = *b++; + *a = 0; + + return (char*)a; +} +#define stpcpy(a,b) my_stpcpy((a), (b)) +#endif + + + /* Write NBYTES of BUF to file descriptor FD. */ static int writen (int fd, const void *buf, size_t nbytes) @@ -72,7 +95,11 @@ while (nleft > 0) { - nwritten = write( fd, buf, nleft ); +#ifdef HAVE_W32_SYSTEM + nwritten = send (fd, buf, nleft, 0); +#else + nwritten = write (fd, buf, nleft); +#endif if (nwritten < 0) { if (errno == EINTR) @@ -102,7 +129,11 @@ while (nleft > 0) { +#ifdef HAVE_W32_SYSTEM + int n = recv (fd, buf, nleft, 0); +#else int n = read (fd, buf, nleft); +#endif if (n < 0) { if (errno == EINTR) @@ -182,8 +213,10 @@ } dft_ttyname = getenv ("GPG_TTY"); +#ifndef HAVE_W32_SYSTEM if ((!dft_ttyname || !*dft_ttyname) && ttyname (0)) dft_ttyname = ttyname (0); +#endif if (dft_ttyname && *dft_ttyname) { if ((rc=agent_send_option (fd, "ttyname", dft_ttyname))) @@ -259,9 +292,6 @@ static int agent_open (int *rfd) { -#ifdef HAVE_W32_SYSTEM - return SPWQ_NO_AGENT; /* FIXME */ -#else int rc; int fd; char *infostr, *p; @@ -286,7 +316,7 @@ strcpy (p, infostr); infostr = p; - if ( !(p = strchr ( infostr, ':')) || p == infostr + if ( !(p = strchr ( infostr, PATHSEP_C)) || p == infostr || (p-infostr)+1 >= sizeof client_addr.sun_path ) { #ifdef SPWQ_USE_LOGGING @@ -296,7 +326,7 @@ } *p++ = 0; - while (*p && *p != ':') + while (*p && *p != PATHSEP_C) p++; prot = *p? atoi (p+1) : 0; if ( prot != 1) @@ -306,8 +336,13 @@ #endif return SPWQ_PROTOCOL_ERROR; } - - if( (fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1 ) + +#ifdef HAVE_W32_SYSTEM + fd = _w32_sock_new (AF_UNIX, SOCK_STREAM, 0); +#else + fd = socket (AF_UNIX, SOCK_STREAM, 0); +#endif + if (fd == -1) { #ifdef SPWQ_USE_LOGGING log_error ("can't create socket: %s\n", strerror(errno) ); @@ -321,7 +356,12 @@ len = (offsetof (struct sockaddr_un, sun_path) + strlen(client_addr.sun_path) + 1); - if (connect (fd, (struct sockaddr*)&client_addr, len ) == -1) +#ifdef HAVE_W32_SYSTEM + rc = _w32_sock_connect (fd, (struct sockaddr*)&client_addr, len ); +#else + rc = connect (fd, (struct sockaddr*)&client_addr, len ); +#endif + if (rc == -1) { #ifdef SPWQ_USE_LOGGING log_error ( _("can't connect to `%s': %s\n"), infostr, strerror (errno)); @@ -353,12 +393,11 @@ *rfd = fd; return 0; -#endif } /* Copy text to BUFFER and escape as required. Return a pointer to - the end of the new buffer. NOte that BUFFER must be large enough + the end of the new buffer. Note that BUFFER must be large enough to keep the entire text; allocataing it 3 times the size of TEXT is sufficient. */ static char * @@ -505,3 +544,64 @@ spwq_free (pw); return result; } + + +/* Perform the simple query QUERY (which must be new-line and 0 + terminated) and return the error code. */ +int +simple_query (const char *query) +{ + int fd = -1; + int nread; + char response[500]; + int rc; + + rc = agent_open (&fd); + if (rc) + goto leave; + + rc = writen (fd, query, strlen (query)); + if (rc) + goto leave; + + /* get response */ + nread = readline (fd, response, 499); + if (nread < 0) + { + rc = -nread; + goto leave; + } + if (nread < 3) + { + rc = SPWQ_PROTOCOL_ERROR; + goto leave; + } + + if (response[0] == 'O' && response[1] == 'K') + /* OK, do nothing. */; + else if ((nread > 7 && !memcmp (response, "ERR 111", 7) + && (response[7] == ' ' || response[7] == '\n') ) + || ((nread > 4 && !memcmp (response, "ERR ", 4) + && (strtoul (response+4, NULL, 0) & 0xffff) == 99)) ) + { + /* 111 is the old Assuan code for canceled which might still + be in use by old installations. 99 is GPG_ERR_CANCELED as + used by modern gpg-agents; 0xffff is used to mask out the + error source. */ +#ifdef SPWQ_USE_LOGGING + log_info (_("canceled by user\n") ); +#endif + } + else + { +#ifdef SPWQ_USE_LOGGING + log_error (_("problem with the agent\n")); +#endif + rc = SPWQ_ERR_RESPONSE; + } + + leave: + if (fd != -1) + close (fd); + return rc; +} Index: gnupg/common/simple-pwquery.h diff -u gnupg/common/simple-pwquery.h:1.1 gnupg/common/simple-pwquery.h:1.1.2.1 --- gnupg/common/simple-pwquery.h:1.1 Wed Jul 16 15:44:43 2003 +++ gnupg/common/simple-pwquery.h Tue Dec 21 20:05:15 2004 @@ -57,6 +57,9 @@ const char *description, int *errorcode); +/* Perform the simple query QUERY (which must be new-line and 0 + terminated) and return the error code. */ +int simple_query (const char *query); #define SPWQ_OUT_OF_CORE 1 #define SPWQ_IO_ERROR 2 Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.39.2.19 gnupg/doc/ChangeLog:1.39.2.20 --- gnupg/doc/ChangeLog:1.39.2.19 Tue Nov 23 18:09:51 2004 +++ gnupg/doc/ChangeLog Tue Dec 21 20:05:15 2004 @@ -1,3 +1,9 @@ +2004-12-21 Werner Koch + + * gnupg-badge-openpgp.eps, gnupg-badge-openpgp.jpg: New + * gnupg.texi: Add a logo. + * sysnotes.texi: New. + 2004-11-05 Werner Koch * debugging.texi (Common Problems): Curses pinentry problem. Index: gnupg/doc/Makefile.am diff -u gnupg/doc/Makefile.am:1.21.2.6 gnupg/doc/Makefile.am:1.21.2.7 --- gnupg/doc/Makefile.am:1.21.2.6 Thu Sep 30 10:38:32 2004 +++ gnupg/doc/Makefile.am Tue Dec 21 20:05:15 2004 @@ -1,4 +1,4 @@ -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004 Free Software Foundation, Inc. # # This file is part of GnuPG. # @@ -18,11 +18,14 @@ ## Process this file with automake to produce Makefile.in +EXTRA_DIST = gnupg-badge-openpgp.eps gnupg-badge-openpgp.jpg + info_TEXINFOS = gnupg.texi gnupg_TEXINFOS = \ gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi assuan.texi \ - tools.texi debugging.texi glossary.texi contrib.texi gpl.texi + tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \ + sysnotes.texi DISTCLEANFILES = gnupg.tmp gnupg.ops Index: gnupg/doc/gnupg-badge-openpgp.eps diff -u /dev/null gnupg/doc/gnupg-badge-openpgp.eps:1.1.2.1 --- /dev/null Tue Dec 21 20:05:15 2004 +++ gnupg/doc/gnupg-badge-openpgp.eps Tue Dec 21 20:05:15 2004 @@ -0,0 +1,7798 @@ +%!PS-Adobe-3.0 EPSF-3.0 +%%Creator: GIMP PostScript file plugin V 1.10 by Peter Kirchgessner +%%Title: /home/wk/gnupg-badge-openpgp.eps +%%CreationDate: Thu May 4 10:58:15 2000 +%%DocumentData: Clean7Bit +%%LanguageLevel: 2 +%%Pages: 1 +%%BoundingBox: 14 14 250 250 +%%EndComments +%%BeginProlog +% Use own dictionary to avoid conflicts +10 dict begin +%%EndProlog +%%Page: 1 1 +% Translate for offset +14.173228 14.173228 translate +% Translate to begin of first scanline +0.000000 235.680000 translate +235.680000 -235.680000 scale +% Image geometry +491 491 8 +% Transformation matrix +[ 491 0 0 491 0 0 ] +% Strings to hold RGB-samples per scanline +/rstr 491 string def +/gstr 491 string def +/bstr 491 string def +{currentfile /ASCII85Decode filter /RunLengthDecode filter rstr readstring pop} +{currentfile /ASCII85Decode filter /RunLengthDecode filter gstr readstring pop} +{currentfile /ASCII85Decode filter /RunLengthDecode filter bstr readstring pop} +true 3 +%%BeginData: 538041 ASCII Bytes +colorimage +JcFO*s8Mfn"T8)mr;QTn!<2ut"TA>srVl]o#6">np\=R`kPk_ar;-9cq"j^aoEFs_q>:*fjo>>Z +!W;rhs8W'#rVlirq>^Kos8;oos87HJgAc[~> +JcFL)!<2urs8;lpqu?]qrr!0&q>UBnrVuoss8N#ss8W)rs82fqr;c`nq%EAjmd0/tgXXWn_SEgo +ZEUO:YkkX)Y8FOM['mHQ\\5o'cI:M)kN_R0q"aXYrr;urrrE&prrW/srqlWsr;HWprr2p#rr<#t +rpKg]rdk+4s*t~> +JcFa0"T.i_q"sO[s8Dro!;?Bir;R!!qYU6is8Mrr+8l!3q=saWna,K$j58S8^UCAGU7%7*Kn+Sq +EGoZ/AGTg9@38uiAnYmnDfpM`Ng?H@\\QG^Knq>5aCk5Tr~> +JcFR+s8E)trr2`nrr2co"T8;us8W)trr;usr;Qcqp\u$-q"*n9hqQc6eC2mtg>:ZBhV[8OjQ63p +)<0W6i8EMMhW*VRhVHr>f@JI%g#2/eoCVnNrrE&rs8W)rs8W'"s8N#qrrDuqs8Mutr;HVGs4[L'~> +JcFC&s8E#urVlZn#lXZ!rql]lrr;usrr<#t!<)iqs8;oqrqnJIp@@>&f$24J['-I,VP9f\Vl6Jg +US=NZV5C#`USOZ\USOcaV59u`US=Z`USFW\rhBgsVldAAajAYun+QbW')VV*rVZQjrVl`orr)ip +qYL3jrquotrVlcq"9/?"qsOL^rdk+3s*t~> +JcFa0"TA2nqu-$as8<0"qY^$P37=B\j7?sm>MA7oUmEHZegQ(b4c_U.#oio]LlnauMLq>1'gs8W)u +r;$0erVlfkrrW/sp\t'hrV6EkrIP"-s*t~> +JcFa0s8E#rrr)usqt^3c!W2fjrri?!q>C0irW)ops8MutrV$6qq"*b.g>h5mi=b//hq$?0f@\^+ +e_Jm6hVdGUk5" +JcF^/!<2Qhs8;urrr)isrVc`trVZWnrr;rqs$m"aq"jg\pup\gbe^]cSu/0s`qY^Bn +rquforWN2trVcZnrqHHmrdk+%s*t~> +JcFL)rr)ls#6"GrqYL*dr;?Zrr;$?mrVZ\#rr)]`lfmEeg;LM%SW8)7?tE\L>$>-7?tF+jCi*p$ +BPhU(E,p)DG^b*lIXlltIX63_FEMSDEGT<"@qB:`?t!GI=]ed/>$PBAASus\UU7ngj6#Uln+QYU +r:Bpkrr)iqs8Doorri5qqYU5Bs4dR(~> +JcFa0$3'htr;?Qnr;6 +JcF-t"TA8rrVl`p"oS5rrr<#trW)lqrVua7q!?nhah5*_Vkg)`VPU/dVlHo-]>;M5f&>uepAX^h +p@n@XqYU-bq#C0ip]1'fp*o\/q>C'UhU9H_^q6tVW2-5_SXuOLTq@pPWj97Xf]2JqqYL-dqu6Tp +qu6Nn!W;qJs3:Ro~> +JcFO*#6"Gqqtp?jrqccnqtpBkqu6ZprVnDFq"XUWo^V84iQo6CT9"_LDJEfp@p`ME>$G?FCN4ZZ +Q_LRf[^EKK['[7?[K3kKqRljAs1A?DrjjPe\@K2ZWgAWkH$!q9?<0s);c-S!?=IDVDg?ttTWu;_ +io]Oomdp5NrV$6krqHEnrVQTmJcFL)J,~> +JcFa0"oeDpr;?Qks8W)tr;ZclrrrE%rr2cnqu6j!p[7G0h>Z7:hq?Z:hW*njo'HAWrr)6a!<2Ti +&b"f=hV-Z>hr*DLi8iqUlLb&Nrseo'r;6Bequ$Bhr;-Elr;Qs"qtU!arqZQrrqu]nJcFp5J,~> +JcF!ps8Muq!;ucp$N0l$qt&q!ah+s[rLjRqUSb&r]Z8FQp%JC["o8&pqYL*gr;linrr*'!r;?Hg +q>C3grVR*(r;$-_qY^9krVH?brq@T'hTW^CZE:(,WMZGaTq\ +JcFO*#6"GrqYU6inc's7qt^$Wna,Dj_Q&uXHu3>#?s[>SCN+NNO-lTP]=bbd\@T>c^;'Z_$,OEo +`5KR3_ns:d`VmaQ`#nU'>\8;AT +JcF^/rr2Zls83&tqYL-frq6:$rT`1fdb*I7hV-cJn+ZeSs8W#sqZ-Wps8W)trrN-!rVcconbrRe +rr)j&rqu`nr;?NlrqQKsp\"%@k2cO$#isq!g=Y*9meHVX#QFZ#s8Murrql]uqt^'brdk+(s*t~> +JcFR+s8N&s"8r,rrqQKsrr)flr;6Kl)u0C$iQ\s8V5C5hV4sch\\lY_p%J(Np%eOarVlisrr2p% +rr)fprr;uqrrN-!nbrOer;Zfqs8E-!r;?Nmr[@[>p\+:Qo$Y^t\$)g.US+ +JcFI(rVcBg,lRW5na,AnhpB$4NI,PYBk(IO>%MVuLU+A"]">_p`lQb`5KX7a2lBG +bK\;Un]E`1`5Tj@aiDB=`Pod8`lH0@a2>[)\[A`FMgoe]>ujj% +JcF7"s83-!rr2imqYU6grseqdgZ.2IgXss'fB;Vrqu6ZpoDejhqu?]qqu?Kjrqu`l!<)`ns8E6& +rr;urr;H(QGio&M>h":CA!<.QLcMrC~> +JcFa0s8N#rs8;oo"8r,rrqQL&rqu]mr:]gFcEEt?Undpe$a$hYdba6\q"OU[r;6HprVZTlr;uur +rr)lsrr)fqrq-6hrX/W(rr)cnrVliqrql]rr;Q]qs8F2?rr2lno]b,X]sau`!~> +JcF^/s8DN3[^iu^^AYkN`5BR5`r3p\_ns=0a8X*Y`W+$Z +bQ#cdbPK?[aSa'[`l,jq`;[dXaN=G*.EffN`Poj8_SEq%^V@CgVj`WfCL:1F<`rg>Anc+4TY]@@ +n+$#BqYU0es8W&ms8W#tqu6Emqu)*GkPp&~> +JcF7"!ri,qq#:cleC3"-hVmJSlhCAVq>^Ko"T%ogq>C6kl2M:kqYU-dqYU-equ$?hqu-Kirr`9# +s8Muo$N0o$qYC!crr)iprr2fp%fQ4kiSE;Lk2YC\jP8AWlMgk`JcF[.J,~> +JcFa0!ri/rqYgHnq>V3/r;6 +JcF^/s8Dcnr;APNq"FFSo'bl(bcHA6A7/D8;,^qJM3OpK]u7n.a2Q!;aN)9=_o':)_Sa70`l?'= +a2Z*;`5V\prQ#u$aN)9?`Q,s<`Q6'?`lQ0Aa2Z-<`lH3Ba3)TJrlGMjb0%`B_o0R7`Q8"us2Z.s +\#GgUK5t=#='K$<@VBUtJZ-`Gi9'Fuq"t$grri;tqu-Kis8W&sqZ-SGs6'E4~> +JcG!7!<)os!<2lq%0$2&qu6WqrVuoqr;6El$iKVbhr!8Cf\Pf]rV6C#rqlNcp%A+Uqu$Bkqu?]q +!;uKhr;I0'rqucnrqucnrqucnrqcQerqH?grqQL%p[I>)jQZ$slKIL#q"k"&rVl]os8N&urr<#t +s8Dups8ITLjSs`~> +JcG!7!<)os!ri6"r;H]pr;Rl;s8W)urr;usqWQ>A[\BOlUo1N8cemsWq"ad`rr)ihrrN-!rVcs" +rr;rprqlZls8Duss8N)unGi%Xqu?Kks8Dus/,]5>q"!\"a0VY9T:MLCStr[2g$SV4qu6Wps8;lq +qYpHkrr)irrVucprdk+1s*t~> +JcG!7!<)os!<2cn-N*c;q"=FYq>^3VjPeh0VN64@ARf+YD1.;6W3WtF]Y;4u_oBd?rQGboaN2B@ +`P]U4`Q#p=b0'P$qo08i`l?!;`Q#m:`Q#m:`Q#m:aNXV-rQP5_!6FuYq90i'aM59p\@]>YWg8E[ +?rp<(9i"\pFHE]NiTp%2qu6`ps8Mlp!<%KKir=N~> +JcFm4%fZG+rr)inrqu]kqYL!dq>UQ[f$i=Oh?)p4rq$-or;69`p%S@\rqu]nqZ-QhrrW2tr;QTn +r:Bpfr;QTjr;6Kkr;?Q^rsSenkj@Qmi83/ +JcFm4#6+T#rr)ipp\u94qu$9^ilA3uVPU)aYeefImJ-_UqYgBiqY^ +JcFm41&h.Nrr)ios8W&rqYBgXp@Ih?m,?C&R!NLY?s?fHHB+W$]Z7t3aiDB<_Sa:1`lQ=%bl>i] +aSX-Xbl5c_a:lS7`l?!;`Q#m:`Q#m:`Q#m:aNXY.rQP8`r5\r^bfp(/rlk8^,fn$F`l?'A`kfO( +YG$r!@T-,u9iPG5FFUO9iT]e(q"t$iqu)*GgAc[~> +JcFs6s8Mus$i]trqYL*gqYBs^rr)j&qsik'f@nm9oBcMWrquctrquTkq#C-mqu$Hkqt'U`qssXb +rqcZorqZKkroX4ho]tGjh:p]AiSs.mr;Q^(rr;utrqH?fq"t'hJcFa0J,~> +JcFs6s8Mio!WE#qrttY3q<5u3Yc4:iX0KLom.'lLr;-*YrVuiqquZirrVc`qrrE&trVulms8DrV +s8)]rs8N#ns8;lnrVZTnq^MIBrr)ZjrVcZkqt\se\?Dj+T:r!X[_p_bp\aabrVuops8Vuqs8;lo +rr.KKkPp&~> +JcFs6s8Moq-iWu9p%\=ZrV6$Pho2.?G\gboAS-+GTrbc@aN;THdEg+^aiDEA`qm[S_[sf,aNDcR +cdC(bc-4>ScdC/>ci;8ibl5a!aNDTF`lQ0@`lQ0@`lQ0@`lQ0>`V[[NaSs?]aSs0\`P]Um_'[.F +c-4ATbf[rB^q[Us]"5DDNdGYQ=]SX1BRGrEb1YqCqYC*irdk+)s*t~> +JcG!7s8;rsrVm$"q=sjdqYpicdbE^CjlGP%qu6Zqr;QitrVl9c!W;ioq>^?lquZlpq#:$eq#C0g +qsXF_rql`orqZKkrq??lrr2irrqud"rqc?[oD&7`$N',Jjl5F^g=G*Hqu6j!q"ssdrdk+/s*t~> +JcG!7s8;rspAb0l%eoqpaJGZ)U7nEdcLCT&rVm0&r;?HjqYU3hrVlfprVliq"8r,rrqcWrrr;uV +s8)`cs8;itrVlfqr +JcG!7s8;rsqYq]:qY'RPn`K&iVgEAm@:3P[MQ!_]]XkksaNW#[eBQ1\rltJds2Y2[rPefS$cU-* +aND`Ocd0k\bl5`bc2Q&hc2Preb500gb/h`Hb/h`Hb/h`Hb/jFupr[_/YH^i7 +JcFg2s8<'"rql]lrs.Z@hqcf0jneoT"oA,pqtpUHoo)/C^rVZWns8W#rr;?Hh!VuTkr;Z^&s8;flqt^$]p\k'frsJJ_hq[)GhrikGoDJUjr:]XX +JcFa0J,~> +JcFg2s8Dut(B+:4rquuF#TqJ?[TuZX!rVlis +rUp3ir;HPEs5s?3~> +JcFg2s8Dut)Z9X8qX`RiUi^!PA7TM4U:S1R^VIOu`l?*BrQH/&b0%uScHXPWbfn5PaN2NKccs\V +aMu3<_u@XT`r='W`r3mT_[j`-b08#Pb08#Pb08#Pb09e+rlG)You6^G1!%VdcHXSTa2Z'9`Q63G +bfe8P`l>j(Y,mFu?s-Q3;dj6PQH.eEo)&Iequ?]pqtg8Bs6'E4~> +JcFm4s8Dcn#P6g&hVdGXo)&FeqYpKpr;HNlquH`qs8N#pr;Z`ss8N#q!<2fo"9/5qqu-Hmrq?@' +r;QWnr;QWnr;QWnr;QWkq>L3jr;Q]ms8N#sr;QTlq>^6iq#pWor;?Qnrs8T!qYU6ir;6EersA2Y +h;78PkgRiNJcFO*J,~> +JcFm4s8Dut'`S(.qtTL-[%X1aUp%esnbr@bqtL'hs8Mrr#QFc&rr)iqs8)]prVZZnrVuitrVlQk +r;Q`ps83E+rr;utrr;utrr;utrr;ujs82f^rrE&trrW/srVc`rrr2rtrr +JcFm4s8Dut)Z00sn`nf>NcAN/=(6TL[)0c(a26!Fc-"/Mr5o/`b/_TDrlY/_rQ>/d$I-f;`l5j3 +_8F10rPnZP!5n`R!QN4Ib5]Q]`r!aR`r*pSaq)\>aiMQDb/hWBaND`Nb/aM(s2Ptr_RQY-F(8*E +='BBLE2h:Fl1=]IqYpNoJcFm4J,~> +JcFm4!;u]n#4C=!e(EgTqu6m"r;Q`rqY^C6hs7uforr;fnrqlcnrVZ]poDejirqufn +')_b.s8N&ts8N&ts8N&ts8N&to)JUdq"tHtr;?QorVc`orVZZqr;QWrqtg0gq>C7!q!?klhWNtU +iUm$I!rVckJcFp5J,~> +JcFm4!;uir&GGqcftOJ]TVoEJiq33Ks8Dor"9/)ks8;fsrr<#trr;osrql`prqQNnrqlWor;?Nl +rql`Xrr)crrr)]mrr;rrs8W,ts8N6$rVlcorr3*"r;6Kkru(_0p\=[^p[["VWLoo`V4ONrg@=b2 +q>UEkJcFm4J,~> +JcFm4!;uir)"$.uYE![:?Y"A=TsVYSa2H!;b0A,K`m4S+!6>)Y!6>)Xs24uX`lJ%trl>)ZrPefV +rQ+lY!6G)XrQ+lYiQ2&Aqoo&^rQGPi`l#^5a2Q*?rl5;caiDB;`5]j=rlGqr`59L.] +MuWYQo)JUdqu6Zqqu6oucIq+.fB3&0rs8T$s8;ijq>:-ersSc$q"ad`rVcZlrVcQkrquZj!rW&s +pAb0l#Q4Jrq>'g]ro3tJrr +JcG!7,6%WBqu-H`i1m0MUS>-CnFHVWrVZQmqu?]qrr)iqq>1'hpAb0ln,NFe!<)fmrr)fpqu?Hj +!<;lo')hh.rr)iprr)iprr)fprVc`opAY*l"o\H#s8N&sr;uoqrr)isrVZ[5rVZQjrqQ6_n%YZp +TqJ'PU8m8Nqu6Wqrr2`nr;M9IpA]X~> +JcG`Jli/X:qXa7DhSXSXEFW6jLoISm_8X@3b/;<@`lH3EbK%]HbK7iE`Q#m:a2c3>`5KXl`WsK! +_8F73aN4A'rQGGibfIfF`r='Zb59B`b/jS%rl>Ab`P][7aN2B?rPnZS#fas,b08,Tbg$+1qoT8e +a2>j7`l?*Aa2e1u,K.UB_oB^8aj8>[d`fnU`lQ!0\upEb=]83t>%DiiiTg+5rUTsirVQQhrrE"L +s*t~> +N;j%[r;?Hhrqufqr;Zfrs8NW/s8W#mr;6?gq>UBnr;QWlrs&&Pgsj^'mJHq^rr^Hkr;-Bhr;HWnrrE&srr`3!rr2fm)ZKd8qZ$Noqu?NlrVufls8N#trr;ut +rr;urrr3T)rqufqs8;opr;HZms82iqs7QBis8N#pr;Zcnrs\c(s81m:k2kabf%9ZnrrrDuq>C6k +q#:Bmqu6Blqtu$F!<7Q~> +O8f:\s8M`lrr2oss8E0!rr;usrVm`5s8W)qs8Drpq=s0lW26AhZ-2A.rV6?jrVulrs8W)trVc`p +r;ZTl!W;iorsA]$s8W)urVulsrVcrur;HWnrr3'!rVufpr;R3)qu?Wpr;Z`qrVufmrr;rr"TA>u +rqucq%efo"s8N&rs8;fns8;opq>^0fs8N)uqu?Worr!]6pAFd<[&9aqV5Boce+W_;rVlisrr2rt +q>U$ds8IcQJ,~> +OoPI[oDejc!;lWm#Q=PrrVulsrqcX+q(qn_u%FRaSa3Ybl>ibaT'9[b5KE] +aplG2`lZ<@_90d:aMu?BrQ#Glc-OYU`5os?`l-!Ab5TWbaoof*b/D0rb6u5(]#2S:b/)3=`lA#! +rlQ"t_o0L7^<"ICbfe/RaMu9B_oTa;`Q.nrq8iKRrlFuZs2b5[&]iD@aM*gN=&Dan?=7iLcJeBo +r +NW9%X!;uins8;lqqu6Zqrr3'!rVl`m"9&5prVZ[#qV]uZhV@Ppqu6p!qtp`MJ,~> +O8f4Zo`#9ts8W)us8N#trr)Zm'D_P(rqQ?_h7KV^U85c_oDeger;?Qqrr;Hds8Vuq!W2lqrseu+ +r;Z`qs82cps8N#trr2rrs8N8us8N&urV6Blq[WZ*r;Z]ps8N&mqZ$Bks82fprrN,pr;R6*s82Zj +s8Duqs8DuqrSmhVrtGD1q=adUca]gBVl62_]BAh`q#1*i"oeJtqu$Hes8DqOs*t~> +OoPI[oD\mhqYg9j"9&8urVlg5rr;lprql9Ri4Y1j@p)uhT=DhW^r4=6rQ+uXqoJWV"N\a,`l@nu ++j%sPb/VB<`llEBaMl3Fb/hZDaND`Qc,n&Bb/h`Na2l@"b5]No_SOL@bga_M`PTa9aND38`r4!Y +ap-)5a1o4%aSs?lb0.iFaNhiJ`lZ0?_o1QU)9gOVbJC]uVLiM^:gR^>BSsmhm-F9 +NW9"WrqufqrVuoqr;R$$p\Xmdqu$Hgrs&#Rf\G?=nbW:crWiAur;?Qns8V9]#ljo&r;Q`rqu-No +!W;ijrWN0!rr;cmr:p9krs\l's7lWmp&Fsis8DunrX&W"qu?]ps7uNgrr2rt#l=T$rVufqrVtjU +"T&&rrqcQm#kd!1kNM*hg\:[H$hsMnq>:0ks8Dlnrdk+Fs*t~> +JcG]K!<2ut+8c';s8Dlps8N#ts8MulkJF:*grr)lqrq$-irr2rnrrU-frr2ourqu`pqYgNqrr2ir +reLN(~> +M#[GPqu?Zos8N)urr;uq)?'C,qtp0YiQ%1)?XdhpRDZ_P^VI_)`Q6.!b5]QR`W4*Z`qd\!ai;9: +`lZEA`5K^;aN;ZKaMub/MQE +`lH6Ebg4YXcHaVXb0.oMrQ+`QnAlHd_8474^W"7)_R>M@@U<5CAS[XPiTp:3p&>$hrqZWnJcGcM +J,~> +NW9"Wq#CBk!<2or"9/5prV6BsrTDblhW"D,s8W'%rVZQjr;QZplM_=orVQNkrVlijs8W&trqHHg +rWiK!s8Dlqq>^9i&,c,#p](*dqt^9fs8;`hs7uWtqZ$Tnqt^3j%K?8%rr;onr;?Qmrr2rWrr1*ir;;-Gq#>j~> +JcG`Lrr2lrs8Er:rr2lpq"amai5)7hU8Z0"q>'pdqtg3erVl`p"TJAurr2Bdrr2os#QFZ"rr2rt +pAFpnp](3krr2rtrW`Dus82Wlq#(0jrX\r"s7cQhq"XU`q#C9hqZ$Bj"oA9!r;6rr<#srr)lsrr2lmrr;osreLN(~> +M>mSSrVQWnr;Zcn!<)co)#Emklg!EDP\k, +OoPCZp&G'i!<2`m!W)`mrs&>Rf%f'AqYU9mrVccrqulurr;Q]ns6BU`r<<3#s8Dilrr3,trVuio +q>LWos8;H=\D[2Yrr +K`D&NrVmo;s8N#trVlfrq>:0cr:ndBTV\Qoe*Q`)s8W&prql`orr2lrrq?Bjrr)lsrr<#urr2p! +rqlTlrs/H$s8DlorVl`p#Pe>pmaAN"q>L?lrr +MuNkWqtp?gs82`o!WDlnp_`l-s8N&sl/U?mF^efgEKI61_TBp<^r+7laoK]abl>icaSs3V`W*sV +a:-)-`Q$!?`l>s8`Q#ps`>m7M`kT=1ai_lQb/VE>`l>sHf$Usm[Dg%u_8XLpaq2kEb0SCgH%:@/ +e&]bKccF9,aT'7!b07oKf%&7!cH4;XcGd]CaN;WJbK%]Db0%fHrPnfTrPnEL)oft:_oU'HcH45L +_Rd.aV1N8b +OoGO_r;Q]_rrDumrrqZ6f\#0YrVmH-rqQUEm%K?:=-7:#^.aRefrV??drYPG2s8Mfjnb`+]q"jpgrr)clrql]ms8V*X +qu6s#qu$Kks8Vonrr39$kMb=]lJ^dsrVuosqYpQprVQZpKE$H~> +LAq8Qrr;oqrr3*"p\t0kr>#8%n&D6&UT;H'q"a^_rqlQks8W#prr2usrVlcorr2coqu6Qorr)ru +rVlisrr:3krVZTmr;QWos8;lis7-(8q>LC9jp!gILStMgKWQ=B$r;?Tprr)fp +rr;unrrE%Qs*t~> +N;itXqtpBhrVQKl,lRT7nbDtVp\=IDd[YDq@:Ob`\%KJoaMbp5bJqE;aihoNc-?73rQ>/]qSrQV +s2lt`lQa3)R'aT'6d_TC0Rdauamcd_s;%+EA>`l#m8aMuHMb0'_)rPniUrPn?J*mDmPaN)?@ +a25g6\\#_iZ]As-:/Y8'H`# +OoPI\p&>$kr;Zcqq>UWff%\j5lMLScr;-M31oDeWQ8gmPPO.jSNqXXOYq>^Enqu-ENrW<-!qu6U% +rr;umq>^Kkq>U?m#Nab'lf$mgpAY'pqYU*drquctrquZmquH_Ns*t~> +O8f4Zrr3*"s8N#prr`5trVl]o%fQ+tqW#MhW2Qu>m/I"XqYpQprVuos!<;HcrVZ`qrr<#t!WE#s +s8W!&s8DZgrUTsfpAY*jrr2p%q2Z[>++Eq]s8N#trso&'rCnCV)AaT1qu$Kms8N!!s8N#srtb5+ +p6.rk:2#TX_qb%Vq=j[arVucnqtg +NW0+Zqtp6hqtg9grt55,pZgnu_3\nLBQAj3`5TF2rlYYmcHaDMbg+GUbg$+1rQ>,`s2t8\A]i6A +c-OYU`l5s?bg";L`PfX5bK7cRf?;Ug_TKm_nrmnZ?K\^>>A=>Q,2POq#13mrVcTnrIOtKs*t~> +L&V8Sr;?QmrrW2trql^!k185>jnSiT#la`"qYBpbq=ag_"o7riqu?]TrX\u,rVZ]qm+//+BU/,f +rVZKj#PUk=)CO,1s7uX)qu?PM,:4EZ,Tn;Js8)cmq>M3-s8Jf@-QjQS-lk#g,V3M]RD%8Eq#C +OoPI\r;Zfr!WW/srr`9!rr2lr')qe+qr58dV5:QFnbN4^qu?]prr2usqu6`ss8VKcrVZits8W)r +r=K#.rVul`eY\^EP4/GLrVuorrWrQ'oL9u<,1?2`s8N#trt##,pk9b4(aC%=*5;ILs82fp!WW/u +rtkV5r1G2W*$#tD)(ZmP-X_Ok]%-?Frr)NhrVuEe"T8<"rVcWn'`7q1rVu]np@nCR]VM +NW9%U"8_olrVQWprVQU5q=*V(]SpiE@;h.4^rja?cHXMRbf[uJaN2O'aTB`2bl,]`aSsE[b5]]c +c!erCb/VHBc-aqba2>j6cd',"KmcO6aOA2G_o9dBbfI]Cd4c.8%^jI%_nj@8bf[rE`RELV#R^\F +'+YMHe&K\Pbf\#HaMu6=_U6nd%M&XC!"/cB$4.;:Bm?,Qb0//Tq9&ZWrPnELs2lk=cH"#Ja2uEI +a2?'CaN;6?]Y;1iH!40G;HS"2bNes(rVQKgqY9p`qu-JGs*t~> +L]7b]qtg-apA+U`s8VomrrqK:*hqZ$Tpr;QuVi8!>Ih=LRE!;QBi!WMtNs*t~> +OT5@[r;Qlus8W)trttb8s8Dusq#:*aqV8EUVl-cRmeZhWs8W)rs8N#rs8W'&rVlipqu-Nns#L&X +qtpEnrr<#qs8;iqq#C9is8;olpA=mfs8Mrroe.=1*$MQcq>^Kks8DusrVXDT)Bh]Kq#:#Xs"N#8GN2_s8N&u!<2ut0)keD;]-Yr+X%mI*ZZ+9)]0S;+!aLOo)/OdrVu]nr;HZo +s8Dutqu$EmrVHNlqYgNorqHEorr)for;Za/s8Munpt2XFTVnN]`UNa#rVu]mrs&H%s82irrJ(?&~> +NrK7\qtg3eo`#^*s7Y^5Y^:(qA8e'F_8O@cd9nMaN)]9&e#%. +PnON=2:p0ra3;cI`lQ3@`kogI4Ui&.#R_"N'GhQ(*Z5n5'+m!Obfn8PaV)n>dEKeYaih`FbJM9> +c,[cDa83mWa8X0Tb500o`l5d,[Zb<2>%;#RPLA[[o(_kUqtg +M#ReYq>C-cq=sUXp\b$prRKN[e`co1#5\5nq>:*hr;Qlur;Q]ks8Mm*q#:9mrqufqr;-?kq>^Hm +s"O?Ed[k*.oDejgs7lWH-R9iR/Dp=%r;Zfrq#C0fIO$*\V#LDlr;Zcrp&G'grqB4f-OJ&k9.V/5 +Qi-g^qu6Qo/b1P@+"P=VXbLL\/0Q>i+!`'U+ +OoPI\qZ$Tnr;RK0s82iqr:9^;WM?Vl_"%9nrVulpqu?]qs8<#us8W)trr!N.rVuosrr;utrr;uq +s8Mrmr;ZTirtYG)d$nO"o)Jafs7cQF,9@a:-JS@prr4JHp]('dGo[kEU&=rhr;Z`qo`+sgrq/l+ ++X5&!7OArqP5>.Wrr2rtrr2lr/ak/1(ad)BWI\PH,oIaJ(EFJ9)B=J/qZ$HkqtU$frquZnqZ$To +r;?Qos82imrqHEprr)fnrqc`prqud4rqcBW]VD3qUSjpTq>C6er;Z]nrr2clL&ZZ~> +O8fC^qtg0drV-=0rr)]cjQ!^qBl%.$X1>g^c-+8Rc-"2M`l@tr!64lV"38F(ao98._T'[@aMuBD +`l,m@_o]p>b0eJS`i=DWA\ua8aOJD]WsTCN$PpIu_7[_0c-+SRcXmn%#(k=O`5^*IdDX>P_9C4a +()7@]eM7sQ(OX`UaiqoI`Q6-@`l6-H(D[PnUoo_n:c07/*$>q3'G1ZYB[4Q@aj&)ScI:.aaj.j) +`WsQ(`lQEI`QI_lpr`QV)TKb4]t(7i>Zas0DgKO^m.BoDqtKj[qY0jbLAuc~> +MZ<_Us83-!qYBs]q>'sersmoEjON;js82irrr)`krq??lrqQLkrqQEjqu?3brVuZks8Voos8)Tl +p%SLa^aUNP:](1irr<#rrjO6r.3M=\r;Zfkrr;fopb*g5/bJu;r;ZZoq>^Kgs8/-3+W>Y"rjO-k ++tWK_r\40Gi@#Wf/bo)8r;Z`di7"<[Al9ft,:<0`s8%;3bkq>3s82]ns8)corVucps8;lprVuls +quciorr2cos8N&rs8E9'rr2ikq>L-grs%uRl1!frgAV$RrVliqK)^?~> +OoPI\q#;$,rVuors8N&rq"`UL?nq>^Klr;ZKbs89VY*umrLs8;lrrVZW#+Vu:>8,3#^s7cKlq#C%:)At!pqtg9kqu6Bjs7cQi +PTq([FS#F:*toS?oDS[fs8W,us8OeLr8&V2)(>1Op\XsfnD;N^N+,L%*ZZHurr;eEPKN^to`+db +s8VurrVccns8W#rrVccq"onT%s8N&krW3&uqu7K/rr22qU7IpATr$E6qu6QorqucorVZYMs*t~> +O8f@]qtg0dqYq`;q>:$gp$(;8CLC[^J\/n/`6?QPbK7cE`5BF/_o9X:aS<[+t*ErVQTp +rJ(?&~> +N;rnVs8;orqu6p!s8UO+i8OM2rrW0!q#:'hr9XFgrr)flr;QTlrr39!s82fpr;Z]mrVn)=s5kLP +-R8!Ss8Vfms7lSA-6O?VCA@Q"s8Vimrj*ji-\;9s)#jI5rVuljs8:q!+!N*$rVlLc.3TpsqYU-g +#lXf$dN^.bAbZ3(,l.B\nl/gbeLq>:3drVuirs8Mijs7uZns8Dlpq#:Qt +r;?Hhr;Q]q"oeDon+lkZrs%uZq=*G%g\h*OrW2opL&ZZ~> +OoPI\q>UHoqYpoor9U5UTVKHns8Dors8Dutr;Q]os82rsrr2fn!WW,trr2otrr2p'q#C6jrqufp +rVca?qu>b!+X%olq>^Kes8VlkGTRe>+D1?Aqu?]ir;<`='I&#*ruD%9s8DuspAb$L)AsJ;lMLMN +8g5,mMYR)Jrr<#srWiK$c5duH@J0X",l7K>s7lKgoBIJ?(F&bVq>\hh.jK/@p\Fj`rVuirs8Mij +s7uZns8Dlp"o\H!rr)forW3&urVulrrr3Q-s8MronCOt;V4jHUXR>f[rVlils8IfRJ,~> +O8f@]qtg3gqu7N3q"F@OioJ4&B3ADeYf=]+c,n2Pb/hT?rP8]U`Q$!AaN44tE66);`5BR7`5Kj> +cc"5Qbfn5R`50@2`6l]N\H*0T$cL05ccan_`nFr<'+kjKc,7EAe&p.gOqeQ>?.$d:aN2WLd*0AU +c+F&d',B$Ie'Kfd()1r>aiqiF`Q63C`Q63,&Khi[cHaYS^r+76^W6>u&IT-Z%aE#4dAR$P"BCQ2 +d+628`s0`/aMYs=_u@aWa8X0ZapuM4`Poa4`Q$!Abg"AQ`r +N;rqW"8r/qqYC-oq:Oc\o_nghp]C-erqcWsrqu]np&A(irVuoqr;6ElqYC0cqY9a]s8)cooDeag +rVfS:+XFMms8N&qrr;ro>9kI<-'J<-s7--hnm*:a-,]WYp&G$kr;ZTlrUj>?,q5AXs82i!+se9X +m/Qq]0E(_HSg5:%J,fQHqYgElrVuoqs6M$X)CtLXs7?2?+WVj[eG]4Cr;ZTmr;Q`rr;HZnrql`m +rr)lnrWE)us7cEj#3=e+mG[?prr3,tr;?TlLAuc~> +OoGI\rqcX1r;$F6)s8N&rs7uZl +nl?hS,F7p#qZ!T9*Z$!as8Drss8Dp)qZ!!)'-;N!s82Zlr;Rf8s6(RH&LI)Is76&9*>p"KdJN_= +r;ZTmr;Q`rr;HZbrWW9"rVc`pq>V3'qY^-dnC4G0St_XQ\)[5^qu?]pq1ep"~> +O8f@]qtg3gr;Rl9nE]H'iQ[Tp@pt;/_TL'Caih]G`Q#j4^;%P(aNDa+b503Z`dc%G`QH9?`5BU= +aN2oUdEg%adE'GH[`->6ajDjR&eL/JcHXkaaN`)`5S+YD&TuaNcb%WYbX)m[$Cf/V^Wk!K`ll9D +d*Fic',QDTfZ_m'%N#ckb1"VV_o'R>@jh:Mbd(jnerU!;qTOJ +,~> +NrT+Xs82lqq>UTkf[e[Grr36"q"jsgs8W)prrE&tqZ6Worr3#us8;k1s8;osrr)lsqY^Biqn[t\ +/Sj,;s7QEgpAam^Jg;TdK)GQCs8W#lrquX?*[;[M^]+31s8211,UZ=_r;?Tos8;ijs8Vhc+=8F% +q>^9jq#=,6-6[$rrVc`ps8N#rrqqg%-RGG[r;QQm*r#W\,U4gCqZ$Els7R]i+X(Lkrr)lps8Dup +p](9grr2rtrr2lrs8Mups8Mrrqu-g"qZ$Qps8;fp#3=n3jPn_\Jc>`MJ,~> +OoPI\qu?]q&cMM&rVcKZe>].:`:NX"r;?Qirri?"rVulrs7ZFqs8Muss8Mrrs7uQlq"VOR8L\?* +q#C$eqtC'apO+&%*.Rk`qZ$Toq>U9d+Vu(4*4u.Irr;i[+WV[sq#(*jrr;oqq>^KfRi3@k4S8[K +s7cLb)]fo-p&+ggs8N!(s87cp*ZgmGqu-Bk*r#QW*uuV,q>^ +O8f4Yrqc]orVn);oBkbpbboGf>(!Qb`lcEHc-F\_`l#a3_8+"0b08,Tbf]_%s2K<%a3)KAbKe5S +f$`0CAhFK`[Em@=c,.?F_96I))%p9#b/i5__nF.9eI)g'&e^qiai)HLb75=*0$hVWdEKtY`4aFE +c[lQ?'J/,$bgFJ_2A7#@9$YZ"_8FC=b/M9@E"jH4I`TdYcHF;H_SX=1d]Wrf*^[uj'u\MPe-?Zo +#Y<@lbg+/Qa32H-53`mDoOd)s&)O]tOU:L.b1f'W82K`?Q~> +NrT.Ys82osp\XsnqpjNRkPbDcq#CBns8Vuorr!-!q>:-hqtp^-es8W&t\fDn=;#((hq#CBnrqlHN-R:#]-0"b#qu;O!)C_*Ms8)ZkqZ$Knr:oM( +,9e;Arp]s`s7WW@+!E,[r;?Qns8W)ts8-=R(bWZ#qZ$TmqYpNkrr3bI-"pbPq>^?hs88r<+:*is6S7pjQP=VrVllrLAuc~> +OoPI\qu6]jrVcX$n_9e8W5SK*s8W#qrs/Q!qY^?lrVlZns8E0$rr2rsqu7o?s8Dfnrq?B^^j."J +(`sY9:&Xhdo`"mjrVs8@(EH6Es8D]jrtG>(i?90\(EVH/s8;nO*YTcaq#C?j)>X=3s8D]R+WMC> +[/04iq>^,g*>]V?bkqA;s8W'Is8-1G%k#*eqZ$TmqYpNks8W)1,%Y)Dq>^?gs7iK-)Ajp7o)8Ue +rUp-h$24Drr;HWprr2llrr<#irr +NrL^0qtp?lqu?]kn*&9,BkD1=^V@n4_90p>aN2BA`5KX7aNVrTbfn5PaN2BBaSX+\aN;NFa2cb/hNC7i)d]S]Aanb/M'U!i)p +r.b6%~> +PQ1[^s8N)urqlfor;?R(nBoD6mf*7drV6-dq"ssg$3'o"q>1!`qu$BkrqH=pqu-Nls8VZ@Ijcin +,9n0Q+sSDIrVlisrql`nk:Ru$,jbF.r;ZNks82ikZ7-h>,$XmCr:ru3-7/!Xqu?Zqs8N#tq=neL +,9S.JS=Q+=QCsZi-6"16qu$Elrr4hSqu'&3,pLb:s8Dors8;iqs82Zmq"t*erVucprqZ@q,UXX* +r;ZTmrr;oirjHjWq"ajdrr)orq>UElqu6Wqs8Mup(&e12rV6Elq=O^Yrr<#shrX1fgY_u%s8N#q +s8Dqfs*t~> +ScAZfq>UHoqYq!'q=jaVd'07D]A!&UrVuoq"TSK!rVZZp!<2ips8Moq!<2rs>5eL"qu$K]dWm&b +*ZZ7:*#fk>\GH.&s8Moqqr9%B(a//As8;ols8W#spT>_U)B2`Ps8;U\*ZlKfrql`prr;uts7uA& +)B0M4C7(HWRZsD/)]fY5=8MmprVn_Rr;8o'*#m6(s8N#ts8Dors8)Qkp\Fd_rr;orr:]bb*[)@h +q>^9jrr;ohrO$URp\=Xarr)orq>UEooDSmks8Donrr3N,s8)cpr7A$GUnF6[gACjHs8N#trrE%\ +s*t~> +U&Y,jp](9lr;QcqrVmu6n*&?&LMppQT#&ImbK%]=^rFI;b/qcJbKJ/VccjW4ap?).`PojbPccX5QM+ +U&Y/lp](9ms830$s8MrnqYBsdrr3,RhUUN^rVuoss82cos8R';s7ZKir;?BgrVQWoq>C9fs7u]o +qZ$Hmqu?B`jH*7a+sS?Z+!XT-,Te=Rq>^kh:C]IgZ/>6 +r;6?j#la\tr;Z`qs8Mup!<2lqs8JnqJ,~> +Sc8cjrVZZn!<2or!<2lqs83?%o]r^Kns8MusrVcP@*Z5t +p&+XcrVucms8)Vj+;u1:*?Z7C*?cRK)'fq2*?_ihrr2p(o`+p`,9@OCpAXsh.K9AHs82ios7lQm +r;Zfms7Xb_'c\E`p&G!jqt&0F,9S$T=h4J0qu?Wbrq69qrr<#tr;?Qnru(e2`iGT)URnLLrr)`o +s82cnr;Q]orr<#rq>UNqs8J_lJ,~> +UAkApqtg3gq>UHnrqc`lrVQU'rU/=RCMII/X1ZEk`;RXVaNDa+c"P>G`mW)UbJqTEajA>R`Pf@( +^sUEHb.u'Ah:^Q)FZKsD'GV;e#W3)0'c:6.e]?%Z`l6!I3>`J>[a32WKbJV9?>n.G_&7j>E +UC[qK?eX)UcH"&D`m;lZM@9t0()If!&e,?M%7D0L'cn'OaMl6?ah,gAcPIQ9'Ze/2aMu'5^V\(2 +bK%lMd`TbW_SjF6f[[>="V_f+f#ttRai^_W%h/jU4Hn.;a2u9uaSF!WaS!RQa;<"Cc-4DS`kf +U&Y/lpAYEtr;Q`qrV6^Kms5k^P*[^d_r;HKis8VumrqQEks7cQlrqcZp +qZ$TcK.A&b./s)@p\ojq*ZcRO-+ +Sc8]hrr)iqqu6`ss7uZo')VLi\tc$th=L@>s8Musrr)iqrr)iqs8N6#r;ZZnrr3)qp]('es!%@> +rr;ijfo&3;*Z-(B,U$s6r9KRg)&"=mrVu]ks8N&nHN"lbK_tcJ'`\+2rVZ]mq-4sW+'s^r.643(`j\?ZN'\!s7lW^rqQNmrWE,sr;HWp)ZK[)p +U&Y/k!rMrpqYpQorVHZorql]p')(P4MJ-I-RBscUc,R]>`Pop@rltJes2o6)bKA)J_oKjIbfeDN +_7dS%c-=DL`PL!:GVfd;$l0Hk'3CXUb'k0I&K09JahYp;^W=f5)&`urai)-:c-4SY_SjF<57S,<% +$B1W&JPbPf@nWq`PfmFajS6@%2BHj$l0Hi&J5Zd%1a-n&J75Wbg"2GaiMEH_A=%'&B_l0ahks6_ +nNn*_T'jF`RN)P_SjF3d+?HM&ePZkj3,Nbemf*o$5*dTQ.a@+c+h +UAk;or;QZp"T/#lr;QWo!WDomrri5PgYD&js8W&trrE#ss8;kFqZ$Hfrr)]kq"adbrr2]krr)ls +qYpMs9.2,6+sA0U>.F/'p&>!U,q'f^Zhj_%r;ZTmqmmso,>@t5rr<#tqu?]mrVu@7+t"EUc6a_\ +:&aqfs8DurqZ$NoDB(#GB?SlSP,"VguRMKrVlruqYpBl!<2ut +rVlZns8JnqJ,~> +TE"rjq#C?m&,lD)rVlcdpVrc#Yg<@Bp\t3mr;ZcsrVlisrqud"rql`qrVuln%K6>,qu?]qs8Vrp +s/eik,QAi++X1!rnG`+[roP7D(*TpYs8W&tqZ$B")]0Sdq>UBn5Q:Q[s82cpm3)]hTK +p\t3ls8Mlpqu1:F+;eS.da!lFR[9;)SnDCL*uu_op\t-jrr;`?*?H/2o_ne;r;6?is8MrrqY9se +p](-js8;cos8!QW)&7\pqPGM[(*FhAT)JK^rVuHf!<;opqZ$Tprr3#urVl[*r;ZZfm(f +T)\fgr;ZfqrVllrrVmAifT]`SF-aeS\]E":`l.ksrl]3%aMu6=^W=C2b/_HAaNi;gf?qIP^V\:E +aN2DK-Ogb($j[1E2NZ&/_8t!D'He))O3#D]`6,g9d%(md&M;8K`lH?Ja32ZCaj\H@$kisX]G)"j +/ChqhcGdiB`6Zlf;[=3M9WGS.F+esfG^)W/;+qE6&JKE=e]l7T`l"hf)]2SrajA\ibfRlGccXDX +bf\2U`QQ6>a2lHRf[Km7%h!7(e;FnL"qV=JJ(Mlcb/hWDo#LjOaSj9]aSNpUa8sH)rlQD*`l6!2 +ZDMkL<*<[E[,'d;rVuorrVZWms8DutqtTmYqtpBqrVHBhVuM8~> +UAt5ls8N9%qt^$arql]sqZ$Hkrs8,Ni7S)0rVuosrW)orrrW,us8Drss#U&Os8Vlnq=M(3BVbA% +qtpEgs8W#sqN<-L*$$A-WTa0TrVQWmr;'PD+XD=-q>UBnqZ$HT.ioo_kPkL$rr;rsq>^Hopuj+I +,pjT_*@.6Vr;6Nls8Dros10L"*A$XXqZ$TepAFgbr;62%-QjHYlMghYs8;o"*??MJp&FmcqYgHo +rqcZpnPcUbq>^Kor;Q`pqu->m+"S]_ZW/7n,9n^]l21ARs8Viks81gT"8qrirqucrr;HX"p#Y8t +lJUt,rrW/srr2rtrqufrrqQKnrhf^G~> +U&Y,kq#C?m&H2A%pA+R[k.RLdXn_Ses8W)s"T85us8;Zl/c>YKqu?Qe[V]WNp&G!is7u]pr;ZVU ++W_I<,Z^o.q"t$es8Dlj;]ckuFnbb3rs8N%qVie;*$XMDs)J&'m^nmip_(aJ2?s7lWms/[%Q+)LQKq>0pbs8W)prr;FaXS)Ag +s8Muss8Dflpo>>\*Z_C[*Z5q<-?82Dqtg?mq#16ioDSaipAXmf(&n..qYU3es8)cgcEa:;T:`^R +p&=shrrW,pr;Q]mrri?"r;HVis*t~> +RK!9crqlZo?iL*'qXipdL0Rtt]YDJ0aMc'<`lcNKaNM]F`l5j6_S*P&bJqiMa,WeeM:U>&`Q#[; +dE9YPAHWAL%1bFR_TL!D`Po[7dR>,k&6-]c_8aU3aNhaB&J>Sgc,n&Nb\tJ@_9pNUcbp1q',M0$% +LdO-aMl08`l,s@esHjV&/`R;cdgXgc-t+heCW;I%LNOSbLk=abeqSW"V;Y[bg4JXc-Y%jbfJ)Za +=Dtgb0\JW`5^$Eb0J.`!Z2[bQoYch&e>XV_pHNA`PfF,bf01p!li=(rQP;arlFuVrQ,#]'$/)/_ +mmCcMf<')>\/f,h=1.5rqZZjp\k*qqY'RRpA4[ds8)fpVuM8~> +T`55qr;6us8)`p$LZs5gA1dKrr;loqu6]rrVZXFs8Dors7l +QN$sarr3Z2qX4:Xo":cnX5*aTrVu`lrr<#srW2usq#=.eq#BlR-mKl],$"@7s8W)rpAb'eg*RgV +,HgY6rVlcps8Dusqj/3>)_CX]rVlirs8;[a*#T[)r;Q]mrr;onrql`nm^=DV(`jJ)-KY1)rso&. +rr;rj-lsEPOn\hRoD\b\rr;lqq"*en*Z65Np\Y!gs8A3/)Ant4o`"miqu$Eks8)W=,pFCqp\k-j +rVuorrquRo(E=A:+!;IB=2sk-s8DusrVuoos7uZjs8W)srVHNirrE&srVca/q#']oTq@sJT#UR) +s8Moqs8;fhrrE&tr;chms*t~> +S,WZjqY9dZqu$J>q#0U+LL""nR`3:bb/D<=a2lHKc-4AR`l5j3_SX++`l,pLbBXF'&/c-FeBlCZ +`6-0Lb0%%"%h9GCdEg+bcd'nTa3)na%LraPaOA2N`l,pAei"-S%\(hf`Q-'>]uA:AeBZ$u$k!gm +'a>5[_oKa6_Sa=;cd,Vu#S%VubJ_K:dE^(^cHF_`d*)Os%2`d2da,eJa(u>#(6Qtbb0/)Vd*Kn[ +b0mEu!s!&Uc-=;LcHjVR`lU4D()Rf#(_RENXjG><_8UEkqYp?pqY'XXqk3t>~> +TDo#jq"X[]rrN,sr;R)PjPBS1rVQ3drVQWprr<#urVukGs8Mroq"F^\Ppdmq+^0gqu? +P5c'lp\FXDU9(34p@nUbs8;fnrs&H"r;Q`prql_&qt^9cPU7Oh*#]J,.:W;Vs8N&os8;or8/iZb +JGo +UAk;nqYU6k"oJ)gpA4ads*=V=l+gtA;L#FXaMlBAaj%iEaND`NcHaPN_nj:/_o9L2e'`CM%L3X_ +&.oaKeBZ(Qd)jSUdF^2b)@1-5b0/&Rcc3uOeA=6a%L<-da3VrJa2Zce6W@j&dc4rb/V< +TDo#jp\Fgds8W)rrr_TEin+20"8_clqu-Nprr)fqrrN)trr"_OqYC']Qn'C"+s\0O-7'BPbP(l3 +s8Vrps72'r*?c^%s8;ols8Vo&E@E4W*@>Ons8W)urr2gD\g&CE:%\Jbs8Mumrr<#qrVQWcCa1&E ++i=$Squ?Wpqu?Wps7H-9l2LKQrVZ]ns8;iqrV6Edl>(-D/T(Faqu-?G,:+?S,:"N^-SJ)/N1\GC +RjfF)Pl1O\s8MomrVucppJ)\Q+X`fSs7cQjpAb*kqYpNko`*qMrr3H,q=jRVq>^Ens8Murr;Q^" +hqd_]i9gOD"S; +U&P,lr;Qcrrr)cp&H;Uh];2F*p\Opir;ZWks7uWls82rts8Dor+TD<9rUcC(*u,e<(E+A;&L,Ho +r;?TpqYpNaLE[QU+nbj7)YsF5p9ABX*uPkU'es8N#r! +UAk;lo_/7`"8_`frVlg5rVQ +TDnulqu$Bls8Mus%dVBkk4&ENq"FU_qZ$Torr6g6s8W)sr;Q]orVZQgpR@D,9Xr$q"F^$E[i4Y+X80[D#"&0qtpEks8N&[.3]c]mJd%`qu?Zpr:g6krr;ll +;'dbjr;ZWnrr2rqrr;ipqu?Wn;#gOpqZ$Hgs8;oorVuZmrqlHip%n^er;Zfn_HAN:.O$,c+s%pT +,U+Ng+^Hnrr`)f +q>C6l#5?p6nDE*jrr3)trr2ioqZ6WoT)X<~> +U&P,lr;Zcp!<2ut#lX]!e#]@L_=[[*=o/0spAb0lrr;urr;?Qns8W)rqY-C'*>BJ4*#9P/)AO;6 +D#+#/qu-QnrVt[u'cnC4qtg$b]P]#6*Z?"<,\ZlLr;-U6jrr2rqrr;ipqu?Tls8N&ps82Wlr;ZZms7cQkq=OXWq>^Hns8Vl.;^`Y4*ZuXG()e8: +*?ZgL(`":)q>^BkrVm`6s7b4h*#BRJqYU6kqu?WorVuosqZ$Toqu66fp\t3m!ri/sqYpWls7uWn% +fQG*n]RVqUn"F/pAb0joDedgVuM8~> +UAk>mo_/7_rrW/rrVlh?qt014Xa+DiH*5!(aN_oLdETPM`l?*EcHXSUaN2KHc-XnhJ.iM)(`4,+ +*uH.9'*q.Ob0@uIaiDNQ^^pnk%]Rq!_TeBD&eGlo'Fk[Idalmka32QIaNqU2'bV8*cc42H`P]j@ +`QlKBaj/R!%hpeMd`Bf7b$2m,ai)EDccjVZaN_ZHa2Q?Db/MKMak,(ldFZOab/1p6bL*.T*YAtd +"UktV(DdJb$lTcp%M"iMe&oVL`P]U1aiV:0)ANk&dDsGVajJ5QaiV`I`66HJb0'\(p;R0Q`lS/% +rlkDb"3AL%`W!jsaNDZLbg+;Wa32K?aMZ$6Z@l4O=BK^IjRi<@q>($nrVH +SGrckqtpBmrr)j'nC#kCq#CBns8W)r!<2rs55PU?kqu$HiqXg=(,pFBN,9%pR@j<-A)(6cT +qtg?mrVlcppJ;nS,C9(%L+">o*[)UL,)=M:s82`nrr3E*r;ZOc+X8>>rr;rsq>LX!rqYa0kkk50 +rr;p3r;6$;\tjsh/g_Jj,U4K[+as8DlqqZ$Nos82cps8;NgrVZ]p +s8NZ0r;6 +T`5/orVlcorVomss8;`L_5=HPiVr`Hs8;lqs8W)srVu`os7uZmrVlisqtfoR+X%jD(`jG9+($'/ +*YftFc2.;:s8N&trq/r'*$9Ct`.B6W*u>h4*$'[Uo)JR`rVlisrrr)lr +rr2lkrqud)rr)lns8Dutr;Q`rr:p6ks8N#rs8W)ur;ciprt550s7tEZTU_UL]BoFos7uZlrr2ur +qZ$TpVZ2/~> +T`5,kp\=[art58,n`.';ASHI]]tqJ1cd0hVrl,/`ai)HJa3+D'>KY:cSH%H(1u0mAIAqZ%hoQd$"g0[e]c:_cH48O`6?IX&/Gn@ccO5LaN2NHaMu3< +aj&2M[`6kDccs_Ybl5cbaSa$ZaND[(bQ,faa=#-ScdC(`bfn5L_nj=8dba2uH=`6$'>aSX-[ +a8j6YaSO'ZaT'6k`Pf[:c,-&j;GL8+Nm?_SqYgEorVZZtqtTs`V#Pr~> +UAk8np\b$mq=XI[rs.]AfAci1r:p3is8;ip:\t+fs8N&uqZ$3cnX_3J,p+!K+WE#&p@k%!*$ZCH +BDql-rVuoqrr'#D+rVmQ+!;UQ*?c^R+JIcjr;HQnrV63ds8MroKI.ocL&1iKqtU0irr`&ns8CXM +(]XI3rr<#oo_/7Wq:`i[NbD-5.S@JUr;$ +U&Q&.s8Doqs8W#ms8Mum_5a<@li6\Ps8VrmrVl`p:\t+fs8N&uqZ$9fnXV$C+W;%8*#C)np%=[l +(EOA7B)DW*rr<#srqri=*YftA*?#b=()e56)P#XXqYU0irV63ds8W#oJKPsOJbf?Fqu-NmrrE&t +rri)ms8;ijrql`orW)orrr)lprW<-!rqud5r;- +U&P8ps8)Nfrr6g6rU]7-QZZeST>%hKbfn2Rc-48J_o9X6cGn/Nb0S)Sa4&:a'F,Hj&K)>l(Ojuk +Kb4n6%M27\bf.N>`PKXBN=?U7*!urY$l06c(`!U;^spi]c-aYO`Q6`s2Y2[rP\fWb5TUPc-4>O`l5s;aND`NaMuBF`l#^6c-Xtmf[e?e`R*,i +^SuTo7PGJn32G6Rc-!r=^VRn1cJ2G9&eT34`P97*_oBd?rQPSkb/hZHb/h[&`Xp2,a32ZGcH*o? +`5]d:b/VO"b5B?Yb5]Q_`r +UAkQ!r;6?err<#trr2p"hV$02p](-i56(QZrVHQiq>:&q +T)TQ&r;HWps8McLWhc?(o`+phs8VrorVlfos!msFrVQWmqu-Gu;]Zl!(`FJ6-(OT$rVQ@5*>ob0 +-JJLsrr<#rs81gu*r[)h,pFTQ*@):7*?c_.T]#P9rr3E+r;ZfoZ6^V8;>C+irquirr;R*$qu-Qp +rVZWns7lTls7uZjs8W)us8N#trri?$rr)fort581qu6?fqYpBcqssIRqu?Zpr;R*&qskaB,Tjer +rqcZlrr<#srqud,r;ZZorVQHks8Mios8Dutqu6Tp#6+T!qu$Bkr;Zfrrr3T-rr;uinu&LZSZ&+O +qY^0grgWq<~> +R/]nUh6Cj,@Xtc!a2lTM_oB^;b0%`A^VS(6aiD9?`Q?ETP<'-a(_RMs%1n!3`ll]X$ka9k&/DOp +_SjC4^rFL/#SS$l&/H#u$4Rg['`Jmr5_Ztq]?&.Bb/hTEbDZi<"u+3Ac,\)RaMl'7`Q#p>A13CXMA +UAkAqq"FL\qu6cdf&,Qerri8ss8N#rs8W'rr;Q]qrVlcqqt0il9dpc!-5n$R,F/3'q#C3foTgXA ++s%r.q>^Kks8Dooqd(Kg,9J+H]Ct34/gqkb*@2dT^KjrWiK&qYU9i +r;YIL$N0l&s8MrnqZ$Qnrr3<'qZ$TjrVu`os7lQt_(-iQ-hmZ*rX]&.s8)`pqZ$Ths8W&rs7lHi +"8qujrql]trqu]nrVllqrr3#op\t0slf76oleVL9rri2rr;Q\is*t~> +Sc9B&r;?Nkpr&o)ZetNWs8)Qir;?TnrqudnrVlfrr:g5r9ICDl+r)+B+d;g#qZ$QooopI7*#K`q +q>^Kls8N#qqHY3]*?#u3[dr7#.3]ZI(*4>;;N]2ps8DrsqtfbQGe*2=q>^KnrVlcq#QFc&qu$Km +r;-H`rq?BlrW`?#rr;upr;HX+rVZ]pr;Q`rrVQWpp\b'grr2utr;R'%r4XI!(F&SQrr2fprVlfr +rVl`p&H;_+rr;fos7ZKmrVccls8W#rrr3#urVcWorqufrrY>J3rVuonr;Z]o]r%NpU7g'3qtg3c +SH"*~> +SH&WgHMdErRV#iai;0<`5Ta?5nOkQ'G=QCf>(f0((q)c'FbR/A!k*XaiMTCb/5Q/R)[FjaihrRaMl'7`lQEG +_SX:0`llB@rPn]Ts2t;]s2kGb`l5jp_#_Hmrl-P2bg";O`lQ?IbJqB2]Y2D/bg=eba25sCaj/AP +_8=45_8!h(`luo('bq)bb5TTlaMu3:_o9X:b0%g)`WO<)aN4>"(<=M@aNW&ReBYqQcc=)K^rFC8 +aNDZLr6"uZs2P&W*5fb7bJ_9:`4s=:_7Xeh<)R"7WnQb0rVccnqu-Kn!rMimVuM8~> +UAk;mo(;eY"4l/co)AXorVuorqYC$erVuoqs8GglrVuons8,M;,9e6O+rVqupAOm]q>:$cnPUMI +-64J9qu?]ls8Drsq4o&R+!KeGq>UEkm^d$[,UXo]+XSdSbl@_=s8Vrqr;QHjs8;]frr +T)TQ)r;?Edjee`Sb4,H0p\t3mrr<#trql^orqu`ps8)co:*h#()]9\6.@9c-r:g-hrVc7_*>9P4 +,cghBs7u]nrr;bh)]BS6j8/KJs8))k@jE*<*Z#_<.V?m(s7u]pq>^?ipAb0kqYgBlrr;uso)JOb +rr;uspAY?rrVc`ps8W)tq>^Km$i9i$rVlclq#C0erqud*rr)VE*#0K2qtp?jrr2fprr2osrVl`p% +K-5*r;Q``p&G'hrVcZls8;irs7QBkrr`9#rr)ir&,c>!qXUeSUnOZbkk=fJrLNt=~> +TDq=Vq"jj^lH"3\C5&b(^W"UJc-+8N`504'_8XF6aN2KGa2#pC-4(+p'b_;j'mS*Vd`08E`6?If +'G)B%'njQKa2Q9Erl?sK#Sn9neD\m&e&oRq8eD[S*#K:t#sFd*b/;NNajJG`b1=hU_9L6G`P][9 +b0%rK`Poj:a8 +UAk;mp\=[d"8C@%h>R?[qu?Wls8Vohqu6Tp"9/5trr2phqYp3_Kd%BQ+LWprVulq +rr;oLrr +TDoK$q>C0YeYB%BhXgdHq>^9drr2utqZ$Tprr3N+s7Z5A*u,M0)]aP#pAb!gs#0TJQS0F'*YTM> +iW&lSr;ZZos7ke1'c\C%p\+I`r;HHfl\cW%*uogSo)JX^s8Mior;-?koD\dhrr2rtrWi8ts8W)u +s8Dcnq>UBnrVl]orr**$rr)fprr)lsrr +TDrm*n+#bsZ>aMkS@-2I^=(0Fc-XYTaMl!1_8XL>bg";N_8X46@gibY(_m[$d`U"[d*C+Yb]+C3 +*#fG&%^jO!`lulUcHX;G)%RT(T[q3"_SF4:eBDq>(*"$)XNAo3_9:!AbK.]Ge&BVQaiquMrl#2b +b/_WH`l,j:`;.FPaSsaN)HHcG\2W +d)l:.(rjP6`lcNMa"%E"'84cRcd0hV`P]U4`lS/%!m&C$rQ+rW&')l +U&P/krVc`uo%Mjbrr3H*s8W)us8;TerV?9drr2rtrWE2ps8)`p/)hfu,p4EJm/$\WrV#pUPq+-r +*?-"C.'`gPqu$Kor;ZNko2@.X,B3JYrVlg.r;6Bas2;eQp&G!jrVccprr)j!o`+jeq#1KtrVuop +s8UaN!rW#rrr<#t&-)Y+rr)imq"aserV?Elr;$ +U&Pi*r;QWkkJO3t`VKB/qu?]os8W&nr;Zcqrqus!q#C6js!cnL*?Q1B($tkurr;ceo9CdL&f29" +*[S)ks8;forqcWgs7B/9'd%>fr;R?*qYKja_8#j=s8;oqrVuiqrVm#ms82cprr2oss8E0$rVuop +rr;lpr;Z`prVuWkrr)lsrr2os!rW#rrr<#s+92?1-grVHNnrVulss8MuqrqcN,MbNI7 +s8N#qs8W)trVuius8N#prseo+s82ZfJf>bAao;/6q>^Hno)AplrVuorq>C6l&,c>%oA6XFSXugo +q=FL^rh0:A~> +T)Wa#j1gLaB7de4`l6'?_oBg:_TC*Jbf\#HaNDcPbeM35aO&Y['H/29)$A78a2,s@bft2=%ga$g +'bq@BccX/Hdaumn_9pId*"N`ddEfVC_p-BKb/W,+T\%30cI'bSccaPS`lH6;f#u"Nb0%g)`WF6( +cMkun`Q-0Ab08#NaN4;!rQ,#Y!l`1#rQ>,\50D*odET\Nbfn/I_o9^?aMu-;c-ahX_o9L1_8*n4 +`Q,g5beqHA`l?6Ic-42NR;=V%cHOMTaMl-9`Q$'ErlkSgaMu6"auXPM@OeB>l2 +`W*sWaSNpUaSa0saN;`RbK%]JaiDB=_6obD;+jl(Oko6trr<#sU]5i~> +Y5eM#qu?]qqYpu_f\Glos7uQlqZ$Tprr61#r:]p]r;Q`rrqu]oqu?Whqtkpe*??(EJ+rp=p\^L* +.iTER+!N!V`VB<+s8W&srVlimqkkS\*[g^^qZ$Ejs8Dutqtg9jrVlcqrr)lms8;ims8W&ss82Wk +$NKu%s8;lrqu?ZqoDSafoD\Rcs8N&u'E7t0s8N&ts8;ops8;lor;ZZlr;HWnr;Z^!qtU-fqu>p[ +&-)M)s7u"--6sc^B@$POrV- +U&Pc(qtp*;Xe2Q5pAb$hs8)`pr;QZp!<)os./s2Drr2iqr;Zfnr;(j](Ddi2Ie`sBq>?[)-l3XA +)BBtF`;09,s8W)r./j2Ar2(MU)C>(Vr;ZZns8Dutqtg6irr;lpr;?Tjs8;los8W#qs8;]l$NKr" +s8)]oqYgElrr2Tjp\t-is8N&ss8E-#rqucps8W$$rqufps8Dcn!rW#qqYpNp#lXVnqY9jcrr2iq +s8Muqqu6Km&,Q8)q!'(K*ulG5bPLr1rql`qrq??lrr)j6rqucqs8Moks8Vurq>^3(USjZWVs!dO +rr)lsrqHEorr;u(s*t~> +Z2ak&o)BR)p>`8r;H8%K`lZQS`5T[2`Q?9EbK8#QrQ>/a;96qt`5]^AgMI`E)%mTld)j8Lep\#F +$kOBp)&3UXdDj#EbKeS`c-OG[M@UC3%a<,0_S=(6aiMNCaNVlH`QHKJ`llEK`koO4bfn>W_og.# +a:HG;d)jJVa2c<=b08#NaN4%o!m&O,rlkDbs3)_4cdC([`lcHD`P][:b/q]Ca3W2Wai2<:`Pop< +aMu6B_Sa=ka:HG;c-4>Pair)_e'#tXaN"4u!li=*rQP>br5efU(sBqBeBGf1":GVJ:9`EucHO;J +`Poj:aN44ts2b5_rlkDbs2c/&dF$1Z_T9g9aMQ'3G#VI<@ +YQ"V%rqm?,s8W&rrqcQjs8Dutp?CN"rr36#q>:*frr2rrrr)cdrYOrM+!MmK.dHd&ZVDSa,oe$N +,Uf&VqYg6h&,lD)p`gn-,dRIFs8Mlpr;-Ehs82forrE&rr;Zcbs82crqtg3equ5p]%0$2%qt^'b +qu$Hnrr2opr;-Qnrr2iqlM_:ks8N&qK-_Zc,9\B[AC(5Qp\t*g!ri,srqufqrVZ]prr2utr;R2h +j5oRhht-mJr;6Klr;Qourr2rqY5a"~> +WW*P/qu-Qns8Dror:7Y!S?_/Prr<#trr3#us8N#rs7lTmru(h7l6@)_)&FR_q"V-f)]9V/(`FJA +PkXtMq>Lp'qY]t,)BL!)s7u]pqZ$KjrWE3"rVZWmqu6NlqYpNnrqlrsr;?NmrVHNjrrN-!p&=sh +rqufp"TJAurr)iqrVccqq#:HqrVlfks8W'&rVZTlrVlfqs7H;1rr2_E+rq[D)'0i*b52#6 +rVccqrqZTmrqufkrr;p1r;6?,X.l5\WQt8O~> +ZMt")qYL'g!<2lq')_@VRVPi,N3Bn:dF$4X_o9X8rQ+u\rQ,#]rl?,"`Q$!Fb7G@-)A*\.d*S": +&fDc*'bCc]GLY'hbkfBkai`2d$P!jZLWmQV`l-0BrlG)]"3/F)bkoQ^a9Kf2bf\)Qc1fH^b5TK[ +`rF$R`rF*Vao0B\bl,W_`WO3"aN4>"s2k>]qo&QTqoJTUs2YPeaND`Oc-4>QaN4A#s2b,\rlG,^ +!m&C$rl#YjbKA,W=o\U9()@i+;RY?0bK%T>_oD\ss2P&W!li=(rQGSjaMu6@bg"DVb5KBkb082S +_15rm:02;,h=LIArrE&srseu+qtg'arVuorrVQKj\,Us~> +YQ"V%rqufr!<)lr!;ZTn"687rpAY'oqt^'ck5H.lIjlH_+shTB:+.,-*?6RV/!p88q>L'es8NN$ +HmKaYGl7U:s8VopqYpBls8E#rrVlcqqu63epAXser;H`srosFarqu]lqu6NkrW)lpqZ?]prquf] +rW3&qrr3>ADC6SR)BU1N->R`\rr<#eip>a`mf!.lrqcTns8Mljqu!SrJ,~> +WrEY0qu6Tps7u]mp[GM`T=s[grVuosrr;Ecrr3r:pNn)#(`FH=Z:uV_*>]A6+"!6Ms7lNjrVlfo +s8W'-rUY7V(*Ii!s7lWoq>^9ir;HZp!<<#srVcWmp\k'iqu6fus8N&tqu?Tn!WE#rr;cirrUKm\ +s8;llrr`9!r;H$^r;RB+s8N&5CEjc>&f2K/+CtBIrVccqrql`krr<#krr;p.q#BimS"ZLSb4#-* +rr2]ir;Q]ns8Dr's*t~> +ZMt")qYL*h!;ufq'Dqh)lIV#5?#Z@7]#E"Eccj;C`ph(Latq&V`Q6>4(_mo*'P!F`'G)9((a0V, +Fk,$bcHjbXb/VE<`Q$'Gf$n%9#RX5Eb/2EG_oh_p"j4p/aNDU$b5BH`b5KQ^ao]Z,aS3[VaMu<@ +rlFZQr5]5baMu<@aMu<@aN"1trPnfWq8r]YqSrQVs2slQs2tA_)TKb8_oT^=cI8.O#RqU^'c@l% +9@_8,`P]U5rlG,Z"i\Bu`lQ=%bl>fgaMu6@b5TTbb5KBsb082V`5\lp8PiE$Ra:3ms8Vuorr;us +r<)rnqu-Norr';*J,~> +W;ckoqYpZEe^cIQ!rVZZm +s7uZos8N#tquHWmr;HWirr`8uqt^6d!;l?br;QHj!WMuqq>U9jr;6Hsr;6Eirr2oss8E0!qt^'b +qu?Nlrr;6^&c_V*rVl`gcXeOT+=8*YK`1l(rr)j#o&&TskhlC>!ri)rrr3-!p\+C[r;QlsqtpB% +s*t~> +XT/;!%fcD*qtg6dpYMR?VpG)9rr2usrqlfrs7-'gs8DrsrtbV4koUcb)AsY<*YoS5*u>rgm/QqV +s8;lort#,-s7j)F-Wm>Cs8Dlpr;ZKi!WW/qs7uZmr;ci^s7cKnrVlfp!<2`mqu6Qor;QQm"o\As +rVc`os8N#srU'U^rt+r)r;HKab[;Y@)B]hBJc#EEs8Dros7-*`rsS]'o>d\tT:r%No_SRes82lr +qu?ZpZN#F~> +Yl=e'qYL-i(\mt'o^qY7[r65$NjHFfA$$k3OS(E!Yk +KZVff_op3Fbf\)Jrl#GgaNN&\R0+$_HGdnG`lQ0BprEZZaMu<@aN"+u!QrL_`W4!T`r=$Z`q@CU +b/h`Hb4*LMapZ;5aNDTHaNDTHaN4A#rQ+rWqT/]Vrl+oWs2b5_!R/^VaT'E_a8j6Z`=gD2c-4S_ +c)XGM((M#b%q +Z2Xh'qYpQnqu7&pg=t-Ws8;idq>:0gs6BRrs8.Ho*$6@I+!DdP+X2s4pAb!fs7lR(r;Z]lla>aO +s8;fpq#:U9hrql`ns8M]k#QFYuq>'g]q>1!cr;ZcnrVulnrrN,prqQNhs82ios8N#t!<2uq +rr2lrs8N&r!W2fks82cqr9!tiqZ$Qpr;ZWhcX\@J)(ObHrS.;^r;ZHis7GL=nEJs,s8W#orr30$ +qtTs`rr2p#rquTfrjVoX~> +XoJA!&c2P,q#'s_d\`h@nbrFdqZ$QmrUBgds8Dp2s8N#nIiT4>)]9S8*?Q=EMWj^4qY^Blrr)j- +rVuckl*K:Fs8;fpq#:U*fqu6Tp!WN,urp9[brqZNgrqHHmrr2irrr2rorql`prVc`ps8Mut +s6K[^rt,&,rr;lqq"Dm=+s.OHj8AlSs8Drps7?6`rt>;1q#C07VjX!BVU#)=r;?Nkrql`prj)QS~> +YQ+Xt!<)oss8*T-n*fArXDMH]Z,"9&a3i;\bf[rE`Q%Jis2H8*bf\#HaNi7M&J5]l&J>cj'FtUl +aj&DVaN;HE`lcNJaN"4u&&cW6cGGRTf$D@UcbdcJ`qd^M`r*mY`l7knrPe]S!6F`R!6FuVq8hpF +rQ+lU"3&:!`r*gU`rF-[ao]f0b4`Poj>b/h[%`W4*X +b5TK]b5]Q\`rYY@s8W"qs*t~> +Z2Xh'r;Zfrqu6che)0`qrrhoer;?Qnr;HZ\rYPJ0kq",%-QjHP+:3i!<2fo!ri,prVQZpr;QcprqZNis8;ip!rr9!mem%_o`#*or;6Bh +rqucsrqlEe!rMonl2Ch`s8VlnrVuon"k-m7K`1l'rr@@ki;U?rrW2trr2p"r;6Bh +rr3*"qtpB%s*t~> +YQ+V#"oeQ%rqcWnrVS`*+s8;osrr)ir!ri,qo)AXgrVlis(]4'j-QX'G(`=53+F`\KrVZ]n +r;ZZkrVc`mrser,q=t!`s8W#rs8W&rqYp0fs8N&s!<2`ms8E#srqlcqq#C3imf37brVc]ms82io +!WE#qs8W'"rVZWcrrN-!mJd+b#6+Q#s7lTmrr<#m#16a0K)GTHrr;rr!<;clrr;usnGa$tp"lX@ +R\$G*qY:$gr;?NjrrE&'s*t~> +YlFb%!rMikrr3c/p@.A'Rq#lQZFnB%dFQXgb/hTDb0':r-H=$Eb08)P`l?-Ja:o=#*#05)&J&Ho +b0.fG_SF=/_8OL?b/hTBrl+oX%+32>e]>tV`lQ9Ha2e"s!64fQr5JcV_u@LP_uI^U`r*mXb5'9[ +b5B?O`r4!Wb4NpXb5TK^`rVg_84"0aj%o?Tk.;# +Z2Xh'qu6Zqr;QlOiS+80rrVWbq>UBrqt^'brr;9_')hk*JfZ$Z*?lMSl1t)Qrr;lqrql`qq>Lp) +q"Xmequ$Kirr)cps8)ckrqQEkrqucrrr2iqqu?Torql]ur;$0cqu6NnrqZTkr:'dr;HNWrX\l's8W)ss82ims8;c3lhUMY!<:pT"8`&ip\k*qp#Y>r +ip6UD!;l]o"8r&nrr2rtquH`*s*t~> +YQ"h*r;?Qos8N#r%I^s9Vp=o6s7u]ms8;lps8VusrU^$fs8Drsrser,p3mhr)\a8/I-:>$rr3#t +s8Mrrs8;lps8Vm's8;cls7uZmr;Zfns7uZfs8MuurVlWmrr)oqrVHToqZ$NnrVc-`rVlcorVZZl +!rW#rrVuos"9&/qrUKpTrr<#urXer(s8W)ss82ims82Z0lM1AWs8Doss7lT[rtYJ3r;Q`oo^0Dg +T:`$oq"Odfrr)cnqu6ZqZi>O~> +Z2ae$s8)`p(]*acbD^XVMQX_2_:6fZbfIcB`lQBJb4E[n`l5p>bfn5L`lHTU@gEY`'c[p,cI9kS +_ns./rk\]Xa8X6]aT'6k`Q>m1bJqNBdDO&G`lcHBbPB3a`l5s:`l5s:q8NHS_u7RS`r4!Wb5]]_ +b5KE[`qdaPaSj-WaSj6^bf]q/s3:Pes2t>^s2OfPrl4uZ"3Sj3b3d:M`rF*t`5^0Mb/qiIcGn>X +cBc,ab/VE>ai_iOaN"5#r5o5b`l?!8_o;>hs2G#U&&$'%b1+SIYBNuB +WW*1rrr<#Ig"-0&"9%rnqu-O!qtKdYrr<#`rY#8%s6VB_*%)^TbOPH/r;Zfrr;Q]srquTk&,lP. +qu?]qq#C^Ko!;uins8;oro`+mh"TA5rqu-Nk!W;ior;Q]k +rrN,sp&53rr;$-`q>:*frW)lpqs"(^s8)KhrVm-"s7lTnp\t3lrr<#Trr)lsp\t0skMG1Yj5'Y/ +rrW2triuKR~> +YlF_%s8UBlrVcfsrr2Zlrr)lprr)lrq>UNqrVc]ms82cnrVlZl +!<2fos8N&srqlcpo_nmkrqZTmrqufdrr)lqrWE2sp\t-k#lO_trr;`ls8Musrr2rtq#:'gqu6Wq +rVd0(rr<#oqu?]l`Mrj/!hn-:rr*#trr;urrrE&)s*t~> +Z2Xn(qtpBkrr3N-iQc(FE4*%2?RmJm.]o_A:\ +r;Zcp[f:j~> +VZ-_?g#N&2"9&/lrr)j#r:fs\r;Z$\(]==3pmWQO+s/"=rV6EhrV?Kgrr;uqs7uWorVlisqu?[$ +qu$KorVlinqYp^Kls8Vrqrqucprr:gRrVm9&oC`(^s4lbtjkTb.s8W)(s*t~> +ZN'q's8W)ts8NZ,l(t2\nbi@_s8W)tqYgL$[p&"I_pAk'hqu?Qo +qu-HkrVQWprr;rsrqQKrrr)fprVlfps760es8Dp-qZ$Qls8Vrqs8;osqZ$Qmr;Zcqs8Vooq>^Ko +rVccqs8W,u"o\H!rVQKjrsA]#or"RVStk*1rr)lr!<)fp!<0D+J,~> +Z2Xq)qtp?krt>;*kJV=IC9tk&bKeARaMc0=_u@XT`pq+m`l#^8b08)N`l$!Ac$Bm7)Aa&ZfuV7H +]tDV.bg+JUbk]?[`sp/2_nsO9`Q$*Ea2lNDq8iKV"j"j-b/ha(a8jBZbkoQ_a8s<"rPSWNrk86B +!5\9Es1n]MrPAKNrl+iU!6G/^rlFWPqT&ZZn]:aM'ue24aN2NH`m2ZEaMks6`PBR8`6?=$`X'W, +b08#J`lQ=$bQH#/`l@tr,f@UBbg4\accjJM`lQa3W)TaMPHl@9m#@DSY6$o_8@]!<)lr +"9&,orO;fW~> +YQ"t.s8;ZirVu]De+ik@"8qujqu$KoquQ]mkPbtis82I7,p=HR-d)A_s8UpSrr!N0rVcThrVQHj +qu-NlqYL-hqtp3gp]13jr;ZchrtkJ'na#>sio&_Nh;$fAh;7,Lio]Rtq"s[_&cV\'p\4I[rVc`q +rVZTns8;`erri?$s8Dc8rWN9!s8Vrprt#&-p?gi6qu$Els8Dims8Dlq%/fqss8)cqhqmVXhu3QS +!WN#qrri;urr;r*s*t~> +Z2YI9s8;opq>^0s`o'bu4lJg@=_n`jjXf81oU8"?STV8*T +VP^ArZb!rjbgkV6lgF<:q"XU[r:g3orr;rprr2p+r;HKfqY^ +Yl>F9q#13js7+mDCL`jF]ZA=Abf\#HrQ#2caMu3:_oD;h)TKb8`lcNLb/VE;ai_p;()Il$&?*jk +`Pfd?rm(Vib5B9ZaSs?\a8j6OaSs4mb0A2Rb0A&Nbfe2Tb/hZHbfn>UbK7oNbK%W@_ns7,_7mRo +\@/Q5R#d,XIX#mPD/!TnA7T7`B520uEHZb_MjC$;ZaR?T]tV1l]YD;!_o0O4`5]j +Z2Xk(s8N#srrViBg\q-Xq>^Koqt^'brquctrqu]YrX]&)rr;ql*?uUJ+)gcNr;5CNrr3W1s8D]j +rVHKms8;opq"t*krqZ6e'E.@Wg=b*)cHt(mg=tB@[i7lu=f$Mdi +dFd=Br:9jiqt0ISp&>0nrr2rqao2AAqt^6k$MFH!mY*889>16%rVluss82fnrt58.qu?Tos7b.. +l/C_'s8)cprr<#q!<0A*J,~> +Z2Xn)s8N#ts835LU8loUC!rr<#sq"agarqlcprr;Nf +rr;cmqZ$KmrVuiqs8W,urqurus8;`mrsJH!s6P=e)Fh72r;HWtqu?NlrVZ`qrVmE(s7FI(US+9g +o(VnYrVc`"s*t~> +Z2YX>s8N&uqs`O7@qD%@cHNuEb/hZD`lQ=%bQZ/1`l5p:o>h'S`Poj^Hn%/p%tqY'XYqYL-is8Musa8QhPq>^Bjs8W#h@N6L5-miEqq"Xg\s8;cprr)j) +qu?Hjs8V<>l0I?`rr39$qYU0frqu`o[f:j~> +Z2YI8s8DutqW4fR[GLf[qu?]qs8Mrr!WN#rqZHcqs8VZhrr;oqs8NQ,s8D=7)]'82+3jQZs8Dlr +rqcZ^rWN3!rr<#tr\O?Ks8DimrVucos8W)srr2T]naYo"ah".6P)YH_Q^aJ8T:r!QT:M[KT:hgK +TV%gISY,bMr1=n#T:_^FSXuICR?N\kOd_rF][>d+o(DhTqYU0i!r_uorr2rt#6+Z&rqu]mjo55Y +p&=jgs8N&srr*T-s8Dlqs8)=p)&sVA,@L0>qZ$Bgs8W)tr=Ac)qu-Qa_53]nT;^oMrr)cps8KG+ +J,~> +Z2Xh%rr3Z/k.,G=F/$[taihlH_o9U7aND[%bQ,fUaSs0naND`Nb/V?8`m;jE',_Q!$Eh_%d/M?" +c-"#?^Ve%1`lQ6Db5BHbb08$(a>1fWaN;QFaNDNHcHF>Nb/qWDaiVQA`Q,g0^V77ZQ\]Kj?<:32 +?tB*2g_C2*W[-u!=)?];^V[n)`5^!GbK8#N +a3)TKbg4JTaiVQA_o:r_s2t;]!65#WouR*O*lZ.?b0A2Tb/M0?`5^'QeC@+r&/,oq8^bl)a1f[: +rQ5hq`l?!;`6H6=_l@lZ77^R$_s$glr;Qcq[/YX~> +ZMtR:r;?Has8V-6o`+sdqYKsdrr2os"8r&nr;?Qrr;6EWrX\o*r;ZcnR3*On+!>:ls81dS!<<#s +s8<)ss8;]jp&>j,p?()\g"bKMme$8Kp\"(ClKmm)m-X3>mKE"HmHs?@nGi%Xn,i"FmelMTlg4'= +n.G'RmI0W;naPu5kiL^Sf%fESq>Ug"rVZQgqY^9gqu6Kmb5N4Us7u]pqu?A1,97pO(Eb#'fDYLE +rVZWnquH`orsS]'q"asinE'$%iRe)/#Q+8jr;Q]orO2`V~> +Y5\n$rTg_^^?tmns8Vros8W)srrE#sqZHcqrr;Nfrr;rr&,ZD*s8MhZ)&aA2*GG3GqYpEnrqZT] +rW)usrr2lrs!@[Es8Mups8;Wbp@\%GcG$QBIDlO-?6C_<(+ZrV?Nlq#CBns8N0!qu#RTrVuNhr;Zfr +s8Drr'*%h.s8)]cD]]f9*>0>9;qM$Fq>V*,rVZTmr;Z]is7aO0TVA$QiqN?Mrr0A+J,~> +Y5]+&lbdaEFK3I'cHX>P_nj70`r='YaoT`2rm(Sen]:^L*6?:Hb/M?9aNW(Y$Q9ru$r#."cHjh] +bf7K5^;Kris2b/]r6,/`q8`QXrQ,#Z/]Q2]aN2KDa2Q3?_7m[u]""2eG%b8j?F?Yk1MYdV9_rkeoX +`lcKIaSs?fb/_THai;9bKe>_e6Wh%()[Mm&N@&EaNVZC +a2l?A`Poj +Z2Xk(rVlfuf\>9^rs/GtrVcKdqu6Tp"9/5rrr)iur;6EWrX]&,r;Z]npb*m2-5n2Zq#B=P!WW/u +rVuj#qXX1OrVcTm+8"LDg#1iKk3MI+o'c&:o(2MJp%%YBmdBQ6o^;/9nbr"]n*]W2mJcPRnH/4K +mf)SVn*KB*m/HJPnIP3_o^_SAmd')tj58M;fB2u1$3'bus8DWeq"amds2t +Yl>43s8LrRU9*k[s8W&ts8)`prr)fqs8Duq!<)?brr;us&HD_-s8;ff.N]?J(F.E&rr)iqr;Z'] +!WW/urVulprtPD.qXs7DlIWVAQBRPtQ'n5;USFL]Se%B`StD[LT:VUGTqn9OT:c(T"J26XSt>qR +s.TRgTV)4T"/DTaTDkJdStM^GSGf!#USOWUS!fV1P*;B?c/eEgqZ$Khr;Zfns8Dlos8W&rlMge_ +pAP'lq>U?ms8E#srr*`6q>U?es7Vg$*#]k>*uu==+3=KWs8W)ss8W)ur;lrrrr3?(s74U;TVnTV +h>%!L!<2ut!<0G,J,~> +Yl>43p>iSr?"L4Rb0A5XahdtqqSi`\b0A8]dEM1&!QrL_`>cn@bg")B`l?g7a2>a0]XPJ\V20,%?sm;J@q]RlC1h-h@U`hXA7fFd@qB1_ +Bk(X`Abp$=Ac?,\rl4iVs2t>^!li=&rlY5]s2I(<`lQ +Y5]!if&6&ts7uZoq"asgqu$Em$2j\tr;Q`rrqu]YrX\u-r;?Qlrg"`G*$ZeBs8V'W"98B!rVlfs +rqcX!qrQYae_]Qin0%;no'l&4lL"!-nF5o9n*TT6o();=mdfo +Z2ak&'DB>?WP/!&q#CBjqu?Zqs8Muqrqucsrr)3_rVuos%K6>*rVufnOrb;S+=1Xtrqufmrqufh +rWE3"rVcWn0E1hBqX2e;Um$h#Q^XA4SXuLHSt):AStD[ISXc.8^T:l1W!20=`s.CI*S=H1DTq7gHTV/$SU7e'JTV.a:OHuT[iV3C6nrr';* +J,~> +ZMtO8qX`O4CM%q%_8=LHaiV]D`r4!U`WaH+bg"ASo>hrpbf[oB_oBjCbK[l>`QHYR'bLla#t!1f +bfIlF`r;4p_8OF:ai;?AamdCMb5]Q]`r*pXb5]Q]`W4*Xb5]Q^`]D2`bfn5L^rOC;bh/^&*"s"u$qgs; +'b1[ueBc.T`Poa2`Q63S.<*X=BiUQ^Ar3QER~> +YQ"_&f[Tftrr`8qp\k!h!ri,nrqHWlr;Q`rkPc"cs8Muss7cO?+XA=^kPtA:rW`E%rVlisr;?R' +iR$'#gYqA`nac8?mf)VRn,MnTmL&IRo(2D?mdBQ5nG_hYn*oi:nc%qUmKN"Gmd]f9rpTmT$gmBO +naZ,;n+?5AnG_kXnF?#ImK;qGmI1#?#OUgBjP8AGq"t'prqZHfqY\M8)>a@4s81P&+<)@D-(Oh@ +-6XTU-?8bTqY^?krs/K!rV- +ZMt@4r:A@9UUElrW)oprqQNg +rYY\7rVlisr:fgPmanY3Q][Z(SY2^OTV.qVU&UecT`C_`SI2!^TqS*LS=H.AT)P8`StDXJT`1P_ +TDkD`TqJ(XTDtJjSXuLJTqJ$MUnaWVrh0CfUS@a\"/2B[U&L\rU8+KVQ]R?*_r1([o_eagr;HZ^ +rr)lmrquflrr2rqrW3&rrr3`/fI.XR)&jfhq6_Fe*Z?5@pA=jhs8Dros8W!*s8DrsnZSISR\\?t +rr2p!rql](s*t~> +ZMtU7mF\F]B99g?b0J,KaiVK>b08*-ap?56b/hT?_8F:aa=#-Sb/M35`QHHEcc*]@b/iaN;QD_SEgrUO6]a>[q;VBPD*kARt^Ms(M=B#\[pe +BkM!fA7baP$YQQAH--O?t!PUA7K(VB4PO]@prkV@q,FF"(>YIA,^!P +AS,Lc@9d)UNN9\.]uS@ +])Va.qu6c[db4/Vrr<#trquQfq>:3lrVcWj +s8VB +_>jN6q#C?m&H)79TVp'+q>UBnrVuosqu6Tm!<2WjnG`Cds8EN.qZ$Tks8V_Z->;N;rr2lr!<2rq +rr**$rr2rtrqcZlrXAi+rVZQhq=aCE^RUGcSGo2_TV).Rs.B:`!29Cbr1O+`rh0IhUSOc`rM9Ii +s/-.$WN*##X/`.trh^:*VP^2dVPU)`U7n8J@u+!>Frp\E#U*uu7@=m#V\ +rr3f6s8MusrqlZmq>0]rS>)RLc1V)7rr2inrrE&nrrE& +^Ae?7qtp?jr;RH-qX<+$D/>ibbl>fh`l#X,^W,ic*R)[F_o'I9bgOMN +`P9FaNDa+c2Z#fao]Z(`r!aT`r!jV`rF!W`>$/%[uG-1BPD-rD/3fs@preQ +@:<[FA-caYAnYjmC2%J^C'8nGQD%g`#BkV-kAnP[cAn>L_ +A7K+X?srqA)e*5`@:E\S?t +])Mp2qt^-grVluhf%'QprrW/sr;6KmrrE&squcurrVQTo#lO]$s8Muns8)!Z#l!*Gr:^0cs8Mlp +"oJ)iq>C6krri8us82NfrrW/srVHO'lIseCj6>gnlg4$-nF-;E*V&XfmdBE*ki1[_hqm>Mg"tQB +jm2F.pA=aes8DfgrrDurrtk\3q"XOTo'GT#iS`YQiT'(`kihL*o'lYH'_(JVnaQ&:n*ol:n*]`9 +mcN0Oi;3BO!W)]ms8W'$qY^Bkq>UBorquZorql]trqlTjo)9O*s7lNhs8W&tp]'er+X%mO+("m@ +s7cEW>Q,iL-R@.5rr3)ss8Mopr;?O$s8N#ts6JJ%kMu13s8Vusrr2otr;Q]urqlTj`;b>~> +_Z'cUiur;6!&V5Vo:rVlcorr)lsrW)orrr2rtrW)lqrs8T&rr;urqZ$Hhs8N#rs8Drr +s8W'(rV"q;rV6Eis8N!#rVZTjrVZ[Arr)fqqu6Wpq>^KmrVlcnrr<#qqYBU/YaCK9S=lOITV%gK +TV).R.%d*'TV%pOU7e9XUo(/nWjfRR`6-KXf\PKHk2bRenbDkOp%\=PlK/$-(?=?/g!Is`_7R(Y +XfSM!Unsl^T:V[Jrgt:,UnFEVU7n6QTqS3QStD[JS!0,:bNefqqZ$Hhs8W)qrri/tq>C6hs8N#s +r;cirs8W)ts7cL8rVuZjqu?]ps7cQaAKMs3*?&)Up]'s`l;nuG*$??Knc&OjrVuoqrr3r:rVc`p +s8;fpnAM#mT;0C%qYg +_>jN5"T.obq"t$i$i0MbfU-GkQFF]Ma8X:&aMu-6_oBd?b08)Pb0.cC_T9[7_oU!Fb/_HC_YV:O +aSj*\aNDZHrl,;db0A)5bL+AV`m+M(rlPAfb0%fHr5o2d`Pp*@_#DFnb0.iF`Q#m4^qmORIV<%q +A8,akB4kghARt^J!+Z";s().A+Co2&C27g0Ee&h!Ng6*+U8OuoYcb+7]>21p]thFpZ`jA46a!Jg +URRR4N.cY)G&qV?DJa6*BP1skB4PObAn#7[@UEGJ?XdPT@:a+a@U*8[PH_X2^;n(,aN;HAaMl3D +ai2WIb5TK^`r*d]`lQ +]Di$5r;-?frVm5ef\-'"s82ior;Q]q!ri,qq>Lp%rVuokr;Z]prqcHhrr<#_rWiJms8VopqYU9k +r;R?*q>:'err2rrs82]nrqlBeq>V!"gX+U7n+,o9nF,i9o()8KnGhqdnF,W+lKREiiS`e\me6/M +#6+Z&rr)iprr2uqmf*RblfI'_jlbdgrTG$bmHa-*n+-,5m.'Z:nb)PIm,?O?f(Jt@s8E<(rr;W` +s8N&nrr30$r;?HirqucurqlTjo):$8qu$KmrVZTmrqD[&-PmpP,2W(nqZ$TjpP'q6)_!)=oDA=_ +rV?Kirr2rtq>^HuqV^H"g?nn>!r_rmr;R!!s8W)rr;OY7J,~> +_Z'`;r;?NkrtPJ4qu6QioY7<'ebo:>s8W)trVc`ns82d,qu6Wqp\k-is8DcgrVlisrqcZbrW`Dl +s8W#srVc`pr;lipr;Zfr"TA5tqu6Tp1ALeIs8;corUf[-W0<@/R@Kh?T:VXITqS'MT:hdIT:hdL +Unjc]VQ-r5`6R-&o_8%PrqI-&qu$s8VleJfY[@+s3rVqt^9lq>C73rr)iqr;QThs7am=TVe9n +q"=R_rr;usqu6Woqu?Zpa8^Y~> +^]+K9qY'XXqu-O&q!6Y"DeYKL]Y;P2rlcD*`l5j5`Q$!Abfn5N`Pp$E]u8+8e'6"UbKA)PaSNpH +a9U&(ccsMUaN=;$1<@JTaN2NHbfn/O`Q-0C`kTO;bf.N@`4NRHDd6RWBPD'lB4bahBk_0lB4Y[e +B4kaerFmHlDKgSdPFo(i^V7M"_8O=4`l,d6`l5m9b/h]Ga2uKF`5hku*ll:>_T0X6_8*du]Y(PD +P(\4)EH#c2C2.EpASGadra7!]Am8\T@p`PO@qT=Z>?YZtWjK[b_7mh,aNVK;bf\#CccF,IrPeiV +rPeiYrlXcP)Tg%>cc*lA`lucVFpo)o&deZQe'lC_a2H29rX^1j':R=j]u.Y'cc3rC`lu]MaMl3A +a3(oH +_>aN7rr30!q>C9mq>LLp)pA=aerVulis7q5$qXjgPrWiK&s8W#s +rqZEf!;ucp%K?8%q#CBns7uNkrqZ?gru^phdG*[GmdKZ8o^qbJo^VD9lg=0/lg!fugY1WJmJ#fD +"TJB"rr)Qjs82orrq6:7qsih*h;@5Qk3;7#n*o`/nEfE*nb)SDnaGl2k2+\[ +_>jN6r;RK1oDJC[p8P!jm/$2Ns7ZKlrr)fpr;ZZn&-)D%r;Z`qrU^$_Itd^is69Lfs8Dutr;Zfr +q>Up'rVZTlrr<#ss8W&tr;Q^`rV$$_m`MGlQ'n28StDXGR[KY9S=5h6SY)UJStDdRX0T=Te)^&i +p%S1Squ$ +^],#Hqu?]prVuQho^CLXC2L,cZ,Y#%rQGPiaMu3<`l?*@rlPhobeD!4bfS;Zbh1g:16b3I%Q +bfA#N`luTFq8iTUs2b/](!"_Ha3)<=bfIT3]u7IHF'`9cB4kiUB-LntAnYdeA7]FhCMR[#DJXBA +K8c5"]"5Sj^;%V*`Q-$=`W!dg_o]s=`lH*>aN2KGaN)EFb/qd)aT'@Lb/;*6`5T[5_ns4%]=GMa +\=f%>H$""DCM7?oBPD-k@:s(W?XdSV?XmVXBP([Y>AB>*]"l;+b0%uSaMQ*<`Q6-CrQ##ZaSj-H +a=GNP`lYm0`Q-0KNsZI.,npBWdF?F`^;J.>d?GLa%291be]Q1[b0J)J`Q%o"&&u?&bKJ&L[[CJr +:1A4sm/I%bqZ?Qhq>1-krPnkf~> +_Z'l?qtpBjq=smbrrUHmi;NZZr;$3`r;QZp!WN#mrX\l*s8Musq"t*c==Yc.qu#^X$N:#'r;Q`r +qYU*arV-Bir;R!!qt]m`qu$Hn!<2rs%HYj_k3;F/oC))4lhL5RoEt*Um-Eiohr3hlpuh\WrX&W( +rqucos8Mror;QcrrVm3&r;?Eeq>:$`r:U((rUoI>jlPXhlK[U!mHs?1nac5?n,DVVl0%-]bh;dk +!rM]drr3-#r;6EirVlipn,=%$r;Z]js8W&th'a +])Mj2qYU9g&?2J4o(Dn[r;Q`qrr)cmrVlcqqu.-'s8W)ss7c?ho2I+`[JB^arWN)sr;6HdrrE#s +quH]prr`)sqtpBm%0$/&qrPJXPFnA:TUu.R,+G0lR$sS:StMmTUS4Ng]ZK*so(`"Sq>0scrVZWo +rr2flrqlcprr*]2qu-NorVZZps8Mrorr;rpr;6?gqu6Ek!W;opru(e3q"jmdpZ^8M[]l^+USOZ[ +TV8-STV8'Rrh0=arh0^lS<]58f^nn8rVQKirr`5trVlcqrr2iqnbs7&r;Zcns8W&tg*RaV*>B]p +oDeacrr3Q*s8)E0,9%XL'3"_urr;oqrr;rr'`\(/s8DiprRe3ATV%qSqtg +\c3ECqtBC3H"1]s\\Q(t`6$*Ec-4DSaSj-YaSsQm)TFLa2Gm9 +b0.j$aT'9[aSj7A_ofs;bK.`@]thIcL1FV+BP;-n@piYMBk:jfBPD6uE,]]4EI3P-XL5j_`59L5 +`5g!@aN;WH`Phbp!65#Y(<+52`l?'=aN;QF`l?*AaN)?@`lH-@rlI:C`l?!9^VRb(`504$\[fAd +\u_B\I% +a4.R-$4n*k)25uYbf@lIaM?0Je?9Mr',LX.fZ_dkb/jS%rl>nqaM,O4aN)E>P@$p\?ZFumqZ$Tp +p\Odbs8VrrrPeee~> +_Z'i>r;69aqu6Km"6SOro`"jprVlQ`s8;lps7cL's8;fis8DureKuOb+sZ4Lkl(ngrVuorrqu]k +qu6C"q"t*krqlNequ$KmqtpC3qq9EPj6,gumd9B2o^hSFp@RqEkiCaViU-L4rrN#nrqHKmp&>$k +qYpWrrVlKis8N&rrr2uto)B[+p$Cbtkj7^(lfm[!kj@j+lg=95lgO3#gXY?_rr`&ip\Omb!W;rp +s8W)rr:0b6rVuoqs8VunnPL;I,9S7[s7l?gs8Duls8W)uqqYX%+Y+`ah>ILm&qu?]ps8W)u +n`/`lkNVsF#Q4Jus8)Zjrk\Vb~> +]Di]HrVZN_oC0ir;Zfr!<)op!r`,tqu?6d./j2Grr<#rqX7,s)'0_=HN3d7s8W&tp](9m +s7t>P)&jkA,2)ejr;QWos8Ei7r;HWms8Vogb,V2/Wk7s$q>^Kmrr;iorrW2url"he~> +\Gm'7jjeTaCm;cQ^Ve15`mOb/s2t,X'#r,5`l?EQf\*nK$jH_4][G'Kqo\KN#0+R%_SsX9rPnHM +1=!kVai;39]"!c7?=[\]BP1g`?XdVY@qK@gCM[g)E,U/eUTh5B`5g!@`l,g;bKA)SrQG>ba2Rtr +!QW:\ao9H[aTBQ(aSEsWb5fZ^aT'9q`Q#p<`Po[/^;%Iu]tUhNR>uiAD/&u_)eNPe@9d5N@:*GR +B4Pgl@9m/^S[lJO_8F:9b4s0_b/hTBrl"lWo#UjQ-H3a8_SaO<1'nF-(E7)?_SaUAa3;B?c-"Pb +]LN8;(Cgtkf[S-fr5ScX(WXD0_o0^E_RYA);,q=edd$K)s8N#rqYpKsrVH +_>aZ;qtU!dqu6`LiRIf*"o@rjrq63ds7lTnq@*E%r;ZB!.O?5_,]!,;rr +]`/cHrVcQfpo13eoD87\s8W)us8;oqr;?QmqYpNp&Gu>(qtpE_[3Qe4*[#.grVc']#QOf'r;Zfp +r;Q]rrqufrrql^Fr;ZcjoD7gfO-5s'U8"9LT:r'UTq7jKTq\3PV7+P"m.'iIr;Q`rq>:0jrr`2q +rVlEg"T//trr)iq!rr5trr3-#rVZWmrVcfqrql]m"TA?"s8N#rs8N&u"TJAurr;us-2dZ6m,6F, +ZDaUtWMcSjUnOKWUS"'LTpqUKTU(q6bkD&8qu?Eirs8W%qtp +\c3<>nD&7s<2mFC`llEAbg=APb09e+qoJfW&]2K6bKnqfRMHSH$3`rFdEg&6b4D%7>$PTPC2.BkA7fFb?sR&IC2@TuDh+(H[CO&g`Pom=a2uWPdEg"WbKTt1 +s3:_kb/h[%`rsB%aiDF#`sTr/a2uKGaN)<@a8O'\a32[)aoBKbbfS!+`\GNQaN)9<`5T[5_o0F/ +^:(&6K6M0HCi!j!C1^sa@q8tP@q8tWCM6sV?&lG4`Pp-@rQ5,arltJe!m8U(rl"lWo#O;BaMc!; +_p6b8$4n'a$V/ss`m)EBb0A;Ta3VHDdaqb4&ePrra3N,UaMu6=`Q63@aN)68`QcTM['3t7;I"+T +k4noTs7cKl!r_ul`;b>~> +_#OH6qYpWQfBiJ9#Pe,pq"FU\rql`jrX\u-qYp?dOXMCo+Y&*mr;6Hks82ror;H0c#4ps4hWL]urV6-ds8W)uq>UC$ +e`5lPhuE`Pq>:*hrrE&7s*t~> +^&JTArVZQinuAA%q#: +_Z'`:qYL0hrt>5#fQCJM[CsK&`5paihs.ao'ceb/qp-bl>jDa2Z0A +aN)?@`l,^1`5T[2^:(#,JoPL=An>RbA78t[AS>^c?!^lG?rgK\X1QQr`l5s=b09k0s3(YhaMu3< +`q%2~> +\c309db<[[s82ins82Kbqtp6ip\k^'nGi@bAKi?A-R?2#p&>!UrWN9!s8MujrrN,sq>V5fcJ@m[ +o'u/:nau;^Hl"oJ/mq"XgeqZ-Wos8W'%r;HQgq>UrVQWpr:`c,+L]u +q#('gs8W)urr)j(eE?2\iV``Uq>C0grrW2tr5Sbe~> +^AecDr;6EhgoREZqYU!dqu?]orVllsr;HHjrr3Gss7uV&*Zl=E+1(k9rTX=]rs&H%s8;oprVHF? +rVlirrVZWmr:]'OOd)?,S=c=BT:_[DT;/*SUo(6+d-:9%qtpEnr;Q]rrqucrrr)lsrrPFKqkq>C3irr2rsrVl]qrVlfro):!7s8N&srUlWu,8D"=gACjKrVlir +rq0MBQh^OWs8Vug6Q-aX.,=h$rVuosrr3]3s8W#srr;okpS4OYSu10 +_Z(JOqY9pas8Vra^jBX-]>D;'a3VuLb0%fIrl4uZrlY,Zs2GVl]$njS5lh/q&IY&_c-ahZrQ#&_ +bf]Lts2G8\aMu0@a2n5%rQ#l!aN2B?_nWprV06'OBl.Qq?t!VYAS#OlCAquoEe0LW\A#Yi_oBO4 +a2Z0@b0.rKaN;TIa2l6A`l?'>`l?'@anj'saiMKBaiVTGaN2KFa2c?EaiMQDa2l?Eb08$,blc27 +c-6.02U'=caiMTGaN;HA`Q-!:_o':(^UgP=PC%:aBkhV?!h<<^q[Y#_oBd? +r6,8caMu6iaT'?maNDWPe;"Y['bLtgccab[rl@%DcTMPWbfdoDb0AHm(`3eu[EQ_5`l5j7b08&T +bJhQ@_oL!Jb/(Mf9hSH'[-[bks8Munqtp?0s*t~> +_>aN7qu7!"h9b-\s82forquZorql]srqu]irX]&'s8I-l+Whn&i;NWSs8:pVs8N-!rVQTrr;ZEf +rsAM[gth;gnF#c5rp'gWm-Elnki1[rs8N#rrrN,sr;6Hjqu6Qlq>LHqrr;cmnbiC`r;$Bfs7l]m +r;?Qor;ZWor:g4+o^(f)lgX<-mIKoAoCMVDmdBE#gtDW*$N'Pss8MrrrV-?lnc&Rg-2miAs7X&M ++X/"JoDSUcs8W&tr.6.9.;o"^qu?Y>,9A-U-ggd+rX/])qt^-es8W)trVlg'mG[=!gAh3Pq>1'i +"TA5mp&<#3J,~> +^]+lEr:p0dhQ3?ao)J[fqu-NnrVuiq"TA?!s8Vuqrr3K&s8@!f*?-%kh"ppIs8;iqmJd+brr2rr +)#X:1rqu]nqtpEhs8Vidd&NS"SthmFSY5nQ%%s;cXKAtcp%J(Ws8W#r!<;opmJlSQj8]&Vr;Qfr +r;HR"r;60IbdjdJT)PE(U84QWT:_dJT;&!IQC#_Yp@nUerr;uoqZ$Tls8VWgs8OGErr)lg[N-5+ +)fP?Jrqucqrr;kF*Z?;=p](-jrcK;!*??BjqYpEmrr2iq%fZG*rqufrk..(PUSH`Err3-!rVZQk +_uG5~> +_Z'Z8qu6F)q>0WsEDq+db08)Pc-4DSaMu6u`W*sQaT'6jahcBN9aC_!"YRRCeC)X`rPnlYs2slQ +rl4uZrlQV3aNMcKb0%cDb.l*;]"+2KAR/naAn#7Z@:NeZB5)3tG^4h7^;%A\_uI^S`qd^S`WO3" +`Q%bn!6FrXl,WnJaSF!WbkfK\a8s<%rl4uZs2HS._nj(!VicLPD/*cp?t!SV@UWbW@Us(_?Wpa! +Z+7Ea`l$'Eb/r#T`QQEoa>(l[a2lBTd\7Bj)A66$d*0e\a2H0G?3glM:Xme4a37<`%iQ#e_T'[: +`l5j7b07lFrlc/#`l?'Cbg+5'D,!Z/D7]$/s8VunqYA#.J,~> +_Z']:r;6Els4%>As8W&mrVuiqq>UQrr;6Berr;p+s8M[:,Ud@%p\t*es8V3[#Q4Jsqtg?kq"k"* +r;ZfCdc0`fn*BE5nF,T)lg!KfhXL@@oDSdgqu-?iqu-Hjrr2imrql`krpK[equ$?hqu-?jqu-Hj +rr)j"rquZkrqud;rpAe3l0.L'nF?,=oC(r1o^_2(ea`\>q>^?ks8;]lrrDuer[7aFrr;fks7'8> +)^$AUoDegirr;`]/1Dka.UCg.qYH!s+s8"Go)JRcrr3-!q>'perr3#upAY'tiU#ahfDkmMr;?Qs +p%.tVa8^Y~> +_#FrDrquQfnu\V(mf3=br;Z`hrr)lorr +qYL!OcaKaKU7RpIStD^KV5'WRV4j6?Pf*+eq#C9js8)Qis7-(8s8N&uq>1-Y<$)kq+Fj"_rVlis +q!KRV*Y]l%f_tXAL*[fX)f,!?rri?"rVlfqs8W)trsA>js6["bRA-MSrr30$qtU*grP\_d~> +_#GDNqtg'Wep:A9VT$d%d*g1_b/hTB`Poa4`Poj:q8iTU&&lT7ccc@j#"6qde'5tUao00\`lQCMs3)k5cHF/JaiMHAa3;',X(GXHBP:m_@qB4aAS#UmCMn3RY.hZh`PfsfaSX!S`<"!"pr_[= +qT8f^pr`KT!QN4[bUgoXaMu38^V@LgR=K6jA78qXA7]CaB4Y@T@piDD>_fYn\&,r"bK%TNccsW& +a=#0P`lZ-@g!E,%&.o@[c.(.d`l>d-#S7[Y(db^ZaiRlq$k +_Z']:pA+[e#hRbos8Vuqs8DWjs8E)tqtp3gs8W,t#63X5J,B0C-hr;HWos8)`hs7?6hr;Q]f +s8W'!r;6Hg!W2fgs8W'!s8Moq'_Ct`lKRX$mI'3%oC_YCoC(huf]2u2!WDrqrr`#ko)&"W-ia,B +s8Dips5>4J+s/"3kP5)WqZ$9^>U1X;,:1,)qt0Ao-6q(9p\Omgrs&K#qtp%h~> +_>b&Fs8Mrnl(t2poDejirVHNmr;uusrVZZms82fors8T$s5,8Qq>9mbrrN)rqu?*`!r`,tqYpWp +s8Drs#P.W>R#@H/Sc55tTV8$LSt;^RVR"\EpAb0grr2flr;6EirVccqoDegh!<;Tgrr)Eequ?]q +r;?`srVlcorqZR!rr)cmqtp*ZQ8'k4\fSqu?B] +^Af,Ko[.VaH`=p#_T'pPc-"2M`l?!:_o'I4`l@hqs2Geob/qlW\HZ3`c,S5UcG[T=_o9U7`pUqJ +b5BHoc-+AMa2>s<`4*RWAm&kerb!!WAS,I_BPMC&DL%_b^<+L9bK\2Qbfot,rQ+uX!6G)\qoJ`U +!6G&[kK*M>qT&ZZn]1^QrQYAd.E]`R`59F/]tCq2HZEt;B4tpi?N]5fh=!a1og7bs<'a'GM"Lg!\'f:C.*)a2.Yms2tA]!6Y;b(!=V= +bKeDW_nEE_<)-A(a6NBss8W)8s*t~> +_Z']:qt^6k$/jXos8W#gs8W)ls8W)sr;$9%Kr;ZferVulsl2L__$i^)$q"OOTn,<:d +r;HX-c-l7Wq=+"GnF>r1kNh9hl2CS\s8E2uq#('erqZQsrqu]kqu6Eir;HWjs82fis760gr;Zce +rrE&tr;ZWpr;QTns8Mus#lal'rVuloq#:9m'Cb2Fj5fRrnEfQ3o'l)@nEf8ag\h'SrVHEfr:9h7 +r;Z`os8W)ms6UBnrr2rq%Jp&!rVulos8Up: +kNDC5rri8urr;r:s*t~> +_#OH6%f5b,W3,^ls7uZoqYgBlr;HWoqu?Nl!WW,trs8Drh#I9Os7-*`s6oserVulprrDins!.=9 +q"3F1NhVu5Pan88TV%dIVPKulcKk<&q#(0lrVlfmr;6Hjrquirq>^iPQ*9QQr;6NjqYpNcrWE)u +rr2os+ntru=;N&$)C*r7s8;lrp@NPR(Dn2;T_eZ]p +^AeZ7h2Z)TYJS,f_8jaGbl5]_`r3mU`q[Ud`l,pAd)sYAf#u7a]>_h0a8X'W`p_"Kb5BHbb/_9r +a(b>g +oDSUe!;je9J,~> +_#Fc9s8VK@dJs7FrVl`p!<2ips8Mupp\k[$s82imqtpEgqZ$Tps82'[s8N0"qt^6dqYq3'hW4"j +l0Is9nb)SEmHs2qoD8@a!rDior;QcprVQKir;Q3cqYp'm`rVQU.qWd"tkj7g1q"=+@mIKuCmcN9cr;Qiss8VZh-i +_>b2JoDSI$WN,gorr)lsrqucps8N#rr;cios8W&us82d&s8N&qs7uNfs7lHhrrDums7-*gr;cin +ruV14qu?92OGB$hR$sV?Q^aP:T;89Zb2)O^q>1$hqu-NsrVQWop](0j!<)clqu$TorVbaTqu?Ei +s8W,u!<)ops8Dusq>^Em"TSGur;HWprr!Z1nD(m`Vl-AcUSafYS>)mZUn='@Z0M/arrMuonbr[g +s8W#rrr45:s7(=T)]'S?[IjM!nGiFaTbnge,8k^uqYp0ds7ZEjrr<#trr2rtrY>D2rr<#qrr2fp +s7H +_#Fr9qW=&ZBt(sr]tqb1aihd"`r=$_b/hZDaN4A'&BMl1a2QHJbf\2I`6$*?b/=%pn]:OK.*p#T +]"l7nP[[m/Bk(^fCLUmkCMn-3E0R3/_SO+.a25pAc-OVWcHQ1.prEHXqTSWTqoJZSn]:IEqoJfW +o>psSqofSqaN)9>`Q63AaMu$&SqM%]B,"lgC1h!^@;'CiAmnthY.MNfbeqEia=G +_>b#Es8Uisj8]/Xq#CBjqZ$Nnr;QcrrVZBg"TSB!qY:'is8E3%r;-Hhs69Lbs8MrnrqQTmpAP"& +lc.fXqZ$B^o]u#=o'>AplM:Gfrql`oq"amgs8MrlrVQTlrr2:*i'(G)DlgjQ7o_\%BoC2JOo&\?Zqu?6d#64]&rVlfo +rr4#8pRL?ks7ZHE*$u[P.Tl3;s7lNls8)]sr:p*erVm-#qYL6lrV?Birrgj1k2be+ +rrW#mrP\_d~> +_Z(2HoDAI%T!nIkr;6NorVccorr;us!r`,trVuiq!<;rq"TSE"qtU0j#QFc'rVHQis8;lqs7-'h +rVl]o-h[K4qY%glSXGP3U7nEPT:qsNSt`O8k4&?Ls8Dlor;Z`jq>:0jr:pC9mqVe*;S>3L] +qu?]qrquira8^Y~> +_Z(&Cn+5n=@rf,o`59R;rl>)Wr5S`Wq8rf\`lQ7#aq2Y:_ofj5cI:"Y`m)H?c,7^%aSs3LaSO%- +aM#R,_7k_2B5D'qD/!fqB5;=!CN4orZb+6#ai;<=_p6<>_oU$EammIJb5'-Wb599W`pq.E`r!jW +`q.:O`rF-ZaskQZc-4GTaMu3@b/hT>]s=VoGA:o1An>[o?XRGQASYmd?@B;k]ZA%2o>jeOcH=8I +_8!\(c-=YdJe/M)#ngUqd*]eRakFN>)\No%4j;-p^rF^Gb/hTBb/hTDc-=>K_84+1aihrTa2?!@ +ah4'A:/PMTdHg]0s8DfjrQ"qg~> +^]+B#c/\a%"oS5mr;ZZnr;Q[%s8Mrnqu$Bks8Voo%f?;"rVuTcrr)lnq#C0ik5GAYrqc]pr;R;P +f^S(in)rs*md99%g=u5rrrW&mrVlg"r;HZqrr2lrrr)lrrq-6hrpp!XrqZQsrqu]nrqufrrr;ls +qu$6g!;u`nrr<#trqu`k!;uirs8;oo!<)iq')UbGk3_U,naH#>naZAAo\%UarVuHf-ia&Arr<#o +rqZBgs7F8X*[MpT?17glr;ZTdGTS(S*[ae]qZ$Tks8)]tr;$0drr2p(rqHHmp](9ms8)`p#hA,! +k4J]RrqaP4J,~> +_Z(2Gp[Q%o_tE]us8N&urVuoqrVuos"TA?!s8W)ts8;uts82d*qu?Eis7c9err;iis7u]lrr2rd +rr)jL'RUo'WU_rgptqu?Zn`rCP~> +_Z(5Em+[tKMRU.1a2lQQbK@l@`W!jWaSs?YbT4jI`lQbfdoCaiVQA`l.\ms2b,\qT/ENq8iBO +e]@a4$HU3(`Poj:aNDWHrlG,^"3em/aSs3u`koO"R$[8s^Ve(_a@j\' +aN;NEa1fI,_p6r`W"9@S'bj'XcGI9;a3n<)'Gh2h0$;#MaN)TMaMu6BaMl-Bbf[rE_o9U2c,[T? +bJhN<`Or0P<_d(jcM%8;!r2Kfa8^Y~> +c2[hCpAY3`ddI#4"oA&nr;6Klr;HU"r;6Eirr2rtq>Lp)q#CBhs8W)qs82irrqZThrr2imrr)lr +rWE)qqu$Bl&(/kep?VG9kj.Quk2tRPoDJV"rr;lns8W&qr;ZcrrqcTnqsj^`rquZqqu$?ar:Bp` +s8Dros8W)sr!36$rr2imr;6Kks8Mlps8N#q!r`,urr*3%qtpr8rp^3c +n+c/&ch[M=!<2uqq#1Hms8MrrrVlg;qt^9bi(YC@+=8Voqu-Nh[j!.@+!`5`q#C?ks8)Tk&cDP' +r;Q]qrr2ros8W)ts8Moorrh0AkM,V-rrE&js8N#Is*t~> +ao;A?r;R3)r:n4(`UW[$rqu`np](3k!<;rq!<;op"TS;ts7uZo#Q4W!s8W)os82fqrrE&ts7lQn +rVlfps!RgDq=iL2PaeM6TqS9ZUn46VVl7r3qtL!frr;uss8W&pqu?Wps8Drss8E)urr)cor;HZp +irA->rVuiqqZ$Tprr)fpq>UTsr;HQmqu?]o)ZBU%dC63XTr+Z\Uo'o]Un+BSS"/%&q>:*grVufp +s8N?'s82iqqZ$KmruM(8s7P2>)]T\:-JJ@rs7irA*u>b8,LZAes8Dunqu6Nn!ri6!rr3]0rr;rq +s8W)us7Q&`Tq7aln,<:cqZ$Kmd/SU~> +dJs7FpAZ*1qX<=4Bns42_o0O:d*^1^`5fsAaMu6@aNDa+bm)D7aMu6@aSj6naND<>aM5d;`l#p; +bKS2Nd*2L3s2b5[oZ7$SrlG,Zs2G#S.\UN_AoM*l@q0(^@:X(eD3_ZL_SjR=bK7uQc,mrDa2Q*< +`5]m:`Poj9rPnlYr6#&\qo/o\`l5s:`l5s;q8iBOe]@a4!m&?url$V3aN2NIbfe/Na2Z*?> +'bIak_SsN[$5XBh&dk_[bJhEHaiaV(#Kk-*_og3GaSj*qa2,d;`Pfj;aj%r>Z!'q#?'s=;rVlZi +qu$KorQbFn~> +cMmtFr;?Km!;ufq!qXmor;RB,s8Vuor;HQis8W&sr;Zcqr7h2Nr;QTnr;Z`rqY^?sr;ZWmqu$Em +&)5q!lLFH8n+#Z*l/L@OkkP2IrW<-!s6KXcr;QW:rW<#sr;-Eks7?3kr;QWmrW3&sr;RAiiT][o +lL"02oBPl7jm:XJp\t0rq"j[_rr)ir"o\>rqtp +dJs7Gr;RN2qu6Wos8)Zda.f]nq>:0kr;Zfqr;Q^)r;Q`qs8Dutrr2lprr)llrr2rcrqZR"q>^Ej +q>^p\F[_rqufpp\k3nrqucsrr;Ec#64]&rr;utb5MJB +rr;]ks8Vck!rr9"rVe/Dq>UBerpe%2VP^,]U84N\T;JHVVN[:bo(i=]s8;osrVlcprqu`ps8Duq +!<)iq+8u$0AKVd1(alldrS&G;'c.u7\Fon#rr)lsrr<#tqu-O(qu?]ns8Doqs8N&ts8N#t&cM_& +aeGN'T>pX%s82iqs8MooquZcnrmCar~> +df0CIqtp9j!;ufq,PU`^QtL<0^;@q6aN`&Tb0%iIc-X\R_nj@4bg"JYb/M-1`V@OR`qd^Sb503Y +b5]Q^`[/IDaN)?Jaj.uM`l5j2^:8&m@:a(^@:*PN?ta:gH&]ST`Q$!?rlP8_b5'*Z`lS(t!Q`:K +a9KZ*`lQ0@`kTUm`ph&!b/h`Ba2bs6\W:iNCM73d@UL +cMmtFr;Q]q!r;lnrr3)le)L9'rt+u(s8W&qr;6?jrVu`js7u]JrW)lqqu6Knrqucrrr2Zmqu-O* +m`ODRo^V>9nF>]/l.t=lpA]^CqYhB4r;Zfls8W#sp>>$"m-aK9lKn02nEfSsh#@s*t~> +dJs4Frr;us+8>g5s8;T7V6ehJr;Q`ms8W&pqY^?krqufnqu?Nmrr2irrr)lVrqQL;rV?BoSXb5)'0]WlQm\d)BTuKnc/L^s8N#ts7lKks8Duos8Dfn +rqQNnqYpKo)#jL5m`2)mTqf9prqHHlrVZ]prVQHgrVl`p!<1UMJ,~> +df0CIqtp6i+8Gm8rU\pCBlB_b7`lH9HrlG2^`;[jXb5TUjO9',(IfcO_$/*ZPc"^WFI6ccjPR +bJM6FbK7uHcH4)Kb/DKKqT';lbKS/PaK^4k6qgmEh"14=r;?Qo!r_riqu?]pf)L7~> +a8Z/R9O!;uin!;qEIp\k?rr;ZfqrVZ[!jrr2iqrr)jBrqu]npTu1i)^ZdU)]g1H**i7:3lqu6Tsr;ZTgrW2ro +r;R2phrN\Tq#CBis82fpr;Qlur;6E@s*t~> +ciqYpNos8DiorVm,us8W#ss7QEirr)lVrr<#urr)j#q#C'fq#(*j(A.+9 +OHHB9S=-%CS"6IXU9E/=q"Xmgr;V?Ip\l66r;ZfqrVuoorpRk+W2H)YUn=KUT;/0UW/dnFq>LOO%rV?Hjrr3'!r;HQn!ri/tf)L7~> +`r@%WoB3&jBp-$E^r=O@c,n&JaiDE@^raU6c,RNErQ5,]rl"lWg;kGUc,J#I`m;rO`4WaI>[)#Z +? +df9=GqYpQprr3)le_9csrrrAuqY^3erVm3'r;Z]nrV$9hrRCfRr;Q`rqu?]is7?*drsn)AoCMD= +o^hD7mH<*\rqufrqZclkq"aa_r.4kBrr;rsrri;sr;QWnru(:jmd]c9p@IkElgO3#hTblrs8M`l +s8N&irVm#uqt^0hr;RZ4qYL-epY7,@)'9kA+<;UOp&"L_s8W)ss8Mp'pAb0g@^Q(.s7uBfs8)`p +rr`6"s7uZo"m"\%kiDC8rr`6!rqZQmrVY+DJ,~> +cMnLUrVlfrs8N&trRIgFe*[&0r;Q]trVQNirs&H$rq?BirVc`qs53hSrrN-!rr*u3s8Vopqu-Ef +kGjT9SX>nAUS"3VVP(ETq"OCWs8;]mJc>HDs8Dut-2m]=s8;llhncFnU7IjLU8+HUUS=%s7uBf +s7uX.s82iqpAFpX]WI`tVo\W2rqufrqtg?mrW2usf)L7~> +cN!nBrr4)>rUo?tcO@qTb"C4N.r^:V;(_oDYrrl0N1prNKU-HaNP`5KX/^qQY"FDY`%@:WeT?sR>T +@V'#?\\l>"dETeX`6lTDrPnlY0?;2Wb/hZGaiDTP^Cq7e&.T?g&.],ocGn#LaMu3BaN2B8bgFg, +PL%1k`PTsGbPK9k`l5a7bJVEAZZfhO<+qc\q#:9orVHNns82cp!rMimfDg@~> +df9@H!W;rnrri?$s4tlsrs&H%qt9d_rVlg(rVZWopAY*lr;ZZJrr2rtr;?Top&Y*frr3K"akZ=F +nG)\HnF5StlMLJY!;uik"o%ffq>:)@rqZQnrsAW"rr2lrr;HWorr3N!jQZO0lh'Z8mdB]4jOWMn +rseo&qtg?is8W)rqt^0hrVn2CqtU!]s7Q6c=sG49*Z?OLh>@6Orr;oms8VrqrVuT`>:Ll-r;HWq +q"apgrr`6"s8N#t"Q&8%l.Z.:"TAB"r;?Qk!W;rEs*t~> +cMmnDrr)ir(]OBfXI\2=qtg6js8N&urVccqr;HWpp\t0or;ZZnrW)uRrr2p"rquZkr;RQ-s7u&m +N16c7Tr"EPTV\EY\C:3GpAFR_Jc>NFs8N6"qYpKmrVmr:rr(rrVkU/]R\cgVUSFfaS^En +rqufrrVl]o"TJ>srVlfr+oVH8qY=27*Zl:9-lh(As8N#trVQWpqZ$Nop$u00*k)"FrrDihrXo2, +qZ$ToqtfupW1BTOjneiNp\t?prVlfIs*t~> +c2[hBrr4>Dp?8Z"@@t*H_o0mFaiqoJ`l?!8`5K^.`Q6HLdDsDNaMu@V&L?XRPZ@U+/`^rOC6ai`#T`r*gU`W4'YaSs=1ahQ$=eDNe0'c%Ah(BCqgc-4DQ_njI? +`m;cS`QUF]$]W6QbfnDOb500n`PK4)bL"MW`k-7m8Q0!4kkP/Squ-NrrVHKls8VrrrR_("~> +dJs7Gqu6lus8VoNg$Sb<"oA/mp%nX`rs/;us8)KdrVP=Jrr<#trVmW(r9O7Xs8W)OipGpno'Gi9 +nE8corVZ[(rVZQhpA+LZq>:'er.4kCrW<#ts8Ms#rr;rprr)cp&*`$3nabi2lLjT5rpK'trVlg! +rq?Bcrr2lo!<2rs.fB2>q>L-ds7Gl@-6F6S+1qOMp&FshrVZ]os7u]dhbbg>.O3^Ar;Zcoq>UBn +"TA2srV6Bl"Qe_2le_X@#QFc$q"agbrm:[q~> +ci4%Fs8Dp&rVulPWh[Q/q#(-lrr2p!rVQNlrs/;us8)KdrVP4Gs8O>Cr;6Egs8)clqXW+$Pbb%M +XIl)UTV&!eeElr*rVZQjs8Muls+11GrW<#ts8Mrurr;rrruD% +aSuM?kd5,2LVCM%aV<(GaihfH`l#d9b0%]NccF)HaiDR%aT'EBa=YEL_o9X:b08)LdD*c;_7Q:J +@r5jhB3SVI@q9>'T"2h\aN;NEbfe,Nb/hZDrl"lWJ]R]/!liF,rl6;*bK%]Ha2Q*:\@?s&@qoXY +?s-rE?#X=cr5J]Vs2b5_.EolO^rOpNf6.i=$P!0%dEKMVaN2?=a2cBDd)NOM +&IB3QVo$O"b/ha%a:uV-_8OLDd*'\Q\nFr;?#[RDp@S4Zs8Vs!rVuorqptdt~> +c2S:Orr<#ts8Ud6mJm4cs8;lj!r2cnqu6rr\K]r/r;Z`qf`(jL"TJ5lr:Bme%Go_"oBYW'kORs, +j5p.9rsAZ(s8D`is8W#prr2osJc>KE$2a`%s8MrorVuikrsn#=jRVd7mIg#9qX3q.jo,2_nc/L^ +r;QWo!<)oos848Ds7cQkrr<#AF>7d`q#1-jrqcZprr)ZmqZ#P*,9%pQ@.jR"qYC0err)lsq$R#t +s8N&uhrieTjSo/^rql +ci=%E!<<&t$ig.gVQ7E(q>:3lrr)j-rVuinrr;uk[NF?&qu?Wpqu6Wqir8uX"TJAtrVlfr,Q%N@ +q=gqSR\HILU7e +b5Wmgs6R@1@<8us`6-9GbKJ#Pa2c3bL";Rb0%rPb/hTBilD;C`Poj +c2[hArVlrOiog:?(Amn'r;-9grVuoss8V`O-7L:Ks7u]nf`(mM"oe>jp&4[brs[*/mIKZ2m- +dJs1ErVm6(oVSOpp%eUerqu]o&,cG*qu6Wei?9EhZ2aV!rVQTos5Eq[s8Mrorr)j7p\saOQ_'nG +T:hpRUnX`c_Vk+crVlisrVc`qs8)foqu)*Fq#1g(qtpEnrr<#sr;QZkrVuiqrtP+WXJVkcV4XKY +StD[MR?kter;ZWmrrE&tr;ciorseu+rVuirs8;Wkq"FO_rr3c3s8N&rrr;lqrRW84(E4Jsp&Fmg +rr;]k)Z9R5rr<#qs82cWUo'iUWq6/es8;onqtp +b5Wmdo$qGYBs,4ocH42QccaGP`5fm;bKe#;%M]A5f#Z(Ub0%rPb/hTBiQ2&=!Q`F]bTad>[^07M +B4t^_@q0+]C2J^%]#)D)aNMZGc-OYWb08#LaSj,0aSEmkbJhHBaiMTHaiV`LaihiF`kK0kQ2YP7 +?"7/J@pE>LAm\i'[_BeuaNDZHaMu="`[o0PaiMWHahu*>bg>.sd*9eXbL+PV`QQ?Dbf.lW\.B2^ +&J."Fbf7rNbKA!(a90H$`QA,'%EcT2_o&B[>>\48b38TrrrW)oqUGOq~> +d/OUSs8Dutq>UEAip$LCqu?Qk)#jR8qu?]ms7@`d*$Q_fq#C]CPrr<#o'(l%qrVuod +f]qtik3MI&mHWcgr;Quuq"Xaarr2QiJc>9?rqu]o"8r#iq>UC(oAAg#nF5o6nFQ#4kLA5ars\f$ +qu?]ps82Weq>:0js76."s8Duns8DrqbpOe_+ +dJj^Ur;Z`ps8W&mW2?lsq"jjerr*].s8D`modCjp)^1%2s8Dipq>UEis8V!U)ZTd9rVuosrT^\I +S#N0VV4sQSUT(Kip\Ojfr;ZfrrVc`nrV_rqu-Hm)ZK3LX/2VhV4a?OUnaf^QD3I> +qu?]mq>^9``TV.jWp%\Rd +p\t'dr;P.EJ,~> +dJj7FqY^@#pt9ap@^j"ecH=6+ar&4>_9:!AeB&%7'GCsjcdL"WcGdrN_oTjVaT'F&c-"8OccF&C +[!YtcCLCCTA7K:gEHf%/^r+13r5e`WJ]R&rrQ68(a2Ga.^TWc?=RMKB;`MYaiqiG +c,RfHrQ+uX+j/'R`P]U5bg4\]aMl0Acd0eRbeqZHc-iX'()[\o6.!sSb5'-WaqDe8`P][;`l>N# +91r0&f'EA9r;HWsrVQKAs*t~> +d/X.Crr3?'s7,"4s8W)qpAFphqu7E-s82Ol+=A$T*%Z:.qu?Nls7ZKmqr.MYrVZ9_qu6Ejrs[fC +rV,dHmHWhWFD%o'l/7lL3ia +q>UNps8;ln!W;rrs76."q>^9js8D`'-n-5Y-%l$no)8ahqtpBirrDimrs@NHmH4?Hs8)`lr;Qcr +eGk%~> +d/OXQrVulss8L6B[IV5U,]Uo(-6p%eOarqZQorr2lrr;Z_HrpKdbs8W)ur;ciqru:t;s7u,tXJ)AdVPBod +Vkg8`Qd>9orr<#rrqlQlrquirrVuos!WE#srt58/rV?Khs8W#j[Nct4'd%nunc&Ofqu.9/q>^Kd +j.`3?UX8o;rr;lnr;HWCs*t~> +dJjaUq#(0gqYfcQBPXNYaNV^(aSs?]a;2n7cH=?a" +dJj4Err30$s8VNEg&D!Rq>C'dq>V6.s8N&sgasQm+s\6Q=7,b]s8N&trVtmV#5n/nq#('crr3A[ +kk+67o'Pl9k2#S+rrE&trrN,srqccprr2iqs8N&r!W2eGrp]mfr;6Kg!r;`mrr<#srr3K$jlZ!u +m-j?*mHO*'imR]'!;QNl!<;Kd%fcP.r;Q?"+sJ*K,)H$inbrUfq>:0k"oeGtrVu]mrrhrTm-`R* +rrE&trrE&Hs*t~> +dJj4Err3<$rqP'HV"4?]rVlirrr)csr;$BlrX7U9(E453(`H?)]'5/K_>-1rr2rtrXo,.s8W#sr;Z]pbGq&( +U#,VDqu?]q!r`,tfDg@~> +dJjaTs8Dibn`I,r?F%>gb0J0/`r*mpa2H6HcI0'1&Ki&3&e$hAaN2QDa2lHKb2^P\b/r,UbK7K7 +]pCLCda?=.AXBT0LE`6/)'"3S^+`r*gU`r*pVb(7Y(a=#!H`l?*@b0%iNbJ_33`59-QH#@G/ +?=7#=?sdMS>?SMQ`P]U:c,BV(,fn!F`Q$-E`PKC.b0A2R`PKC0bg4_]ai)?BQjOK@%hNO)bfon* +qT&i_c-=8I`r=$k_oKgCaM`d;8lTE0jnJ`RrVcZo!;k@IJ,~> +dJs7GrVm5ieC+9ps8)KeqY^-g(&S%.q"a)X-6XET+>"o$p%eXeq#C6NrY,5/pA=mfs8V9;p@%A; +kN_d,kO/6Ir;Hm"rquZkr;?Qnr;ZWqq>:)@rpfsmr;$-^p\=Xar;RH,q#: +d/OORr;Q`qcE*_hrVZTmrr3'!rVc`n)#aL7qu?WkqWCm$)&=,.-R%OBq>^KirqbXRs8Ni4s8Vfm +n#hbISt2aLR\laT\(LBMq>L9jrqQKnrqZSFrpp'arrDrqr>Yb9s8;fpn]Ir2WMZVmX/;PiS>i"1 +q=4L^qZ$Nm!<2uts8Mus"9/8trr)j.rr)ihs7cGt-Q3aE,(T:]s7-*frtPJ2rVlisqZ$Bis7uK5 +Tq%pUlMCMXs8W#ur;P:IJ,~> +d/OaXq"41AVg)O/`Q?9Fc,mrD`l@tu(sL.AccjSX`C:^]'H7])#ee0oa2Z'Cb0&bc(Wt1Kb/q<9 +[WbtpAn#I^?Ya7iI\+6k`r4-dbf\#J`l5jo`W*sVaSj84aRR>!`l5s;aN2NHaNMfLaiDB:^W![D +E+s&tA78tR=(PQO@\^iPaMYsArQ5,]rl-#%aMl'7`QHHMb/M99`QHHP`QZ6FN=cX6*#<;9bgQ:/ +qT'Stc-4/E`lcNJ_9B^8bJCcD<`!(>`8gLequ-Kn!r`#pfDg@~> +df0CJr;QZp$fBRss8W&ms76!`rql^.rr)fqs7u]iphqB#,9RmN+2msRrrMuriVilXpAP"!f]r%t +l079kn)*+%q>UHorql`qpAFjc!;qEIoD\dfrql`ns8)osqtg6grt581s8M*7l0S$&o(2A?l0$.? +rVllqr;Zfr!;uBd&,lP.qi!!D,UOS*pAY*hq==Oar;Q^$rqlTmqZ$Ekrr3,fkMkIQrr3)uq>:0> +s*t~> +d/ORSqY's_Y+`T(qu?QnqYpNprqu`prr!s/!W)iTrYkh1s8Di\PF%c2 +U8Xl`VOXd=oD&(Vqtg0erVlisrp]r=rq$-`rrW2ur;Q^:rVuWis677nV4j`PW2ZYkUSj3Rp@nUa +q>L6hrVlfrs8MusrVlcqs8EQ,rr;hO-5@OC(nC3rs82W_rr2p"rr)fprr3K(s7lNhs7!FjTVn^Y +r;$ +d/PcunE02lFBa7/a3DWM_8aI5`l?*Bb/hWB`QQWMd*:-@%h]`q%hf#9bK\DZaOA;la;<"F_T0R2 +Z +df0CJqYgEn%I2O=s8N&ks8Vilr;Q]mrtbP3qXOUbrr)DA,p=QY,9\A(oDedeqr7VQrsSYOlh:2= +n*&ZfjRi3H"oS2lr;ZfprWE)tr;QQjJc>6>"8r&nr;HX#rr)]gp\=Xarr3T,qu?]kk32F4nac)= +m-=9&`;9N#rXAi(pU)Cq)C-T +d/X.E$iKS?Tu6Eks7u]pr;HWqrr2irrr2p3rUg-hrqu8:+;u7<)]Bifnc&Lbqr.MlrVZZac]sof +TpM^VUSb!+i:R'Lrr2flr;HToqYgTsrr;uos+11?rr)j"rr)fprr)j!rVQHer;RE%d]fXKX.lA^ +X/;SpUls^.q>^Hmq>UEoqu6Tps8EH,qXq->*toY9[.XIprr;Nfs8N)urr)lr&-)>&s82iprnj`M +S=7"arVccqrmh%!~> +d/OaWn`\W%?[B,odDjAP_T0X7`lS/%(s'h=aMbd>b08/QA.9.j)Aj"oHcj^YaMm,Z)9U%?[Zt*+ +@V&YTBOu"#N2aA+`Q#s=b08*/b(7Xba90T,a2\(u(sgFH`5/gFEbB'"?XR&I?sRVZ;kph>b0'_- +!6Y;^s2kGb`l?+!b5]Q^`Y-A8d*0dt$P*OW%\(np`Q-*EaSO'TaSs0oaNDZLbg!oC_SF:7a.Zs? +92g>klMLJY!<(LKJ,~> +df0ROr;$BmrQWpmrrr<"rUg-grqucp)?9^4s7lEis7H?krVrr;onrs\i&qtg0drVufor;6EkrseMQmdKi= +kjn?7kj$Ikrr3-!qt^-grr;Qg&,ZA).3'KU-b'$Rs82inqXORbs8W)srrW,qq#: +d/OUOrqtB>Y4;PkpAb0es8N#trr*i7rr)lrrVuohs8W&lZR-G-'Gq`/K_#$?qu>XS&,,IdS"QLO +S>`!SVlA,j@2rr<#poYdDuT;83PW2$)ZX..Z4 +q#13krrE&srVc`ms8Dp-qu-@:'cJ&8Zhj\$qu?Tko)8XhrVlco&H;_,s8N#trVkNJU8"@-qu4qA +J,~> +d/Pcpp>i5cEOoe4%r'82be_\7kmS%ut_`l?*=`;RgVa9'N.bl#W_aSWu.aRR@Nb5TK^`\#-KaN2KEair#Tc,[`:\Zp]l +ARK"T=^bK9>%h00^;J+;c-4DSaND`Obf\#Jqo0>kb08)Mc.NX9'G;"FeBlCXb/2!9qTAZU)90S5 +aNVfLaND`N_TBX5c,dhi<_Q.eT&BSHrrMukeGk%~> +i;`fUr;Zfr!;ufp#5SU?hr;Z]ps7uQ?-Qs`X+sA=7rVHQarr;oq +rq-3tbhqgXlL"''l/qR9rsSf&qY0map\"7TqY]^[Jc>6>!W;rnrs\l&q"aa_qu-HjrVlcprseVW +md9H3m.C#CmHiBdrr3)rq"t'gs8W&ur:g1$s7lCB,U"JAqu$Ems8;iqo)AXgs8;iq&,lG'rVuop +q"t*XlL+,snGE7cqZ6Worr<#t!W;rps8W)\s*t~> +h#@HTrVlWm&,Q>$c)@Msp@nC_rVulqr;HZorr)j1qu-Qls8Vojc6=/H(E")6;Z$=jnc&Rg!ri6" +p\ka%p?S':U8+?TVP']_^Z>(arr2urq>^Kos8<#srVZTlrr2iof_u$Rrr;uto)8Xhir8rWdJa4I +rr)ios8D`ms8Mus')hFFUogMjVkU#`V4soW^%M:%rr3#urVl]rrVlfms8Dp-s7l::*>os'q"t$i +s8Drsq#:6jr;I''rr)fnrVuosrr)ir$N'h:VOF*Lanu&9dJn^~> +huE`Tp&>^'qWOnoA#6uX_T9[8`PfR0`Q$("bS\LD_o9R1`6?-;a2cQ3%h]d#*#92HeB#c%aT'B_ +aSa'UaT'6s`PT)oBPD$a?=I5PD2,1-`6$6D`5]m<`r=!]`lQ6Db5TTcb09k-s2b)WhoGf?qoAo[ +aMu<@rlG&\q8`QUilM,=dE):/s2b5["3AO%`W!ptb0J8VbK.W:]sO`lA"ss2Gbob08#M`mkh@()*.ec,n&J`5Ka +iVs&[r;6Bjrr36$qt9aXqY^?lrrV!*rql^Gqu$Korr;oqs8Vcls8N&srr<#srVliqqrCd',Tn6T +,q7[Iqu?Qis8;`nqYgWqqtpU +h#@WXqYL$frVulrrtbV.n>iA;o`"ddrVlisrVc`qrVlisp&4mjrr2rtrVum3rVGMO*ZZ%6)]p?Z +q>1-gqZ$Kis8Drlru1n8rVQWls8;fnptq.,T:hpTSu89beb/t?r:^0grW<&trRCiHrrE&ns7QBe +s7-*es82fls2b37s8N#tr>bb7n%#EuW2-2cUS4KWS>u8Xs8;osqYL*dr;Q]ls8W)srs\[g*Z7lK +qtg?mrVuZlrt##+qZ$Knr:G*$q"jshrr;io"98B#rr)j+q"2.kS!fu$qu$Hns8Mrr!<2orrr1sX +J,~> +iW&rVs82irs8D`m$gc#U>)g&7bfn)G`W!k)_T'O:c-jMRa2c-:`lcTMa2Z9Dbe#eD(Dn#-'+he( +b0@uHbf7TDrQ+uX"N\g2aMn.r'ue5=aj%fC_7cdNCh@6hA6ieVEgjZ?`UV%KaoTT+f#[m6"3ep/ +aSs0a`Q#m:`Q#p?rQG>caN4;!"NAC#aNF+qrPnlYs2tA_rl4rV!62[m+i_L9^ohooARShJ?=$uN +AmoPb\AQ,(bKA#Nb/hZC`Q#ss`rF++b/V?Ad_rl,YnbgXJ=E_]/$A[CaurVcWlrVQKjqu6frq"X^ajSs`~> +iVs&[r;6BhrVmB*p\+L`r;Q`rf[]Zps8Drs!ri,srVm9$s7lNls8;ior;?QnrtbS0rVQBhB-/QA ++<;USiW&cSs7uZls7uZoquH`nrrE&rrt3N'mIp2Ap#b_tkPYA[r;$Bj_Z'H1qu6QoP5YR]qtpBj +rrDrqrs\/JhWsOqlh:/EmGQ%arrE&qrri?!qYU0brX/]"s'$co=Sr-qpAY'nq>UIHo&0NI"oeK#rqu]nrri8qq"apfrrW)nroa<3~> +h#@KUqYL*ers\l(r;!@fb4Yc4r;HWos8W!+rr;ipq#(0lrVlfpr;Q]q(B441qtL"u)'T\0'cJ@R +s8)cqq>UE$PU7dt:o`+jgrVZQirVlisrr)lrrr2p(pA\/9*`Vt7 +qtL*i!rDoorr3?&qYp4i*@\,dr;H3crr3H$oWFpXU8R;Ps8W)urr2rtrquctrr)fUs*t~> +iVs/]qtp?ls8Domrtt_0j*4mXW56U%c,R`A`lQ6?aMH3@b0\9/`#H_=cd'kU_SsL7eOBib',V>n +&\uu;c-O;K`l\2#rl-)%bfn/I_o'I5a2ZBD`kJutZkQH?"%,BUU.kUaND`LaSs3Y +`VmgUa<8L?aNEC*%15&Cd)WlCaNMEBaNMcN`Q$9S3slaff$)2*a:-59d)!)#;G157aQ`U$rr`2r +qu-Hm"o\;mpA4aKs*t~> +hu<]Urqu`p%/]\ss8DutkKW2Ys8W#r(&\(2s8;orrr;ipr;Q]qs8Muqs8Dfnrri&oqLg?s,7,5< +ir&fUq#CBlqYpEm#6+Ptqu?Bfrr3Aag$%\lkk+B,iUHaDrrDurs2+d4r;$?ls-!?`r;6BjrVuos +r;R/iiU,t.o]P]1l/9__rri?!s8W)tr!*,ts8N#qr;HU8rVuTd?7-t"p](9is8;cks8W&sq#C"l +-70`[[f>mss83H$s8W&Om-Wa!s8W#js82fprVlutq>:0irrW)nroa<3~> +gA_icr;HZos8VuopV`rGdJin.s7G0]WiD_pVk:#iWLo:)oD8Idrr2os!WDrqrr<#trZD1=s7Q%g+s'_Us8VurrVQKl +s8N&ns7056+;Z6/s8VZhs8NT(s7k0:T:VO`qYL6hs8)`ps8Mrr"9/8uroF*0~> +iW&rVqu7<+rVufhpAXsLSo&q5\\?21bfKb&.*0BOaN2N@a2H!;aiV]IbKIrCc-4SSd*cJ<'GqZ& +#S=Jdb0@fGbJsM%rPnlYrPnlY(X^.>`knEl@Ui_W>%hP\DN1O.`l>p:b.l!tb4NdO`W!mRaSa'V +aSO$ZaS +hZ!l\r;6uqu$Hls8Vs#s8Dutp](6lru1k6rVucns7?9ir:m!9*ucLT ++H-6prVufqr;-EjrrrE"q=sIXrr3&Kg["k+"RkdGlMCM[!VuWks2+d4r;$?ls,m<\r;?TprW)`k +rs\AUlfRTtjRVU0p!<:0rs&>qq"jmfs7cNmrVum-rU_Nb-[5F[rr;`ms8D]krsA1!+rqsW-KG.' +nbrRhr;Q^)o\\s$g%,1=qtpEmrr)j!rqu]nrVuop!<20]J,~> +i;`iVr;R?-qYgHoqY^3;UT<5DrqlZnrVulr$30o"s8Dutq#C?mru1k6rVufos7?9iqt?U,(_[o5 +)N"IhrVufqr;HWorrE&trVulrrtkM2s7PcLQDCFVU7n3TXN^;3rr)irrqXD0qu?Kk!WE#ns7lTk +s/>qrs8W)tr>,D4qu?]kp%6/$X.lSiU9LGlWK"giq>C6orr<#mrr;rsrsntt,p4CQp[nIbq#CBl +p\t1"mT1AD+!Mrhs8;ogrr +iVroVqu7?.q"Xmgp@%eDX_r$F[DKo*bfn0,`[JpOaiV`HaiqN?aN;]NaiMTG_o^0>e'-(_JJ8Y, +)]f>qb/MKG`luI$aSj-Y`>ut>b0%rN_T9d/[:% +]Y);(aSs6[anNk!aiDNHcHHV(%U.B'b/h?DeBGbMa3Vgj&.T?`!k-=i`q.7\`l5d;_7,8":/Y5h +kk+lSrqlWlrVHTnj8XW~> +huUEorVlio%KHA+n]'hdnEfE-l/:Cqs8W#rs2"^3r:g3\s69OYs1eR2rri8prVHBh +rtG%bhr*trkOeN9p"8%!s82Tcqu-No!r`&rrVn&?r;Zcms7lNQ,Te:ap\k!hr:g6kr;52",U4NZ +>4MC_s7-'qqu?Hjs8V +irB&X!WE#prseo'rr;ijg81n*r;ZNir;Zfrs8NN+s8Vlir;HZpr;?Qorr*N-s8Dutq=ajep;A:3jrqcZprW)orrt5,$abc^hU7\'VW26Nfm/$YYr;XY5qZ$Nn!<)Qhq>C?ns7cNk +rV-^KdrYGP4s8Dusppm&iTqC3=s8Muss8MrorVZ]qro=$/~> +iVroVrVmN/qtp6cq"ss[kdPABRD-bZaj'h-!6G/Z%EQ`BdE9STbKn>N`lQ:$aqqt;bL+eZ^s(!J +WuDfj'GrsNbfe8K`QS5$rl,tt_o'L:bg"DVbeLcK:hFEL=]f0IBlh/&a2lEEaSs5sa8j6Z`<4-$ +aNFM+!6tMe!m8U(rl+oWs2b5_qof)^`r4!Xb5TW`blGueb599[aoor5c-4>Ja=,'I`Q#p=aNDZG +b/_B?_8j-ECLLFW@8L38>%q/\\%TZ!aN2ECaihm+b5TI*b0S5Ia26*:#mh)Re'Q.W`5^0G`lYIs +&/H#m435FW`l@Vk%E5uu_og-9EDB&$B"RO2s8;inqr%L)~> +hu\5/r;Qru +s7Q'bq#(..lJLjnp@e+Ip$pV\s8W#mrVuosr;6BhrVm?+r;ZNkrr;ifi%H0"K`:l\rr;rprn/bH +*?cn6nc&Res7-'jr;HKcrr<#Z!qPF*rr3&rr;QTn!ri,srr<#tk5Tr~> +ir9,[rVc`ns8W'-r;6KlkcU]+p&Fsir:Ksf$i^,)s8;Wdqd"aAqu6Wprr2p5rVu]ls8;osrU6[, +'d"Hsq#C6is7lWmrqZR3rVlcoqs_=eW1]cPW2$&e]CtRjq>1'is8Drs_uBN4s8N#rpAXjcs8E#u +mf*4crr2io_>aK7*WH$8rVlisr;?Tirr;]_m)6$+USji[SYW0NV>:#frrW2trVca$rVZTlrr<#m +rr3o5o@tf5,(TLdr;Q`oqu,+n*YoY=;XXM`rVuHf'EA(3s8Duml`lnTTrRYXrVHQorr2inrrE&X +s*t~> +h#A/dq"X[^qYL6a`cYO:b.u*>b0'_'.*0HLbg\[Zb0nV[a2Gs$P33=(5iIBXtdoa2c9Aa8=$Ya<8XM_p$$CaNVC7#nL\"cc4&RcHFP<#nRR\)*H*gbf@ir +a:Q>(^r=@A_5Um09j2_mn,<1`s8W$#qtg0drS[^+~> +huE`R!<2ut!W;opru1Lah>dNMqXX[drqlTjs8W#orr2q2+=(pup\t13r;Q`qr;ZZoqYL3jpAaqo ++Y"H\p](9gr;ZWnqYg]sq>'sdqtpBm%ccF5mIKT;lK[:,s8N&nr;Qlqo_/0Urpp!_rqZT1rW2rr +r;R$$pAY!dpAOgcrsS&IlgjiDqX!S=hoGZp"oeApqtp +ir9)ZrVcQl%fH2$oYI)nr:g6kq"t*jrr<#srr<#t"_8PoC[h#rru:q:s8Musqu?Kgs8VinoiE%U +'I3;Ns7lNlqZ$NnqYqH4s8W&nn#VqPU849VS>NCHo_SU_s82WhrVcc6rquf\rpBabrqufprr)f3 +rW<-!rr2lrrW)iprrW0!q#::,o#7N'T;&*^T;/K_Rdp.Ms8MuqrVuip"oeQ$s8)KhrttR^+WM\M +q>^Hnq"rek*>9\C8c8Ves82ierr2p,rVucls4sTFT:E^kq#:9m"9&/qrqucrro=$/~> +h#A/do_/1[rVli\N)3BR\]`LFaj%oJb0'_'s2ZP2f1-&S=4>I>b/2!7c-4,Maj8)K_o'4>g.;u$ +&JNI5bJ_EH`6%u!rl-)"_o9^@c-=DM]5q:h@:WVV>\.ZAZb+K#d*9eYb/M?>_T2r$`P][6aN4;' +s2t8\qTAfYm`#j[b0%fF`l5j5`Poj +huE`SrVlotq#13nf\ui01\UMArVuoqr;Q`rr;6EgI3^$b+(++$s8W#ss8;lps8Durs8DulBd"fE +-H>o^rVlirqt^6kr"/c'qt^6ks5Dl.n*fE/lfd=,rr`8mr;HTo"8hcaqkF)[r;$?fs2"^7quH`p +rs/Q'oD/%VqYL-i$hi]Lo()>Cn*9-%ao25BrqcNir;-C7r;ZZos7cQjr4+%!.CJsLs7aD^)^H[M +CARi,qu6Tpnbs-sq>UEkr;HZpi9BR_r;ZfrqtpBnrr2fqro=$/~> +iVrrXrVHO.qYgu.p\Omes8N&grr;rrrt58,q:)13US-$1qu?]qrqu`oqu?]qjo9i~> +h#A&bp@eCZs8Vr@@8Vl\a3E#a_o9^rastEMaN2BB<='9V&4saZb/D-:bK.]BbKJ8Qa2H9K9FVdK +'WK@$ai_lL`VdgU`Yc\7b08)P`P-4nB3f"OB4bsuS[uMS_Tg:'blc,0`l>m:!65#W$-('-b0%rN +b/h[&`q[XS`r?P$5?`V;.6Bcp&4ggs8)fpr;QiqqYfUWJ,~> +iVroWq#:a$s8UR(mf3=dq>'sas8W!0s10X*+!MdR-f=drrr<#sr;ZQkrsAZ$qh$1=,9iiXq>LNq +s8W)srVmE-qYBgas469%o'br0n)'pbr;?R&n_iR&p@7P6m.BVn +rr3E'rVZQmrr2Wes8N&uq>Lm#\1&gQ\G,g.,pX]U-&)?slMgh`%fZD(s8Ud6lKd1(s8Mrnrr33$ +s8Mrnr;PaVJ,~> +i;WfVrr3W1s8Musrqc&YXi1&4rr<#trVZZnrr2os$G%Q,(E!u0,2E"irr<#s!WVrorsJ`%q1'S- +*?C^GrVHKrrVuosrr2p7rql`qqZ$,\S=uXLU8"NZ`9mHqs8W&ts8Mrsrr)l6rr2rqrW`?#rr<#t +rr)iurr)ilrsJc(s8Dors8;fprqZQprr)ir!<)fprr'\4s8W,us8DusqYq9/r;->+Zm6k>[.O'u+<;F;++a:drVliarr;rrrX\r'YG7\b +TB?%Js8;lorqlTmrr2'[J,~> +huE`Ts8P.YqtU-iqq6.$DQLFle'ZF[`Q63EaMl->b/fAB%29d")\9X*_oBa=a2H3=bKJ&Kaj=H* +&.o8$d`qd6rQ$)$b0%fEa2le`Q$6LcHsq]b0J,Oao03\aNVd*`X9Z#_o'F2`l?!VaMc*0O_\<3>Zb06?=RMSU;+=Ta2c0Aaj%lKd)Z..s3)8"`l5sAc^,+P$^]DoQ44KC&.rU- +cH6(*n&Q'_aMu6Bbg"5@AP>QoA&IO&r;QirrVcZo!rD]jkPp&~> +irB#WqYps%s8UC$ec5[Kr;?Qhs8W'?q"f+Z+X\QW,TOJsr;-UEo +!ri,qrr)lss82ir$-qo+na>]+le:t0rseo+rqcTkr;Q]nr;6Bh])Ma.s8N&ss8O)9r;HWnqt^!a +qtg0dqY0XKlKdj)lgON?q"jpdrqc`rrVl^"qu6Wpr;6Bjrr9k7s82rqr;QWo!<2uq!rMonrr3u4 +q>^KSl0S3Lp'r;!TE,:L.2.j,o[,(oUgrTsO]rtGD/r;Zfa +jQPdXs8Vfmr;HWorVlfo!<2$YJ,~> +huE]Ts8W,u$2=DlT;]!irr;usr;ciqrVZX3q"\qQ)BKk5*>c9cr;-?krVQWfs8Dus[/M!H+aj%Y +q>UEo*<,m7rr2ikrVulsn=$5JTV8!PWLh#orquNjs8Dor!<2or])Ma.s8W,uqYqB2qt^6iqtps8N&urr2lqrql^6rr;utq"asWZ_j@o +X/DecUnWsiqu6Kls8VuqrrW2ps8;lqrtPG/pT>\],IOa&)AjM8J+NU:rVulrs7-*drVld*p[knc +S>2tXrqHEirVlZnrr2'[J,~> +huE`RrVnkSp]'Q%BO\$R`R!#Zb/M9>b0%fE`lcNDa\`H\+X%U9".7NZ`5BX9`Qu3:a3N5##7V1R +@F3-?rlY2\s2lA'`l,j8`5p*B`QG]!CLLOR>\%bdP.JiW^rOO7aSs2daT'<\`rF!]`lQ*;a2n8% +&'3)Bcd0tabg";QbK\5Nao0O"dEg+^bg=YZb/hQA`l5d0_SjI8ahl+'b08)Pb/hU#`BhMbaND`T +dETG<_5M9]>@_2J>?GEN>)9i*]#)S3aNr)PaMQ'Abfn5N`l#d9bKu4R#S3Vt&e5Hi&8';5a2c3@ +rl4KLs2tA_%Eco@c+pYr7S$^*g?nJ/rrN&rr;Zfl!<)*\J,~> +irB&XrVuoq!<2rs#2Rc.s7l9bp\u!-s8N&uq26[G)C$LT+ccKus8;oprVlg'pV%pt-mhshs8Voo +('"72rr<#trr<#ts8UR5lgXE2lKdF-s8W&trrW/urqu]'rr +hu<`VrVcaGrV-0FVP1%iq>LKrrVc`mrtP;+m[Bc;U8=Z^WiFkArr;lms8W#ns1A:-rrrB#s8W)prr<#t,5qE7lf?jP +da64[`l5s<`l6-Le^N!sg?%l$q#(0lrr;rqqu6]rr5/F8s8N&ur;QTns8E&rrVca3q=CkqT:r$R +WhH)]SAP"!rr<#or;?Hks8Drprt##*s/-SW)B9V6)'OP'rr)corr;Qgqu-Qo$iU+cU8XTNc2@G; +qY:'lrr)iYs*t~> +iVs#Yqtg3frt"ei\n+mI]ZA@FdEK\N`Q%nus2H5)bgFkdC_IHn)]9J!D:?\S`6ZNDaiMiQS.-#G +&ie7aao0B\a<&IDa2lM]\\Q%q]=br&e_8EueC)[fbK.iH`rUb/hTA`Q$'>bL;+E'FkT^ +&J#IdcHO>Jb08#L_o'Laa:ZS=bf\/UccaD";,^.jT&8r6rVlrsqu-Kn!rD]jkPp&~> +iVroWrVuoqrVm,Kj8]/Yo()_Xs8W)ss8W)uru^t7rqO#O+s7pH/0]'3p](3hs8;fii%$/r+scm\ +s8Dcm!r`&qrr3'!rVQTo#h&)-p@.>1k1K\5!r;Ncrr<#t!WW/uquZlts1/+`qu?]pq"XderquN\ +kM".sb/_H=`lQ9DaN) +hu<`VrVca#rV>iPY2AmNrs&H!qu$Korr2lrrr;pU?m(]472qu?Wls7aO6 +TV\QVW2-AhQ+$2[rVlg"qY:*jqu6Tnrt,20r;ZZlL`@BU)]p)tp](0jrW<&trr2rgrr2j0rr)fp +s8VfecD.24T@Wr9rVuiqqu?Zpk5Tr~> +ir9/[qtg3gr;R?!c":FG[Em1HdEg%X`Poj:rQ$2*bf/5`d[CXW',2$!$rPQpcHOGS`5p'5&etog +$e!>B`5qr#rQ$)$`lH6Da2Z0@a2P8iC1(R[>[hJbV8CEubKS;Va2Gpp`<4-$aND??s2tA_rPg\3 +aj//Qaj8Jff$r'g^p^GW\[]5`^;7\(_SO(%]tVCq]Xthe\$`EC]#`:Of[nHoc-",Irl;ms$HgT: +b0%fH`l5p7rP_+Cb08D`b0Ir?`O1A6?=7)9>[M)Ra3\N, +&/#Kc$B*Ab0%uRd)*8G;H$e/XlT!MrrW/qqu-Nrqtg9Ss*t~> +h>[NTr;HX$gtCTbs7GsVrr2p#r;6Eks8N#sruUn6rVYLt-mfrW*\1I[r;HZqrqc@f*@2aSj8]/S +s7ZEms8N#q(&7h/g$S>#mITW-h"h!Mq#1*grVQQls8N#ss2"^7s82d5r;HKgr;QWhkhOM&^r"(2 +_8F73`PfX0aN"+r!65#W'?8,9bJqWD`m3N6rV6`5naYJss8VuorrW)kr;-C(r;Z`qp%O4f+sA>Aq"aserTaC^s8W)urrW2sr;Q^!jPf7Y +h>R?Tq#(-js8W)Ys*t~> +huE`Urr3K-rV3Fg[e0Uts8W&pqu-Knqu.];p&FsdgE7[^'c7`5=6KGWrr;unohH;E(F%f:s7u]g +rr<#ur=K#.s6,Z:S>;mUSu8RCq#C6irs/H!s8W)ts8Te3s8DusrVmc5rVZQkrquNShU0 +ir9,Zqtp?js#KuOicA78Xi\c4c-=JVb/hTA`Q$!Ab/hZN`QuiW\d&ia',D/p5/bpud*'SRc8Z1K% +hHM)bJ;6@rlY)Y*6H4=`5][4Zs[NVA79%YD/c5^ai)KLcHXDLaN+8!]u^5rs2YJc`Poj:aii#\r +n%h.`k8X_[_9Mi^r4:5`P]R3_u%:N_>_4`_8F7.\$WKG\Am.We^i6pb/_NB_8uZ!r5eoX!6+lU6 +-.ErcHaJRcG@N,K5>(&?s-W:>[^o[Yedulb/q]EaN)NI`l5s;b0%`H`5omBBFG4S$BrfWbJM3=b +g"AQ`P]^ba8jB^a:6;9cHO84CfXD7GgP[Nrr3&sq"Xgf!r`#pkPp&~> +hZ*TSrr3&mdc:?,s7cTirVlusq>:'gquH`qrs8N"s8;`P>9G?n+;#tLhuEHMs8#eD,9J,Bq=jge +q#:^Enrr2rtrVulrr;XY5s8Vuqs8N?&r;?6Ke&]T/`Wa?! +_84%-rkf,`aMu3UEo +r=Aqurr;ENmcO'-mechNjl6:>!;l]oq>Lp)r;ZZoqu+EODUSRXs82iprW)uerr2fqrr2p"r;6Eh +rr3>\iTf+bs8W#mr;?Nns8M*ZJ,~> +gA_Z]qph@FoD&:`s8W≺HNmrVdlbAp&4pd<$3.s)n>Y:rVuZls8N0" +rVlcq%dfIPTqJ$NSZ/^Mq#CBnrr3-#r;Zfpqu-To_#FB4!<2ip-Nrr;oiqu?Kio#Io6U9:Mn +WMZJd[-IViq>L?ks8W)ts8W&s&HD\.qu?Ni^hdc3s7H?hs8W)t"98B#s760fs8N#srs\l+pZ&-A +US#I#r;-Ejrr`9#s8M-[J,~> +iW&rVrVnnVo]NA]A#d,_cHOANb08)PaMYp8b08#J`QuTEbf\2B4q&AG((h2j^u!;[ccn6W().@Q +d)ErJaSj9[aT'@&aN)9?aN)<-?"mt]?X[G_G-/Nta2H9HbK@rNbJq*6s2kA``r).q^V7Fs^VIRr\@B$I\-fj^^!5!We^Dac`3IB/a2?!Fc,e&Q +^;%"/Ch-US=&`O9A7p.i_T'C2c,[rNaN2B@aSsY8"'Pi)*2s8VlfpAOsi!<)'[J,~> +huE]RrVlrIgA1aJ!<2or!WMooq#C.7r;Q`rq>L?fs8VrgBI+ZH,on0XYl=OuKI@`c-)1,5s7H?c +q#1?prqu]o#h\4sn+#]4jkg":"o\8rqY^?ks8W'#r;6EkrVsb6rVuiq#Pe>un__d:`;[S'_Sa:0 +`5]d7_SX41ajntof\,!3f\"ZtaMu9Aa2Pp4_o0I3a2ZK`l1P&U_#FB6#6+Puqtp('irr<#erW;ulq#14# +qt^*aq>^Kmiof@Trr3&srr2lrrr2$ZJ,~> +iW&rWrVm0%r9:5cfD>@Drr2rr!W;ons8N!?s7lTnq#CBinm`aW*uu(7,-:_=r.61-*Z^dBs8Vcl +p\=^hs8MrqrugppQD:+OURJ'XXlB$Or;HZprVc`ps8Mrqrr<#trr)f3rr;rsrr2pTrqQKmnD2F1 +_SO++_o0L4`Q-!<`5K[;bLP4sg"G*4f\"Wra2Q'=aMl'6`5T[6a2cWdlh:>X^]+*0rVlfr,5V?; +pAb0ir;Zfnr8Y&TXf&4rVk]f[VsOH_rr;rkqYpNpr;I<*s8Vrls7lTgs7l9eq>('irr2rdrr)ls +rr2p+rqlHip +g]';4mD*RNNP!*Sbf.E9`m)iSaMGX2b0S;N_8!q1^<4[Ed7k2_*#fP-(6R1lcb +`4WRf\\,Sh^V@S!_7mOj[^3EM\[T)[]tV7s^qI4`Za@-O]tV:s^qRFm[CX2obgFe]_8uSps2auX +6--g]_7n4Dc-4JW]sjME +kl1Y^qYpWrqu$Em!p%qrrr2urqu6]pq>U-kq>:*hrVmo4s82]nrqh6p*$cLL+XiHCX!&W;++a:g +pAb0hs8MrprXo))rVcZos8DoCnEK6!kO[d#qu6]prr)lsrW3&srqc]nrVsb6rr<#trqm!!nCbn$ +aN4:t&&Z9$_oL!Qj6lU8q"ad`qu-@%q"jpeq!R1rdEBPL`50:.rkel[fBW,,_>aK7s8E&squ-Hm +rr;lsqu$Em"Shfms8Mus%K5JOmI'N5oChY4h>dNSqYpL3rr<#trquZkq#: +j8],XrVmH.r;4(*aSGc6qZ$Qnrr)fpqu?]qrVnnRs8;corV1dc(*!u+(a=q-W#cp*(jkrUpAb0h +s8N&urr2rss8Dutr;Zfeg5;MtWLoi^Tt9UgrVlg'rVulrrVZHfs8Mus!ri/sc2R_Bq#:obU8"6mq#(-gqZ$Tpk5Tr~> +h#CRTp>^U/IC-r;ai_H7_8aaGc-"#C`lcQM_nX(/]#qn/dF$KR&.09j+rM/;d"_T*)@g]CfYY\Q +`m;lOb/hZDaN2BCai;?>\"m& +bL"AO^TV*F +lMpn`!rW&srVm!!p\XshrrVW@iVid.rVlirr;?TlrqcQmp&=jgs7lWmr;Q`prVuii\0NLE+rW)llrW2rrrr2utrqufqr;R/siTfjplLOT>o%r:'s8W#orri8p +p\4L]s!dsIqu6Wpqu?ZprVZWorqufos7ZHlpAapcrqu`or;Zfpr;Q`rrqu]kqu7/Nm,mL-s8W)m +s8Muoqu5[VJ,~> +nc/Re!r`,tqZ$Tp49,9Zs7lHccDn;Ds8;oqs8W)qqu?Qnr;Q`ks82irqZ$Tos8W&rs8DW!+U9EOTTuG#pAFpes8W)t +s8Muok5Tr~> +k5YGZs8QF(qu?]lp?JP]?EM5kccO2J_SX:;aj8/ScGRlHaiM*0^;7e1a2cBHacHZB(*OtC*E3^] +#7EQFeBZ4Wa2uKKbf\#G`Q$!Da2H0@Z+X.L?Wq/TAp8a@`Q$!AaN4>"rQ+r[c,^%1bfn5Lrl$>+ +bK7iJcHXGLaN_fHbKJ;bZamca_SX70_S!=cZE_6sf[eU%ccjJOb4EjWbobKc_R-_\]Y;(o^U:2U +bL=_^d*KkS`l5s>c-42GaMua+ +WEW7i@%HH[s8Mlhr;QfnrTF32~> +lMgk`rqlcqrVlutqtL'grt3i3oDejhrVuipq>^Kls7ZKirVlllrr<#ts8W,trr4)8e0Q1a*@E$T +,9S1,qu$Bkrr<#tr;6UBn_Z'B2!<)os*<,m8s8W&t +rVZ34`PTI,_oKa3]Z%k8i:?dBqY^3hs8;]lr;7T7s8Mliq=NO``Orat`l,m?i:d*ErVQHks8Dil +rVli5rr<#urr)`prVZ[(rV#L7kj[p/r:BI4iVicWqYpHn"TJ2jp\Fae,6%Q@q>L?hs8;lrr:^!_ +r:BX-f>jDTNGWM's8Dutq>UEorVlip!<)fp$KpRBkLon8qtpBkrqc]pjSs`~> +nc/XgrVZ`qqYpZrrr<#tq\]+iXf9\CrqlWnrr2`ns82iis8)cps8Vljs8W&srtP4U+;c.5*>o_7 +)BDNHqYU9ks8W)rs8N!1s8N#trV#T?US+?YRAR!bo(i7`rrW2tr5&C4rVQR#r;HZqrqucqs8Drs +(\?+q`59C0a2Pm.`Q$9bpAY*irr2lqrquflrqcX8rVHBiqW,rG_S=%0_o'OPpAFderql`qrquZl +s8Tn6s8DusrVmo:s8Mrrs7>0ZVlHnoUT:2hS?hSZqu?Zqrr)cmrr)isrr2g?rVlfrqYgHhrqlZn +qt9d[qXO1#e]!rJMJ?nrs8;lrqZ$QnrVlis%fQG*rqlWfaJ#8uU#>bBrVm$"s8W&qk5Tr~> +kPtMZ>Q=[!qu$HlnA]ZUI(7;Abf[oD_p-BDbJM]MdE^"a^W+C4_8XR?aiDHDb/^Rj&0i/@*Z>e& +#qsiVbK@oJaiMQIbf[rE`Q6-DaO.u=Y?,:??"I>\Fa1[?aSj8sa99Z0bfIg'`W*q+b0SAWaN2QJ +aj/2]cFC6l]tq_/_nhe1_oBd?b08)PaN"4us2ZD,aMPg0 +a3ViRc-Ob]a3DiUb0[)iSp#Nt8OUYNd*TtM_8c>o'$&,5`kfL(LJplBAAn' +lMgk`rqlcqrVlotp\k*njOiSns%34ds8Duss7u]ks7uQls7QBkqY^?ls8W)srVu`hs8CYX,U=NL +,TnE`h#%'Krr2rsrr)cms8Mrorr2fprVuoCiofe"m-*NdrVlusq>:0js2+d2s8;j2s8N#ms8)KM +a2Gp4`5TX2_T'^Mli$_\"oeGsr;?Q`rrE&tru:t9rV5R0c,[c=_o9dIl1k)Ps8Dusrr)cps89_4 +s8W,urVZ]qs8Mus')L\No'l/Ao'bo!dJs7As8;cnrr3)uqt^-es!%I?s8VWbjO)5PPalW*@j`cS +.Np8i.OH>^HiO!Arr)irs8DrsquZltrVZ[#iooO\o`+pgrr)utr;>XUJ,~> +n,NFe!WE#nruqCAs8;orqY.:j`;'?3rVHQns8N&ps82ilqYpNerr;lorVmZ4rVccnq#C9D=rn\%% +ilQ3-JA4mrVlcq"9/?#rr2rtrXo,/qXrp8U8"?TU84ckq=sjdrr3'!rVaS3!<)Tirr3r5s8;WO` +l,d2`5T[3_oKsSlh^SVqYgBlrr<#trp]jdrqud+r;#O0bf.E6^;7kO9 +kl:\]7/Qr]s8Digs8VuYIp[W1_TC'DaMc9Gb/)'3aMZ0If>c%V_84+1aihoOaiVE:d*T3e%MKTd +'b1Z\\C/[GaMu9?`l7qu$c^9/bfn8T_nE-UAH#p@@qT_'_o'L8rQ;mr!m8U*rPeiYrlY8^&')Z. +^sC9Qa0N4h^V[n&\GilC`6m>kbfRoE`lQ=%bk9-UbTP!Kb0/#RcI'VF\@B2c_SX+(bL4PSbf@fE +`Pf[9ccXDIaSj9[aT'@!a2Z-@aM4$GBHA8Ap!]$&19b5TU7b/hTB`Pop>b0%`Jd`0bQ +ZET=6JQ#<7%MKQo%2KWn&e#"OgsF6a_SaCmaT'E]a:Z>1_nX-l@8fp)RH*o=s8Dflrr2usk5Tr~> +l2Lb_rqlcqrr3W-s8N&umbR")s82irqu6Wms8;lr"T7Y*gA(XH!<2lo!<2uts8EE&pMD)u/K5ra +e+s%?rW)orrr`8tqu6Nn#h\;,n+5i.kMQ7a60)#jI2rr;uos8Vf8^:0irrN,squ.c=p](7o-RU5k-RU)[-mKfV*?l[G+XA0Z*2`T1r;Z`q +s8DrrquQiqqu6cQl07.&s8W#Xs*t~> +mf37bqZ$Tp')_e-rV4X4Z0hSds8Vuqs82iorr30"lttDJrr)lor;cirs8W'*q=SJD*%)IC-.)Dc +rquforr<#ur<<5up"c+/rhp*qVQmQ'q#10jrr9G+"98AurVlg4rVuokb.Pp7_8O=3_o0mZlhLJZ +qY0jcr;lotrr2rrs8E&trqlZlr;QZorYkb7s8Vl\gWd^U_nO++ch%25rVlfrs8Dlor5&C4rVulp +rr`9!rVZZl&,G.oVPpDfVl$MqSA+OgrVlg#rr)cnrVlfrrVdl(8CU%rVu`ns8NT,s82irqu?TKUS=HYf_tXG!<2-\J,~> +lMpn_rql`os8O;=rVcT\Y%2.Ibeq]Oa25g9d)O)H`Q#PYZI7CUc,[`BaiXP*'?\GAbfJ#QcUe3I +)[-TVYL(_Ab5B9Y`>?P8b08,Tccp&bK.`F`l6!Ccd0eO]Y)"r]tUVPbL$70 +#K=a'_oU3Nb/26ub5KC"aiMNC`Pfa7^7TRT?!165?=RGDHaUf6aN2O'bl>fcaSs3ZaT'C*c,J/f +2%1!.)&aMGj0PZUmfBs$b!s8Vrlir=N~> +nc/Xgqu?]qrqufqqu6uPht@$Jq#C9jrr2p+rVlNcs)B>6M"(<8lfId2*rVlNM`5p-8 +`5TU2`Qd3+q>UEoqZ-Wis8N!&s8N&ts8N&tqYpWpqYpKo)#aL7rqZ$De&08F`l#mWqu6Kgr;Zco +rr9h6s8W,urVQ`oqYg9j')UbRo(2MGn*B2aiW&rWq"ajer;S)Br;6Bhr;HTopVn^),p"$G-QaZS ++=8Qb,V;c!,p4]jq>UEmrVccrrr;ltqZ$Kjrrh'>kN(Irrr`2rr;PjYJ,~> +mJm1bp\u95rVQ,^Wm1PCpAb-lrr;utrr;`fs)&u*KC&C/qu6U2rVZWorr)ijp](9gq3rNG-RdL> +rr;uprrE#prr;p5rqZ#CVPL,aU8b??p\b'js8W)srr2rt_YsQ8rVliqs8E#qrr2utrr3Z-k/>Ba +]>;D$_oBsWmeZq_r;-d@rW3)`)p\b!i!<2uq!WE#pru_7=s7O8W +)'9Y0'd+;6',_o=+ +nc/OcqYL9kr;SbUo$VPhKuVEWbfn2E`5p3B`P'.>9*c)Ie()XX`6-9FaN;WJa2l*5bgOMQEWcLR +$*hn)cH=/Hrl#eq`5BL4b0A8Yc-4/==D_\]?>+7uO1E!A_oVi"rl>)Z_T2l"`PojaN"+u'ZS85`Q6$:^Un>c9N#ZN +n,<:[pAO%OJ,~> +o)Agkr;?QkrrE&sr;ZcprsntZh>dNKs8Vims8Vurq>UBubU4JR+=j)`r;Q`rrWE3"r;$?l$hjVq +s6cquo_AIdpA4dfrrN,srr2os&(L";p%.G.j8/fUr;-3ar;Q]urqlTj_Z'H4s8El5rr<#ts7u3) +`ll*4bJD*5ce[m[s8W)trr3)tp%eU_s7QBhs8W$;rr)fqs8N&urr)TTh8mgY_9'dMq>L6m*Y>&s82Zir;QZp,l[]:q>:*gs8VopO^ +)^g?/[*S72q9(!%-:mt4s8)Zns8N#q!ri/qr;QrpjQH$hl2:Par;-9eroa<3~> +mJm4cpAYO!r:.q)[IF+hs8Vrprt#&-qZ$TpaWhZ>)'tdKr;?Qos8N&u!WDinrsSQ#q>]f[[ds.l +s7Z +Qa+d%mIeF<'-BX;s8Vrlrr)j!rqufrrqm&YW1'NS_#!s,i;\<~> +nGiLds82fls8)fpr;SbUqV@QHDm7C+cHO8N`5BL8_9'sIV@!\A&Jp&Kb/V`PbK@oJ`l,d@b/qHE +^s0lSPKV5%d)*fBrl+oW"NA3p`le;,&^82+@VK@_@UNhiQG:5Ma2c:#b5]Q_`koeG`l5p:aND`N +b/D5^_nj7.rl+oWqoBo&e'ugjb/VKE +_oBjCcHX5?[D9A_]!Jrsda#qTccsPS_8uZ!qoBc!a2Z6CaMu9>`Oqdb>Zt?.;cch/?&Z80`Q--D +rlch6aMu6@aNDN>b0.l[D?paf(DR\t&05k?NiUINgpIb+'dq/D`lQHH`qmahb/M9=a2Pp0RpSc_ +;Ng&4rV$$Gs*t~> +o)Agkr;?QkrrE&qquHNkru^@Wo`+sjs8VomrVHKmqZ$Ne:+7V9+=A:%a8Pf2s8W)t!r`/lrr3,u +s7lWfrr3&tq>^?krVlrur;QZp#h8)0p$VA>iq36M"SME]q>C6l"9/2nr5/I3s8;j.r;$6iqW?8F +a1oL2^rFCIl1k8X%fZD+s8N#trVcWhq>:*hqZ$Hlqu6cop\OgerrE#srtG;(p@e@FbeD*=`5]sc +rVlWmrqaG0s8W,us8;oo!;uinrr!W3s82irqr[)6oCDPDl07$es8W)qq>:-j,l[]:q>:*hqtg +mJd1cpAZ<3rU\[=UYl(KqZ$Tns8W&rs8)cno1C8P)AjS86cAlrqu$Hqrr;ZjrsAT&q#C!cs8Mrl +qu6Zqrr;usrr!?'nXZ/AV4aT`WQFr0s8Dors8Dusrr9n8!<;los8Nu7rr;lZe&BDD_Ss:-`7aDN +s8MupqY^6grql]qrr2lnrr2rqrr2lqrr)itrV6Bl!WE#srt+PC^W+@4`6%BGs82irqu?]1rql`q +rr)d.s8)coh6`uVWMlhsUSt'(p\b!hrr`5tqu$ +n,NFd!;lcls8)fpr;SbUrT:LrKa2c-=cc",SbV'PH(`""u.\kG8bKe5L`Pod>^WamG +`QZ9LbL4ncb/;KDrl#eqaN;K?`Q69Jc-"#;ARf4^?=@YjPearO_8Z>ps2b5[_T3tA`Pojd*]b?\&,bm_n3Lf^W4aNcHOMSa2>am^^J-&bg4\ac-"#C`PqbpqT&ZVrl?/$aN;QC^rOO< +bKJ8^fZ(5#^;Rap[*7.Nb0S5H`Q#L1!QiF\`u;q<_8aBdF^A6L:K(A"A7^;)_SjI:b08)PaSj+& +aMkp+^W+CCFEVnlLCFq3$Id/;c,%cT:^\'FR`WCebg=N1`rF-Zao9 +o)Agkr;?QjrrE&sr;Q[!s4Z2is7ZHl/H#PCq>L3es82inXX##2,9J*X-"lZ?s8W)ss8Vurq>:3h +s8W&trVcWnrqlWmrr;oqrr38lhXpL4m-<^#rr3/ur:]g\rr2p"rqZBf_Z'N6rVdN.rVl`ilI!/[ +_SjF4_p%$4r;Z`oqu?]q#lX\qq"ORZqu6Tprr2fms8N#t"oeGurr)fortbV4qt^$\p@nLMcGRT? +`m"&Sp\k'es2"^7s8W)ur;ZX1q>1'grr2rtqu?Nks8D*AnF>o9p?;%krr3*!q"Xdcs!I[@q>C0i +rVufqqu?Khq#,=X+YHdop\b'hb9ePX;Y^7fs8Mrrs8Drrr!rT's8Drqs7u]pk3_Bnhu +i;Y_,pSOIkqu6Tkqt^9ks8W)ps8)`jW?3#q*#KV=+(OX0rr;uss8W#sq>:3hs8W#sr;HNms8;iq +!<2orrr*H,qtI^iTV/-XUoD?%qZ$Hkrri?"rVlfqs1A7Js8N&urqPa*]#2A&`l5m?i:m3MrVQQm +rVlKiqYpBlr;QZp"TJ>us8N#r!<2lq%dhTZ_o'F9oDeUcs82ir^Ae*2!<2uts8N&u'Dhb-qYfVN7s82ikq=aZ))]L/$rV6?kr5g*)(es`'qu?WlrVlZn&cMb0 +rVlcqrr)MpVOX +mf*Liqtg0dqu-Bk2XfID;//]s2Mmrs2P)[s2lk5`l6!B +cdL"IXMMop_7d4_^sUQUbK.iNb/VK>^V@Y(`6?QTdETbO_oBdnb5]Q_`rF!c_o9U3_o9[:aN)EE +rQGhuf[@OJ_7mFgfA+Zra1oX6]#Z)8a2uHEaN;K=b/hQAUN'F::ek#!=CtF<]thS+b0%rNb/jS% +,07d?^;n.7ajA8Yd+_Y.%37UZ^Ve4:UC@nI3RGp`a3DlOr5S`W&]W#;a2l +o)Agkr;?Qjrseu+rr)cprVuoVhZ*WHr;Ru=q"Xdds8W)sqtZ0s,UXZT.Nfstr:g0ir;Z`qqZ$Qn +s82Bds83B,q>^Kos7k7Ap[[e3kN2[B"TJ>rr;QZp"8r&nr;-Bts7cKlqYpNndJj+E(&Rt/qu?Wg +rp@_@a2Ym1`Pp$qrVlfors&K"pA=jdqYpBpqYC!brr;rnrV-`rq>0sdrr<#ts8W)t)?'F0qtp9a9`P]g7fB2i-s7QBjrVum!rr)fCrWiK&qZ$Tms8W&srVZ]mr;70+s8N#qrr<#Ukk"?5 +oC25 +m/R+b('":5s8N&trVufmfqbhCs82cmr;Q]ps8W'=s8Mupq=f^h+!DI:+W)8Zq=X[crVuirqZ$Qn +s82]mr;Z`prr3W*s8Vofb*&ZtUSslf\G,murVlfr!<2ur!<2rsqYga"p\k-grr;rCrrOnA)'5LMs8Durs8N#hrsJ](pu80ETV0-trVlfsqrRj.~> +mf*:crVQBi2".PXBs#V!b/hZC_8FODc-4GXcd:%dC'G%Z&/6B)$ZFV?bf[lEa3;WNbfS,Mbfn5P +aN4;!)T^(Dbf\&O`6HQA]T-$+@ps%\Ee2'G`l?*@qo\r[s2OlU#LC6,bf%TGa3VgBc,mrDaMl9E +b1Y7M[)C/,^V$hTda657aq2S1`lZ9@aN;QE`l5p;a3)L#b:q&]b/_K@`PfX,^;%P(b0.rObK7iH +a2>d +o)Agkr;?Qjrri<"rr;usrrhErp\Omgru1k6qtf_r,p4?V+CcbIH: +`PCL/q"t'ir;T%]r;$0`qu?Zgq"jmaqt^$Zp[dtGnF,l9mI'H5nac5Brr;uoq>0p^rVHEjrVQWp +qYC*fn`/$4b/hU&oCW(\rr3-#rVc`qdJa.Brr3)ps8;iorr)cpqu$BlrYGJ4s8)cqqr$].o^;;G +mHW:&s8DrbrVcchrYb\7rqjee,9eVbs8((e,pY)6r;-Bls8)cqrVlTi!<2rs$M3$FkiMjErqQBh +jo9i~> +m/R+bs8W,urr3H+rr),_U"9)8s8Dlorr)lsrr2p9rVZQglt@O\)&a;2,93r\q#C6kqZ$Kis8Dup +rr2rorXer+rr)NiXJM_bTr4`m^[h:$rqZKmrr)lnrW)forr`,qs8ULG(B+12s8N&urr2rsl,^cc +]u7h/_rgmnrVlco!<2ip!r2Zlm/I(brr3#ur;?R.rr;olr;Z`os8V]Ncb7B<_uB<&r;Qp!rVc`q +dJa.Brr3)ps8;iorq69lrVQQn&c(@fV5L8dVl65bU@\3\s7cQlrVZWprVlfqru(h9rV=DY*?6BM +rV4SW*?6HqqtpBms8)`oo`#I$s8;oga-i`lWnR@LrVuiXs*t~> +mJd:eqtp?hs8VsNp=+1iQG(#WaN2B=^Ve=DbKA#Oc-+8ObJQgU%Mg6.'G(A/cH=PTbJqoM`m2WK +b0'\(rl4uZ!6Y8a&BE&=`k''*An>:T@V9k?]Z'lkq9&`Ys2OlU#K4m0ai)3@b0e9Hb/qiL`Q-'= +ajAYa[_0i$b/:lp`R2cIrlG)]s2b5^4j(smdE]YH_o9[?d+-b+iS`VMhV[/Bf[eU&dE]nR_Sa:1 +aiqrRaiDE=^;%b/b0JG\ahkR)]Wg;7_Tg+"aTT]*a2lBMa9TZ,ccO#I`lIYk)TK_4b0A&M]:EYB +>[16/=&`gEZamrs^aSNpRaT'Bi +c,IK$J59*>E45E +o)Agkr;?QkrrW/srqud!p".ptr;-Eur;$-brVlfrrr*`6p]&E7.iBWY)^le#de`qBp\t3mrqZTa +rrL?mrqud#rqQ?fq=OL]ruV+4nE]2qeBlFY_8!^t^r=XNh;RG\o(i1Zq>1!erVHO1rqu`nrqu$, +^WaX;l21>Trr<#trVccrdJaCNp\amfrr)lorqQC!rr;rss7Z +lMpk_!<)os%K?>$c_IZCr;ZcprVlfgrt5#)a\F,o*#oY:)Fi'Jr;ZNjrr3#qs7?6irVca-qq%4. +USOW\YeKo1rr<#sr;QQor;HWorr;cm#64Gts8Mojd/F(Crr)j+rr;cWbeD!4_SO.5Ys8N#r +s8E'!qu6TrqY^*f%.`lQkMtOZhrEqip\k*k!<2cn#QF]$s8;Wirr2p1rTMM +mJd7dqu-El1B%%=ii6^2aMu09`l?!8_8X[D`5':0a2Z*;ahc8t2&?`C)@dMf/[!OKd`'ARai;0; +prNKXrlkDe&C8VC`kIgC?X[;I@W[@CaN4/!rQ,#YprEZ__9C'C`PU'E!Qr[db5]Hpa2u]Ubdt0t +aMkj%]Z&:Dbf7`FrlRjS`l5g8cd0h]da#tTbKnetkjn66mciimiSNJOl0e-6o]t)Td*L"_bfn2N +`l?0Fai;TLaiViWb.+Xg[Bn$+bf\#KaiMNCai`#P$-C$'`6ZNFai;?na;<"?`l#p@_o9a8STeOL +<`<%%@U!fW]>F?a+Ni$XccjJL_nj+*`7WX]";;D6fA0%9*t`qY`6--=_92YrrPnlYrQ5Jj`5]Hh +BMV<)M!G!>!rM`jkPp&~> +nc/Xgqu6fur;HWorVm#Hd/X.?qu6fur;6BhrVlfr'Dhb)rV;d6+s\!R-RU3\mIUAXoD\aiqXXXc +rt5)*s8LX?p[Ie9ioU4?rV?6cqYpQprquNi"TSDrs7lTndJa7JrVccqr=]#*iQ8jTaLoO3b4GQ- +s7cQmrqudGrr;onrr)ZgpA=IGg;gIhP*1iaMM[4KN/ijRLQ.UpZ-qLjlL"-7q"F^`rt,//qYgHj +ldi/3!<2lq +q#2'-s8Vlipfnsc,E0Yl)Bp["qu?Wis8VTf$30u&qZ$NJnE8m3rrE#Ys*t~> +li.[us8W&srr)fpqrsfQq>1!gqu-Nno`#U%s8)ZfP:IRl&0W/>+E$K7s8V]irrN#soDT="s7ZBd +hk[0IT;ncl^@M3rrr3#tr;QQpr;HWms7uWss8;`nq#:<@rYtn7rVulrs8DrUb.ks:]#D\6p\t0l +q#C?mrVc`ps8O8?rVuosrqufrr:K7.cG[T8^:h1m^VI_%]XthrdG"*_qu-L4s7uWns8;ckrVlis +rVliold*Se_SZ-Iqu-KmrW<-!rR(TJrVuoqs7cKlrVlTl(&n72rr<#ts8;iNZD4FrTrFreTtL!q +rrE&trVlfqrVulort5&#oiN1P*/DBU',i+]q>^Hirr;lprVuco&,cD+qtSd4V4adCqYpHnroX62~> +mJd4cqtpCMqt]mI_Ja;*`lQ<=`l?!8`Q6 +lMpn`!WE#qrt3uAkPtP]q>UEns8Mrorr2rtrVlfr(An.3r;?8<-m]fO*%2sYTD&<[r;HWpo)AUf +#lW3>n+#u2io^4>s7lZmqu6Zqrqliss8Vln#6"T$qu?HfdJas^rVlfmr;HKUaMYs2`l,[>s7lKk +rVufos8Drrrs\l(qXrpj[%3)+J:N4LHS^%rI!p6fJqJ]+It<<5T"3G;o(E%\qYg?ep\jses8W)u +s82W=a2lNDoDAIcrr)irrqk+B$2ac!s8)]ks8;fdrY5D3r;6Els82irr9!>:mI'K"-5n:-,psRbq#CBjs82ipp\t3mqYg`ts8V0=jlPM$rrDlVs*t~> +nc/XgqYq**s8Murrq<:lc2.>;q#13is8W)nrtPD2s82]cHm0UG'GVc1,Fe?*q#13hs7ZF&rVHNk +je&HBTW+ii]_;3urVllrrVQ]prr2rjrW`?$rql`jqU,9\s8Drsrr<#pkf:TY^rOF1e,T=Ds8Dup +rr)fprr2p-rquZjs8VrXgs*dR_T0^r^GNaB_o0O0_oBd8_7mXr^<>F*s8W#sqtg +mf*@eqtp9j0)5)-f5ken_oC!=a2Z*9_oU!EaM>L(_o9X;a3)<@dEBk\>nRn_%M'Ed%t;gPrkniT +b5K?YaSEsh`lGfi?tinRARoS,]u.b4rQ=KJ#04m-`Qc9Pc.Ct:gt^N0e(EL8ioK7bkiqI"k3)!nk25"LgYC`Nmd/iXdDEW9`lH9M +aN)NIa2c?Fd^-$"^3 +?WrDr^;It1rQ+oZ*6?.=_84%#_p-6M\c`QM&iL76")H?1b.l!7bK9_*s2b/YrQ+r[%EQH,^2[1H +=anoiqtL'Os*t~> +li.(dr;?HirrW2Ohu1-k +rr2rtrr2g&q"jp^nE%NQOG82_GS>4?GB\4QEcH&;FE;SGFa&4_GCfaL%%4iemIpDOq#(!^s8N#t +')qq1rVb:eGT=G +rr2rtp\l!'s763iq>-U*-QFEO*%pOTr;-Hnq"Xm`rr<#srX/T#s8W&ts4$?!i;W`XrVZZXs*t~> +kl:\^$NL)(qVn3KnG`I]rr2lr!ri,rr;Zcq')V_,pAb0fro8YR)As5))]^91rVllnrVuQi%KH4r +X.c)_T;AHfnc/F`s8W)trVulqs7ZEsrVufls8Vinci3nC&c1n;^r=@0_TUO's8Vums8Doqr[n0L +s8W)prVlfpqVf3.`5KR5`P]L0`5T[4_SO(-`59=(^r+1*_o9C"^te\`qu76)s8Dutrr)lrs8CNd +`koalrr<#rs8N)tdJa@Mq#CBns8;fpp&4sgrr3`3s8W)rs8:TSVQ?\oV5U>`de!M +n,ECdrqc]orVmZ3p$^tT@:ZdecG7]KaMu-8aND`L`l.krs2Z&"`QQ9:bfdrQ`cMq0)ANnt#mZ:3 +b/VN;rPnfWr5oYnb/h]<[qfGZBO,.^F1B9+aisb,m)TFPai;9Fahcn_VC,eD]9< +eBQ4_beqK?aj%oIai_u^]Wo#U[c#WXai;?BaiDfM#L('2aiM`Hao06TaSj7!a32QB`5g$C`lGi] +CL(7J_r5ScU*PBP*b0S/RFpSlk'F=sWaO85IaN;6;d`fqXb/h[&`r4!Y +apuV9`Q5s5UKUJf?)Qi[qrRj.~> +li.(dr;?Hjrsee[f)PdLqZ$Tpqt^-er;ZTl(B=:3qu?]fqsL"&+!i$Q+"11brr)cpo)AXg!o)`" +rq-E`Q,sKnc/I\s7lBf +s8N#tr"]#!o&dfWKn+VrF)c;FH$Xd[FEDYIrcJrsFE_tVH?sj`F`_hWK8,8]`oHIVq>:3lrr +nc/Xgq#C?m$1#I%g]%-Js8;iorrN,trqufpqu.?1qu?Qns7?'PQlm.a(E")8;tp:ir;-HirW)ut +rX\V(U7@pNVl$WXp\Y!jrVuiqq>^0f#Q=]&r;H?hpWrj;rt=eN^;Rk*aN3-0s8D`mp@eOcrr2rs +rr)j$j2ALC`59Cj_`>QK^qmn*`5Ta9`P]X3`5BI._Sa.%^r441_Ue/Ts8;iqrr;usrVHHlrr)ls +d(mc=fD#7Drr)lsd/F:Mq"Xmas8Vuns8Drpr;cirrtYM1rVccqq#0g/Y,A4sYFhkkQ07i=rr;rr +rr;oq(]XF5r;Zcir*^W\(EFZ-oDeagrqcZlr:BmfrVlg)qu?WmrPkb)T +n,ECbrqZWnrVmc4oBakk?]r(<_UHiWbfIc@`lQ[_&RCNZbq`5]sV&Wa3Mi@[Dg/(^pCYt +e&]PX`l?BH`P]U4aNVoXf]DDRbKeu.l0I['naZ5@lfmd)o(2PJo`"M5oCDA=oBto.lfHsMgudt_ +d`TSG`5BR8b088[cICIMWkH-icc=2La2uHMa9Ti(_TB[:cc,e$rQ+lY)9L+Ha2Q!6`5TI/\;k9/ +<`<1!AS,5P]Yhbfa9Kf.`l5s=b5TU*ccFMTcHaMa;&C#b(D0-]f#l+O^ +l2Lh_qYpKo%JIlrs8Vrqrql`mq>:*grrE#orYth9qu?WjoZ;2'.30WU*$lgVci*nArVQWorquZm% +fH>+s8N&urm:'*p[.8*rVm3'pA+^fs8N#qr;HKqr;Q]qs7lQtrVlirs7^T^rYPP4rqlZjiP!@Q_ +SsIFq#16js8Vrqq#Cm@Hn`RNON.l\&EGf`;F`qtSH[C$`G'.nLFa&"OG'\I^H?aRUGB\.NG +_(:/b3ns#s8W)rrt##'qtg<4aiDKfp&>!jrr:@E!rTiZrr3)qs8MrnrqcWsrqu]mrr2utqu6utk +j%O#q"47AdJj1Gr;Zd!r;6Eiqu.K5q#CsrVuorr +r38\n*]T;s8Vrnrr3#ur;?Tprq$/?~> +nc/Xgq#:a$r;>9EY42Jfs8MlmrrW2urVl`prVulsrtt_7qu?Tho>bhr,8M47'-/);bl%Jtt +n,EOhqtg0drVmB%mGbNmC8nkYaNVlVbfKe&,K@mNd*p=cb/hTBa3D`Qbf[nr:^[pH)&a8/%gf5^ +cH+,HaSX!SaT'6k_n2F?A7K+VBQ:Q$^rjg?b5KEW`r3s\`lQ6Dr5],``lQ6Gb!sYSb4s$Xb500\ +b/ha&aSs0cb0A2TaMuBFaN"2"4ibX_`QQ]KYf+Z&^pUl*ccO)JcHXq\bf7Q:_oBsPiU,:,](&gcd`p(X_ofs@dETq[b599[ +`rF-[apu\?`PKL5`OAuE7U;bPqu6WqrVlfurVQK]s*t~> +n,NFcrVlrrq>C6l#hmu/s8W)qrr;rr0DthLr;Zfop\jsgqYgHgqtT<4:a@81,U"0N,TnLIs7l?g +s8N&ur;6Eirr2rtnGN:kmbI$so^:o(rVm$"r;$-cqu6QlqYpBl&,lP)rqcJ$>i#/Sq>UBirVQTo +s7$!ks8;`mq>($fs8Mrr%J]turS#0.`5BL6d/*V;s#pAUpAFmeqYgElq=3@=ML^>1I=$9]F)l8C +H$ajaH[9s^G^OsfH$4=VI"$KfGC+RXGBIkDFa]"Xiq)pArVmN0q#1$]s8W#H`6-3erVZQjrVc]p +rVd&us7p]Hs8Dlorr)l]rX&O'G1??as8;orrVuNhs8W)tqu6ulea)Pqn+5l8eGfJ!rr;lop%\F^ +r;Q]nr;HQiqZ$Tprq9&**@Fk\rqZTms8W#qs8;lps8Vrqs7lTmrt>5)r;Z?Hn*Jp2s8Mrns8Voi +qYgHoquH`gs*t~> +nc&UgrVm!!r;?QnrsShrV5)u@s8Vuqs8N#t-N3uDqu?]qqZ$Norr<#prV>T6:*CSr*#TJ/*ZHA7 +rqH0es8Doqqu7B0s7cQlqu?N0T;/<\TVJ[No)8RcrVucorVuiqrr;in%fcG+rVL#,h>.*Js8W&t +qu6Woo`"dg$2aMsqY^Bmrr<#srY#8+s82iQ`5TR/_TC:)rr;omrVZ[>rr)lsrr<#od)3N4^V%># +`Q#m6_o0L2_n`t#_o0C-^qdec_E#BF^;.V&^r+.._Sj=,k5PAVr;Z`ns8;cos8;ospWgLla6N^) +rr;rqs8W)ts8W)tr;ZM0[f61%rr3#urVlfbs8Dp)s8MmmER4@Rs8)]nrVccqrVuZlrr;uss839! +f<;?PXei%nWgWGWquQflqu?Wos8W,ts8Nu8r:4NTq7jNmJR"arVulss82forUBi;~> +mJfEJqYL0js8DQPb\q!^[)0f$b0J5RaN)3;`l63Jai2B?b/)$<_9:*?D`8:E)&a;(&J>?U5h3om +c-=;MaMu7!`>HV9b/)BFaN)#I?=7;R?tOP_^!+aEb/qZoa99N%`lcO(aq)V<_8XLE9LZG3d)sYX +aNOJ'!R/^baT'Btbf\/Pb/hZD`l5d7c-kCq_o'^B`l7nrJ'5^S`m_W._oTj3\[9l1aiDBCcHt"f +d*0GH`Pp0[mbm$[lLOK3mHa31mHNs(m-3g-o&/aN;THa2>g7`l5s?aM#gC:n?Rpb/M9km^q#eF>u>'7>>e^+\]E":aMH +nG`Rhqu$Em#QFPms8V-;oDS\=r;Q`qqt^6krVuooqZ$TgrV?3bq=M(0,p=?N+!qpI.j?B?VtU/h +s7uEgrrW,qr;HWprrDimrs.';p$:i0jSSrV"o\H!qY:!Xrql`qr;Zd(qRh>Wm/?qYrVl]jrr<#g +rX8c$rr1hjiVWQNrr2lr')qq+s5_A@_Sj@2`r#B-r;ZfrrqQs!q#16fpA=7!W/#a!HN/@VG'%\F +H$a[UFD>,^;+X5K:KCb3CN"9=I"-KhH$=:KG&h\NIu:,;nF?PYr;Zfnp@eC^s8V`@_SO=gr;QQi +s8Dp$s7uCn?'YHfrr)l]rW`46[U0"6qYL6drr<#srr;lrrqud'q!6o3kjn98p#O[%rrrDpoD&4\ +rVlfo!r`&orr322*%2gJ])2L,!rVomr;Qs!q"t*eq>($hrrE&tqu?Zuf'Mkhrr33#rVuljp\Xph +s8;orp&BO~> +m/IIlqu$Hnr;ZZ/UqZO$s"40Js8Mrms8W)us8)]os7lWlqYpBb[:pj,)]0>2&euZ3,>Y--rr)lm +q#Cr;ZfrrVuKgrr;los8;os$iIVa:[J,]qZ$Tps82fqr;uuu +s7lTkrs\`$qqc)Ks8N#ts8N#sr=/f(s5qSE_Sa:1aSkl5rqd!"rr<#tqYgHkrr4\4cbI64_S*\" +^r+%,`l5^)]X=]-R@K\3S"H[g]tD"k_8O4+_83n&aMl0<_8=XXrVlolqY^@6r;ZNWcbRB=qZ$Tn +s8W)urr2rtrr2rooi>.Us8N#t"9/8trr2p+rr;utrr;utrr;utrr2rrrX&W(ph$a4rVuZmqu-Qo +rVuiq!<)iprr<#t'Dqb-maA)=UT:AnWhQE]p](6krVZ]orr)j(rr<#tZPb#*)S,_Drseo&qZ$To +s8W&nr;ZTgq>UBl!<2ut#lO4hTqA"'p\t0l!<)os"9/5rrpg#=~> +mJf9Hqtg9ks8)9AO(EXE`6--?b0.lD_8XF4ai_QAbg4,I`P]g?acT4+%h]Tp+qkS-$k4tCbL"G[ +_nXCoaT'6u`Q#p=c-F2Dai(Sj=CkcCC2]NO`QlcQbK7`oa99N%`lcO(aq)S5aN2PpEC@mnccF;R +a3+D&rlPDgb/hTBaSO$jaMu6=_ns1;gr2gd_T^9E`Vmeja3M]R_7.(qai1fpf#?"R`l?'?cI(%_ +bK7]Fh;[#:i9p+,o(),0lK[g,lK7?thq-Q1^:2)-eD'*OnFQ;IqtTdQmd'H?q=sF;dFHh;f$_UO +]Y__3bg+/Mai_6&\[U&4cH=PV`P_\o1WISY_naS`7ss.:_nj@8bf[oB`l?*>aMu<@aMu<@aMu<@ +_o'RH +rqcHirrW&go^Mm2~> +nc/Ufr;R!#pA=migXuK)s8;rsrVn2Bqu?Zos7uZgs8Vlmc[.2c+!_aS)^6FT+Xqlrp\Opds7QLol&frl(@Wm'@G'\CTH?OL[I"$m'T@3!"rr3,ur:g*err3,_a2Z'QrqZZpqYgHmrWi?# +op2RckkP,UrVu-]#QM5pKsgmWrUKmes8Drsr;Zcnrt=VXmHO<;l0?jls82ioq>^Blrr)lsrY,2. +rVHQooOo3d,Yn13rr;cns8N#q#QOW!s8W#ss7uZos8;lrrrhuRlK[F/rrrB$s7Q0bqu?ZppA]X~> +mJd1crr!<+qu?]SWi"JIs8W&rrr)jCrqufrrVucpq>^Kkrm,j=*#]n6,o.F<,TA"Tg@Y1?qZ$6d +s8;]l(B=.,s8VocSsZRIV4ss:q#16lr;HZqnG`Ifqu.*(s8Vll^qRRu^;n%>p\=aoqY^0hkfh,eh>[ +m/IIlqu-Qos7*R;B:?X8a",9SaiVWF`59R7a3MfPa3W2Weu`ahPj=aM>N(>A75PA87=@_T9pDbfn2Kn]:aMs2b5_&Br;;bfe#U3iQE2bfRcCa2@kq +rl>,_aSs0X`r*pX`rF#+_nOCAQ?#%)aiquK`lcHD`P^'Ge$??q_SO*mcILFbaMc3?_8+(8d)X2Q +i9]1@gZ7_jnEoc:nb)PBhS#SUXehr$Z`0n/\$E0=X0KFgiU,sokj7^%oC;DCm,[<\hsf^S`l6$A +d)aAKbKJP]\@T#\e]l7Z`5os<`PjXQb/hHFd=%3L_T0X5`lcQMaMu/]'["M:`lQ-;Lf$fDE7FFXs82Zk +s8W)prVuorpA]X~> +o)Adjr;QTn/H5MGs68Cts8Vuorr<#trr)fps8VrmrVl`ipu\JA,Tn6S*?QF@+snUE^\%O)$30Vs +s7cQnqY^9hrso&*rr<#rs5)W'oBti1g\q-Trqucqs60I^r=&T'R?a57qYg +mf37bs8NZ.s80F+\*a(ir;Q`rrr;usrr4;@qu$Kmq>'0M5p70e*#BJ4&fr2=?+]Y)r;HZes8Vin +s8Dutrr)d4rr<#ss7l;kSZ&BUS?T3lr;ZfpqY^?lrU9acs8Drsr5Xrr2ips"XNOqu-Hhs7!t?`k072aiD63^qQq0D.dWu +Ao)@/F`;>GH['XSG'7nHFEMDa[(sc&rkB\o`P'7,_8FCZs8Vrqs8DuprV?Hkr9;/@_)BP^Ls8)clrr*6(rVucprV?KnnbrLarr +n,NFdr;Rr;rTK)MH*P3)`lQ?HaMu0:`QZQGair5_cdBO`.M*=4*r[#h$ka$W6CuQTe^;j^bKI`G +bJsJ$rlPnubJqT5]6e1+@pWPcEk9!'a2uC$b5fTQa99Z,`l?+!b5]Koajk]dL5*sm`5Tg:^r+.1 +`l@tuqo/?MI`9@Ca[1K3bg+GT`l?9I`l5p>f>=o._o'-jaP"eabf[uI`4s%%`m)fWjPnJ:l/V4# +o'bf*lgNfLT:)=KYdU^D]XYA]_8*k$]XP>RXJh`/iTp""kiqL*p[7Y=lf6^]hpKNjcH")Eai;TP +f?CG,Xj5M?b/qlM`l5s=s2kkmakW5!>,ouh_oU'Hc,dusao]Z(`r=$d`l6$?Zq&+mc-FQ4aSs?^ +aSj-YaT'EYa;`+:a2Z$7`kS-Y@T$9/=^biBS&ik!`5KX7aNFM+s2lY*`lH$?`OQd*)AS1Sb.5I/ +cHseZb0IcCa2Q +o)Adjr;QZp!ri,nrr3/Yg%bUIrr2pKrr)ipqY^BhrVu`brPr_&,pjc_*$-1I*[agTkPt8Ps8)Zl +s8MusqYg +mf3:cs8NE(s8)/\T\TMFrr2pLrr)lrqu-Qjr;ZQ_r5NIt+X%dJ()Rr4)C/+Hjo=uKs8)Zls8Mus +qYgEns8N#qs8EN.rr;ok_jmKpUS+WgmeZq_!<2urs82?cs8Drsrr*H.qu#_\ggK:Brr2rtrr)lo +rW2usp](0js8N<%hdis=rVQTo'`S%.rr2rroZ+kf_nsOBs8W#ls8Dip +n,NFdrVo"ZrUJBQ=e3LOb0/&Rb/_N?_8OO;bh1=gh5XBf(*+>=(`4#)%MLgH^>-oTccF8NcH+&N +`6$'>`lQ6Drlc)$`Q#U&LhCL3@:F.q[(O;p`lQ3BrlXfQ+NhpN`P]^:b/hiId)\Ps9?52l_SsL2 +_8O=3`l?*@b/j=sr5a<+a2tthVf:D7b/VHBcd0VMa32u?^W4@-\[1#:b/ViPc,dZ7_o':1g$./3 +i9g"0n*]T-n++boSYE6q]"5Pj_8O@4_8!LgaN;B9^V%(`\$i6>fCnt2mdBB,n`KH5h:p]Hg!@^\ +ai)<>`lQ`^[BR?[fu;4Xc-42HaSs?k30?s?f6?Fdqr`5Ta;aND`Nb/h`C`lH$?`OQQj(D5 +o)J^grVm-"q>:3ln(dO3ruM+;rr;cnrqQNio^%Y_+se6S*#fk;+"/F_aRT0+rr2rt$NBr&q#C9j +s82WfrVm]5r:U*ds8U@6me#i3iVrlWqY^BmrVQQms760hs82d*o_S<8['k;Vs8N&urVZZis7-'r +qu?@mfOEh7r;?Qnrr3Z2r;50c`Pfd3d.[56qYpNnq"=U`rtak$K7&&hEcQ5@I"#H_,pF?I&I]$P +!WU0]n]/nmh>RBKq>LWn +qq#Q-@fQ<#rp0UarWrJsV3Th(Zhs[krr)lsrr;m!rql]prqud&mH![)mI'E4iSOM4!<2ip*rc3> +r;HQ`_(-[urr2fjqu?Wps8DutrV,H7+tA?LKoqt^0drsIcKl.ke.s8Monqu-Nns8N#ks*t~> +n,NCdrVm'#n\_$9q>C75rr)lsq>^HhrqQ$JNuoGe(`aA,()Io9,C@K$qYgEmrr3?'s7u]mrVuls +s8N#q%fQD"s8;ceP+n>=TVedHq>UQqqYL0]rr;rqs8W''p\ac;Z*S]NrVm!!rVuoprr;rprW<-! +s7uX!r;Z@fdpCr-rr3Z2r;?Qos8L]f_nj:,deN\=qYpKlrtbJ/s8W#I^rFC2_o0O0_nr0qAnPgr +FT-G9GBS+MG^k0bFEqkKH@1*dH$F@VI^Korr)iqmJ[%`$2sepV3BS"[/L"'s6osds8W'#s8Dlprqm;EX/`1u +WiN7lWqu\ms8Dror?)%;s8W#ss7F)U*h!$-r;-?krVuoss8W#ij,+j(KCSg;r;RT2qu$HnqXLe` +T:Ndiqu6Wqrr<#trqu`cs*t~> +kl1n_hO\2&]>r%mb=g!u`lPs?b/VlWcH:26%Mfa!)Aa/$&/5O[WQi`3bf\#Mai;6@^raU:cH!rD +`lcNMc-4#G]=PIPC0b:UC2]leaN)<@aN;NDaia1q(s:(F`P][7aN20?dqb\R?dm9=`l>s7`Q8%u +rlG,^r5\rZaN"5#!6Y;bIEKFScp5iU`mMrJ`Q6HQaMl6J_77M+`OT`5'++ceRd8 +dc9Z_qu66Pn+##6StMj[\A6,'^U^qd`m;i:UT;)NaiD94]tM"q`4NIgeFi;'lL=02oB5`%eEZ#H +bKe2O`PoX9c-XqG_7%&*cG[uO`l6$uaqVqH]Ml=1g<%@RaNDcOaN2NHbf\0'b5TTob/VHDc-FUe +HHIt-e]e$4mDoXWa2l?@`Q,s;^jH&c10Rg[>ZYg[`l,d7aNDZLb0%fF`Q-$=bK\/'&ds*%S9rr;ifq>:0orV60dp]#a~> +li/I1q"t*kfA?Q-q>C3ir;HWps8;ogs89?6+s\*R*#p%H+Wr=@WVZGcrVZZo%fQ8$s8;oprr<#m +s7uQkrr3f6r;Z]ps5E/9qtTO6nGiIaqu?]oq=smes760hs8Drsr;Zd#[mAZ#^A@g.s8D-\#Q=\s +J\B!!krVlip"TA5qs8Dip#jh$OlgO<0r6,*>!r2cmrVl`p!<2ur# +Q4:^KgioBRdrr3?!r;HZqr;?Tprr2QiJ +,~> +mJd1crVn8?hk$n;rqu]mrVZWns8W&to)JQn>TFt)+Vtn3+<2CO>H.Mrq>^Blrs&K"r;Z`qrVlfs +p\k+)rVQKjrr;orrhc'WUSO`abkh8:rquctqYC*\rr;rmrscA"e:PC2s8Drrr;?Tprr2Zj!ri/t +qu$j!rVliiI(6q*rr)lsrB1)Zs6[kF^q[k1lMph[s8Duss8N&toD8LYdEBYN^r+.-_RlIeA8?C6 +H?XLTG^Y!eI!Bj[GB%J=EHQR+HS'VoJpMTcHZjLVUUS@a\&H5%^W!n(dJs7?qYpEmrVuoss5(N+ +_uB]9rr2rtrVd$$nlXUq]Cu4'rr2rtnbs*ur;HTnrr)fqr9dSA^gd3?r;ZWmrr;lprr3i7s8W&t +s8Drmm_>j'V6$Sk[#X8DqtC$hrVclsrr)ir!<)os#5E6hj7N9Krr3Q*s8W)unE>6F)BBS?l2:MZ +rr2utr;Zco$NBu'qpD:1V4HB;rr<#trr3#trpp)>~> +nc&Ufrr<#srr4A7]P22d_8F:7aiMNDa2c-A_UI#"5mIl+((h<"*>T+u4G2&,c-FE0`Xg#(_T9X; +`5]pF_op$<`le;*&^8D5_n0YhB4POaBop*JaiVX'`rj?&b0':r"3Sj3`rVccjAQcXsJn +guI)JlKd^'p@@b]?&.obl>g1 +aMu6?`lH9Kd)eld_Tgb/VELaj"N:&/>Nbbgjt\rl+rZrl,Ynb08)PaMZ!*MHs"]@(G\) +s8D`hqZ$Tj!<)ZlJ,~> +n,NFes8W,p3rAsPhWOq=rr2rtrr<#tqZ$3fqLKk=+s7sL+s&!M-]HmSs7QBdrVucns8Dutqu?Tl +s8DfoqYU0frVmZ4r;Zf`j8/E?nE0KFs8Dfos8Mffq#(-ko)A[hrr2op&,l'F]AI)Srr;rss8N&u +rTX@]r<2Xmi`PLEr;Q[/r;Y0``P]X9f`(XFrr)lqs8Vfkrr3MaR=93qE-HJMJ9+OG.i\ro!"K#0 +!!O/Z&-N(M-l+'A"nhp."UkkdAo`-CFaeO\FFT+[jno&W%/p5#q>^9iccjPip\ame#5n+rO3qD1 +kPkAYs8E<%rqV5NfQYL8rquHgs8W&ss83T.qYg?irr;lprVuo]lgjQ9p$(qmrr3#ur;HNmrr<#u +rVuotq\T,.TDeffs8;corVu]jjb>',,U"3U++sCg!;uin!<2ut!;lcq#ik"3n,!(ap&+gh"oeH! +rqlWcs*t~> +nG`Lfqu?]n$,E.Hq>:3ks8W)ts![aDo`+]8+!M[E)]B_8+;uPah=gmDs82irr;Q`qs8W#srVccp +qZ$NnrtbS1qu-Nms7"!sTq%aJVU,#:s8;oqrVc`tqtg9^rr;rsrr)j-rpk9BgL&h9rVQQmr;HZm +rr)cooDK$orVlcmm8VnAl2L\^s8?a4s8UTf_nj40f`(^Hrqufos8VrorVQWb`50F0_oBO+^p/]- +Ao`*@H['jcIsZHfHZO1FE.!1L:2k9!I"$NjG^+O`J:)WgH$"YN_8O7%`PTR-`P_!@s8;cmrVuip +s8;o@aiNB7rr2rrrX&W(ora8!?hXHtrVuosrr;rrp\tj)rVZWmrr2loqu-ACXO_U>rqufmrr2rp +rr0*%*uu== +(*4 +nc&Ufrr<#qs8Q*tlAo8%]tVP.bKJ&Mb/VBD_V!:D"qM7W&el,o'akRi\]W=;bf%WF_SsR6a2u3< +`5Kj>`6ZHB`Q63HccsVN`it,(AR/VNAs'XDcHFPVa2Q!:aSs?Ra;E(Dbf\#H`PopHct9B+9YAct +b08,Pb07s+b5B?\aoKZ^b5]]cbrsCs`Q-KX9@lYUbeqE@cd0\Tft"Z3`l5X,fZ;C[`lQ'S +bi.R(h!==qna#B)i4GMPYIMHj`Pfa8rkq[GU7J-b_mFDZPc_R8_T'X;`Pom>_nWt![_hk:q"*_> +m.'K-e)f`Mccbe_*:dGVRFZ,"Z/aMu9k8Cu83_nj=3aN2?>`r4!S`Yuh9aN`&U +b/MHJe'HFiBrBR"[+!1=aMu6@aSj6`aMu3 +n,EIbqu6Tjs8N8]huE`Ss7uZnr=mO*,9J!N+<_pSG/3eErr)HgrV6E_rZ1n7qZ$Norr2lrrn$c/ +r9`e0s8Vojr;Q`rqt^'crr;Qg'*%n0r;$Bfrq`:MhSO71rr<#trr30"s8W)srVc`qr?_ICqu?]m +s8)cnqu?]prVulnZ\cY7q"k$bqu6WmnAWMb_o9mqrVlfr)?0R3s8W#ZU4IN*FaA1TJS6GV)@coO +!sAl.!"o>5!#-t!*tehf.Olhn#lju+"8`)u!>5J8&J6R-EHHJQDfg/LLofk7rVlg8rr<#sq"r4S +aSYi3qu-QpqZ$9^<8)-=r;6Nnr=&]*p&Fsiqu6QorVQWlrr;rsrtYM/s8W&trr;]1J(`:RqY^9d +rqcWjq>UEorVlNgrr3;ujR;R1mHs2slMgegrqH*`qY'pfrVn,Ar;?Qkr;?Tpq#CBlrqaii-mKu\ +,U=EL.3eWcqu?Zqqu?TmqZ-Qns8W!'s7b@>o]H2Rqtp?l"TJ>rq>9gaJ,~> +o)B=$rVlcqs8)coqs'rOq#(!gs8)^1rVZQ9,TR^=*#fn?,'C]pp](9ds8VuqrrE&qs7uX+s8Dun +s8;lrr7%(0RAldSZ1@no"8hrmrr)lrrUTpts8)cnr;Z]pr1K,*^M`rJr<`E$s8Dlqs8MurrVuor +-N=&Bs8VrqqZ$Kjs8W&ss8D\rKu7U%s8Vros8W&haND<8`Q\)Tr;Q]q0E1kHs813^`kf[8^V@U^ +B52@-H@'m\I!L$eI!9jaDGG%kIsZ3E@<6[ +nc'0us8N&mo`+sac=U:n`P9@2qT'SucIAj%%1X!g(_dGf4`l5s=rlXfQGg+4Sb/;B:c.@c(d]ca%ccs\Wc-=DPbfRrH +`Q#p:`lH-Bb/MKF`6?0DaN;`Qai)BMfV*]$:?_AcYJJ,lbJqT?qnYM.`P'Ilp[[hEk3VEq +f@0$6`l5p:_o'OCeD%12XjtV6_T0sI`m2]Z6ciB@g<@[U^r477^W=C8_oB[?`P]gq`>ZY4`QZ]N +_SjI;d`p(\Uik>78Cu24`lc$=sH[(j]*aMuNL_oTj: +`l?*Dc-=>KbKJ/N]u\= +n,Ejoq>UBks8VH@q#C9ls7uX1qZ$P!+XS0V*?6#hnFukWs82TkqYU^-arSM8Fj)W9Aq#CBlr;Zfqr;ciqrsJc*s8N&ur;6Nm +rVlg8r:^0gr;-Ha<8=::o_n^frV?BF`PK=3_<:[nrr2p2rr)ZmqrOf8E,9lLG'/4#,p3s.r;[Z: +!!<3%!"KPZ,UP)Q!!a\pAj@4:#Qau.rW!]7"9\f-#64f:*,9D3Fa\:FH[gsho^MbX8,`J^il'%' +qu?Qnqu-Efs*(s!AFfZuq#C^Bfr;-HnrV-3hr;Zcpr;HWps8)Wls8W)ss82ioohaZ!UlGEN +r;6NirV?Hms8Drkr##D0r;Zfdk4\H>lLrVuorp&G'grqXiQ/0H)] +*[2jK:b!>4S,WB`s7u]orqllqq>:0jrsS]'s5!>AlL4cQrr)fq"8quiqt0o=~> +o)Adjr;QWo#5e86Tu?^'rr;io(]+10=<&Fu*u>\/Rd^"Mr;Zcns8Drsq=4G%rVZ]ns8;Nhq>-PV +S"cUTZJ#-TrVuinr;Q]q!ri6"nbs:!s8Vloq#CBOA_c3_aT)#6rqcKks8Dolrs/Q's8;corVc`q% +/fi!rVcQjn57o7S,*$_$MjYUa25X7^ukOmrr)rsrr2rtr%S*Dd*08?c,[N.^kQQ>E-?SWI!KmVH +$Y!^Jp2!+:NgYqG^*e`G'J7XGBS@[H[:#;Gp%EaEHm"daMl$5b/V0:^qSn0q>^Ejs8Drps7kTja +liX%rs\f'qt^88\'ALRr;ZTlrt5,-s82ims8W&lqu?Wps8Murrr3#qqu6U.rql`ms8MafiRaods +82fps8;oprr2rprq?@*qtg +nc'0us8MojqZ$EURU:ES`lH$;qoBYtaO8X""qh@c)&Nj?dF$:_ccO2S`l6$5aSj9XaSs=#aMc!@ +bL+SNb.>/mCg:@SA9+*N_o0gHcHOB/`WF6(b43Og_p6]ObeM-C_cG=>>H-;rc-+/Jbf\',a"GBP +`l>s9c-FDPbJqTIa2cHIb/V6>_o0[KfgSufQA`5Tg;^;%=u_9K6F=(^Adirme#i* +p?9u`lH7Jl_8X@9cI^@WXgH'm`k]d>bK7`T@B7.=e^i6c`k]U1cH*lB`6ZWI_o9g;ai;<nt +b/VKAa2Z!;dDsJTcp-=5QZ(O&c,n/Ha2n8&!6G/ZpW36S(uXdY]YqM-cG[iJ +r5LY;bg"APcdBkJb/VBIdATMF$l^E0(D6m4(^q@;gr[:F][+pHaMu +n,Ejpp\t0hs8U[+s8W&ts7uX1s7ZK-.3]fW*?lmJIHpJ)qZ$Tjr;QWonbrOdrVllrrr35ehX^:( +jkfV.rrr8ss8W)trVlrop\XO\s8N]-q>^Kgoh=3'dp)YFs8)cqrVl]nrsJc(r;6BhqtKpdoDS[h +r;Q]mrtG>1BZ8V%rUp$drV6-+`5'41c2%59'E7q,qYBNbJTbsQG'SFj6kUIK#5\B9%0m" +o)J^g%KHD,s82`ZUTEPOs8W)ss8Dp1s7Q?',TIU=(E=Y5Hg:;(rVuoprVuEes8W&r(]X=0\sAqa +Uo(3>rqufprr;rrrr)fnrr2rgrrq>UDd!1 +FanX\H@gThH?aL_G'eR]GBS.RH$aghI<^"Y_8X=.dC['1_t=!+s7lHjr;-HjpWLS(qu?Wprr2p4 +j&k35M>I/Ks7QEgr;HZqrr;NgrVc`q!WE#rrrN&prr3Z1qu?]orr)llViT`kEm"FYs8W&prW)ud +rY>D3rVuAsU84T_WiN.qjS/]OrVuorrr2utrr)lr!rqulrr3Z.rQA[o*#9e5(E";e\ak.h)BJVO +s8VrsrVlcq"9/5nrr2p*d\3,#VVV4MrVcZnr;Qitr;QHjJ,~> +mf*alqYU0]`b]@^]ue@7`W!mWaT'BudDsk0%L`d_)^$7.AB;s@aNMfG`lQ0sbkT?\a;W(=aNMfL +bItZ>>[h8R@qh%>^;S%8ccs\VaSs3Ia;3(CaNi&NcT0P3`B_nrc,@`H`P]U4a8X.2a2Q!8`P]O2 +dD+#QbKRuI`l6'=a2Z6HceqU-`A,obbKS5Qf"/c3\@8`ldf%CpcW[@%c-FJM`Q8&$!6G/Z!Q`FXaSa0sbKe/GX)hKJ +nGiOfrqufr!qk17rr2urq#2*,s7uB_Te.<0*ZHIT,`DEppAY!arqZ?ZrW)orrrDrprt*TKo^1u" +mJm4_rr;rrr;6KlrrVlcqss^es7lTn%eBErgu-qYRed!]s8W#prVm$"qtg0err)ir%0$;#qY0jd +q>L6frVlfr'D_:0MVi`uqt^*drTV28`l5p^qYU]4fq>_63$ipD0 +(e/mW3#r52!sKf+^IgBq$N'l,":,>>"8i-`&Ih]VBRjoGH#eJ%f^8_=rVuforVulZ`Q7QFqtpEh +qu2;TflPC4s7lWor;HZqoD\I0YH"qup%\@Zq=sd^rql`ks8N)urVm?)qZ$7ffA>Ogli6bVqtg +nc&XhrVlg(rVHE1Tulm*s82cns8Dp8qu6?]o:.0E*#KG9,pJ6@rV6EmqZ$Kjrr2lgrrL3j +s7tH4USOZdWQ4Q/q#CBmrr2rsr;6?hrr;Qg!WVlmrsnc#=5;]cS=06RrVuorrVc`urr)cmqYps% +s7Q3]q>^9hr;6KlrtP8$[YWac`Vo`5s8M9#_T0[8lM:JYr;cirs*XhGs67A=^W4:/]!6itF*`1] +I=-BhI!]s^FaJ=XDN&XMF`r.WGBmQHDfTTVkirVuol +s8Muqs8D#qa70'-rr;fjr.M<-EQn4Xq#CBkrVlihs7jpDWjD3fq"jmaq>1!fquQ]mqYq'(rr;ao +f\YUgm/Qq\rr;6^)ZBU6rVliRXer5%Vlm:qZ2=7pq>^Kks8W)trr)lr+o;6BI=<5)Aa20 +*$DHSq>&;`)Bt4:0k$h^NjT:ijlqu6Nlrqufrr;ciks*t~> +nG`Lcrr"GDo]DBHL9\bC`Poj9`l?*@b0%iOcHt-s(C_?&',hVoCXLPLbfIWA`Q$-Gc2Gl`b5THu +aiqfKa2uB9Ti>]QbKnA8X3/H#a3hrOdq5E'@^=M7`6?KFbL"kbf[-USKT4.#daHUmdEp:h +da6.WbfdoEbK%cA_9^Ljb0nX#bhC7]`W!p`b08#L`l?*BpW39T(Wk"B^Vc^]?=-f3>@CKI]=Q"t +`QuHGb5KCFb08)Ld)sJJbFqQJ$lfrk&KVo/REE^rW"TRRFj.b8_:6l[bf.K=aNVlMb/qZ:Y$k't +<0$#6s8W&mpA4aYs*t~> +nG`dnrVlZjs8Um3rr3'!r;ZTl%/p5&s7Z3OGU=UQ*uY&&#H.@mrVlcms7-'us8N&rs8W#sipZ:( +l/(S%rs/N&s82]hq>C3k!r)Bbo);,Yr;ZcirQB<=guD3&rV-'sfrs8Dqq>^*Hlg!4#rr`8ur;Q?gJ,~> +nGa(!s8W)pr91#YkP5)WqYgHoqu.6,s7u]eo]:-<*YfS-+!;`(q>:0k!WN,krr^Hb +o:V_NX/2W,o)J^err;oprr`/pqu-Noo):6@qZ$Qis3,ZAgYbj!s7cQnrqucqr;$9jr;6BhqXj7G +rUfl^Ch%70eFrqBr;Q^4r;$Bmk$cc^AbQ-'rVb3`^<4F?rV?Ejrr2fp1ASu)_o9R1_6.ZjE-cPP +IXQTgGBe@VF*`7XEd#8sBR=iCG^=FQT[Zh]F*N1^H[L0erd%dsGBeCZF+AMAc+q!.`l5g-ciYnKus6ZtPKQr*CaQN6rp\OpgqY^ +nc'4"r;?Tpp?fh4@]$i\b/_ZE`r!gqajA/^cI9pC()7Ds&/GidLXF8fb/q]Kb0%s*b5KE]`Yce= +b0J#N`O3-dA7B4aA:1]&`l,m?_oTptaoKN^`pq,@bf@rOa478"f@eh>da5hLa2l9CcHFAWe^W's +e^Mdab1Y4oLJC94?aA&4dE9_TbK.TEc+[*#]hm>0bK&5L`P]QsY1(M8b5TK[`Y$hke_]Zao'Yo" +SYWU3]YD5#rl?,%aMl'DaJjGJK1CX+_oB[/NC?E^(5T-&_8F70_u7Db`k]F.`Os@(lMp\Mm-X6* +gtV>Ed)O&KahQ0Kg9dlocHF5ObL"$me(%%8d*ftOa32oceCB+07mo=$39AVRG\C>oL9/JHgW[pi +c-"5P`5][/dZo"-cbN6)e]c(P`lQ +nc/Re"o&&sma^J!rrVoos7uX1s7uZfs8VolbY9N-+sA!P,#?Y]p](9enbs!trquTlrr;?DqX00JI'!<<9=/jJ:(2('":!Vl^k"p=r2!s&Q=AScdAGB%hTJ\:@As8;iqq>^Ko +i5O(;r;HBis0@^=d9lG?q#CBns8)PZ>='f&;-m*e8l^qHZG*Z/F'r*jS^d6,s8W)rrr3<"oM"-+ +f4*\3rVcZmrr<#mrr<#trXo20s7Q6gq>^KegZn1mmdoYbrVm#os7lKhrr4/@r;?Bjr;Z]e_&t!N +*$\t:7j]WSpAb'ja!r)VR/d$]qu-NsrqlTjrr3#mqu6Tuio]Xcp&=skrVQWprq?AB~> +n,Epts8)`l`h9j8s8Voprr2rprYPV1rq?Blp\;p)-5mmE)'9qpdeNYrr;Q]qo)8Xbrr39%r`%M)hit#2r;Rl:qu?Zmrp.h&G?n-F<)lkh +=bsGZKni`=anYo8qu?Tnrt>'.e`:kaqu?Zf`P]F0`9$mrq>L^Kks8T6\g!aC&qtpEnr;ZNaQWcX&4&9*W5tFq6TWl)6O`Ff4FJ.1UqY^?iqYpL# +r:Wk@jj[_tq>C9crr)lorY>>1qZ$Tkqu"F+XK/:tX/VQWo_JO\rVllrrr2rt,5V?;s8;K&)]^"; ++CWA[,9fMIs8;o8,o7_irqcTjs8;forr3T0rVQWjs8Vo`Z(Re\_tX*/rpKf:~> +o)B@$qtpBms81c?>&1Ufb/DWLaN"(t(;n53f%/7#Y;R++(Dml&%Q(E8b0\>KouR-P+iqjKbfIuA +_gkm&@U3\dUVY*jcc*f>a2Q-Bbfn5L`PojfaC3*7`luWZ50_g;MilK<`Pp!Eb0ADde_JBRLL!>1 +4[2+mMFMfdQ?d^C9<6Rpd`Tt[aiVWF7ag70U=@?,e[WW:]WArodDj8I`Poj:b0AGogYM8eoBYK& +N2*_m`lPp0+iVUJb/D0?aj$lE7!:e;U;"jsaMai`*Fqi4OKGq)^VRhd`Flp+`59R7`koFhq>9O@ +mITbpi9A\8`5K[2c.(OdX0gC)ahuQ]PC(Ws9@D/+bf\/]eC]:@0cMc5:d[*%7Y$\rXeLDT9gr<> +[F*X[e]u=`c-FGW5M>&>9u>3$`l5s=b08#NaN4>&s2b)Ws2YVkaMc<>bL=MM^O]?er`'8->ZeAD +_99XAbPoZ`a?Ibf_8jR?b/^+[(E~> +o)B:#r;?Toq>^KMhuM31r;Zfor;ZZlnZ3rV,p"!J+WkF_nc/X[rr2p5nb)eZs3^H- +o'"p/s8W&ms8Vrmq=smerrW2tr9sVSs8)Qkdr!t)fhCl3o`+marr;i]`f"20Eg4)\h;@&Ies/m" +;'5r#>Fa8%UIuW(EqZ$No +rqufmoZYGFrVlTjqJX:0a^Y&Eq#:-il_dd!5%&;PEH-)&Dr]L.h:p`Ah:^>jS8M;EXQ9E]p]'s^ +s&.P'l&hk +s8Vji+=C[Gq"M?B+Y0nos8Vq,-m0i3s8W&ns8W)tr;?Qnrsel(s8N&fjQl*ms8W#kqu?]n!<2`m +J,~> +mf*^oqu#TWY1`[Ns7u]nqYpNp'`J(3qu$Hirpm-7)^-(6)B9]/l14?D(&n.2rr<#kjH-41V5LKP +p%\L`s8;cmrr`5trVlcqo);5Ys82cpe8=%'fM1i3pAb0hs8Vu_`J\).E0@WUgtpiCdum3i;-@C5 +;--S#`Urs"rVuimr+*t(_K#8KroV)7^r=OmqZ$Klrr)jPrr<#^]YqY'^VIX.EH5fAH@'j[H[L0e +H$OL]GAp9n]23?gH$ORWH$+OF]@NKH$adbFa8"L`59@'`kf^4^A.O(s8;orqu?Na +bfT;Qs82`gC;8]MAGlK)rqQHTUJYYc?#Fe(E-#)uin*)Cg=tH>g"!^*D,Y8Khu3TIs7lQm;V0Oa +O/DdRs8Dutli%q%s8VrqrVQQe^p0]3Xe;_gW:BcQs8Duss8Doqrqud;q#CBe9,f'ad/!FG*?$6- +pAb-c?m6L4p](9mq>C0hrt#,-rVucns7cK:URdsTir/fT!<2QhJ,~> +o)AdiqYL3k%/[t^@Z.e;cH">TaN4A's2b5[(;n5;`Q6?KccCnH#Sn0j)Aiu_a2ZBHo#;iob0S/P +`k&3OB3o"VC7;WGbKA/M^Ve"/aND`Nb/V?:`q.8bb0/)F_UPu%gZI!Mf@S!^^r=^Qe&\D)7nR9G +XN9#If@A$'6pspYB3\2,5tS'(da$+^_77WcbML!@e&feU\];RtYgCP>`l?!6_8XL?f&,6*lM:JN +lK"J4Z*VKd_8jX)Gq"BSaNqoHafpd`4A&(EPJ4WB_8j^Dbf\/F^V[q6aN_T6 +qs`q6o^D8+bjjK9`jrh!c.U[t['A'3behTRU_:mVdd`9D^8D;c7jFW?=c,RW?aND`Nb/hZHbf\)LaMu6=`VmdpaMu*@aiMiS`kem% +@o?0+9O2%C\&5c&aN_s.b5B=;a3;TPeC#rS$q%&@e"I6_'p?npf@`h3$3no*bf.QMdDN]5`QZTJ +b/MEI_o.I3853j5mJd.cr;ulmqt0o=~> +o)Adjr;$'=`7<(iqiBDs6kgNs>Q=s2$kj[sH?+7QFEiY=lLaoP +rVlcpq#Ag`i;3?NqY*kHhqV)sp\40qHX)kD7q?[[FDPo9JC`]:i8NYQhqm;Ohq[#D`/SJFVW[UK +abAO/jOq.lp\jgbr;?Nms8N-!r;HWirtGD3p&G'gs8)Njs6K4Ime5r4dd[58!<2uqs8N#q*WH$; +s7lWk]5H!kqY^<^:*CoupAY*edNKh]T)/<^s8W)ur;Za-s8;osrVuiriTTagnGiObrquctqt^6c +s*t~> +nGa$us8MukbbMoLr:pUC(p&Bgk*uc+7*?QAso(r@`rrE&rs8W'"s8Mlo +rso&'QCsqGW2R`/s8;osq#(-trr)fps8W)ts7$$fs$QOWOk\XHI^f1Qq#10RX(bUYWm08QhV[,C +gtpfDfA9;=BlJ$,D,s_T<0Q;;p\Op[H*Q2V^Hnr;RE*ahPO._S*aMBQ&'B +G^Od[G'X(7ApS`PHuW\o_4t+UGBA4WH$sp\FaMWeDKp5IH$OX[H?spaH[gEeF*i+SGC@BN]YqY& +^r"Ius8Duss8;lls3o$Fq>L?iohOE$hGWn>q!Q"D=HQfU@rZC,C2Rs=eDK*=hr!;I);X30hqQr@ +_22]6U>tkBbD=p1in1egq>^9is8Dp!rVlfro`"mj)u9O4q#CBnrq!4dVkgMpY+*<%rqZNlrr<#t +rr)j>r;HZjrqX*?c27J>s6rZ"*bFs@rUnGT*?^gGqZ$Tnr;HZprXA](rVQWgkGb#DSB(U,s8N#h +s*t~> +o)AdiqY:'i%-sQpG.#'"d`fkS`lS,$*6,t:ahu*\%2KBP<(*_8X^G`Q,s;_oBd?bfn5L`PojgaC*07b/_THL5"=9gN9:KfZ)+b`f*VU +@[OpXfA#-;hV[;Ghq6pgEcZPNDer3B?9ieQeB>q[a_eNIeO.j6bJCs8_R[5(d)XGQ`PKC1b08N$ +bh)%WrUK3bOJK8$^r41jaT':u_7-nn\WL-1F`0pG^VnC:`m)5nAICh3.XReo]Y;A2e'H1R_T'X9 +_og'E`O51,l1OW7k24k_g;:P7_p6o^fse0,g<7a^cTTq6dm2F4cGc8S4ap0i?ZL./D/jTIfAbZE +i8EMJgYLfDf@8:h\pdLMM9+2uUM8/]q8O5l`lPm;bfJ2T_Rcj\ +=]\C#<+T6f]uS+kbQ,faa>h>``l-$I`mE(r8ug+Vb0\Qr&en3me^i6X$P*YoccF;OdEfeH_8XR@ +aMZ3Db0@`$?:mmkRH+&?rrW/rqt0o=~> +o)Adjr;?Nns4@MOs8W&nr;Q`erYkh8s8N&SFrVbL*$uaS.(T6RrVulrr;6EirqcX$p](9Yi:6C' +o]6#Orqucprqu$[8,rAaq"p,JhVI;M;2DWrSRP`ZbMV(-jl5+Rgu7)Lh;%#Mhl:1+E,T`>DJ)qq +V.+2*][EN_i8r^.g@tK_aM5[2nc/UerVca,p%7hBZ%IFHF*<=3+;PCirW!Z6!!NQ-!!*-*!u+7X +gu)L,(]aU:"9&9.#pqjmo]&"a%Km(=q>`na#RCM7#o*UnDf9fDFFAXrb4,<.rqlTjq>0HtgA:jE +s5RJ>h;$ja>$+^V[F\A^CNFT8EH?"p`oPk3i8!&Ii8*PNrnnRKhrNM3P?q*^FJddOiS;"qp&"^b +rr2fpo)8^gq>:-j%/BSms8V'Jmd]f8kgTJ0"oeDpq>C6ks8)^2s82fprVcE!,p+D`qY^BhBd+iK +qYgEno`"ji"RY.8lJ2C=!W;ios8W'!r;QHjJ,~> +mf*dqp\1AVh!k@DrVuors8W&srr2utrquirrr3N-s8DoMEYf`4'HS)5,.7CHrr)lprY,81qYp?. +R\6LLWN5gns8Dutrr2lrqu6Wqnbu/\qu?NjOJCR`i7q.b[`"hK=c1D[gY(`JhVR&Hh;d>Fi8NLj +@;g%#Dffi.;pV:JBpQE[UL2j;gM5O?rPQ[n`kq*Aqu?]qrqcQm9\dG(a2,F)Lh^pTI=-?cG^"U` +H@($aI!g'VLWIYEBleQGH?jg`H[Ks6bgOj?F*W4]G'nR]H@C?=^RZIMfSC3"?4EH?"p`oPk3i8!&Ii8*PNhVR/GhVm)*O^([Y +Ff=$Phq>MjpAP!j!<2opnc&Of(B+1/rr<#sr7RmHVQ?i"WLE&MrVZNkrVm$"r;?QorVlfp)#F73 +rr)Gq*Z,sHq"t*cA/l[5p\b$jrr2lrq#1Np_kE`pU$MXUrr`9!rr2QiJ,~> +nc/Xf;?-LWfP+cc[E$D3b/hH;`QHEKb/VE?aN`&Wbf7WDbKnG_[oW\G'G;Au(DN=^`5Tg?bfn5N +aMu6=`Q$!AcGdi>KNqhj>]4_t_8O74b/h[&`rF-[b5]Q_`pq,hc,RrJdVt>ug>q-dJ>T<";b__W +e^Mq(h:^T;hqd>KgYq/KX(66jE,]r8@SY(8<*+I?\s6[ak0m5;ce,M?`5Ah'd)aS_cH3uFb0IoV +e^N[Jn*TYSR@pRc\A651_oKj9]t_;"_k1F4DgFWnXT$7d_o9^;^P3(l9kPr$Vn]dSe'u[^^VS"8 +b/_93`lt^-r:0FOp%[b"kiU.+_8X^Jc-XJ._;!GSbIC6sh;-dT9gqu'AoMg1EH?"p`oPk1 +hV-WAhV7,Fhr!8Cg>'uaKhk$%B:[]6i7+`;cHF8H`lQ#hTAaj/,S +aMl- +nc/Xg"oJ?"qV1$/rrW/pr;Q`erYk\5qtpEnn'Y#W-QXE[)cHS1rVulrr;6Bhrr)iurqcTmrsR!@ +o'u//q>^Enq#'+M7eQf]oX'G6k1o(MX+GGYa55q0hrN_LhV[,Kh;$fFj4iMIh,%j0G'.JAF)4V$ +g;]V3BSPI$gtlVqq!Z>>^Ve1fs8VrlrVmE%o(UUlH?O.OK4ubQ%gW48!<3*"!"fA>$NLMA2dG>+ +b;M!d!<<*#r;[6H7@a#:`%iJF!=&T,quC%($4$V3"pYM?;J^Q*Fa&7_TBYqCrquZkr;H34b5_28 +s5RG@io]+Ig"#-:hJZ))FEMAAEc,hqfA5HCio&hSgtUWBh;@2Jgu75Gi8!)Kf&>ZEjPu8ps7cQi +rr2fpo)8^gq"amg&,Gtss8V]SmIBZ7k31FsrVlg"r;$-brr2rorYPJ0s8W)us0E^q,[pTMrr(1b +,:f2[s8;Hes8NA\l0R[/s8W#nrr3'!rVlNjJ,~> +n,Epsqt\O4Z17ems8N&urVuorrr2otrr2j3rr<#qrqlTms6\-**?Z.:+r!cMs8Doqrr)j3rr)fp +rqcTnp?7a@U84]acM.>\"BQcS%FfAGZIg>:`Bj5&MGio/SIg=oA9 +FEDS9FE)%hdb2U0J7sYngY:Usg\UE[^r4@*\HuF4?bfmasD0'rJH[:$dHuaCGQd*Xj>'"q/IWg9gH[gKkGBA"UI!9aaH+:f._nO%,\]+UJ +rr<#srr5@WcGf\Ps8V7hgu@MReC`:/f@t+7CiaZ5F`MA=<7fschW!JQi8!)Bi7m)FgtUcFg#(Q< +jOW;MgYh"LU]:2jrr;uqrUKmdrr`5sr;Q]q&,Pk9XJi5"WM?Dhp[S7ZrVca!rqu]ns82crqYU3j +&?cin*F/F?rqstX*@7!Is8;He#Q3PYSt2[rqYpKsrr)iqo`'F~> +n,G?Eo%g!ODn*p6aiMQC_Sa@8bf\#G_oBjFdF$1X`Pp!=a3`>UYW!(0&JQ2n3R5R`b08)Sbf\$) +`Xp50a3DE&QBASmjN`QH*WaEPkGd*^%"E7<_#l.`4cBo9d_j42uFhUpW>g>Uf?g>LuEhqQp^ +Bm"Q?B6A61:"._0Nc8bmZd6n;cI1"\`Q6.Go^hhMp[["_ +ma/kl`lufSccNAqj2fNc[8#B9l/:(Bd+cpuB1?QSFDZ/@Ci3/$gYglFhVd8Eg"P<aND`Nb4!FOas5!I`Poj:aMYQFAm/&(9h\l(^:hn;bfIcB`lQBJaMuBH +b0'_-(!F\9^WP#i$m-3Te'uOcY6GRRGgk"/a9f\S>tn.*Phkm,r;Qirqu-9hJ,~> +nG`^krr<#Of_kaK!WN#rs82fqrV?F)rVucnr:p9boq3]X*ZZrPqtp?krVZ]ps8W,u!;lcq#2eA$ +n+,r,rVlonr8R]Hr;ZWjs4(oAiT8qXfA,h&AjP/JKh;[AFhrWnSh<=1-=1R +k^5E.$Np8+%L*P346l_/Sj4A+"9Jc7r;Zm"#6b#+r(gYUrJgYLrDgumSThVdJUhr*MQhr(!h!ri)prr38^lL=?5o'4Wkr;Qlrq"ajes7uZortPJ-rVD*n,TnS_q"OgcC*4cI +p&Fp[rr +mf*Ihm\co2qYU9orr<#trZ(t;rr<#trVc`qs8N&rrr)Wjo^\Ls*Z5eF_#=<2rqufprXeu,p@t\[ +Tr4Zd\b#Ups8DuWr^ZndrVccHC>7V(guHr>i8EAMhUgiCgu7)Ki7QrKj5&JPh;6q"CN+$2FD>i5 +DEuP*hs8tOf\kZJCYAaK_o0O;g\q*NrVulr;Z6Ojs3SKt`50?uH!tT5GBnL[G^4O[H['XUJoc$6 +b/_JDDfU#GH@($eH[:'[I88/DFu_niqOrVo@arVuol +fu*(Sq>^@kf@Sd5io/YHb;_q6E,fi0G&_S>@,'Pti7m)Kg"bcJj4rMNj5/\Pi83GIh;6oJhV-^b +p%eLbrVulrs8DHdrr3*"rVZWmrt"qpYH4b%WNW7fa85Z4rVlcqs8;]l!<)os'Dh\&INTUJ--Z,Y +s7p7F*[(%Rqss^kr:RgtR[pGLrr;ur!<2WjJ,~> +nGa[2s7=BRAsUBXb/VNEa2Z*h;dJKgumPO +h.UVECNai9F)Gn^d+d%*ce7(5gXJp(g;pb<^::f'bK@uPb/hTEd+n0@jRhp)mGkOJ\AQG1a2Z?J +aiV]B[CFPdJ1bbEB0UU9]Z8(3^V@\(`hIer@Sg<-=c0i9]tr(3^:qY1aMkp/?c1$t]=IY+p@e"H +jN$''`Pfd=bf\8V]!'K1_o9b^cdLM$i8*#;`\g)'DK9f4G&_M:?J4,lhV$ZCf@o?BiSEDOiS<8H +gtLT9g"P':g=+A4e&oVP_oBd?bf\)L`pq.Maoof*`Pojra>L]9C0sq89itS!N5W`\b/hZDaN2TL +aN2NJb/h`LccsSL]>r<1(` +nG`gjrr;lJgAh3OrVlicrW<#tr;6L"p%a+j-XcfJqu$Hir;Zcqrs/#CpuCc-lM1AY!WN#Sr^Zhb +pA]lOg#_8Ll.b.Rhqm5LiSEVQh;@5Qin`8Hj5/_Sf5GYMEcQ/DDKg&D8"%o]inNMQhU#O&psmI+ +_T(m=r;6Bhr;HWp,l-AdKQ_3VLhJOf%g<+Pq=!!30(!W2p-"q*M?FF/1RH\\9VpAFsiqa15XkfDlbqYg;eQJp]]i7m2B7q[$`EH?,? +Ec?2=>M@uiiT&bRio/kNhW3PLhr!ANhrEYUgudPMiT+J4p](9gr;HWns76-kr;6Bjr;Qcorr3T! +ipl[3q<77qs8W&ts82Wequ6WlrW3&trr*N0qG&.T)C0.ss7uYt-6OhLq!n@_rs7]MkMlL@rqQKl +rrW,qrqHGC~> +nG`mls8C9:XRc2arr<#prqcZnrWE3!s8Dip#4hJ9.jSEqqYp?ks8EQ/qYnO#Y+DSfZJbc[rVccR +r]pG^q#?)OfAb]Akh=tPi83>MiSEVQh;@5Qin`8HiS<;KeST5EE,]`dnSI=6HeGBnUeIscTkEg=\V_na1/`6J;]8,iDarr;o[`o6mms8JdXiSWbU +g>CCI@rlI)EGolC]Ej5&_SiSiPJj5&MIhV[8JinreNjknhLi*Y^Bs8Vons8MutrU9aa +rrE&tr=],,s7u]>Z*(+-Z_ajpmeHh\rVc`srVZKj!WW,srt4us)&Er-C&@r+r2UqY-FW[Ko)9-t +q;.s +nG`gjs6ZOjE43a,`W!mSa&qoB>kaNDE> +N*("$@qKkV^rFI7hT/sAc,\FHQce.@gZI)>fA#*9i8<;Lh:pcDio&SBi8WSMimr!dEcH)s8`mEf=g%>44nEnDnXM;m%ccX;Lrl]?(`jiabR6#(c +<,OUO[_^#)_nWt*a2Y3A9ik(U?q>%1]#)"oaM,C-aN)9=_oBX0^U2JimIT`:m+KPJi8`l5s=aMl?9^kQB*r!cca>G`R**l +&JYZ`9$bo(duFtL&spYYo#M-V]q&8!9k1Hlqu6WqrUg,?~> +nG`dis8V?Dn,NFcrr3'!r;6Kmr;ZNj%fcG$rVQWpqZ$?:E8^cprr2os!ri,qrVHWnrr2p%cL(2m +m,@U8rrN-!iVlsXqu?Nmq"@kJi8*;Uin`\PhV[;Bg>CWDi7d&>jkStVhVI8F@rlX2FDYu?DJa?2 +%RSsB0KdE9ALdf'4Gq>^Hmq=sa^n?RdrGB8"P80nlOqu@9/!WW3%"9T/\3MGj:n>Akn +pAbX.$8Z,PqXWBG.MNO+"T/6#"9\N$rsB*>Ci=H?E.sD)o)&Fd6i?o]ouu"as7H?k:T3+(hqZ.E +4`YabFDQ2FCiF968_r=]hW3JGiS3)IhUpN +nG`dirpm@ma7oQ3rr3&ur;HWop](6lrr3H*q>UrVHNjs8N!-p$n?CUSauecMRY? +qtpEOr^Qhcqu?Eb=PVcegZIAHj58_NiRQZ>g>_&EhUglEjknkJimqOXDfKf5DKK]1DJ`@`g>:uJ +g#&?dr;4j]^;%_]rVufqrql^(f"/H/a2Y0+C2\KKI/\I\H$XjbG'%qRG\*;acH2;\FaAC\H[C-f +H?sgcF*MKCdEBRFD0'fDGBnRaI!U!]H[L9eI<^3]]>DD)ah>U*n,<4brVca[p<;(bs7ZKl9W?n( +hqZ.A3GrnTEb]c@CiF968_r=]hW3JGiS3)IhUpNGmp]('gs82cqs7-*e +rtGD1r;?Nns82T.XK&=tYGn/#p\k*jrr3#urVc`pru(h9r;Q`rro57E)'U.Cb4u#/^*FI1=7H7i +o)9*ro +nGa*rr7u[-MSREZ`l?!9aNM`IaSa'Y`r_o0F1_na.7jl5:os7>U/X.uc._T)PnFND\Lai;9,Q<6sa +7oWZ!T>&Ch`PK:)bg+2FXbSQ46U50BG,)Rea2G^+_oKg=bfn2FaMl?5o^V,2q!74nl.sP'b0A#N +e't\6d*9&Eh)UhIcI:4S7Q>=.E-6#CG\h>8E_"m@gt^oCf\bB7inW,:gtWXqe(<@'gtCH2fZqs( +ACSfO^rFI8aSs?^a8j6KaSj*paNDWGaL\U"@9ZZ)>[C`\\A6,,c-=JTrQ,#]rl,hscH=,FaO%p@ +(D[u&#H?&#cD)3d$Tu5J`q.7X`l5?!:/+c@hY@*Ms82HgJ,~> +nc&dks8VuSj8T&YqYpKrrqu`nrr)lmrX\r(s8DorrVlios82]hr;6HlrVlotr;QKmqu6Tp#NFh7 +o'b`"s8N#rs5O#DrVuirs8)`f=ch%ef%f'3`j)8/U8bE;h:1Q@inrVGgZdMSgfAN8DKU#@D09iC +E`?FJb2h15EKKkjqS^7pc.r;'`IUC]rqcTjda@shs7ZHjN.%Xj +AnFnQE-6&>G].D>EGokpaQML=g#_5Pi8N.\K5".Q92JAPBOQ41It(p0CA@i/r;6Nil2ChcrqlTj +rVm<$qXsmghs^+*p$;>%rr33"r;?Hhrr;`l('"71pTP_^)BpCNAbGbl*?udV.fT86rX&N&s5W\: +h#IERrVlrsq>U-gJ,~> +nc/Xg"o[;RVsF3Yrs&K$r;Q`qrql`qrr)lsrr;m*s8N#trr2rprqcKer;6Hl!<<#sr;Qcrrr!;1 +T;&'RVRQ*ps8;]lr8@QDs8N&uqZ$4iNR$8+f\"`nZ(de`WNjJ!eE,HEhqm&>kM"qL<,uhlF)c/7 +F)Q5@;InLrr2ipo`'F~> +n,G$4^h-rX`m)cJ_8*t4ccX>K`lZEKc-",F_8F:8bf7QD`5Km=aN_iPb0%cIa3+D&!Qi@[aT'E^ +bRhq:_fK-k?"%Dn[(s]!`QZH_aBQX*`5fs=e'U@,`RW;be^;:"cETaO"16dam9[]>V4jf#c+O`PBI3_T1-beaNB4,q& +F`UMM:"7eEaMZ-8`l?*Bb/hTBn&YLJ435Rec,[r<]qAkCF+KEW,.((JO(`pq+T_i7Pg;.mQ5rr3#qqt0o=~> +o)B=$q#CBZht$gIq"Oads8W)ss8N#rrV?F&s8Mrnrr<#sqtpmkHCij\Uj'Z)->H.GorThVL`6@6@rV?6gs8Mrlp$ftTI!TsbHr)=*!r2g+!>Dg$>FF)PoCDK0i;C7<`.iTAhHhQ^K`Dh*S*QBI>lO%)`/;Hul9m.^JRrVlin +s8Drqr:9jdrttY/qu6WqrV?']rr;HOnbMYGoBP]Bs7cEirr;olrW2oqrr3W0Cb$kYQmEq)8Lbc4 +)Bp7OpAOR]#lOJts68h=jQudD!ri,sp]#a~> +nc&gjrqaO,]);R-"9/5rrr2p'rr;urr;6Birr)j#rr)lrr;6Kn#Q=Psr;Zfms8N#srr`9!rVl`p +&cMY+h3"P0V4apCs8;opr;ZZPr^$G]rqcZpp%G4e5".b%78d*.CijT)=\2Vh`o5S0jPnqMgrrH1 +FE2)5G]%G@C3"8NjBl,,>H.Jrs6IbK^r+t)rVulrrr7E0^Vdn#_RFl#DKpPXI=6HgH[C'aF*`"O +?d6[8aKnicFFAO`H$O^^G^4XUI",mfeAoeSVd".`GC4[]H[9mZG'A1ZH$4CXF1'-+_T'O2^%_I) +qu-QmrVbQrr;Zfqqtp6*NL\S05\k@[E,f`1H>RVDD/#Egg>M)FfGiYN?qbKiLm49iOHGSl83]mQ +8]9lbqtBses82fqs8MusnbrRfrr2otrr2iprt55-_l]rBWNN+mZg[nnrr)fprr;usrVloqrr2p2 +qe%/s*KhK`+[RCi,nV%4,kh6;oDT7"r;ZDrStM^gpAP!ir;H9fJ,~> +nGbNGjd9Co_p$?J_Sp@al1rPANO0#><; +_oBa!J0nr'85EYeQ)qgCa1f."a3W)P\AYIW8nC:]?"QWk\Al_,^Wb!GrPr$`aMuFdFQm?DM#g.4)/n_F`q_?HY[M?CM0!_f\YZ>f%[?68o8s.Od2)mPEA@, +5"\X7\CT6]c-48N_8sX9rQ,#Yn&YOKs2Y2_rlkD^1q^DOB3JD7=B8OCYJJB-dEThQ`Q$!Cb/M9; +`lH6Daj/C7)Aj3D',)`Rk@s8W#no`'F~> +o)B'rr;ZfOhZ*WOq"amg$2s`#s8Mupr;6BerX8Z(r;Zfms8Dors82fq"T88urVcZo"T8&hq#(-k% ++aY3me#l@s82fjq>UBnir8uXs8,^oqtg?j]ML=90eH*G0p%ZdNgc&qMfDm%]A2,qi8NCGEH5u=G +&MA>Ec?,BCfkfJlIYA!p](-Tahbm;kkY8PqYUb_tX30s +8W&pqrYlfq>1'i2Y6h@ofdG=F)c;DE-H,@Dfp)>G-BKQf>WJq +YgHls8VoprVlcno)AXg$2aPor;ZfrqY'X^rt+/YmI]o=o\TWJq"t'js8;fjrr<#ur"K&).3KjHn +L>S&-6OKU+ +nG`^hl)CN5qtpBm!<2ut$iL&)rr)`jq"O[arr2rtr:`> +L2V$JEHH&9DK'K6Eb\Zun*AWmrV?Kll,UTVaQE@!rr2our;HWp,2:#R_oBEW>&8D/H$XgbH$Xgb +HZsaXE)4X&cG[VHD/XlMrd+Ti(O1.JG(b-aEE(-&`Q>oSA8up@G^+L[GlDnQH$=^`Fa8.s^rF70 +_SO+Ls8Vrps8DoqlH/f"rr;ons7ZEeofR24DJX?6DK]f;DKKl:Ffs9Mf#388@ul_8R$IZ8&X\lE +PVtBS0fE=3p\Y!fs8Vrps8W)ss7-*grVccqrVca-p[k_lV6R/$W0kj-s8MuprVlirrql`pr"JcL +)'!#M,o7C=(E+/.*$^C=s8V]is8NK#rmIF1S#5THrr;rgs*t~> +nGbK>a`LpT_o^0H`50C6c-+;PaNMoZg"P*+aMYp7c-OPVaNi#IaiDHHc,\)RbK.iKaiDE?`Q$!A +rQGns`k$"r=]SsENP39O_o0a?b0&_bGK.eA_9Ks@g>&Ge,UY,m9Hl-MPE_#nNg,B==&ulcf\>^:_e?d)3lAa2uQQg?[JMmd]i-^Q>P3`Pf^3_oKd5 +^V@J!Y(SNJ;+X8c7!k`@^;n4(\A?5.b&P2=^8cT;E_o;.C0YME^rF.*cdBhO^VRn-bfI]@\C'g< +o_A%Bf\Y?(a2lEDbgXV0bK.N?bg+VXf%Jk2BlA$4GBIhGBl\$1Df'Qse(W +o`+pi.Js/7io^:@rqQ2\>j@c +DKg'pEY`V<46QD:-is4k`9_TD->r;HNiq>UCaqq-dVDf9oU66mQX!E+)X;7ojCeQ^O2)Q][Q!O-u,pP'0SP5!Co[og@7) +s8W&trVlcno)AXg"TJ;oq>:0h!VuTjrt"AZoC22CnCdjAq#(-ks8;]ls8O)5rr:q%-R"]MQ7O(# ++s8'T.@U24s8;ops8Vupq>Lm%p\t3miU,soo`+sfrquEgJ,~> +o`+sjs8N9#_5=X2p\k-irr;p5s7kr+ARMP's82fqrqu]nqu?]ls8N&ur;HctrVc]ps8;uuqYpL' +r;H9;R&-OTW3>girr)itrr(dSs8OA@s8;`lq4K0%4=DgD-'aRUQBI_uQBmYtO&A_pUpd4:E,9Z7 +pi$IUF?/O[s8)Zmrs%B'`PTjerr)k9r;HKls7sIN_8F:+G%>N:H?O[[GBe:VI<^-`F()6"d*9hJ +95SotH?FX[I!0j[F`r+ZH?*Mg_TBL'^2.S,H?aR[H@'a]J9Z?cH@1-fH,.P:`4a1,e,B4Ds82ip +s7"5"s8W#ps82irqWBkWEVseTE@,UAEHH,,;+a;XC-%ZJQB[c#Q^Ei%OHYcJ8h)nb1P>3`deNkB +rqQN`rW<#rrr)isrqud-rU]*RVQm>(Y+V6Vs8;onrr2rsrql^8p\t0K*?Z8[p6$d>(`=/0*[I'I +r;Z]pr;ZforV?HlrsS\oW2#fS`:s90s8;NhJ,~> +o`+sjs8PUXP@npA_9^?J_nj=5bfn,Gd)sI:;GE:oc,.EAd*U"\air#Kb/h]HaN2NHbg"ASaMu3: +`Q$0Ab0eARbJB`R?s-`CDRdU`a8s<%rlX6A-cX6J_TL$Ff%Prt2)cm94 +]tLV,6=F7p7TsmjO12^:_T9=#^W=7)]thCeP[%Eq>?"sX9m!;M^r+^MaLJgq^*ge6^r44-\b5gg +o^2/0hVZGubeqTHe'"T)c,RZBbf.`Re&s%IDK5Ys!HE&WD'j(;Ec#,Y846Bi30]_nP*:ojQ'%Q$ +R$2Ya,r@;'E7>i+b0\>Na8O$BaT'E_bWa=sb/_N=\"mV9>#S1!=')fQajA5Sa2>p_o9gC +_91-:%2]Y)gNO>B)]fb0&eTQCb/_NE`llTFa8*dgb0/#DY?+Ij@%QNXs8W#oqu-9hJ,~> +n,EFGgA_*qpA+O`s8N#qr;ZfhpEM"9,9h1,s8Mlpqu?Klp\Fjgrr;lprr3&tqu$Hn"TJ>qp%SIc% +bTn/l1*^*s8W)tr;6Bhi;P,(q>C9mr9HK:VD:P.0NTYTPaRl'Q^F/,Od;Aq5[eb=@V9>"EGp!pE +X$](6-B*%rVl[.Bg"X%3j).1q#:[EWp&Fsds7uWoqu6U3rMq.\,e!aK=sb=;,q>8\s7uWms +8VuprVu`n&H);#s8VZLmd/m3s82Wks8DZkJ,~> +nc&jnr2?+=p\Xjcs8W)trtP(t+!DpN*H1lUrqcThs7u]hq>^Hls8N!!rVZWms8W$1qu?]qqZ$?Y +TVSN_X/+5Ar;Q]os5 +o)C0;qW)QoRCpJWb/hK<`lcNJai_NH":c@_#uK!raN2lXdDs_Ta3huJa8X'XaT'C"bf\#G`P][7 +aNDfK`Q5s,B4PFU@pY;5`r=-\aT'EAa=#*H`R3&W_A:X^+?)G6<$s8\Q^*c"QBmesPa7:m?ZK=Y +AnH=-DKP\oIrfaD/u6_:cHF>McG$d#\&[(NbJV9Bb/V?=h!CfOnMA:ZarXh)O!aiME0[D^#"^r""+]AE#GlfR6c +cJ-[daMl9Dcd&].c,[cB`](r\`R_^P@r$(*F)c2:Ci"66DfKc7CMRp0D)6s.QBmPuPEVZ'T9tq4 +A2Z7X/"/$ud*pIbb/F7ul,`nIs3*^Nc-+2Ka250(?r9us:0LMa^WFRC`5'C4aNDTC_o'I6c-=S[ +KaeA%S_;CM%1jEl'R8?cbfe)Oai2 +p\t6mqYpTQjSo0%rVQNls8Mrqrql`kAgSB;,:]epq#84Yqu-?ds7lWjs8)`orrW,qr;HWsrVH6e +rs%uDp#P/rl2:P]rr2cpr8IW%rVuosnbrAQ0ZQ@83a>0nR?<`"Q&UfkQBIQ#O#:fqG]mnEFED?o +EY3;5E^RtEs8DuqqtJOU`5^a2rVmT0qu$KloZ)N8HZa[J-lE$c!!3-'rW!T9!sTN"?K:tSm.K:C +5SO2#!!39#!#,P;!<<*#-UZ2IoC2;C!es6BU^rs&K"q=j[X +rVQU*rSd&+mdTl5g].MK9p\t3eE[`@fbl.D6E[ahYn,N7Xrr)cnr;ZforVZQhrX&N" +qu-Qph!FOerr3#rr:L#>~> +p\t6mr;QrukG,$MqY^BnrYbb8rql`i@j)I%*$qQ^p\i"Sq#'p^s7lWjq>UNqrVc]p&H2P)s8W&t +rpmmgX/;ks\b?"#!<2rsiVk2&s8W&eqtrc5`&oh7=@6qlOd)/sNK0BlP*VGq2/[GXFD>f9EbbAg +F`2>=6H]6+rVuosqUEC$a5[!rqtp^CdBH@gToG]S4]G^4ISFNr=]aj%_/ +Bl\EHG]S+\H[^BcIX-6hH#dt#Z,45c\@&A2C3suJIWg$dKQhZeI"$NlH%WuA]<\cUUpTmrs8Mrq +rX\)Os8W)srr<#ts6)LdCN9;lrGa3%Ci=<4EH5l6Cd*0.PEM9"O-GukOHl2nQ"!3j2+p>.8G;oR +s8W)ts6]gbr;ciqrtt_7s8;cns8LfWZ)b"-Whc?Ws8Dlqs7lWnrqud;p\t3dD^6JRaSYf.E$\/J +m/QqUrr)cnr;ZforVZQhrX8c*s8W#XURn$Eg%YLGs8DZkJ,~> +p\t6mrVm?'n&AdA]#2b7aMu30.J_Y6uJBSPa7SoNgQ,qQC!XiDK9rD +CN=K;C\VmuE,fYIU;tO#aiMHE^::kc]un[Ea2uWN]>h\@m*FhZlKcESYI1s[c-"8N_8X@)\t!4c +?r9Wg8nCSNYf"Do_oTs;a2GU1bKJ&C[Zr[b@8p66BREC/\%Kf(^V\+?_na"#^Vn74b5U5H_S=?m +R`X%'`l,sBdCZs8bJqL"_`c&g`Zf),DfKiVH]s\UQ'RJqR?3W"Ru`b> +6!5a$0J+a&e&p(aaMu3=aN2NHmE#7K5KCskaN)?B^mSeB<)67h=(/MU`5p3G^W+@;aMl'9`m)KF +bf3B~> +pAb0lrVm)[htmBMr;HHj(]XBh,pF]X,ppY0s792:;5WjVs8W)uqtg[2\KNB`:#QtJ7!!3'!'*JON.6uJRo(2MF]K@YS +!<`W9$Msi'"oeQM#9cHgl1=N;q<"S<*!??D!s&B%#7hRh)]TnE13@JF=A(tU5f3*krr3Q-rT`/5 +r;Q`rrVZ]noJ1Q/pi7^#EH?5ADf9`?F];S3Q'[Q"R$a("OdM;sR"In9/Nu +pAb0ls8N<&qS&iHpA+UcrVdW5qV*/5+;Z+C_tsE';'J`1me$MYrVuflrrW2trVc`urVZ]lrr3?" +k*W$AVQd;_s8MuqrVtjU-NEo7s8Vk#><4W-QrG_^T-Z3jBEc5f3EcZ;"=d>29O-uB&P<=nlOHZ#_6X2*&3Zqp>oDeL\ +rr)l`rW<&trr2p1rr;roqYgHoqT#qDZ*1.1PeHhjrrW0!s8N#srrE&trt"o$W"p-fp\k-lqtBaV +s82cp#lXc#s8W#srr)Zlrr36&oXLNbT!\:lrrMlmpA]X~> +pAb0ls8NQ$ifRSp]Z/+:`l5s;aSs=!c-3['&/l&m$`)8&atQ`kJQ[AmeqZDP=n``r=-:aD\1`5TKuWe)R4 +:cq6E;I!+i]Z7ds\\Z5`aEbV>_T'[jghUV=RY_8X[6\?Dg&R?a,(NjO^V:-h9C +/YU>4ai2?BdDWK@bfIZ;^VS.?dMc_1DfKi>EGoZ1Df9T8F)Z#7F*)M&>*bD=O-uB&Ps1@tOd),] +5Z]0c.h,3@dbDgaaMu3<`lQD(c(s8VijrV->B~> +q>UWts8W)srr2pGeCXa#rqcHjs8Mrrs8Mrmrdl:;.3fldq#C63,9e9Z.WW>up%SLbrVZZorr`/o +q>C6l!VuZmrs&)PpZq)#kPkJ]rr2p!r;6EMr[.OBb"hV?2'b"P7:StPG*SDWRl6+gMjTZqOd9!G +DfBcCj7iKJrr)`j=K%=0>#8F/F*(GS/L2DR'*e@7&eQ$/ +`U)p`rU8lp3#i,&$ksirqZ$X2'E.tm#VA-lmeQMKmG_M"%KQPA!"'A]00i--;,9qkF-NrRd`-cr +meZ\Tr;Zfpmb@U7rr<#ts7uTb3Gis:ErU5/G&q\DEcQ5DFDu5.3g>elS!9,$O=+h*R@08)Ma(NQ +.jud$o0fq[rVlcqnbrRerr2p#rqlNgrVlg*rqucqs4HW'mIBZ:c2R_ErqZTirW)orru1e-/14a' +qYL6ks8Dorr;?Tlqu-Qmqt^0is7lTnrsSW%s8:g?lf%mDq>9gaJ,~> +q>V!)s8W)srr;rhWhnePs8W#rrW)utrYkh4r-fV)+rqOOpAOg**ul4F-Z?]ioCi4`rquctrqu`n +rtYJ/rV6Emp[Z.iVk'rpanYc5s8MurrVtjU-N!hd:@r!N+>QMT@S/\(Pa@Q&2Mm]WR$*l"Q;pk% +E,fi;G].J;pi(7oF)*brs8Durs8W&J_8OC[s8W&srr<"#Ul'G+?#4VENb2mBG]@YIG'SCbIWTpS +=2i\4d*]bKF_GoEH[0d_GB&@_I=c`fF`DVQEGeXk]>:k[XK>W@Is6*hDgQeOE,B8u>ZOd)ApKE7 +YcW#2qZ$Qls8NZ0o]#oLrr)lrs7uWc3GWeXqJ[j)EH#i8E,fr>DJrlAP)tipP*(of-#&C+R$*_l +5$_;<,UA-87'ZLcrr<#ts8DKe!WW/ur;ciqrtbS2qu-Qnr:I.uXK/S+X-*&Mrr;cns8N#srrN,s +rr36#o-Y_cs8)Wls8W$,s8N&ur;6Elr;6 +q>Us(s8W)srr;N6E+#qDbeR8at*"`>_cd^C<"q1kI#Z.,>bf\AQ_SO(+`Q$!A +b/hTA`Q63IaN_l?[YA$rie9C+6[4`5om:a3_`:]X5Q#c,duF`ju.1&H2ZR$mo/!ApB6)UT(l>`lHc8kNGSI'LN([&9^o[*ln4be:?i^<4[#KK=6P<)?k6HV'4/\%Bkp_6fP\Ea1se/1ND; +6;D$3KN)s@fZD+Lai_iI\CAgH_Sa10`R3*W?>a\&F`VVDDf9c=EH#o;.<9NODfB)EPED&tQ'@Pp +->JU/QB7;d3a#E))&7/B,)F:\`l5p:aNDZoaSj9\a?@S``Q-$A`PAck@oQ0% +q>UHnrr2utrr4VJgtMf.r;?Qos8;fps8Mrrpa@F.*G/Snp&F`,/0#lU+[^u(4aiNZQ9R?YOd26!P*M1b +@!-L5Df9W8E-$-sE[l-NF#WdkrVulrr:ngZ`5Lg7r;-?gr;HG!j5]Ucca0'o@n&:+5;t)6&H)Ss +'fSkOp\O7Vn(:&]%KHMJ(`t+0!!!'#%i6N+!!!3E1njF0n+lS?LGTPF#RU\U+sfTgMm(4QhVRSk +pZgJ+G.@>?qYpL"r;,m>qYL3jrr3-!rq]'$qJuUX!HN2ZE$B:BF)l2AG!qO`QBdW)RX$nOPF.?' +NfZn<@k9;mM*Nfcs8Drqs76-jr;6Ejrri?!rVZZos8W)urs82Olg=E2o%Ed9rrDokrZ;+7rVu`k +RO3^Xs8M`lp](6hs8)Wis8W#srVuoor;$?krrDinrs.WHm,[O5rVQ6eJ,~> +q>UHnrr36&s8W&FWNYsms8W'#s8N#rrr*c-,9IX9@9I@;s7C4V'c\&0*@2qurq66hrVm!!rVQNk +rt,/,qYgHop@+BETVSTikPb;Ws8N#ss5Er)rVt&,/Yb$H+';oW5!44UQ'OWoJ!$"^Q]dVs0jo-E +FDYl5Df0Q8q/?OYE,RQ(s8MusAc'rm`Q.?Fs8Duss8W"'h:h#Dbd<^g?qjKtBPMC*IZelDM"4S\A,Yl^:LYR +MK6W5s8W''qu$$Gs8Drrrr<#r"8P?$EVOJQDuOW!DfB]8D0'ecOdVGtOIV\^2`-Y`N1c/k8QfIM +.l)fB0^o&@rr2utrr)Eerr<#s!rW#rrr<#s3r]0Yr;-H>XKAM0VlQ93qY:*jqZ$Tprr<#trr;`k +s8)SX,(f=arqHHfs8MoqrVlcqrqufps8Vrnq#1j&rr)lln#W%MT>LR*s8Mlop]#a~> +q>UHnrr5^ls8VGXB5=oud*9_N`QHEE`lQBPdL?j#%Sf,R`n&C6((V/f#RV.QI+ulg`Poa7`lcHJ +b/hTA`lcNNc-48>Yub@7=_;TR_nsL7`r4!Y`o>&fb0/8/+r6=g*un9e>WOihOHl+r3.I'UQC!c" +Otg?eEcl8;E,]`9F89g*E,fhEb/M<>`l?*H`4`jkaO&,MaN)<6V#XFY5r()C/2Jk/4%j=8OK#t/ +_Ss-dHSo@u7QF"=F#9,m]sb"rB8!S6`l5d"IZ_On`k%jS=CP*!@:s:MJ?$)t`3-(e3[upK5tkBk +B5M-a=_D,DV<6@Ucc*l@b/:jBd*0AD#fOd+e(QH^CiTDr!-A-Z!-%pU,B.XCEGfl@6^!n'QBRr1 +GW7RDQ&;/kNCmA`.4?`m.2'_Nb5T?_`lcNLb4*LNb5]OHa2Z*ucp!^WF^< +`l?*@`l?*Bcc=)N`6N]9>JS_/]u@_-b/200\\?J +q>UHor;R'%s4lE$s8Vferr48Aqu?]oqt.BE)^Qriq>('coeI=+,TnNZ+EcZJID>A2aFE2XeoDJXes8W#mf>PYIkl1S]@/g3*roS%go_n=NoC;/(gV'M@>W!Q.!!WE6 +7ucp,q>^-LTK4(q!!OMg<]h?%"ptY\.O5i4!!E]_?g7(Pk3h371*6r+!?N^KbhqUNnF5f1mIU/A +nZbrXYNtZOrVZZp"RY7Fq>UBn#5nN"l:>o5qf;^Y.<0ENF`_\FEHH;BD+eW/P*hT!OF0>cCm^NR +SUBjs76-kr;$6hr;Qlur;?Qjrse/Zo(;G9jO!r,qu$ +q>UHor;S#@or=h8pAXpfs8Drrs8Muss7N`@'HJCOp\Fj`o.:Li)]'[s)%7Z0g\UjIrr<#srVQNk +rtbS2qZ$HlpW\kpV5gH8pAP$irr2rtrSIN$s7uUT7r'n#1fIU020bFSQ&.@fC65!LR$!_`1hq/R +CiOH6EHZA +q>UHor;SVQiGD_\]u\78bJVO +rl,hubg+YY`OUq*>ZP*@NP&fb0J8b+#I@X)`:]%/MhL2PEUh\7V\$UP*hAu +I5G\]Ec#i;EH68ED"qu_Dg*\P`6#s?ai`)S_8*Frc,RbGbg"JW^5Dt^+s.s[2b..^@Sfft>B6FF +^!=`m?U7^K2*O93B3C_4\?DB.:f=:2ahb3G6V+/t`5Am;3-8J-;.F)u;:8njNPR@9>% +HU(&7Q'7H%P`nC:@mi*r68Hd/b5T?_`lcNLb4*LNb5]OI`l5p:aiVfMah"p"?;scu +`l?*@`l?*Dda-.Uaj/TKEl?2GdDsMNdEBJE_njO=a3VK?cc!oKq8`ubaN)H?\pRLR=DcU[oDa=~> +s8N-!r;HZqrW3&urVnA&fDkmMrV?p1@;=S_srs88i>,9n6Q*?lXL+se]9rVlfr +s8N&u)>s:)q>^Kns8;osa7AlnkMlOAqu?Wps8;lps5EtWr$D&f8k_?9>\>iGQ&qGuPBB2^BpXjH +Q'RYH9lk2lE-?5BD0'Z4!#\>8o`+samG(5q'*&">+=t8g,SLFn-SV#U('=O:"8ZR$*]&Oc;P53%7m#I676%rr2iqo)8ahqtpBjrrE&tr;ZcrrrDrqrs\#Xm.9W2hs17AqtpBk +s8N!>rVlfos8Dkfd/O(Er;ZWnqZ$?is8Dioq=MnerqcZnqYpKo!<2ut#lEWFmbIjBrqlBgJ,~> +!WE#ms8N!%p["lTr;-?js8DpC6krr`5tr;HTo +)#jL2s8;c[QEI*_V6B^ks8W&srr<#sr;H-as8Vrprr;uss8=;Bom]J'3'gVT0eJWNS!9+Z6:YaV +NgH#sP\*X2DK0Q9DfKQ4DK>PlF)Q,644XB1s8Murr78g)_Wh!tr;HNjrVcZEG2_E3gXFWsc-4>J +`4p;*GB8"SG%.8mcd9bQaAm2'I=ccZ<7>#lHus@N?_:2/I"6HgF&Jg?\@SZLUHs!BFaJ1;al2.1 +eBuRdbJ_0.];J`?^qojHrtkY5s7u]_m/?k^rr)irq>@rrCiaQ7Df>Sn.W99FDf0K4E,'N8CL'Z! +Q'@GrQ!m6c +!<)iqrV\YSrr;rdc"C%i`lZNK`P][=c,R`Bce:bu'Ga$cccaMZLC4k:(`*f%(D[`!%bT.PaiV`N +bfp(-s2Gqtb0/2T`3N?T>?4gC^r4IDai;<>`lQ6@`pq.M`qmdU`rF+/b0ADff4[-/2*tMZ1bOrL +QB./N6:YaVNgH#sP\*X2DK0T;E,oc8Dfb_oI<0UL0X&U>b/h]He]G\BZcg_9`6-9LcH3M1!%f*$ +)Bgan5=.k4@Y.ZtS$U2[U-D7K5/]6,pm``lQ3BbK.Z7 +SR,Am=&rX0Ge;&;b/VHBaMu6@bfn>S`llTWGG!%*ccXJMb/r/M`PTR;e'?(/Y0+W&a3)R%a:-54 +`l?'2P[I-_@BSkds*t~> +s8N/tq#:9m!rDfnrVlr\eE-]04T,*Nqu?]ls8VckkU%Gu-)CS>s82Xs+se^Kjs6i.V4'k!"93jK! +PF.StP%IEj;3mB6QBmn9=`JM&EccAFCi+B5BPMU,E,]l=GBJ"*T)AWfs8DljhSd@Omf!%[rr4hS +rV6/`O7E,Is8;]fnFZ>Fl.;4_+9i)o5Mc#1o_@[S1*?c$!"C85f75q.%i.>lc:K&ZrW"5Z3+Lk/ +n*oi$;)o0t.Rgl8nbrCco'c#9rUKX87ZrO]Ph>[.rVca`n`fiEs8W)urr;b/?#4Y%EHQ2@EaE!E +:0;@PFDc8BEc?,65a@\(Q^*\&@SpBuOHl0!Q'tWV:fq'X1c[Vgr;6Nlrr;Nfs8;orrr;io%KH@u +q>^KZjlu4&o^U?.rrDuoruV1;qu?]ps8ViXs8;`nq>UEkrVZTls7Z9)K./+!rVlimrW<-!qu-O" +hWO7jn,NFcp&BO~> +!W2fjs8W')r;$3-WP8-$rVl`p-MdZ@q#BFt)''fls8;omp/W+R(a0qB+Vtt9(*h!!s8N&ss8Doq +qYq$$s7l1F_bT&EG]T2EH#r;DGH\us8N&srqbHh`Q%6Arr<#trr)lqs/hLHeCE.L +c;;L#_Sj$rQXXuTG]?Krc-F;RaJi?_G^b'aBNjP_Ed)YGDb@`?DLHn]H['FF^Tk2OWi/d.D09r< +^>Ro/eCMmibfIZ-_73(A]tqMYs8W&sr^?_Sn,N:brr)iqs8$J8CNF?2F)>o9?!Brr=);erD09f: +DK9>QPEhK"PE84A:g9 +!VlWms&T*pqY9ses8VcQQXk*F_Tg?L`59U=a32T>eC#3M'b?#Mbg4Yh6P1.J(CLWe',hr,(U)?4 +`6#s@bK@oKb/hTA`luKN_MDGsr(?bf[rE`W!mIa99N%`Q$!ub#$0sb.l'7bgF_nf-m4B +;DT[k>W-\dQBI>lAP?0%Q'%K"Q'Y?ME,oo;F)lA$$6^T`SZB,=dE[A\U8M_:(+ +_8X2FC58:.AT1.^nC%bNRX'a2Z-?d)<]Caih]EbKS/Q91ioC +EccJBFE(Gb8P<&uD/j?4s)ATgF([_'QC*u&N^I/K=dG&1rfdq]:g$Lm=t(pJ+O\`^b/ME`a8j6W +a:H80`jp+o=]SL'=\c?@aiOG#4N5=]b0/,Vb0%rJ]$SXAd)!`G`Q?3=_TTmFU2(JUAB`'4aN`&R +`lQ6@`llKBai)-+Db`l-LueI1s8Vlm!<7Q~> +s8N/rp\t0ls8)fprVlrPchIG="T/&kqY^?m2#71FOWtqj/b]#?qZ#;#,TA,7^k!^W,9%mSf_k^F +s8Durs8W#oq"XdbqYUrr;QTnnc&RdrVl`p8G`Aap&FJPCFUlH>@KfW+deLY +M`[)B7VFrKRZ<`"PtPG(F)c5=EH$&H-u<"F@6egTDKBl@E+DfAs8;oqr;#6g`5V*@q"k!i2#d1J +nBcTRqu-]0[q\!!!-9/2cAM5<'l<1sFNL*-4(b\:>4t" +mGrU^/LNQ`lMgSMs8D`bo()\We6.liI=@4*o`+mhrr5CWm.gMYs8MlpqY`3_G&VJJDfg2:2C:7S +:O%#(Ec6#?EH>hUQ'RYuQBsaN4aW/YJs)7]PFPNP?=d@o0KrORpA=dbi;O2_p\b$js5WG2p%%h3 +n+cndrquWms8N#t#Q"K#rVuosqYpNpp^=Wd-Rp8`-78H\s7lBg!WW,srrhTHkj.-ss*t~> +!VuZhrsSf)r;5faWnI.DrVcTm+oMB9M]3KO.J*?7q>]"l*>BZs^ORFN*>KM7eGB.As8N&trV?I% +p%"EBW2?W,mJ-SUs8DrqrUKmcs8N!jrVlisrqZTlo`+ANBdbE>>%'TS+-r.UM`[#>6tSNCR#I;o +P=]"uEGof5Df0W@->HS>?TrCLCiO?2C1'd3s8;oqrqkQj`Q%6Crr5^krr;`ms5f93gs40nbg"PX +`4*Lq\P-d_Df]1)c-sbOYukdbG^b-eD-5of??'q#7_u`=Cj:;TGBS"F8$ob0V5e<L9ks8N#ts8N&rs8)`haJGDuV"4H]rV$8A~> +!VlWms#U,Tq"jmbs8Vc8H=N&I`6HNL`l,jQc@$QC%M7".bfe_U)&3PnQD%as)'9_9'YDi9 +^r=7:bPfR$aMu-:b0%]@@q/S;?ZiKc`lcWObfIc@`Q%Dg"NJF"`lS/%;96eu`PKmC`n]*&=rSSg +mMsPY,5$Ec?#9E,TiD-YleB?pAUPD00lBC/ch/c,e#KbgX_G^UVM4 +`PT^9_oB]FeA@Y.,ss".3C6A48lA>b@Wt[d_?#2fd[C!Q`Z\pG/8If3iME$fN2N,/Z +_8*UWJh;.T='^,OBVC824!+n?%Nm;a7SZ`VC2>N.h='UVlds8!aMuBNa1f[:aiMTFcH+9D<-<;* +HZ!hHAM>5[8PF8IEGo[nE[>[FBKDHEOcYck3b^X"MF;rTNfoKl9i>2)=Xb[L4J9sCaMc':i5e[; +`kJ$T@9-E(<_e=c_og'?`l5p:`lQ6GcHFAUb/V]Pa2cEFaO/Gga2a-G$lBTn*"^6+`k]pHb/VND +`l?0E`lQ*;^P,QR:28GTrVuWj!<7Q~> +s8N/rp\b$js8E6&rr2rqf@9d!s7n_Qr;?Nnr;-H`.O62aIf06Cs7_*c*@!93q>Kr&*uuLTmf3:b +s8Duqs8W#oq>:0jq#CB]e*lhnhtI'L"TA8qr;QZpn,E@brVlis9E"n`s8)`pf/e:22E,)J>q%^\ +P*2/"23&WBQC!l#5\4tWEGp&>F)Q&$0d1%#LN7HSF`_\GCGkterr2inqVT90`9dEtqY^@u +q!HG)>f,h$pA!q=m/$AFp>s^p5VGH[pZh&9i@?W#$NU5-$8"1%o@$H/:R9_a;^2JK"U>A?-;&(% +j7(ou<^es\nFlVKs7Q*bn+->?d;",SH?+:ie+E\=rr2p"o'H2Mrr4#;s7uG*>]aq,C2\#Z4B,cm +Bk):(D09uAF`MM=2ZAs_R?i1aBKVHH7k9pjS!/ne:gREt0.S_-Y?(]'rVQWSrXJf$qtpEnmHU^!r;?Nns8MurrtkJ1rqlQip]'rlKIJAs*$c[R)^ri+pAasf!rN#srVm$"hrX4[o)F4~> +!W)`mrrE&trsSi)s8CHEYOqShrVQQn*rQ'9r;Z@6*?-,JqZ$HmomR\n*@p^VrUOY@(E+Ucrr**$ +rr;inrV?I$pVE)jV5^ZKpA=acrVu6`rVulr9E"kfs7ZKhrVtJ0H7Lg/?W^P]2LCOKQUE]kO>Co/ +MjT`oPEA%=E,ff5F_u,8Dc\S6@7l5mEG]c8DJa#Aq>LH;IcGRB2o`+sirr2lpnF6JUs8Muqs8;_0>B=Y%BPhWS4&]QiBOZ($Cijc< +F8p2(C,D-R78ZlPF@YpKMPiW7P62G/$E"Rs8Dfoir8rW%K-&!^9"B=W3)nhjno)U +rr2pWrVulpqu-Qpq>^KmqYTs`nu[Ef,p*g@)BKP9a8G]3rr)irrr2rtrr;rrqY^ +!;cZos8o>DK9W6=>1k,987G,DK^/CD-IUqbPoR;bgaeI]X>i) +aMlgQBQPUAN>g<6n":^R#m8Y9jM!l.O-/C(6^N*d)j5LiQ2&A% +E#lkH=0fR9itD$WPcjWaSj+;aN;WMbK.iKaM#[4_oU0Mh:Im(%MBEf)A3es'VNI[c-4GR`lQ6@` +lZHFa2Gs:TN+NY?H2I2p&BO~> +s8N/rp\Xsis8N&u"T/5bgZ8A6,l[Z;rVZ]ps8)]g`[)]K,K0QYs82@2/0c3hp&4X[=W]"5>l=U$ +'`S(2r;Zfpqu$Hns8;osbNA9\lfe"`[nSNn*h&rVlfr7e5pBrVulss8Muhg-BOtFE;_J +?ntGo92]_HH?=.FEHQ;AD_dQBQ^F"1=C4deO%hZTQ]Rc*R>=(5@6Hq0BJb,(qu?Qkir0#Wqt^3j +$f^[Bn+?&+lMpe^s8N#tr#l";rr<#tr;6Hks7cBfqnI#"-6j]R.3fu\)^HMXq>^3brW;rrrqufr +j9"c3m.:7-~> +!W)cns8Dp)s8N&q^SSdFp](0hrVmr;s7lWia<)6:+2RmQs8)4+-QO(To)AFY\$`]L\#iDJ91Ns8NZ0s8D`HWirP- +Y,\&&rVQQlrr2os,Q7Q=rquWirr<#nqYL!!BdOrB)\aG6)''G4)1_M^q#:9ms8Dp,rVufnqtg?b +[A'@g_>!m#s*t~> +!<)co2u`aOq>]oHB7IM'`lZBIb/VK?a2Q?HUCe%F#+j,[c-"04'Fb7XdF?Ot7hcpP6.XN.b/hWJ +a8O0[a;Dq9^q*icA6<2bXLuKmbfe5O`l5j7`lcHoaT'9[aC`T9aMu3>c-4ba7n,oa,9p2d?SG*6 +Q(""g0gCt`:K^;*O.2H#OuI/qEH-)@Ebp#:GW%TDB/*;,E,]o=E_'EUa3;WEc.'nJ]X,T%bK%fL +cd0\Uh:BKY*+)0$9M%<8:0:_/@fmF]S%aMuBOa1fa=aiDQKbfRf4.r0BRFEh_2 +01]eJ:MjlkEGfT3FE)8;0p@id*gMjYd- +S7#W!:f^_"H,IQ!b5]Q^`\tlZb0.oI`PoX3^<"dVU/i*F&eb`s*>]:m(Ca`ocbIWF`l?0DaN2BF +aiMNA`j9;Q:LKdVp@\H9~> +s8N2sq"t'frri;rgtVc*rr`/sr;-Bl)ZKAG+sS:3qu$HgrOXHu-7@=Crr(Xs)'C02rqlitrVc]p +!rVrpr;Qupg?%kij8/`S$iBYnqu6WqrquZjr:9jer;HWos%<4gq!pV%1Ij8O=^GK5/rc6ZQB5NI +6B[[?:iS[POI);u2/mMSF)l5@EHZ8BEHH5@EAN`CQ'6>WFAHM5RS?gnG`"Z +ec,RLrqucm+T26 +!W2lps8W&trr2p*m&?`8q>C3jrr<#prr3*!s7L:/*$J2Tr;QKh\0Dh6,16GjrnJS1*$2B^r;?Tn +rVuior;Zfrrr!3(ou!/iXJW#NrV?Hm!<)Zlo)A[hqu1a4QAq,i?qEYG +Q!-q$4G&TYQ'*q@DJsN6DK0T:D/<]S/Z4eBCiXE2Df7qjq>C9mr;Z`R`PfaZrr;usqu-Hfs8UNb +]!tGbbK.WF`jE7aZ)O_2WCpW#XjP@3T"i%S]Y_\-`IG@-iTp'uflFR9\4s.YH+n0X/DBM +r;HWlrs&H"rVuosrr2p!pU,;G*=`o-'c\;6*[+R6+!)Qrqu$KlrXJo)r;HNlqTkq/SY>BHp&BO~> +rVllrrVnVMq"X^=FC1QM^Ve.7cHF/G`5]sIbtel`$oZPVaMQ;j%0[4MZJ!RP^'k>\$Bi`Xb5TQa +cMkudaSs?^`YQ.C>[M,LA!XmB`Q?9Cb/VE<_o9X@hqh!Y>K-;-Z/Jf^/>+qt]mH_CIDI(ahQK8n2chaRo6"o^VM>hSro7 +=o\Ou+&O$_#SJ@.1Gh6c:h`R4^?4YOq<-2nfZM7U`lccM^!"O>a2l?DaZRhq.;!dFEGf`A8O#[_ +BR+61DK0]9F)c/<16@caOE*R*9Oj3O8lIC&O-,ZlRX.%s>t-1b.[qd+cI9noa:c_;`5KC#HX0BB + +s8N2uq>C6krs&H$s8VN=j8AoYr;HQms!%FAr9>aY*\!HQr;$Bh@O2sB8,rJ^pQ?UG+"mBfr;Zfq +rVc`sr;6Bk'%H=7lf@=1s8Durq=aX^rr;usrqc]no)A[erVlis!<2ut8,#e42C_:$?t!:s7[9.0 +O,Gr$:6^uk5Aj^rT9bh.1N@ARFDu>@G&;,ADJX/u<-`;%FE2SA7eZf\rVlcoqr,N3`8pdlqY^@u +nE-m&ItWt`iUcp6oDALcn,*"Fj1afjHJj[(K7\AqGB.\HJqleMp\"4La*uaj:lg*IEI)qMEH[P= +=DPbBp@2i?="=Squ6TpJ,~> +!WE#rrser)rVZWos4O*Go_JOcrVuos.KBAHrTYgR(F57@r;$Bf?Q^(/6iHlYq2lXA*%L^]r;Zfp +rVuoqr;Zfqr +s8W,r!<)lr3r8XFo=SXE[D'SraN2ZLaMl*6c-aTH'b(atd)s8RcThmB&1H8Xai\Z2(CLc#bK.rS +bfe/Nb0%fHrlQ+u^U%*Q?X[>cYJn5rai_ZF`l5j7`lQBJb3d:L`b!38dG*80)'p7e:KUk'0gh1f +T8n^a=A+jAHp2CO7\5m2P;7)qE-#r=Dfol5GAV,3?rM;cF)u>A@kuETb/MB>bL=SD]X>W$ccO8H +`5p`hnDDs_fs2E-=AVI\<`iO#@;&qP=>aMG!*1Ul_s-mip\".Gikd&t#RhCe"9;//-HY]Gnac,1 +k2bB~> +"TSJuqu6Qo#6+N"s52W+rr3-!s82`lrr3u9s8/T4*%36"s8W&olms5%,cpk>s77EY(aFD*rVuos +!<)oss8;fp"oHg;p$(N9s8W$'qY9j_r;Q`qrr2cpr:9jer;6Kns*"5%3JfjS@Rsp59JBY6Q^3r( +GXbS.Pa@Y)@r4DfQ'ILgEH6)@G]%P>HZ@FEhItq#: +!<2or1&_%Kr;?Ti^88gErVuirs8N#trVcZmr1Y,F+X?.Ls8DcY-lO$HW;-5hoH54i+F*e_rtk\5 +rVlforVuorr;HN`c]b')VQAGFs8;`n!<2lqo)A[hs8Mrr4T>*:2hj@I?UnL/9.sD0Q'@MuG=>A* +P*M5!@;@u^PEV(_DfBZ8G&2,6H#IG>EGff1EGoo8E-,SdpAY'k#lal&i5N^Thtd9OIf9[+Uhdrd`4*FaYI_3BRo7Y[b/8.-\&,hi_8O@1_S3^$^uXYQBm=K2F*M;=EH5r< +rbs6'E,KZ8DE#7f?Sjns/bo/#rr2p/q#(0gq80G;Wi3"t +V +s8N/tqYU6k%/oqmiK[u'^W+7/aiOJ*3Q/_Kb1)7V%2TPoeBQ+W`!lqZ$]EEVd)lS'#Rsk[b/hoU +ccsGKaNDTFb08#J\WBTi@pj)@]u@qhaTBN(`r:H>mYBEc6#5Ec?,JMd*0_S`Pm>Md`Au2 +\&Qk=_T'O0`QR<1f[f$Ggn-`F;ccOg93,bA>u1N#853)!.&b_bp\XdZmH`KC1Ed>C$NU_o!(83H +m.^DMnE0,kaZUgJ9Jn+[!rsYT#9,6Q6;(^+5f27@m-4-3kKiGEaMu<@b0\&@9"Q`QliKdFVP9'lDIG_8!n- +bg";OaMlELbK@oAZ#WZ=@?BL?rV->B~> +rVZQm"T8<"dG4a$"T8)pqYL-is8406-6jXKp&Fshs5@Q@,:;jUs7X#K*@2rWrVc`qr;Q`prr<#q +r;?R*e`QGgm-OcPrVullqY^6irr3-#r;6Bho)A[equ6WqIJQ2q1+l=.>[^`"EflWL?=f@294LMX +QC)t_G#2>,PE.M=FE2A?EH?;ADg?8@E,p)?F)u>DEbAMOqu-QprVcTN`PfaSq>C$crVufpqWb/6 +FE;_aG_=u?m.U2BiniU9f(Jt8nD[\LNf/U=GC"alMP=n4s8Dutp[[l_Q<937MM?h`X=`J!Z@fPCZ&+>[9!F;`ssUir0Jdq"asiq>UEbk4SQE +q!HQ0rsSc#p\=[drVuosr;Q]q(B4/'+X&=V[dWnes8;oqrqO#I-rKd;qYgQorqQHls83'#p#G]/ +hZ!QMrW)tK~> +r;T^prVc`qrr;8YVq^nErVccrr;Zfqs8Vrk7NrfjBCc'"rr:kb-QXJtqZ$<$+W;LIcMdbBs82cp +rr;rqs8W&qrVH2YU8aoi]^ksts8W&ts8N&srr)lfrr;uurql^drqJ]B/h9S#>@:MsEK?[rq+ +8n(;SPa6PWFA>o$Oc;)5Ec>r7DfKl9D0Ki8DK'Z7EH,o:DIQWAqu-Qprr;rT`Q#pQp\t2`@:`h8[l9Ec#i:D*E?2OuI2r1l[icOoA>o>E4+[I?fq_P_)8.>$EL;:cnLOir8rW&,lP(s8:ZX +Y,\G,XI%H3r;?QrrqlZlrso#,rV&c")'a")mIU2Rqu6U"pTth^9D/5]rt>>0rr<#srVZHgs8W)I +St;7Ao(E$5~> +s8N/tqYU6ks8=qKaDYXV][+O5aN)HJai)';b189`'FmmacGn#Q\O@/=#Kk?=bE`PE'b%%a`Q$0I +dEfeNaNDTFrlPbh\Qr9A=(Zol_o0^?a2uI%`Gc!1o/FYmH`lojijeN*u"tf!@oP(piplU2o'l58dHoK,a2l9Ccbd9:b/q[QaiMKDaO!Fa +DgQ5?F`DJBE-,`:CN=N4FE;>@Ec+*iP`Rb;DDI-8OcTK?'NpBA.>!qMQ&L)S?!Ubd1-HW(bKAkd +'#qo.b0J&I\<(#t:/"bl:R8i +s8)foqu6osr;ZcLh#IEPr;ZaLNsrV6Ej +rVm#Tkjn'"rr2utrVQZpqu6`sr;?*as8;`m-NEU%0hFK8?!pS\9U(j/CGKdn?qjisPa.`#A4pi$ +Nff)\E-5frr2p"kj8*DrVm'"r;Q:t>jcVaG]7^mD3p)=D)I9?PF%J'?XHQoI6'i]QB[Z"P!E8Y +@6#i4pAOsis8N#rr;Z']&H)>#s8W)qqu?!Mq>KXEn(%F;"8hohqYgF7rqu]os8DlqN[#fdq>C9h +s8MurrVlcb,T\Djr;ZZnrqlZos7u]p"Q8h>kO&6J"9&5urVc_G~> +rVm?+rVc`pq>^E>SZh_`rr)lsrZ_C>s8McL+rMC>[Jp.)r;QTgjGAH_rVuM4*u>tiq>L?nrr2lp +rt#).qZ$Tgc^Lc:W2SVIrVlcqkPkM]!<2rs./s2En38Np3*]]q;CP5$Pa#l9Cm8:#>"Fg?R?(fK +D)[E7Kfj6oATmT_&TM`#9_nYcs8W)urSYZ5`ROh\s'Xj(`Pf[/\O&W6YdCaE\$(OHG^G&D=gCmKl9Cc%';P*V8#?=$?kHoONVQ'7N"P<`;V>rF*) +pAb*ks8N#rr;Z']rr3Q,qYpNprOo52Y,\Y+SFlaYrr3*!s8Dops8Ms*r;MQo*bb6Cs7u]nrVlg$ +rTkRA,MDtmrtGD1rr2rtr;6Bis8W&mTUqUGc2R_B"9&9"rr)kI~> +s8N/tqYU6k8,*&RTjDN@`luND`lQb.eT$'+1,WaiDEFeCV`W?I-gAbZPJc&iA%Y`Pp'I +dETYJa2u%F>@`r*s[aN"4u"ieX+bfn6#aT'B`aN"4u.*0Z`d3p)"2-X6i:a\o" +Q'H)=D3\C!=@SL=RZM#ODE*W;L-9HsApd`Au3\%0u.`Q6-;_SaUQeD'E[ +lf-5[1/i..An#Cm2ulTA6:XNQ(dA".VO5]^cGZ\="99AM#Sn9u.S38['hX.GP[d`B9laS@9f"Ii +84NY@5>G'B0.LVYir8;Viq<$Cl-o"NaiDKBb0[i9aiaV(#0Fj%b0WnY99XZ^8!9)7NY"H_@9tZ)0[S1gbKIuJa2Z6daAg0s`QZTN`kSp"&lmZ5ccOY`bJCm.bKg_3(VIr.^;It7c-")HaNVoRbf[r>[8p+$ +AZ"\ds8W&os*t~> +!r;`krVnSNs8W)un)a*>s8;ckr;?Qnr;Z]pqg]k4,V&6^r;Zfrq>^Kls8N#on/rhs*h3!*q#1]u +r;?Tpr;Y[AjPoOqrr;rp!<2fon,E@bqYhi=s)0>I@V&nI1dRFiPa+fuH&kp+CcRWHP*)8!BKCX4 +HTc"aG&Qnks)\fe:AXtgrr;rqqV]?1`7Y+drqg'tr;?B[^4glVG^G*tQ#KK0Nk39ZCUF\q#1-ep@\.Lhm.NCmJl,TgM3=!FCc`dQ95\ut +I>ubKs8Drrrr_KOq#:9ms8E0!rUjN)mrBmtC34JeCQs917qn9TR?Nt#BNe,pKf;8@R?a/'R?9X@ +>Xpt?bkV&6rVZWolM^k_q>:0k$N'Vus5j(KmdKYsrr3)tq"OacrrW,qr;Q^3rVPG!+><<`s8Duq +r;Zfqs79>G+HlNrrr;iqr;Q^&rqQ +rVlrsrVc]p#5>Hub4kl6rVuos*rH!6s7q$`)BL3jrr)lsrqQNlq>^HnqX>LF*?(@?rr3*"rVc`m +rser+p&1Y]VPpZ2nGW=brr;lp!r`,sm/Ht`./s2@s(j&A?=7&=1I.1cP*8BmGE#O%CH.BBOH5hn +AiP4,GroSYFD^Jc&7nN0rr2rtrr;rT`PfaGr;QNl!oUl2rkhpRVPo)H8_i4Y +OBbn*B66sIZ^m3;k2"eFgXXa#cc;u+?#+_T]"kScQW2PbbJ^l%NeCSJLT%`#]>UbAMn$dH_SEt[ +s8W&srr)]UnGiFcrr3&o?XE2?.W9!@ECXc-I60o3Q'I`"Q98e_9Tt,f5'<6WR?X/&4'u&W3]bL\ +qYpHkrVu0^rr<#q!<)os$f7ncWNNM)QgF>@rr)lsrVccrr=/f*qV*24.e!97rVuclrVm&j;^`ND +p\k-jrrj~> +s8W,r!<)os8cAPdkC$Qg\]E";`lQ6Db/;?;cd6)6'G;#!d)edacR_aNb,)'Fo`?bJhHE +cd0hQ_8s[=aNDW=_.?tP<+C9_`lcO)ao]Z(`r`lcWVj&me]F`-_hHuEk/37?$i`Q#m=d`Au3\$j]-aNDTB`50IE +dbscblKdNQ\TTka6=jnU!(f.B6qooH5U8!)(,/]\=>;"2-ib;##T+X+,W81m>uNF(4A]X.BN8V4 +!(K">#e6s +>ZOS%]>;J-aihfG`P]U5aSs=:aiq7'$5V"3a2cKMbJh94aj33r&Tc.5^;It7bf[uIaNVoRbf[rC +\8G2@?&@J0r;HHkJ,~> +!r;`mrVulrs8N>_kl:\^qu$BjrZD%:s7l=4.3Kdis8Dusqu-Qhs82`ks8S<2*?6^"o`+des82up +r;Q]prrggHk1ntqrri?!r;Q]is7$$fr;$=$YDj6>i$TQ"3?GI[!l:F#9,GPFmqn1e)PK +GsQXpEHCYjF`_eB:&+bfrr;rqqV]?1`7Y(dqu$BeqY^0[^kmMdH$aXfIX?m2FAk_XQN-sZmH98J +o_\1NkMaRn\`2lIbCf!Sp\b!iqYBmWlf@*fkO8'2lL4<*GLZ$QqubKs8Drrrr_KOq#:9m#Q=]#qt=0%EU[uqE)^Rk8o0`A4>;kaP+7c#3,DhoPDD/*99>@%Q'7Mr +10n.4/5?!?rri9!rqlTWrr;m+rr<#tq>^K]o(DA:o]599rsAAls8DutrqlTjrr3f2s7[o`-+s3S +s8W#ps8VrqpT,\^8H&MarW<#pr;Q^&r;$0es8CmFle249rr)orrr.E~> +rVlrsrVlcq"mDSSkP>,Vs8Dp?`jJCm(*J@RN5(P#>>!0TqT]SW8I\ +6ue935BUp`EU[oLEb7r;rVm9)s8Clp`5U:*rVulos'X]s^VRe*^!+C/_6A]&8S`S+e'Q+MA$+MF +g"=KbZEggY`m_)5gZ@8Hf\"QuccO5Oc,ml;^V77e\#i3,ahbZtYVD-G\[]Ae^W3mJMi5'`aM>a1 +p&G'jrr2lmk4&ELrWiE%s8Mdr@W1aT/oFU%Db4`.IQK3DQ][c$OuI/\9Tk/h?V6BBQ'RZ#OYL'E +H7MYbrr<#rrr2fllMge_(]F:1rr<#k^9FcAXfA&)p](9ls8VrorVccrr>P_4s7IWU+LqCKs8Vun +s8W#sor&rJ6i6l_s8DrrrtYM1r;Q`rrqOj1T:_tIr;?Qorr2rsrr7K~> +s8W,r!<)os:&F\]csg.Q]u\F?aNDTHaMZ!=`mG#0'+J[,bJqB6`QZP=t09_T_Sr\[`7<4K75^%-dEq+/LDgGeMd*9SL`l6-LaLSskZHph@bfIcC`QHi_iqMj+ +n`]K#d`SkJ="5O(6S:Ml=TAmP()8Jb9h%B6@U!q_@UiYA:K_0-7ScTO +=(qe^YeeQ=l0n6(^::i=oCD/,cg99*a2l9Cd(R08b5TK^aT]Z(cp:iSrGhgXpMhg(;.j`9Bp!d' +/WH$VR?:YcdBtX`kS]s>#\L&;bqVN +_o0L7c,[iC_o'L8b0&#Nccun'%@bPY`ll]QbJ_*=cArbO/_%bU`Q8&$rl>bqbg"AS`l,HI;c$G/ +`pENurVlfos*t~> +!rMopr;R$$q>^!DlMph^r;6I7s8;l0+!VpQg\^pKr;6NoqtU3kr;Z4V-Qj^Qn,N:]rXJf&r:g6g +s8V!?o'55frr<#rs8M]knc&RdqYhi4BeV5H@UMPP6%+iXS5*ETI[=AADEEo;T95J-4ZmeLHp2@d +/TgN'6?@XrqeAKqt^'dq=cZ&1Ao])6%OFMb,F`q@n&-;nH;f[)$HApAG +s8Drrrr_KOq#:9m#Q4W!qY+!#EU[uuEC7rjlL2+!UoPa7S]6Yp.-P_M28240_mR$3`&KKi[2 +9K8^r;$0cs8W)tr;)'j*d%AZrr2rrs8;co +robdQ/D^7&qu.-(rr<#tr;$6es8Us@lJ)77rrW0!rVleH~> +rVuor$3'u)q>Sg8XS2Sks8Drrru_1;\f)P,*7t#`s8Dlqs8;]ms8Duc73WZoD!q?#s8W&srVm<& +s8)ZnZ^mhmZa'/rrr;rrrquotrVlcomf*4c.K9;DnRjI+>[Ul(-U2s/o_e[crVu0^rr<#t(&e.3s8(WR[Ag+/XHN/Prr;usqu$Eks8W$(r;HNfJ/fDF +r;Q]q%K-8)r;Z`W,8_f^r;Q`orXf,/r;?Qns8W)mjeJB;SC7?6rW<&urr2qJ~> +"98>squ-O#qsX![?t$L]aSa1'aMu3>`m:+Z().1id`]_J_T^=-*HO-,o+?9N_& +=]&lkNf'EiQBs]qEftc4CN(hGnSo.YDdbQMc,[cB`QQcR\\,>Wci2.$b/qcHc.^\,p[R_Hl1!m* +lJL4@5QG@X1dP"l!%A]=\&Df9]u+6tT]l7Kqu$Ej +s*t~> +q>U^!s8V0:q#CBnrr2rsrX/W"r-g4>,U^D,qYpL+q>:3frr;iof.@gX.^/jOrV?F$r;QKkr;ZfB +p?h,&m/I%br;ZcorrN-!rr2rtnc&Rdqu.u93&`?l?=,W71PV0cR$KdF5Cnu-p,RpA4R[s8;ianb)88q#CBjnE]Q4lK4&*lFLb7JphfaEdMe4'*\F@&63[g +EHd;io`+mhrr3)am.gSZrs/K%qtg%eA9%-[06))#2Jb^)P_gttPaIi$Q;gt)<*toG3,1F?O-Q&p +Sn_ +rVuos#lXc&qu".'`qfW6!<2ur!<2ut+8c"_-PdXE]DMC&s8Vols8)cqqu5+q',Dsurr;rss8Drq +rs\f)qu5oJWL^&pci6Kq>^Hns8N&^rW<-!rr)d-s7Nh)XKA_0S]LEts8Mior;HTo*W>p3 +s8;o4*[2lss8DorrVlcqpAabe)'tRFrr2rrrWN9#rVc`ors/Dk[[s(b[.sY"s8;uurr2qJ~> +"98>squ-ObqsWL,A:_G8`l?0Fbf\#G`Q$$M?Pa:i'rBX1cHOVTa3)-4aMH$&)\!5lP1\.%`Pop@ +b/hQ>`Q6'E_o&QVAQ2rJM87'RrlY8^rl+rZr6"NM0ZqV`b/VE?b0SBO+WXKc?8j#^KThjiP;cu6 +I#VN3D+eZ1O-u>q;D`Z]HUMd>q/J'*EBc6n5BW*C +.U%t"Q&h,+ +rr<#trr3-!s8UX"rr2utr;Zcq*r,^+Afr6C-RMHRjnJTMr;Q`mq#CA>+ri'Wo`+sgq#:uaHePa[`%LmL295C\o>8oSB/Pa@]' +P%68"Rt*P60gT^IEYC6krrhrNm.B33s8DqI~> +!<)lr%0$5)rr;8`UZ;(Js8Muqrr4&=s7TtA(`OS?7[E*-p\apfs82WlrcK7u-6`$]s8;lrrr2iq +&GlG*]V2.!VQfgos8)`prr;oqrr;6^s8OPIrUMWk1L+0b8P#)7OdCih3bCR&ODm[*@R-*APa7D? +/qTL?3+jm/D")CiEb7r;s8N&urVufQ`PfaGrVlipqu$Kns8Uul_SX4/_SXR;^;Rk)_j=A'@EO:N +iS*;UhV6]2b0J&QdDO+G^"hQ%gX4BodFZjhaMtm$^V7+d[^*#Q:K^P +"98>squ6UgrVQ'%F(D)]ai26Ac-=JP_o'@;d7k#_)&Nu[1QAC9kRra3)KErPeiYr6"KL0ZqV`b/hTBb0eKN(FN9d;b'kqQBdf!@kWJ'IlV0r5]-%2s)33k2pfgj`lH-CeB5D;]"lt=_8sdCcHO\leD9cjp@[n> +p%S.Xq!d1/3uf&`1F-QP#osj$,;1l;4%E%59E6:K"W&O91,:gP4$#Z"92f%f7UU"JG>p^f1hN.f +iVN'>jm9dtc,@Z4lh'N8im6uCaiDKBb0[i9aiaV(s2t_fajECXE,ff5DuO_VDu"B+DKAB(?9i2D_[<8S!]P*PEh8M6TQqS`5^$Ca2Z*@ +aNMfPbfIg'`Au#^c-sAHfGP)5R*WXbccjJMa25mAIM*/^bJq]J`l6$Bbf[rFbfn)Ga2G]P;+jbn +cM$u,qYC*hrr7K~> +rr3E)q>C9mqZ$NDf`2!Nqu7fmVp%n^ep\X0ZWVQ>[p%n^go^VVFo)AJ2me$5IjeQ:M<_B0cSQg,[G%+Gb"T\W($5?EW +Fa/=qeF`e>rr2p"kj8*Drr<#t"T85k?XN5A.T8`+4+WZ]/T[5APaQV^Df%UlQ$5N10p\H!P+7f( +QBm\@7k[!jq#CeGoRGrVuirs7uE`qu?]ns8VrqHn-7UpAY$jrr)lq +s8;o,-6Q%Yr;Q`qrVlirrr3,sq#(0krr3,Xm.TN1qu?WoJ,~> +!W2iort#)+r;P6@ZL[ehs8Mupr;HTo*;]\P*YfS-+;l:RB!h=,s7ZKmr9u'X(a+\8qYg?lrr*?+ +rr)lns7Mn^U8k'*rr3,trr;utrVl`plM`=6rr2iiBdPoL?8a^(P)Z)sR?BIC6ZJ?G2em7gKohXa +P("[7OG>`)1e)KRE#rR`q#:6ls8Duqho3OQf)GXHqYL-irr<#V_SjF3`W!_U^V.V'`3qt(Ui +s8W,qrr4YMqsC1hFM#H2_o'XAccjDF^rFOQ=:u/_'cd_l'MFeFdF5tVd*pAV)%mHsf?))4`W*sW +a:QA1`6H?C[p*BF?t=i)_90gtaSj*aaND`Nb0%fF`q%2)b08)PaMu410[p:1lm`VSWK2" +1h]0oPDD26E&NH5R$3_`-&dtB2e=j:Eq+,^Df&i@d`fbOa2cHSb.GC!^tR$3`XKi.bgYCrfC&8( +p@.MLmoK8RjipPnQ!'VAUD,7')^cRL2*=2p69n(,'`]9i-8$c'4#JfX853#a>Z+F#ATVWf\qt=6 +W17e*kPji1Z*_Np`l5OUr:omBcg99*a2l9Cd(R08b5THibf[rKcpq/WDf9K2rc&!XEHD"ss)0Jc +5t*b^P*%55PE:omEC+JV3Ju4'h=\tEp^Wb*Lc-"'*`W+!g_SsO3gLq`@9Z4oebKTt+(!4A=SJ2JdcH+5Q`l,m?bf[oDb07m) +`=9_[=@l"a[IX%cqYC*hrr7K~> +rr3'!q>:-j!rCX6q#;N:r;QKkplm9T+!hjN+rqsR.>6@RqYC0$,9IpQhY[3Ls8)`orrE&trt.MinauYWqtp0[m-soNn+62EmBKrUH$G7/1oH^$MK)]0!!W?%$j[_LCj1&S +O4 +!rW&srr<#t%KH7GUrW3.rr;urr;?NmruD";qN<0G(*!r,)]'S9,_4GDq"Ocp*?,kAhYdBNs8;j- +rVZTnq<=3?W2-NNp](*irr2rrrqucsrr;Bbs8OSJrVZ.44\Ag<0Jo&ZRZir%O?7,JB9&-1DJ`0V +OHu)oLa8+KM)RRn8T+EErc.dR*-#n/:&4bcs8W&tqqoB1`Rb%drVQNks8N&uiPYZ6>J\7t]>h\% +_nC_AT7:p8P,s@+f@SF+f[/!gbeqN>aK9+,fA,0-d*0b\c-"&A^:V.fZEB1"]YhV!Y"#[d9"i*Y +P)c#pNK/pV\])S&_8,aDs8DrrrVG[Gs8Dp&s8Drsoj_6HEVseUEW:"XEW'i0Ec"cR0/nKMP:)'N +PEqG->&[n=Od'BMBfqK:Q]dGsPEqDuM)7:Ln,34arr;urkPkM](&e(-rVZ]fc`aIWWNE(np\k-h +s8;ios8W$(s8DusqnX3k-ft=,(&n75rVuc:*ucL"qu6Wqrr<#trr)iqs8W'.s8DGfU7.dip&4pj +r;Zcqs*t~> +s8P(UrVuorqtoH8?Au\BaMYp%il!aV_,<&"V6U!n)8i6Su*@ilq1,q3u(OZDkLTa2Ym,lMpnRjNm2EaiDKBb0[i9aiaV(#gLK4bfrXSD/]Dn4*,C[ +D/jQ6DfKc8nU;NP+@u*R?NktP_qCc/^Vefa2Q'>a8O'Z +b3m>Pb/hTBbg";M_oTBL@oZDt=^,1>^rX^Ibf[rE`l?*>a1f.%e>j5s%_g3.bK7]Aa2?!CZP*i\ +dEBbU_nsF8bf[oDb0%`C`Q6*,@o#?jRH4#:qY:$grr7K~> +#5eE"s8;]lrr32Xi;@H#7SBFE)A?FE;MCEckr$q>L?ms8Doni5NXQe,0+Cs%WLmr:oiuKm.TZH$=OU +H$+FcMDVQ=3/VE:%N@)aiqr9;p%\7Urr)NXj)OVanFZMSr;?Nfm-4'3nE0H6\l4f>I!1.$;.un? +;I^CEqu@-0)-L]mFF0"so`+mhrr3)am.gSZrt,20rVubr9lkArFE)8CDfTjsE\_QWE-?>F($grtP;/s5`J< +p@7Y"s8Voos8W)tr;$6hs"sTPqu?C<,9`]Xs82WlrVuonr2Cbf+o2'8s8MurrVQNms8Mopr;6Kn +s7YR=le_[Aqt^0fs*t~> +"98AtrVca$rqN.\g\q!Krr2rr,l[iDqu?Biq2-CA(EFD1)]BM3+!+CYo^Gm+)'W#Pr;6Nhs8W&s +&HDb+rVQWgYFhYhX2Of0s8;Wjrr;Bb;uQarrr<#oqe.i8?q2H(PEVE"Od;/l6=3hmOI'*NCLfbm +QB[c"7$*ss1,0Oapf`e(<:!bg">M_o0O.;UjRSf[A0mbf\&Ob.t^*Z+@N7;np/i^V%'u +IB7I>\;lc6O-,WhNek6b`5TU0p&G'jrr2lmk4&ELrXf#-rVu_q96"leEGf] +!rr9!rr3<$o^gmJ=e?bKc]"uS1anNjVb3R,Gc,IQ@bL#$C-6-)R*g)YMR[0,'PEA4?=]:HM>$#NO +6]dY!R$'k!SVf0Y>#&mTH#[tQC2Ig+DK9]=FEVbID,*:=bL"AQa3N5X\\,Gaf$"'6B#i$9dG31' +nFQ8@mJ$2=k3M6[>cjl$cf!EUST?5f4X_jF76`t&7S?TW!%oWH/h]%B4?Gbr9ikV.;d+-d;9[e[ +kjdbiJ?OEriO-5,^<=gB^p`S,qXE@fm+9A"aMuBL]tVV2rl>\pc,n8VMDf$`F*`%PG%tf2E;jT5 +G&_YACf!qm/VfCOKp7pkNg)A +#5J/ss8Milrr3/]k5YJ[r:p74r;Z]hs3Yd6,9@pM*ZZFF+s\6[J05mU+M[aPrV-?grr2p'r;ZfK +o()5(nG`IFr_rals8;oks7;-o3a+p.Q][T$Q'mu+P=&hm6&;"Z3-T=%P)u;sP)tujPq>$rEHl5BD01&<459Z4p\t3ks81`p`5L4(rVulr?N9otoYQB/F`i(QG&_MSI"b=;Ui9gl +70`qq)a\N/p$VVOp@eF]p$_@3a7B!!qtL!cr:oaInFH)DkM8n(J9#RTKS#78SXh&b&c`1;"TSN) +(0PKoF*W_oo`+mhrr3)am.gSXs$utas7KW.FEVVDD/sW9E-6,+F`VhGEcYJY:+hWpQ]ml&PEgJ^ +E)p#(Q]4:E?UL!@R#mDlOd_T!PCl+S8"fJRs8)cns8VEa"TSJsq#:9m$iBu&s6f+Co_7_6mf!1c +rXo20qtpBmrVccps7VWu,TupWrr3W.rqQNmAgJTMq>C6lrr)ipq>C6l&cDY+q>L9lrnHW!kl:\[ +q>:-hs*t~> +s8W,r!<2ut#QEk^W9+$Ws8DrqruV1;s82NicYY!N)B'S5(E=84*ucPT*?,n9]D)@)q#:B0+iEs7QWj&=i\+ot&s8EW/rr<#trr)irrr;YP)BKgio`"jurVu]nqd:Kb-2.68qYpWpqu-Hm#lXMG +T:qmNf_k^J"9/?"r."~> +s8Mus#l=/]`b&ST`5hl"s2b/Ys2Z;0bK/529G%pK'GqT%*#0A0&fPQn#Rh!3dF-"Hai2:!aqDe8 +`m2cM_ld9N=Bo:$_8a[=a5P*>b/_H:b/;f[G82`.5;8IhQ'[`&QC!b$@V.l\RXI,:ai_rbdbF9_nabu< +o'?#3gP(Z`GaRLF]YCYMIOS)S-U'm^5"8.=;dTM>0J>%40g.ij6q'[G=]o<9Fu[S"lKS$@l.&_4 +Y[F-/\AZ,+`lGs+l1ai>i6UcAaiDKBb0[i9aiaV(:Wgr&aOJEu;/LQ&H?+%@C2S*+<,QZ$D/3og +8l.-tOd)#sPEM/V6>ok(PEq.mB4"#hPaIPoOcc)uP*:M`/3/I+ai;*>`lQ0>aNVlL`p^t`bf\)J +`l6!?_n1M.;+X_c=*M6raj0n.r5^q@`Q5p=a`7Ut$Ja%Wc,@90^X_+9'+Y`-ccF&@^r+46b08#N +`l?!=bf@G_=%l7qYjqbjqu6Wlqu;0~> +$i9l&s8Mons8VEEmJd+cqt^45r;HWps8;`kl_70!*$ZXG*[)XF+s.jL+Y*-[s8VloqYpNps8E6& +ps\p)mc+0E!;tgT7Jd#]rVQWp]hCIj<^(hkPE_GuOHPip=]9-$N0'Bi1il9#R#mc)R$=,&1dY,C +DK9`6G$-qQDfTf@EH?,@FDc@tp&FmfrsJ`)qr#N5`7=eas8N!Os82T`_MC-_o'b.do)JaXrr2Znp\=^](%CO?Lm*%)H$4O_LM0tbD^$#(!!``- +!"098EHlSNN7@M"rVlfr"6f+Hrql^bq#15q8p#&kFDYo7EG]Z:7l!S=G]%n#0k;tmOd;8uR@9IF + +s8N,tqu-O!qoP_Bnc&Rdrr)itr;HWo)>j7+l_.&r)'Bt9)&sS2*?#h:)^Y%Ks8Voos8Dp/s8N#o +rqt*,X.u]#o)J^err(gT;Z6Xorqufr\Oe\\<^1nnP`h>pNf]Eh=&E]qMN3sa12fWlQB7Q'R$=,& +1dFo;C2e*-F]^_MD/jK;E,ff9Eb]bjpAb!fs8W&sqr#H3`7=hbrr)orrVloT_#D5U^r=11cb?rl +.H'cd'bV`5BR3];K,`gtBd"ccaAK`PfR*]!f1^Nk +!<2or%K#b[UhFVM`5fp@b/h[%`\tr_cHsn^e&d4t#mLtT%20Qp&f25o&do5ud*B_Iai29Bbf\#H +`m2`J_N@])='o^H`lcEE`8J^Cb/(s3ce4mL.o&i"G`e;UQ]dDlPEo`e]YtTb/_WHceQt'nFQ6Vmd]f; +r8uYI>-4K.i4-G1^Vm[F5=\!o2a0Gn8PD]M$tPE_?"R?grT?UUQQP(5K2>#gZIQXF9kPF.Z#QBtB-/$RLC_8FC8aMu6@b0%fFn&Q9gb0%`D +`Pp'?^RSe28lAJq;mO9_b09k-rQ#2ba2Z'BcH,tr0O3M_aj%rOe(9in%gcCgc,doB`5]pAb08#N +`l?!u4.!P3i5Gr;Zfoqu;0~> +!W2lqrsJc's8Ua+p](9mrV?HmruM%6s8W#srV6*9I4H*\+U?m"l8)- +m-+*@rrW0!rSd`Ss7H?krVQKF.6_!7;O'p^p@RtLqY^9fs6Im-RXoa(Cj(,MLP%4>U-1%E!!*E* +!"0-0EI)hUNR[V#rVlfr"6f+Hrr2phrqufos82LLEHuMCBN9"iG].J27YsQtH#c/dGq+uHQ(",( +P&*I)3JNBUPYPJ(9jEsPO\ohJQ]dT$QB6>R2+[9;rr)lrs8V?_s82lrrr3#uqu6U"kN_[/p@cu7 +s!7I +s8W,t!<2ut#PYBr`qfT5s8DroruV+7s8Mops7uE=Hn#jU*#]V8*u5q;)M@\^rr;uqs8;lrs8W$, +qtd@`X/Du>r;HTjs8V'W;ZHLks8Mokf-WRa;,`gDQ'[MI=-/Z1@8:Z'G*J2RD*N/!MjBWkPa.Mt +.o\btEGone-U:IHDf0i3?s%AjEH=7Oo`+sfrVulsqr#H2`7=hbrr)orrVloT_#D5U`50C3_nF6% +OfW8hRYZfaO-#EXJ8Wo_cd'_T`Pfa6]t@(^dEpFkccaGM_SEgq]X+S2[^jGt]u7e&a1"d9XBp=8 +Lm+-_PEM!@`50@,_"Ia-rVlfpqW@;IrVf:bqu?WpqXugbF_u#-;fQ`"DJ`oOL-guEDE_f[.[6Hf +R$WnrC-Z\rKSPbS9NlC0>a:b?;/(fPP*DB#OE`oD8+Q][rr;uss8W)t!<;Ne!<<&ts8Dus$iftn +\ZDp3XK@lHo`"k8rr)fps8N#ts8Dios7ppV.MI7*q=smao7nS7'-k!^r;Q`rrr*'#rqu]nrr3?( +s8;]b\>#RdW:p2i"9/?#rI=~> +qu7-(oA5.4K=o+Aai_cIaSj+8aiqiIcd9q`d*9h<>n-iI&.oKn*"s;)#A2B6bfI`>`lQBJb/hTB +bf[i:Cfk%J@>)A5bPoQ@aDoYFa2Z*?e%QVR<(p&POI)>qD-2pcP[[F+5BiBWPAWX/1lR`cP*D5s +P:KX!5B:^_3u^(MF*)>E@9ciNF)>kLR)mUsa3)HAcIL"G^::f*bJq]Ia2uKMgsXsHoCMYDo(2M9 +k&$0ZFh>T&]>qk.9"gsD1KZIo5"&"=:.\&SC:K(._85;uYbgISEFED_Ca:b?;/(fPP*DB#OE``61<@_Z`6?C&`rF0^aN!\i)9U1GaMu6@ +a3)'#CfO5&/a([:02SsqYU9ls82ZmJ,~> +!W;rqrri9"s3fNurrN#sq>MK9qu6Wqr;QZnqtKjbp:"`_,oRm@+s@aTl21M[rVcclrW)iprsR3A +nEf07s8;oqrr(gT;uQ^ms8Muc1I"u=.?0LZR@'+@0U7oeG=QIZ7ZNk&R9i]d@?Zq[_=>Z5TVDe`/Hs82irr;Z`oqr#N5`7=eas8N!ls82T`_Mdro_%hDnFuk[s8;)H@uPqQE-Z5@DJX_Y24'1D//8$_ +$j@#4D0UAVO4]q>UEo"9/5qr;?R(p#,3%g]. +rr<#ts8NB(n"6H3rVufqrVl`p)Z0O6s82cns8Mljs7a!9,U+!D&02`(.H^I+rr)otqu6Wq%K?>) +kE`'DWikI]q>L3is5O#UrVl`ps8;=?4&o-+Nfoj!QB,0$PEV,O7;?7!N0]`q>Y\%$PE_2qOd21b +?%abM@l[*E87uITCiF/o;K$>hB2JL*qu?Wls8N&qi5NUPec#IGrW)oqrrLulrkhsW^V@\#^m/-& +OC+o9I>3]@P)ti^D5+toc-")F`5T[0_0;hY"`GJ\KQVrI% +P)YfjOH.)p_SX('p&G'jrr2lmk4&ELr^Qhcs8N#tr.IpfE)jQ[@;KdnEHO;2JQP?S4-+\EOd)/l +P*;(iCc.*8R[K3gG@s6fNg5kb9q7K4Q'ISuOu=j;oDe^eqYpKos8W)us7-'gs8)^Qs8;onqTu@J +WNW1n[.=4rs8Muqrr2rtrVuoqqu?KR,odjK7$X+*@2U+,*[+/Fqu-Norr2lqrr;osrr2p+rqcTk +ps>V)S=]'GrqucrrdX~> +qYpuqcZ!Wg^r4.6b0%fHrPgh<`Q6BMbK\5P`P]aGc]q07&IK0[)Arkq_pHfR`Pfg^dK_n9GqFDc,pPWEY>MjBj$O=kck6@"TVPql((Q'7JuPa%=f,n\>F_SsO;`l5p:b/hTBn]2ZhaND`L +aMu6D`lu91LK[YM<)d"@[DU/2bf\*,a>CiUaiMTPd_lP#%i7-TIXY3+&e>?X/]u>[aMuQ +bfn5N`l6$=ahtQD:esu#ch$u3rrW/qrI=~> +s82lrrr3-#s8Ua-rr3#rs7uWsrVucerVlg5qYpNnp\=RVjc)n[.iKT^Pl:UXrVccrqYgg!qu?]` +fCSIqjo#,Zr;,CO7K*5cqZ$Sd-QQk[0:S)aOcl/C0T;3[O#:rq0pn#iPF"jG5C/QbP*hMp/T$_; +C-c3em7V&=F*MS'XKY$.GX9@Dq>L0hs8W$'qr#H3`7=eas8N!3s82T`_M>al&,lP< +!XB0.CNb&TO4:'N6Y^O<;cec_FEV_B6Mn/l4D6X5O`-GIQ^O>&2/5Hs +PFIJpIRIgo1Qe2fBI-68PF%MtP*qGA4unJrrVuoqs8VEas8;osrVcitrr)j)jR)X6n`nR&s7uKg +rr3r:r;?Qmrr<#rr;XDN-6sf`-Qj][,Tn +rVm9)s8W#OT0s[jGZYT-PdaOOo,+RrVlisrr2lqrr2p* +r;FR$X/;o1q"X[arVtmV;Z6Upqu?\e,o^DS/tA&aOcYr=/rGdSNAGNi0:%TaOd/F?4aN?`P*hMp +/SgM5Bg#a_mRq&6D09YpX04g,GX'4Cqu-Elrr;utr8>T4`7=hbrr)orrVloT_#D5U]u.J!`3;k* +W(EM!GC+afM3a?fN.OREbfn/J`59C-^::aSa3)lXc-4DS_nERg\ZJfE]#DV*`5oj>_J=6pNM^6+ +Kp7sgOcPL:`PTI*_"Ia-rVlfpqW@;IrVlcq8c&>^j?dKp;,C8I??(%)C-ha)<]O\HMihqAPEhK& +M_f$3DNU?DP'fT-G;GAONbB_1Q'7Q!PEM>r@QQQ+r;HZqr;Q]qs8N#ss760hs8W&srr+X.gG)]]h<+4'ucr;Q`ps8E&trr)j-rqcTl +qW4E@T:ad6rVuosrr7K~> +rVuop%KGq*BQ^Vu`l#m?b/h[&`]1r\`P0I@c-+#Db/_QGd*BUL1_L`8'cD&?ccF/Ga2lEIc-4DQ +`l?0?_h:rs=^?6]`6-EN`PfdUaBd!3a2,mKHOp]q1+JWOOHYlr@PD(q<:R$*b+><[@t +SW]A*N\,(25A*)UE6^7CIX?HZ:o:?ZBPoT.d)j>FcH+&Fc.'hE^::f*bJq]Ia2uKMgsXsHrps@j +nb2b2>bnE&`id%raMu9E_7?e"!*Vrc;-$[q:.n,M@K8YJ3]]Vt6:4II?XQuC36U@VoC)8HrVu_d +UO/Z>Dh=[o_nWgm]'T1`o&J'_f?)(S`lcZA^<+OsaABq!`l>g7d)@VDC0"D>M.(^VE+:KWR6`T> +3g,\DOcbrsRZ'(;6#VpTMN`HUAp?+oS;q8/8X5L+P`q8uO^L'oA'2j7bK.]B`Q$!?`l5sga;`.? +b08#LaMuHGb0%8f@TH6!<*E8-^<+UDbf]n*(rjP;c-OSXgmS +"9/5qrr)j%pYP-6s82irq>LEnqYpL!qYpEjrqcEfrsnW"`eS5B[f?4(s8Dutq>1'sr;$Bmf]2Jj +kkY2W!r`#miVldUr:pVD&%Q^=,+Q<$"^Q'RFgDfn]YQ'.MtMEQ)>L7=EiR[02,O@<&9 +9\B2P?Z^=,AVE`FJm`O[kkb>Zqu$KorVcWO`Pf^Fr;HZprYbb5q"2FYH$+7SF`;MOAo">\66-42 +!s&B+r;])21$eB#o^qkOq=sUFm_4qXnFQJOp[e(Mo'u/*7#-;-I=$$UCfD2X%jj$$SK&m^!!!',% +oI1eH%(b&o`+mhrr3)am.gSYs$c_Ys8W)uoKI;(:M=BZ7riWl?=Wm'AnWkZQ^a#&Q'%Ao5&XY#Q +^*r.P?q7,@6p*=P[R$OQ'@]"QB[YsO?,Cqo`+pgrr;<`s8;os!<2uq!rr8srr3Apjn&$9n_=*Dp +\Facs8W!5s8Moqs82cgpU_[m)'pIM*[;sM/]7V_qYgd!s8W)rr;6 +r;R!#rVF7$_>*j*rVlotqu6U"qYpEks82Tjs8W'1nG^=XA7i.Hq>^Kns8Voorr)iqrr3B(n=ubX +Uo`ANpA"Xcs5O#Us8;]mq":LM-Wi!ZQC!r+Pa#-+C6Om@1i7;*>Eb/7OGGu>1PD0ZO-l/pR#XO2 +6:oi,@ptSU9D+/;YE*QoOoO_bh2jBelR$E_sN]_/] +9U1g-RZUiRCgTJlOHa0C8!T=,P*V>tOcVI[U%\Ncr;Zcqs8W)trr;Qgs8N0!r;Q]q(&e%,s8)B* +X/r5&XdIZ8s8W)rr;HWnrtYG2s82cfosc(]&g&,5(E4D2.Dc&YqYgKnrVlcq%fQ8%rr)GlS=lLe +q#16lrVqB~> +rr3Q.qYL3ZO^j-[`5Ta9b0%fHrPgh9_T^?J`lc<>`koU9da?Flb1i_*921]'bKe;OaN)3@bg"AU +aMu6@_R?GC$^rXgKcGdZ?ilHPpaM?$:a+l8g<@WiiQ^O>0PuTeZPa.4cDKJKUP`_;pM*,l: +Kpn3eR?`u(O$lc,33pq#:O%5-@Xgd6JQcS3aj85R_o9^:`QcoR\A#Pde]YtTb/_WHceQt'nFQ8E +oCMG.V0]1sMlOG2dEKVV_T0R&O9B,n8l&;\:d.ZP=]T&f!)#XD69mUq85`Vs=*R!Qna?,=lLb,M +_7-kLBWeXJ]t:rFp[dt9cg99*a2l9Cd(R08b5TIYahY^6bfJ;\-"C+RBk_T[FE;@s8(c-[ +?8"L3RuEYsOHkkiDH]c#Pa@l&>uYZK6'ICp@7EbPPaR]#Pa.Ak1FR[jcH+)N`l5p:aN2?>`q%24 +`lQ +"98;rr;HX$j5KD*s7u]ns8)^#rVuflrVuoqqu-O-r;$?hs7lHjq"aperVZ]ms82imrWrGts8UL6 +md009rr`5rr;>OQ7K*5cr;QQa0j7p9Q^!PtPEqJ78kG)4Q:kJ$A4MiPP*qVt1N?3%PaRZ#QB[Y7 +->%MqqM86iGB?_T=)(<5E's3qr;QWns8W$'qV]?1_q"\`s8N!6s82T`_M7L`?!>-o"S6I0PrW!?3 +&lNUiG'o;!o`+mhrr3)am.gSZs%31hs8D]lpA%a$B3ASY>=3IUF&JG$pPET-B9A=EPa7`$4^i4f +O-H#tQ'O7AF\-22P`m[t?'CJBOd)2sRuL*.qu$Eis82irm/I"^s8Ni5r;6Elrr2fps8D!JnauA9 +j8])Tr;HX#r;6Hmr;Q`prr3N)_(?rZ,:"N]-&:a\q>^KlrWrK&s8Mroqt^0grs&K&oBYo+f`(mR +q>:*hrdX~> +r;R-&r:m+_c27MU9kp\Fj_p\aper;Z]pqu?ZprVlfrrs\o* +iKC1+s8N&ri5W^Sec#IGrW)oqs'X^!_o'F0a2Pj,7&6YP +BlnuJG^F[\M3+*eMcdI2bK7fA^::Y_[BR&9^X: +rr3Q.q"O^NEaP!I`l#p:aNDTFrPfnta2Gj8bK@iFc-=GVaMlBFeB,tgcdC4dai;K@bJjJ)(Adq?P*qH"Q&d\> +:1TQUOHu/qPZ/l3@E?T%6uINu:IJ&q86K@NcHjML`666A`66ZM\A#Pde]YtTb/_WHceQt'nFQ2; +o'thj:oLL-QF"cG`QcNCb/M=j]9k9`=@u:_9i+bj?!q;[!*rc#69[Ip9N,"s>\@'hmJ#`+oChdc +]#MRgK9NBcK;Z<"^qRSQp[dn7cg99*a2l9Cd(R08b5TIYa3)TD^a(;Ecc(]GgO]K +>TdgIO-PfkR$'R>D)[K=Q^*f#1MLr%AsS[F/Q5r=PFRc"Q^!u!7l/iEai2QG`l5p:aN2?>`q%22 +`lQYbg"ASaMu<@`Q?9Ic,n)Jc-W1"&J5?X&etjh_9BsCaiOD& +(!">8b08#L`l5p=ai;3)H;mU7F4^'_rrN)qJ,~> +s8E&pqu-O#iSOV7p](9ls3goHrseGUmd0B6s8N&ur;$6eiVldUrVZ]nr/iX64)gLROIMAqRq>&H +NKf`d2fNdmNL#otQBuJKEAW`DP*qT#RVF-MZhjF+7riir7tP;`4)AY,p](6ls8W#srVcTN`P]UD +r;HZpra,X%q"2FZH$+1QE-H_.I@XOm'*8.6!<`K-!!!*$(eV@+mdTc;p](-gnEGp*459H.r;69_ +m-a0,U1TL9G^Xga<>boE!!!rr2p"kj8*Drr;lps85$F9m&'k +ASY7cH#GP:p\=#;07o@QRZ$5E'Pa@MqS=!k[G$RY,OdLVU1Q7QdOI),sR$*_[4]M=UqYgH\ +rr2iqrtbV3qu$EmqY^UBn#QFJts5iY6h>[EWrqcQlrdX~> +!<)lr$N9hbTV(uWqZ$Tnqu6Bjs8E#snc&Leq>UBn$i@T*VPgN:rVu`irr)lUr_`Rks8W%Z/lXcI +PaIK#OcYuA68XU`P__27E%m37Q'IT!Cc62eNL#ZmPEVAI,ZCuGqRK%2E,S*n@UM-.BMJ:%s8Drs +qZ$QprSY]6`7=hbrr)orrVnM,_8F1/a2#a/EJ^H1CNFcKI!^*_I!LI/P)!_Kbf@lJ_7dIc\$E8X +>uAbfb/4.o#J7je]nC=7^Abtob--AS=l_>q#:3kJ,~> +&c;V.rV6*[dq2^p`l$$@`5p+"aSfcaSj*ZaNFJ*'["M:`PoT?=B\j: +J\&hFdEftS_oC]WGg4=Jbf\=R*)/>0Q'RK%PEVGH6T'gdQ&.D;EAp+>;=LJ`Pfd?a2Z'@d`/f3]Xu_;`lcHEai_rbdbO?`na>N(eolb@J!@(I +^qRP%a3)38_mkk!>?`%792/&V>Zb6bBMiM^?lRYXt3ER"$tLN0K`lQ]d]&P*L2D1sX.[bfn)G`Q$!?`l5sgaT'7"b08)P`l?!C +b0.`:VI`do:/+_^ZbXi0bK@oGa8X*YbV72Z_nj@:g +s8N,qqu6U%qr?c;s8)]orr:IHrr3>_l1=E)s8W#ss8N#piVk8(s82cno;"'B17jbqS!K>-Q'=9s +DO$QT?rV)[6&q@sPa.Fs:hhqPrf\^tPERF_jo>2W6Z$pf<(1+eAoLA9r;6Kms8N&urVcTN`P]UB +r;HZprY#8.q"2FZH$+7JKmS/2Srr2p"kj8*Drr;lps84_DFBNL* +GZK$2EEd)Oqu?1O@?I%EOdDJA +!<2rs$N'VNUT4"erVulqqu6Bjs8E#srVlBfq#1d'rr2GaSu8Wij8T)UqYgBmir1A's8;lroV=*> +/tA,hR?j,)PEIjkCm1-L?;bZS5E(qkP*;"k:1uMHrfJOoOc_%Wj8])X6>17V;*nJX@Vn]0rVZ]o +rqu`prr;rT`l,gHrVc`p!<)lr!T(Zl_csdu]rY,,Ue#HKH[L0dG^"=SJ:ioBDM,sOb/2*5Z*psG +J6I#1:X$Sn_T0I,]"bY5GIbW.a1n[/H%1-aI=,pSA#tDdIufVRLpY"?_8F+^s8W&srr)]UnGi4] +2?!&d=DW)%;K?bp=D%F0s78NaO-u;sR$q8YC,(L.NLQ5nN^72k6ue3RO&&k:Q]dH!OID:1Pn/^> +T`=ujrqcWns8W)ts8VZhrr<#s!<2ut!rN#rrr3;q`j)SGWi2?:q#:3ls8N#ss8N#rrsSf)rqc<\ +q"":\qYC-jr;Q]qrVlcq!W2Zjrs.GXS=QA(q#:3kJ,~> +&cDV-s8)EV]ObN`aiM]G`Q64#aS$G&Cm +dEThQ_oCZV-dKWKbK>V_:bA6&Od_Z(R$m7q$!gJ^MBQ`5]pA`l-'K`jidr]@G*Eb0">:ai_rbdbO?`n`KH!]hk6"A?!;[^q77q +_nj()]XjP25$:KN78?fY>?GcJ"hL\<(rIfb07uLa2Q*?`l?0FaMl!1_oL-Vg!n?rbgb(`_oBg>aND`LaMu3:`Q$'Eb/hTA`l?6D +_7uXN8P +s8W,rrr32hiUHmIrVQToe,K@H#Li58n_=*Dr;Q]trquZPr_raprVZWic7_#.Pa@YtQ'IH%M`tN- +Q][8o4D8XoMNX9iQ(3nZ6XEWUPb4,'Q\S8hq>0j]<`aS[G@!#Pb;!!O&ZOJ"QV)@6BX9lFuqJ;r(Ns8Drrrr_KOq#:9mq>NSXTQ3D"AS>s[ +5Y_4Wp[lX!SW]A*P*TTOF>0)NR%'8)P%%@,@nMfNP&3R(1lIWdP$=-;PEV8s6g+1As8)`pkPkMZ +!<2ut(&@b)s8W&Xo^25Gk264=rVQTos8MumrrUBn"TJ>rqu6Tp#lF;p +s5rV4iUm-L"8i,urdX~> +!<2rs#l=83VS)R#s8D]kqu?Nlo)JC^%K5:PUo(9!q>UEmr;HWos5O#UqZ$Qns8("m1P:jUP`M#l +Ngkkf?8\"/Mj6>8D)d?5QB[Z)NHINl:R%$5P*D;f8_O">q>!rfDKKH4CMQ=&n,N=crr;lps8N&s +i5W^Rf)>RHrW)oqs'X^"_o'@/]!u43X'][aH$k!dH[0maH$=:]Mgfuo`l?0:`jiUbRpTuPGAp3e +ah>F*[_T>WIs8<>]th:1Fa/%SI9k_o9L/p&G'jrr2lmk4&EEr^d"fTQ*7q +@:X.K4A#MOq=i*(S<0&$Od0BKE\s8)cp +rr<#trr<#hrr2rsrr +s8Dut$iTYXS7H]ObK\5M`qd^Q`rF-Zb5]Q_`r*gO`rF-Xb5KBn`P8*H?qQB.Pn4^U+5OGoJeB5T_dOd;5sS;qbZ>u6fMSs#>)Jj@2s`lQ[u8nD^> +C1Uj6.*KrR_8=78bJqKDd`/f3]Xu_;`lcHEai_rbdbO?`oCV1uFHNbNS%d+ha2,R.^qme'\@>&' +Cd;Q)9Me5X9j(_6@$@apHn8r=?=-f,EbGi%9`l5p +s8W,srr3&Yg&1jL!r;lrdf0:H%e&-Co]t`@s8Mros8W#piVldUrr<#ns5#:VOHH!$P!"kqPF4aO +:gTu4k0Ye)$jI%L0MosVm.L5J +nEZ9bNd5SB$3C>2!!ubKs8Drrrr_KOq#:9mq>N\XoD6Fe<('E? +p%eLaqYQmrNKfTnQ(0mH:1fNMPF7Yq9j_[T3KfbpO?I/\99Gd/Hm3ErPa%N%?E4#%s8Vops69O^ +quH`prtY;(qYpNpi9p(,qLp$qu6WqqtpBhq>C9mr;?Tirr2p.r;6Eks8W&r +pAb0Zl0[Zurr3*"s8W(K~> +!<2rs#lO>#User8s82Qiqu?]qoD\pls8N&jrX&N!aI/j"X31D>rr*#urr<#Wrr;rss#^)WhC9t7 +O-lAu3ffYjQU#1Y>`bA;N&>Hg2ia#qNfofl6s<\hO,oKmP*TLHs8VomTQE=p=\(YH\bQ.'%fQG, +qu?ZqrSbc7`7Fncrr)orrVmAa_8F1-]=XG;UQJMgG'a+6s*77bGBe7ZH#n#H_oBI7\%95d6Z@?p +GB%_4]#_Us]XthgG_N]EbI2J6IXcNhJTlQjH=KsTP#?%JMiY'U`5o^0p&G'jrr2lmk4&ECr^-8R +`/[_^8r<*4q>^?jT4X%FOHu-#3FkfoN006hP)N%>Bl5kkQBdOpAR.rkSWeFFD46]RQ]t^Rs82ir +q>UBns8Muts760fs82d.s8N&urVc)fZ*1C6URq&Qrr<#trW)usrr)lsr;Q`rq[!2uqYgHorVccp +rqucurr)fprr3W.rr)lrs7sF(T:`F]rVuosrr7K~> +s8Drs$M<#)@#2D;ccX>Kq8iHQs2afO"3AL'`r4!Xb596k`Ogh(?X%#k\AQJ6c-",I`o5!Gb/_TF +aP+QO-'+.UR#a=lR?Eq'BMVorRZrdiDJ_@oOe[r"RZU$C=](9BPF7Ss=,>PTaOGlM-p:$W.lajgj`EN,OVU;bI&aMl!1]Y;)%`P%^R4D@Mb +7o_uTAqVq#\\PkNIlVY"Al;E$=_:$Ug[Y=6[(XZ+_TL0@`4`=*C:pKdPdSb/hTnaSs1"b08)P`l6!@b0A&I^o:aE9hS2U=LH,jaMu3< +aNOP'1WIDO_7dY'bKJ#Lb/1s3`l>p7b/h`JaMu3<_o'I9bfn5L`Pfp@bf.W9HrNg?HJ.odrVlhI~> +s8N<%r;Q`rgsZ3%!ri)sdJj1G"P)`,o]#lM#6+Mss8W)riVl4Er;Q`hrO=s`Padf"HS0N.OI9TK +D(hKCPaQJXFC[CrNg5ouR?BsP3KoksR#RPq:%nG`q==F]O*d\crV?Kis8W)trs\l+rVcTL`59F@ +r;HZprXo2-q"2FZH$+@^P:qia.juJCquH`urr>Cg!Ws94OR;r9qs3S9]f%e_!!`K5&1fcCjm2C' +lfG9UM/u-%#mgS3#6=f4#R(qe-\/'j2A?H/=)re0H]?PIs8Drrrr_KOq#:9mq>NSVs8Moiq"FFU +rr;ljqs$P1T95V0P[7-t5F%\$Q'db.?upESI@$+U2f3P:;jNN/M_n=qPF7T#D2n8hq#(-kli%%e +rqlTjrVm?*q"ad`s8VKJn+6>CgA_-PqZ$TirW`E#r;Zfpr;Q^"rVQNls8Vims8W,s!<2ut$2OW" +s8VcQmH`d.s*t~> +s8N#t$N0.fVWR^Qqtg?ko)AIbn,E=drr*K,oqnL[VPrh[rVlisrr)iriVl+Bqu?]jrjY!^P*qAp +H7X3'NgF0CCFu';P*^&PEagtlNg5osQ]==B23F5kR#RMm9_\Mcqt'^]N-CrTqXsj`rVm?+s82iq +s8Cor`5L7*rVlcrrVcb(hSI+I_S*`VS?5M$I&??(!KH^0\O2f3P:;jNN/M_n=qPF7SsC5hoe +q#(0krr<#drW3&urr2utrr)fq%0$/%p;=#;Yct'pg%bOGqu6Kms8Dut!WDrqrrW2trVlirrqcZp +r;uuus8N!/r;Z`or6h=2T;^uOs8W)ss*t~> +&,Z>)s8V`2E*o0JaNi#P`U_(M`r,\rl4uZ%EcSs@U<;G?_k<4@lT^5Q'Rf)O$RA9P*hQ&NL,>[f@&*kbLbEa>(aiL +dauae`4s=5d)sDJaj@u9^V%2/bJq]IB#i$9ceQt(nFQ2:l!ga-Asg3IaiDE>^q7.j^s:3ETOgr7 +<(0SV=(uSBQ*7g;[_/5`7;$=;;c$G$?>%p_j1i4E_8=F4\\GSYYF9X$Z#tr&\[_%onEoDdm+9A" +aMuBL]tVV2rlG)]s2[aNaN2WQe'udpeC)Ugf$)Ilc7Xd +s8W,t"T8<"g"$*%s8E#udJj1G%*S24o&9WIs8Moms8V!Us8PI`rr;YFB98CCQBto9G*SM^QrI4+ +0U//eRS-n-DDmoKQB7?!HU;:+NLc)rOdgr;qt0pgr;HZnrr;ons8;onrr;oqrsJZ%ptis+_peP^ +s8N!0s82T`_MEJ[H%B1-T5#l"&eFmIrsV='$OHn?-:4Kks7H6Me=Ar_+qY@n$iphU1JWn`jQ>gm +a\%:N,U=BP*uQ(?*%<-_,r.bAUR38J'cKJaG'8OueF`e>rr2p"kj8*Drr;fn/cYP>p](*ir;ZWk +s82^^Ng#isP`D"`DEUBqp](9[rr +s8EK+rr;iGUp'FfrVHEkrUKmcs6]gas8N!-qrsBEV5UKms8N#ts8MuRr_`^ns8VeHAWN%`_8F1-\:AY(Kj&A7Gl;pdH:iR1FEr4;OhJrMaM#-A94i6dI4Z&+'gKnbM?N/E:IKSkA;J4QQ/6#D(+WQ;omah[TLs8DrrrVG[Gs8)`ls"+!Bq>^Bm +qu?HfrquX\N0BTpPDbVYD)mZ9OdVJn:0DFO=&>0GQ&IS=9P0RhQO8IL:6Uj/OckN%qYpKsp\t0l +m/@"`rr3-#rVZWnrVuor$N/baYH>%0S[8"grr3-#rVc`prr;lpr;QlqrVulrrrN&srVulrs8Nr7 +r;Q`rrr<#ss82ZjjJ8? +rql`q$M(9-AurYbc-FPPn]:^K!li=&q9&`Yqo\r[rPnlY&^&"j:Ld[=B"#Fpbf\#H`lcH^aD/i6 +`QcV@c,mrHd)V:;Ds0.[(s5`Y-FdT5?tWU9[UPj`kog@bL+MNa2#a/\"?[$W`bReZIAF2oC1/of?)(S +`lcZA^<+OpaT'76`Q#p@`5p$Nc.("fa2uWVh(O87P*_Q!QnE)3OH#ElQAn[DDJrWSQB[\o2/c0# +Q2[*bL0.37P*qGuJN;$&c-O;I`Q$!Abf]Isrl-&&bfn5K_o9X>cHXJL]9QSq77g9WGe_8=`5BR: +c-4?0`W4*ZbR_e5^r+17be_3:aNMfN`lS+u)T^(B`Pp!Dbf[rE`l?'FbJqGp>>@k!Z0:`Qrr7K~> +s8W,u"T/5jgY_o.dJaRSo%3R,n+6SXr;6BhrVtgT;ZH^os7U;^P+Ru*PZgLMPEM8nRQ,/(6Bn(( +P;R8p@m,j:Ss,Y0A56*5O-l6"PF#IWr;$'as7H?kq>^Kms8Moqs8N#ts82cihSd:Ke,91Err-7( +qtTg#Lj=,jMC5$Y.=-&B?sR#B?!LQ:>@:W7<,,FVmd]r(b@k=OHuEk=AnGphCj_=d;Sq>Yo$g-q +H"h#4Bm+6$CN"*1Dea6;;JDk9:j$M:A8Za;NR[V#rVlfr"6f+Hrr2rnrW)ips#TlMs8Vrqs8Dgr +O-Z*#OdM=uBKLU.R[98)A5@5c?9*n)Q@LZ0=A4sFP*:l";bE= +%fQD*s8Vo4U;-['rV?Ejrr;Ths8Vcks8Voor;Zfr#PuW5W2?Q4qY^Bnrr;rUr_i^prr2rlD1Rh? +P*V;76qi`)Q&V.hCMuJ$S<&dgD/*QDNg-&rQ]b`K;IGQQQC!Ys=gA#+qZ$Tfs8Mcms82iqrVulp +qu-Qos8Lut`5L7*rVlcrrVcb(hSI+I_72k7TLuH%[^`fT[C*HQ\?WTT]",+TZ,OJo[(0mh]t_@q +]tMA2_SX."LJb1[[C*&)]=kqp`k0@2^;e1._8!Y$_L$^1Fb@NMT";YX]#"(>s8DrrrVG[Gs8;lm +rrDurs$$8Ws8Vlns8DgpNK]WqOdD.nAib:(R$Ei!@SLf[>W7J!P^Y<,=A4sFP*:l";bE= +%f-#!s8VVP>B[Ec`m)rSrl4oXprWf^`l?*@b0'\,s2tA_s2G&]rQGAdaN2C#`>$>5b/9*:@UtYc,7fI^;7e1cHXJMaj@u7^V%2/bJq]IB#i$9ceQt(nFPkj:U$["bi7UF +m.C&Fo'G]-oC;>;a>mO2:/k;=7rm>Kp%S=Sp\jRRld(2=G][_1CHBr4p\+@Iqt]p`qsa7Wq"!0j +I^=m(j6OeRnb:kcm+9A"aMuBL]tVV2rQ,#Ys2@RI`Po^;c-*uDbK7`Eb0/C#J;fSTPF\+1B/Y%$ +R?j&%@nq#_>r[\%Q%(K.=A4sFP*:l";bE= +`luZMa2>2m;+b#akO&!Bs*t~> +!<)os"TJGhhrt"XQ'dVu:hFQD?B:88PaddrD)mB5S!02+PXP$9s8)Wmq>UEjr;Zcms8Vrqs8Dur +rVGBh_o'purVlisrET9rotlH/H%Sn6TjD2`FEM\IF)uJFEH-)EDfg)Q;;CN\[ +q>:-hqu?Torr)\p?BpkEQ'IPo2.&_;Pa%H#JNmpc;bEIAQs_[eD`cR +q>^Ens6Tabrr`8rq#(-k(B44,p](9js8VNRn*K]Df`2!HpA=miq#1Bqr;$9gs8W#srrW2us8)^# +r;6Els8Mrrs8Mp&q#CBms6K(:j5Tt9J,~> +&H)S+rr;i(VTf)7s82fns8W)ts8V?_s8VrprVm9)rVc`lVl$;fX5`sQs8W)urSdbUrD`gprqU8U +Q]RT!P#>19PED5uNJ'^Ejs8DuriQ&mUf)GUHrVc`orsml%_ns3/Kr]-J^qRq1`W!^n_o9U3`PKR3\5gDa`OUCuT=VJK +]t_M+^r=:2rkC+j=D">2ZX007a2#X7]>_k-_nX.(aMYj09VeR\[Dp&#bItg0p&G'jrr2ilk4&EL +rqQKnqYpLXrr;rsrVZJl?':M?Pa.Gk10m53P*2#pIm%L[;+R%9Qs +N)9EOq>^Emrr;?a!<)os"9/8rr;Q^+rr;uqs7jL>Z)t1.PO&#Crso&,r;Q]qs8N#rrVuflrVZ]q +r;ZfsrVZ]qrZ(n9s8W&rrr;usrVuoqqY^9g[A9Ch])2O,r;6JD~> +&GZ/"s8VD6=bFK%aNW&QaN"5#s2P)[q9&`YrQ>)_rlPSh`l?*Bbg"AUaN"4u!65#Z$Gg7X>@(j3 +]>r(8rl"u\bfn5haT'4ra2?'G:N)DYS!T43:,J2uR?rqf3c7,TPa@Dq:M"BB?B:56OdM.fCcI33 +S!')"L+^`nbJ1p=`66ND^r4=4`PoX:bf\&Jc-jP=]Xk`+bfIlF`Q?9Mgsk3OmGE>IX`pDoj6l:) +qYU-aoCGiMp@7hB_BWr.A8":mUuC\6nFlYPmHsB:o'>#88PFGKIS[*,qXO4Nkk=lFoBc2Js6ngh +;6I61ali'fs6J[ilIX.saN2TP]thh4`lQ0>`W!kK`P]O1^;S(4`Q5s<`Q$)\98f$uOHl)p3F4t: +PEV5tJ3I^_;G!7=QX;IbD` +aN_oG_6nDf9L_f`;R=3X`59L9bKS,K`lQ +!W;inrr_BBrVHHl!;tjUrr36$qu$Hnrr)Zkrt#,/e+*.tg].Bm3WRQC=&+Q>Aoq:Q_04R$EtdC%qB%rr2rto_o0prVGBi`5Bpo +r;Q^HqY:'ho=fm(H@nATQ8jqSF`D;;EclPJEcH5BI"$s5?Iul97;[d0IXucfrHS?f/UD>\I!gcf +6<0FtB9IggG]n4NF*;hSG]mtKG^O(8Vg(BeA9N69Iu)_JrVuiqrs%]To)AUbs7-(Kq>^?b8s#L1 +R$F#'3+"b1Q'@W#P +&-)V-rV,WTUu_4Ks8Dors8N#qs7Hhk*_3eD+P';/_^:_D#_Sa:.^qde*^W==-OD:MIC50==`4Nt%q#:3k +qYg +&-)S+qt8icbQ>r.aSs3ZaSa1$aMu6Dc-=JR`Q,pA^[gc-"&D_oD\uilFL,`Pfa@aN@5$M3jU'P#YC:I$U%_P`f]QECN`kQ'H;:Aoq!FPF%Dt +PA*9e9TGO*Q^!VQ;:VDgn+$&Do^hV?mHXH5hQAYe@l$!%e)]`^rq$urmHa**p$D>bf]:n"Nng,`lA#! +'?\D;`O_O>:K("^:PQX+aN2?A`V[^Zb08#NaSs0]aNDTFr6#&\r5ScXs2P)["3S^+`r='Zb5]Nj +^4]K_:hI]3qu-QpJ,~> +!VuTkrsJ_cjo>;Xqu-Qpr8R_Trs/Gsr;Zfrr;$9j&G=`Ip#b<7rqcZprr2rtrqtaS48o3ZrVuk1 +H^U+cO-s-?S@b)R?a))O\s:#q>UBns7H9tr;HKM +`Pf[AnGi=`s!dmGp%$(RI=aD;SP4?hLiRM&&FFA\%eai_>$3'u&kMu@9s8Vlar\jfL +s.WqeP*2&qQ$c"rUELrr2p* +iTT\&p$LQ7s7cEgrr:IHs8N2[jlG=srrE%K~> +&c_k0r:o'AVssT`rql]ps8N#ps7uZorVulps8)`prVum:rr)irs8MupqYL0HR\Qg^anl&9r;HZq +rr)irir24Crr;uprqpARR?X)"QX*-_@$ln@P*D8'>%hJ.PE))i5@eS3@#L;4Pa+pK/s_E_Q'R\s +:Wre7s8W)srVlfrrr2iq%0$2(qr#N6`nL4fp@eIb.JE`$_8NidRA4#S]u\+1a2c*7_Sa=3`4s:* +\9<%%@[agG^W+@._8=(g_uIRQ_\9u*_8aTUFC[s*]Y_b&_8=.._SH/f&\c?#`O8d2WEsPY^;%h3 +a7fK2rri)npZ:Z]nQ@24u<0iu9Q]jmHCJJ/uPEpDM +CN3$ZQ^F&%P)r4H94^Hns8UsT&H2Il\[&<=WMZN^rr<#rrVu'[qu?6d$iA\U +U7nC>q>U?krdX~> +s8No6q!GUo<3XHiccF2J`lQ6@`l5j7`lQ=%bl5cbblZ&/`rimZ!Q'Y'HBkBGkO.2(k@VSnL +M3F!`P=f(2P_k]kQBmFoXO4l%_oU'HbfIfFb/hU%`?3+@b1,+aZF@6TdFc@N`6?ENbhLq2nC2$9 +Tkh$sp?qqKD=R5hnaGl0kkXZ#Jmpc*KY-+*q>0UQo^hP;lKdj/o^hV?n*d-!@SB;Cli6hYq"+%I +o^h_Ko(_M^Xe$8Ng#Y_ +P`h,N5tt@GRuint6saS$>EFu3FYd`M9P'QXQ'7Am87kM'OH5fmQ?u!Eaiq`K`l5p:rlX3@&&uJc +@T$*$8PWa,aNVfH`obAA`WF-!`q%1Y^R&,$;I6Hgr;HZqJ,~> +!W2forsJ/Oli7"_q>C9mrSmhUs8Vm!r;Zfrqtg9irt*uBo(;,>s8;`ns8N#ts8MrTr\sfTs82ir +FENk1Q'.MO9klJCSs>S*PE\7JDEUdfOID@nCi:nkSX>h,O??6:S!KA(Q^DEDo`+F[$2jbui5NXP +c2[eBs!da8qYKs"H$b':Rts^mIW]^KEcubVH?aLNGBJ(QHiPES>(D*NFEMeMrHA0_3-KLlI!BUC +0-MoQK33A9E-$/EF*2_PG'8([E-c\WDFg7Q/pVS_F`W2apAP$fs8N&am.^/Ls8VWg2Z3RL=GWN2 +RZX,'85_Up\t3err:dQrr3Gnjm2^9 +o$7:8qY^l/_U;rrE%K~> +s8NN,r;4X2ZMOV$rVZ]qrr2fpp&=mhq#:^D6F-ViPP*ToVB/5@7PEV/lP!!Mr4&)9+R$'FEDCh'CQ^Ehp4%rSAQ'RW!QXu*JrVuiq +!<;urrr4/@r;QWP`l,jGs8N&sqYgO.5&c1F^VRk* +_o':h_>qLQ`"^,*_8F40a-VU;WPOh8]u%e,`5]dp_]?M5]ue7/RUW:e=gbiWa1f4\s8;oks8)c\ +o)JI^rVm!!rVc`os$?Y_rVlisrVlUnL7+-jOe%\-;a$G.NLl2e3,W=tQBRDd6#U[3DO-ELP*_\Y +4)7T(P`qB!PB_*Brr;`mrr2rthYn)bqtA(9WirJ(POJMNs8DlqjSf/ZnGWgnm])nRUriT8rVcbH~> +rr3`.m%dcm\]W4@b/q]CaN2B@`Poj:aSO'ZbQ>r.`r +!W;rrrsIZ?p&G'iqYpNor8R_Ts8Vm!rr<#tqtg9irt*H +s8N?'r;*pu_YF*/rrL=(r8bo27A6\XVnKgba2Z!4rkB5b_o9@1`6#!;Kn?)>`lQ-7]u7e* +_SlGm'Z@l*^:qaYM2@.la26!C^raO5`lA"r?Gj^o`PKR8]3C>fBpHBJ`l#des8Vurq>0sEo_\[g +rVQWprr)fprr<#trr)fps8W&tmmNM,OHu>pKK;)DOdD8tQ9o(p4cktnLam.W?Ug6FQCF%tPX];1 +8!0+)rf[\&NVibQrr;uss8UsT&,lA%fsRrbXfIiErVlisrR(TPr:dFfU7esns8N#tJ,~> +rr32tk)EYf\]4Wm"Ne[$`lS(t!6G)\rlG,^!Q`:[`=Ku0b08)PaN2B?`lu]Pbf9Y$'$8>;`kQ+l +>?kd>^WXsG`l#^8rlX6A5/tX\aj&#OG$g5oTqIWs2JZ5uMOBWoR[&dcG]["dO-YlV4_n;'M3tN`Q63ErlG&\!6G/ZHcaXc`jECg[aN%4`kp!Ia3N5`e'qF"ZsUZ+kO\B; +n*ff:oCMMBnFlAAcEaRQcLUAhlg+*=p@RtFmHa0.oCqtPrPl%DZde@(me-&DlfdEjlKdd'p$VD; +oC:USQ(W6%lLaGud-TT5_Tg0EbHAe)b/q]C`Q$'Fbo4gI`Q$!Cc-=DN`Q-KO/W5gVR@8q\1c'WE +R/W="5[e7dNg,Z\-tmF&7$Eq&S!&er7V?s9Od;AuPE]Emcd'MPbJqN?`lcH]a:?2&MHa"U:JjoZ +`lcEFa7.1Ib36nP_6mlM;-8D3qu6VG~> +&,cG+s8UX&r;Zfrr;?QnrSmhVrs&Juq>^Kor;QR%r;Q`rcL(,fmJm4_rVlfurr<#Ur\slUr;Z`i +]NLM`R$*_u5&tL$N0]QiQ][G4<-!"L=co#7G"$=2KpS-lQ]a=78O9dJ*/0s8<0!i5NXP +ht-jICB"2-rV,]oMd^FqD,6%AF_u,?H@LEmH?jaXG%tkc$jm7R5&>(RFEr+VF`V\JF)uABEHQ5; +1(j]p$or!?F)Q8HH?j[VG'.kLH\-H^C/Z!!0WpftJTGj_OjNUqs7ZBjs6/_?s8MrrnbtQKo>Odp +Q(!r"Rm9SIPa[`&NG)((4+`rdLcBKs +s8E9%qsgY]d.[D9rWE3"s8VflpAb$h!rr9!rr<#srVmK/s8W#\R&Hm^^&.g-s8Doqs5*bTs#9rS +s82N"=-\u:P*M1kDJV:iP`ColO-!@>E,\6IO-PoO6uG&=QBmf%OZ-Q9PaIZ*OH`Gcq#:9mpAY*l +3r]0Xi5W[PhspaFrVlisrr<#\]SCR#H>U@9`l#d4_8!_!^qmn*a2#p,Ll[X\W6)fd_oTd8_Sj@1 +rP^\2_S=*ZN09TnZ,ac%^r=.,_o9U4_o0I-_Rm_.^Q!h +&cM_/p"4RuLUY7Fbfn5L`5]gpaSs?]a9'B#`W!mV`W*pXb5TU0b/hTA`Q$'Ebf[rE`Q$$B`l5/e +@pN>Z[(j]-b/VE>`lQlkO]GD#ECO&lPEBoQCcI$2 +P`q>m2-WM4PEDN#O$0eoaMYp7aN2NFaNDZLbf\#H`Pp*P`jWUl_oU6FaNDuV_T1N\^m'8KMhTsQ +nac;@n*ff:oCFU)oDJ4TgT7p%alNKjjm)C0q=aFMn*TN2nacJMrm/3f_T:j3mI'<3mcrrskjAB> +Dsm2]o(qa\TNnt"M`m;f(6&CbqQ]mh" +78oA;OI1o:956G9R$!([EGn`7PDc$!Mk-,*=DL3"Q'7K!Q]jn-cHO;QaMu3=aNDZH`o4uL`P8'T + +s8N6$s8U[%rVm$!qtpEniVjYnrqZBis8Mroqtp6gs8:U@mHFYF +PEM#mR$MeYCMQ1oR[oS.R[./1F_WsfPadb&A8!raR$=&&GWS$OP+.Z'Q"ZBXnG`Id2Z)FO`5U(& +rr;ooqtg9gkJE66V5c51JTYsJEd2t]I=-p@rVuirs7-(Kr;Le_Pa@l+ +P(YhRMisWnO+p);;Il8YP$V.1EE7g[SWT"uQZb`:D)RN@R?<_uQpp-5qu?Qls8UmRrVm)algOT? +l-oY3rr(:Es8N5nkORutrVllsJ,~> +s8NK*r8aZOi;*BPs8Drqs7lTds82fprrE&ts8W&orsnqNR&Hscc2@S\m#Bg.EARu`l&PZ]PYBK1I)RZBgGB/bm1*irr4A+[8!Hq7_HFM`PKI/^q[Y"_8=(,`lYNDRZU0WkPtS[rVlisp&6WE +rr)h:G*/&XQ'-e]2iNohO,eo^BMi9.O-*^IF)Y-5Q(=&!Pa?P\Ec!^sPaR[5PR0_=r;6NkrVlfr +rVcfsiVjAfqt7b/WNNA"U%nWdr;Zf]rr<#arX/MNU7IaJlMpn`s*t~> +&cMb0oYPNXR_-S^c-+5La2Z-uaSa0caMu6=_o'I5rP]#]aND`Nb0%a'`?*%Abfn5L`Q#p?ai;,] +>\%,KK=8M7cH=5I`Q$!Ab2LEk`Q?*E`mV[ZLQ7[kSaNDZH`o4uMb.t3! +<_?.b;HUWRa2Z +s8N6$s8Ug)r;Qlsqu6WSrY#81q>:3lrqu`kqtL*ikNVO&kPkJ^r;Q]qrr2rtiVkk7s8Duqs7K$L +R?Q'Rf'8MkjZPa%N#N)Td#=*L0J@=<`QE.;nVH?sj]G'.tLCJ5i25u!Q5PaInD:g-SZR?W1^EGIFtR?a/#Ss5:,?>rAINh);qS!8t0q>C*hqu6WMrr2p%nEBH6 +o^^H0rr`5tqY\hA$ig2(jn&$(oDejirdX~> +%K?D,r77aJo)/Les8N#rs7lTds82fprrE&ts8W#nrt>.2SYiBmi;9qu6Kms8DuRDMO^!L:P:@^sBa7_86,frkfDdZ&4g.R#m9!`PT=*b/_97 +`5KRm_E,TTbFaiTP*_2fZFe/m]"c5!^r+(+_8*n)^W4:K^AVR$2tZE,%4pR$rAINh);qS!8h* +q>U6jqu?Zps8Doss5Eqds82]>Z)t+0X.&JTs8;lrmJct^mJ[=fjeA04UY5VGJ,~> +'`7k/nZ6PEZ+n5ubKS)J`PojEk)3Q'%5u5?`2@3g>\dPqR;B +G`e/QQ'4ZlHB4/QR[8dpe'H%M^W"4:b/hTFbg"AQ`PTL6dDWQ2^:`%IfZhabbeh3Sb@H@$I\GTe +o^i+OoBY`2nalABo_7IX^:(bf]@6WKlgFH>n,MqVmh,*^q>ARS^;J"/_s$CTkN240rpqB,q"XRQ +mHaWD]YqIhVHp@*:sA(Xdc]Z?ce") +s8N6!s7tO%r;Qluqtp?NrY#81qtpEnrqu`kr:^-ig[t%$kl1SarVlisrVlisiVkk8qYgHmrqToW +OdM5nR['.;EcFNfQ'[c$R?B!"U)%>Fp11KnP?9nb;lt@RrINj7WHNs8DKe3Vf"UPa7c$ +R#s9dL6\!fQ'*t@16RocPr`]"3K9)eQ'@PtOA9&">!S19PEDDuQ%`]Bs8Diprr<#Prrs8NAdo_%D4s8W)tJ,~> +s8N&q#0EdJr;6Ejrr<#ts8Voop&Fmfrr2utrr<#rr;RK1s7MeQVQ@>urVuiqrVc`qrr2lpiVkh: +rVlioqt=qQ]IA5:3'T/OdqST6t\QCS!9/&F?E-[Q'7JuO\Nsrr;Zfr +s8W#rs8O/>s8Lus_nh":nb2bXs8N&uqo2L5Th;u<]YqY$_86)frko>e[Z$3+QC*MkVS^0g`kfIh +`&trS_8=.0TotS+PDYEW[)BYp_83k#_8F1,^qde(`6=1%O,]3RDeu,.CqRNqq>U9jEFh[!8`ogH +qYgFR$!_t2E?PYP`h5m1Mee.P`_1jC2Z(jNgGupQ'7;)>] +'Dq_)m$VL-^V7S)bg+GO_SsO9b5KNdb/hTBpr*ssaBODmNt300Jj +P*9oI8!&guR[TC*YLU_3^Ve(8bf7ZFrldCD`PTL6dDE?.^iW2ue^E!m`P'IQ\43] +rVlrdgZeY9"8r∨$?lr=&W&s8Dipr;Z`qrVlijrXeu)s8W)rqu-6cs8UdJoB#TCs8W&ts8W'# +r;Q`riVmoqrr)`os7_=fQB@N!PF7SE3cT1'J=;alP*_Gu>#fQ1FH`#U?;`e:Q'7`'O#f"\NgZ8u +P^mB>s8Vupqu?Qgs8;oos8W)us7cQL_SIa,G)&?Up&G!crqU&aThBHWG^+LZG^+CTG]dkBE+VcX +$3^J0!"oW$CN=W@F`qnLFE_qVG\_.J'E%oX!=0&tD0C,HF`hkKEHHGMIX#s4'`\=9"9o8[,E/<` +H\n!4p\'VKE-#u".Q[8#qYpNprV?KlqZ$QprVlcps7uO^PaR`!R?EUe2342mR$;>V1-hs8Dutg\q3Nrr32[oC2GIi8O\8s7lZmo)91"rVuls +s8Drsr;QQmrVuogrr;m&s60+Lki;^Crr7K~> +%0$2)qm`BDq#13jrr2iqrr2rr!<2ur$i^2*qu?Torr;uts82fors/Q'rr)fqs8Mus#k*qMWN48; +rVuips8E-#rr)fRr\slVr;Q]gLM`<=QB[T#O^g@hE'&N9PF.GsPEK$HDaST/Q'>QO3.mHYS!8pn +0U@`eQ]RA[B_VK*#Q4W!q>^Bmqu$JtNfB"&`l,a3_8=+-`Q#j2_njU2Q&:cfOc>6O +:n"OiV7XS3s7VOXEcc+s-opkoq>UEo7K3/`rqcZos8N&ts8Vlj7?X%$OdM8l1H(>_QBm\J7o`]Q +PF,QMCJ&E(R?Ei&Nfct +-iNr@kCd3%]tqV+aN_rK_o9X:b08,TbfRoD`6H9?bf7fEai29BaSsC/b/hTA_o9^>bf\#H`Pp!@ +aM4iV@:E]$[_Kr)ai_cIaMulM'P_]u@e%]Xk1WUSV&+f#H\4g3Q8"Ame%F,h(,^b/q]C_9Bm:aiMWD`l5s>b2,%2PE;$" +QB?+?k:.]ZD_TU$Cn]26_a2u?AaMl0>`5][;`Q60la:$#/[U;j-?&[b;s8RT~> +rVlrXh"9/2qr;$?krs\hurr)fps7ZKhr;HNerWN/us8W)tr!<#ps8(RIn)F$>rrE&ts8W)u +r;ZfUrr;orrrEgW/ZPb+2'3GWUeR$UEgs7kG!LOk51LO;nqrr3o6_IK['4c"E,G^4RZG'.kDFa.M49G7X3 +!Wi9#"9pbsEI%P+$?U<6FEhtOD)`.0r;\SR"pd8'EcQ5AF)ZA@F)cGSE`3eX"9AKbi"0q4%c +O.4nkDG>(fEGp,>8QkogrqZQn7K*/aq#:9mrVlfns0H*rQBdc&Q'!LpQ'IK#Ou[)5NguAo3-8;% +NL-#qRZ`t.@r?*ENKo]mQB[Z#PZkHkr;Q]qrVuoPrW)iprs%]Sn+HD;g&D$Oq>gHarWrQ'rVuio +s7uTlrr`2ns8DNf$iB\unauJ7i;`iVs*t~> +%/p2'po1(;q>UBlrVl`ps8N#r!<2ut%/oo!rVc`qpAb$grVQNlrVm$"s8Muqqu7?-fp&5/XOd7G +s8DurrVlfrs8MuUrque2r;3QuQ'IQ!Pa%Gu>#8pI7rXcYQ'.Z%O#Lcl/XMZcQ7uZ?NL5]mOub=N +RZN\sQAnVsq"Xjgqu$Kor;Zfor;-Hnq#C3I.>E8&I#*5Gq>UBnr4#h+P@2,A`507)_8F41^rFO4 +bIEN1N_P\$P`q3.`l#^2_ns7*`kK=)`Q+[5OHGipPE(W^[)^/(`59F+ai)98_TBd.P)PWhNf'*a +Lj)drQ<^i6p[r>tEGof2FD= +'E7t*iG`(f^r+.1aNVlJ_o9X:b5TX(bfRrG_nF.7bKA5Ja25d8`QHEKb/hTA`Q$!uaqDe8`Q60B +a1[d8?!h-+]>DY.ao9EcaMu6@b2:9Y`Q$-Je;d._PEhW'P*;29;/0i:EL2rVPF[u#3,3=]Q'%5o +/mV,.QA_&j3%olNP*_Z-M*Jr'_844/aNMiFa32HA_8XI0daQ,RJp_rgJo`p&bJhWPY$%QcFPuBO +o_A4Rn*B9$oD8%Uk.AUPrkVUM_SP.-p%%P@p@[kElgaQ@qpE$c\\5o!`5T^YoBki3oChYJn+#f6 +nEo>R]Z.n)\&6.lQX?GLEm2JdhGlgTC2@L$ANN**d*9VTaN;B( +-W6(iNgZ"f@Ps(3P);,:<`"[ +rVm8[h>@6Orr<#tr;6EfrXAZ%s8W&ts7lWcs8W#rs7cNjrt#,,qtL*ijl?(%ir8uVrr2lr"TJ;r +s8V'W!WDins'Yd)g..EqOI2;rRZWk#C3=,RPEVB#N0Tlh3cJ).O-l/]3AH;ZQCO.I085pVR$Wr' +C5;Q`q#(0es7ZHjp](9mr;-Hhni:l@LkL\5Lk>C#s7c4lVl)\'H?aUYH$FK2EXHr5D/DiT"onW( +"TAB5">s_0H?XOREcuPREcPkO'*S14('+OsAoVg3FEVePD/Xc>BOVta"98E)rW!lI.PuL@PF@Js;d!`nOIM]' +P*_M$A8Q +s8EE'n"?T=r;ZfqrVlfps8W)urVuj*qu6WqrVuolrq$0irVliprr)isrr2lrrr2p,rr)])RA?ab +kPtJ[rVulq!ri6"hu3ZVr;Q_>qZ#5;PaIQ!P`V;oPkR>3b?<+1fRPC>JFL7=Ht +P$fnrS;ru&OdKm^Bks7cQfs8Mfns8Mrms8)=HG'esoMLUM4nbiF_o1bUK;67RN_na((_o9X6 +a2Pd9[#'m,OcGNdP*;!-aMYnd_8=+,`50O/_S`"(MiX-gP*(fcO1!'K`Po^2^W=:4cG@02Q&1W` +MjBZlNJiR1PGDcM[Ij/O89/lnD/aQ7>tG"irr;utpAY*lr]C/Zs8DccAUou.QC!i%N\s1cOdqPG +5W"XlN0R:CAiPj?R?Nc!QU,/!EAr??QB[Z#Pa.Q"7Gn(DrVuZl!<;'Xrr3B'pX?IPY-+jpn+ln\ +s7?6hrsAT&r;HZqr;ZKfrr2upo)A[h$2qf7R[C&Arr;tJ~> +-ia)7dUZX[`5]g9`luZH`Poj_j +]QR1W?YQ=P_oB[:b08)PaN!,YFN_YC`luTV\i,V8OI_f%Q]RFrBlmoNP*2/tMj0Zd3GhZ$N0TNQ +2D0ZNPF7M=/;'IQR[]M,?ua]F_84=2beD'7^WFaA`l?KUdj&UOLOY,1LND(kb/_q$T;l/:jQl:, +p@e.Ilg!s4p&F6c^;e73_8-r'_SP.+oC22>q"O@Hq=+.Re%N9'^;%Pa`-95bp$M&3o(25`lZ]Tb0@fBaN;N>n]2'U^4BB^;JX2 +rVm&Xh>dNPr;Q]ur;6BhqYpNp%Jou$pAFsjr;ZcorVccjrr<#urr2p,qtg?mf';kokl:\]rr2lr +!ri)orr;$XE;]_0s8N&ps7JgAR?Eo%P+%o+P>#.sBL%iGR\#q.PZ_"%0U%`bQ!I$XN09Nj:-Fi* +QC=#!Q^C#0p\=dfr;Z`qrr;oirr<#qj?@^9LP(A4IXPumh"UTAHDkseI!9aYH$FIQEH-&@EH+V]% +KZP/(Bad>!!Y>oEdDtTF`VYKFEqLQ$jQk:"T/66#!-C;EclSOG^FFJDeNW#":5&/#lXfF"ooKU/ +"r4iVV&dSFDQ#:HuX%AF_ASCGGaXDSPa7W"Q'IItp%nXbs8;lrh#7l_qY^?ms5o^C6.s8MupnbrRdrVlg(q +tg0fs8W#sr:g6^rX8Z"s8V +#6+T!ihWLErr3*!r;HWns8W)urVulsrsel'rq6-frql`pr;Q]qqu6Tp(B4:2rr;uss8N&spS4CY +X1@p'rr2lqrquots8V$Vs8P=]s8W)nrpiC9R$*c"OI;Q$O\/_kAj2E?R%0M&P#kUt09VN^P[$gT +Mij__*^qmn+ +rl,,[^r]\4s&r8\aW15&kCZCisK+CiEoDq"Xmbrr;lqrr)iqs8P1Ys1V6nP`qDuPE_>b8!TR+ +O??$IQ'[_a4)7!4R$EktT8lNJCihmdR>I5oQBmc#Q'+B)r;Z`qr;Z`mrW)uXrr2p*r:oEZYHG(3 +QJ;66rr;Th!rr2trr3?%q>'sgs8;oqq#Bpas8NE(d@d##U>c(MrI=~> +.0'/4_.6iZ`lQ6?`QHEE`PojaN4A's2b2Z*6?:FaMu6=aiDNB +]4"cC@<8ir`Q6!G$=AifaOHGWf +>"D;CO-G\u3g>hoR['&%Ot>2.`5op:ai2NDai(p9dF-I]-=h=PJqel2J7'P,bL28_W/6Dem-F-4 +p@e+HmI'N>s6@25`5g!<_nc8c-/&%`nF#i?p@@kJs8('N^;.S'^qRY(`5Up2mHX*.n`fH+me?Hj +pqOPd]YDM%_SjX)XjU:VX]2slZnQ<6G]S7PEcGhm)qNHea2Q9=`l6!;`5]j?et56jP*D9!Q'@J` +7?a.#OZc-GPEh;Y3GCR,QBRGlSW$0FCihmdR>I5oQBmc#Q&RQPc,[Z>aNVg+a90Z/aN!2[&BW,= +^7AD%8kMuUS\rLf`Q%Mj&B;T*aj&#ObKJ8`dE9VM^Wc5h$HKoB=Ai.+Z0V>fJ,~> +$3'u)r86E3rqZHjrr`2rqu$1-`q#CBkrV?Err;Q`rr;?Qo%/Tr&s4$K)lgOlQ +qu-No"TJH#qtpBmj8NHarV?Kls8Dro;2CR)Pa.N$P`V8q20EYJ4IMA!P+mr(4Dn2*O-uGr1cL;Z +QBcQWR?6#CdhG^4[iFa%\0B+k:G$31&1 +r;^+0&mS7NT5%ok96>/pEc5`>F`_tLC,l(grVuoqrr)iqqZ$Tms*ARNPa7T!P`hB!P*2&pE^;mN +QB@V3>[U*gQ'dW%N_EVsBg%Q>S!B;)QBmc#PDr3.qu$Hnqu6WNrW<#or;Q^#hsU40mb[I4rrE#f +rX\u,s7lQmqu?BKo_eahq#0d_#Q4K!s5`G3i;N\+~> +#64Preu#VErr3&ur;HQns8E#srr*K+rVufor6=s1s7?$cs8;lrqYh--rqu]os8DrsrVuiaRAZsa +`Vf`8#QF]#rr)irs5X(rr2fmpeHX2QBRPsQBI8oO>CrkB0)B@Q&qYsQTK%a>`P2>N&*AK +Q^*eVPF%>uPEM>rQ?.EKs7lWor;HHes7lWop\=;IJ;9#7K6iB/J:M3]qXd%MThDc2rkncQ!Q2kT +`GiW1Zu^hYNK]QfO,oEdO/U(8_SO+-_o0@0`1;1(M2m[YN/Nd_P)Z`d`59F,^r3h+`k9KDG^bg9 +OHPN`PE2#i[sED!F*?h=C2Is1D.Rg0EHQ)548JdOs8W&srVlfns8VrqG\`\2QBd]#PaRpKsCoDARfq=4IarsAY\Un+3QfDY^IJ,~> +.0'&+Z"%7Q`QH?B`QH?E`l5s=b0A/QaMGd<`m*&8e^E0j`luWD`Q%\os2l5#`l?!?`lZ3+='8O1 +ID3eFai23@bg"AO`o"j_bJqK=bKA&Z4b/ZZR@9G.PE2&m1j!GF4.).rOeI`$3GVPsN0]ff0f4ZN +PEKpMRZa#"OI;5nB4K?<^WF[=ahtp<^Wb$Ie^Z`l4KO/3?eLd`'@*n-&lg=<9o^hP? +o()hR[DBetaMu39^V.4fddmD*Ie!(&p%/(ZfXJK1`5TX-]Y_V)_;k+PlL"*2nDj'0p&Dn?^Ws^4 +`P'+)^;I>/P)Q\kG2kYlC34W&n=?OH>rsQBdc%%$[$@LcO,5`P]X7bf]q+"3ep-`o4uMa32cGX'\Rl +9N+i=_T]s8`q.7_`l,j;`6?f\f$:eGc-FSL`ULqT^Rne0 +$2ji'p>#$7s7lEhrr`2rqu$rH9QI-P*M/t=@-)P +Q^!o"QBmc"QC!huP=5*@s7uTms8=#=o`+YhL5C_4J;8l0Jqo/84k>.0VeKI`Is$!ZG'3b)"F+`e% +1E(6'*SI +Rt5!/tSq%F'Eg1G\hVRE,fltQ'R`#Q'7))o)AOdrqcWoh#7BQqYU9l$K^[Jn*TGss8W)snbs'tr +;ZcrpTn`g0V8.;rr<#hrWrH!s8V6CkiDR=s*t~> +#64\qbbMiErr3&ur;HQnr;Q`r%JKi$s7%T^89+Y/s82cos82d.s8Mons8W)ss8N&qgmP1BXO@%F +s8W$%rr)irs8MuVr\4BOs8W)urr)RpK9VddQ'ISsSsGS.6p_SUEoo)9$srqu/aSY)Y"r;QVE~> +.KB8'U0qrI`luZG`QH?E`l5s=b08)P`lbm4b1=iJ"Xcsnf$)+Nb/VHsaT'C#aMu3=aiDQBU/tJs +?AuV=bKRuEb08,S`l6iVs2eZd_TL-Id7J\GQ^=81Q'7i,PaXsCG%!h&P*^uoO`rm-0TVBWQ;p.K +O-GcmO-uE!OHPlpO,GaBccj2GaO8>V`Pp0@g=AT7JUr#nL5:J5KS4b,`,'4cJtUiclKdj/rq-6\ +>P\'f[_oko`Q#m:_S>kRZ2>Q<^i.6Od;2jGXH7j0NX^-P*VAuQBmc#PD)BQcc!f?`m2`JaND`L`l6oX&BDr=`NsAT +7nloaB#2a/^rGue&B;Z+air>]NCjH`G0e@UbfB7p$H9iaB2_]/O5p'9J,~> +$2ac&kM>q5s7cC*g&-)P,r;#"g+s8Q;o_SUfqYC*jr;Q^.qt^9lrql]pqr-i)kl:\V +q#13l"TJH#q>:0kj8K/Yqu6Qms&o,'K9_ddQ^*i%PEV/mRo<"#?p^9KR@9M5;,0euPa[bp4ue^m +PEVK%R?Nu(Od;H#9%C"PG(G:&N/31:KS,,?M0D9WYFRe5H?jXVrc8R_5A!!33+"9&9/"#OV1H?a[YF)>_M$iBu+!sJi+!&G*RDKTu?FEi"XEFfjh#64r.!!rZ+!!N?-% +:=Hl@%DL-FEr+OE,ff:G'%kEF`;Rcs7cNm5Pb3 +KonpR?a1l4_]'nH'+PXQ'7JuQBd]#P`/N4s8)cqr;Q`Orr;m+qYpNpo'c5^KiWZ<<*GPqF>s8)9b#Q4W%kiCphli-p7~> +#64\p];3OBrr3*!r;HWns8;lrrt,,.r:eb]*?6X-oD8Lequ?]nrY#81qtpEnrVZZos7XC"WNNGb +r;Q`rrr;p#r;Q`rrr(jUAcMc0rr;urs7TZLQ'd]"Q'ISrOcYZm;+bb55aRe'R$O4<9hT,_R?o +1-q(hPE@h:30K\lR$%c`jLR +Ybmo_rVccroD\ah%Jg#'oqrZL)KbiRs8VrcrX/W$oWt3^Tt(%"qg\~> +%fcC^NaI1Aa3;cH_oU!Arl,hsb08#L`Q#^7aNh0s#65([a2lHE^W"46aSj9]aT'BmaMu3=aN;T? +N*'(Z?C\h1bQ#Nbb0A8V`l6iV@`cg1`5p0JcUrPDPF%l-Q'IMqOcc)195n6(R$X2.Q^LTA8S+$N +O,?"VO-PfgR[Tb/P*1flRZ9J;bf%N=`llKHaNVWJdNi@KJ;B2?KRe]&JVf/)4?TO8@,gM9jQc($ +rq(1$o^_IY`kT=3_8=%)^qmt._Vb7`nEfK1oCMq0]"Pi"^rFF8`P]R-]Y*.nnalJMq!dnGoXVQY +`lPI(cc*Z5a25["l/A:TTS5sL@r?4$CLh1-I!KXNB4Mq:aNMlQa3;]HbKnXq99b^.QBdYt0Tqfb +N1-#m1I@1fOcMD22NX8dQBIP`3bEOhH'+PXQ'7JuQBd]#P_VKRd)3i@aNa\+"3ep-`Sno +$2FQ#f%p0%rqQ9frr`8tqu$AW +qY^Bnrr2rsqtpBmir3B`s8;oqqu?FoLR+3hR$3i(PaRl)P*SLFF%(,4R?EerPsT+IJs;UiC,(7) +Q'@T!Q^EH>Duqu$Bkrr)irrVl_BG*82YQ'IYsQB7?"Od'Z4O-u)rF$ri2 +P`qK"QBOaGF>Aco`+pds7-*frrhBEm- +#6"PpVP_N5rr<#s!W;rrs82d's8Durs89#C*[5"err2uprr;lp'*%t.r;ZfrrVccrnZnX]YI*j! +rr;uss8<*"s8W)si;R*`rVucjs7TNIQBdW"PEqPuQ^*htPX8bt6ZA-ROHPZh6"W92PEqSM0Ro@P +PE_2pQ][N"P*;)TFSu19s8Muss82Wko0%STK7\c#KS,#0Lk'r+HUa*n>d1oVaMPjo`,NW2_S`O# +G'8:^G^P.$NK93cP`Mf`_o'=.`Poi]H[1!fH@C0iLQ7IYPEV!1`l#[3_8=%.^jL0QG("OdGC5@2 +P)YQbN5EEH:S=a\C2S'1E--,>Df'E7DKKl&B))9$rr2lqs8DomGB/h2Q^*glQBIVuQC +.KB+qG%6-8a3DiG_p$?E`Q$!Abfn5N`PKO2c..pc$O8uGe'Q7Qa2Z-tb5KE]ar/4<`Q$$Bb.;k" +:f_53_TU'D`Pp!Ec-48KhoKl\c,7TCaNr*tH]F;WT9Y_0PF.Z%Od/:BE^Xo0R$!SlP!ZhE'[3&OcYikPE8+;EAEH9Q]d\uR$O#'Pa%N#LGRH,_SsO;bK@p*ao]Z(`o4uMb/hfK +\r9W[934qc]>_P$`q.7_`k]^>e]udI#mC`%d*p4Vc1/j^a2,B0=AMV#hY7&#~> +%K$2*g"ZQ,qYC$gs8MrhrXAi(q4K#X,*Mg$s8W#lrW2rrrr;rrrr3Yin*fK$s8W)urr;rrr;Q]n +rr<#Vrr;pXrr<#rqHecDPF%W$Q^3f"P*_K!O=+dS30TMnP*hAd3)EY>PEh1b9p2$-Q'@T"R$Eu+ +P*h,/o`+mhs"!pFs8DUZKSP84K8+u4K7Sf3KSP>9K1^/h]SCQPH$Xa]G&_D2;@j3@!Wi3!#mCP8 +!!!0WCM\4oFouD.&cqh/rrE*%rW!?65B(dmF`__CAeP4Lq#Fk)!sAT.&QO%+Gt"Bs9Qb8oEH-&D +CgD%*DK']=7)JWsrVc`qr;Z]g>DSK/Q^3c)O-c/qOID=j7$EjtPWEJ2P`qH#QB68UE`?#%R? +s8N5gV52`@rr<#ts8Drsqu6Qo&,Z*k+<2D^p\b'krVulrrVlfps8W#trr2p.r;Z]iTV&']_Y=*. +rVccorVcp!rr)fRrr;pXrr;uppg&EPEh1b9p2$- +Q'7JuR?j2,OHbQ%o`+pis"!pFrr2RYK7ec(JV8N+JUrT-IY!-(KM6T$f>GA@_ns.)`5BR/Z?CJ< +H[Ga>hLV>c!iZEH$#?E,T`+L?arr +&cM1?F(CKKa3DcA_9p`O_oBjubS\LD`P]U9aj>MH$jUe%d*BbN`lQb08)Pb/h`Ji5kr=BZeTFbKiIoPa%`0Q^=#$Q'.K"P`R8-AN5m:R?Er"L,`"1 +PEV8m1JO%&O-c9'PEV#hR?<\\5L@fs_o0^8cHt(g-uO6WI"[?2M2$Y9U`PTd@aNDZM6@=l^Q^3c)O-Q#o +OID=j7$EjtPWEJ2P`qH#QB68UErT)UPF%8mPEM8uPa@]#R#u\UcI'q[aNM]H`r='Y`o4uLbfA#O +_l-^29heMYR_ct_o#MB^_SX[Fc-XZ:&eGc3c,RZ@n]:aN#eu3u7RLM/pA9@~> +&,ZD,g"cW-qtpBms8Mrrs7lR$rV-?l@NcjBYl+Csrr;fns8;iq!rVrprr3,VoCD21qu?ZnrVlis +i;WcTBE%r2rVLPZR$F#*PEhJtSW];%PaRamCJn8pPF%PtNBq8GEKlTSF=3',SC#"G_([&L5L\5f-bK8MRBV,q,HF)5An90b:: +A9E'4E-Xq2qY^BnrVQWnohUR8P`h?%N1,usR?X%t.tX.YOCV0Z@[*+@Q&q;"@ouQdPa7`$R['5, +PE_C4PR)DXq>U?lrr;rNrW<#pp\k*ukO7p1o[r[5s8DKe&-)S,rr<#h/fuAed/O(Fr:9jdrrrAc +jRMj)rr7K~> +s8NSiUo*,Ms8W)urqu`os8Vuqs8NK+q#CA#)]Bs&qYL0is8W)urVulqs8Murrt52/qX^2MUoho< +rql]ns8;osrVliqiVioYrr)iqAGl7AG*S/RQ'7K"P+@c%P*DB!1i#ukNg#fpP)VbA6ZJ?QRWKp: +N1?2tQ][T!PE2)pNDB0Hr;HZjs7uNdATrWXIt`]2HW,!:It`N.JV&H'7dSdH]ZIn*^r=4-aKBf4 +G^945GCFseIuBJQNj$CE_SF1+R=0:$H$k!cH['d]Its#GOcZia`4*n,^qjl4KR&)nH@'s_H$t@* +P*Cfa`5KR-,\PTQ*SOHr:E=AXs@QC=&-Q'[l%PEqGtQ$.KKrVZZos8Dcnir8uX%fH>(r:@P*YH>%$aS#E0 +o)A[hrr!6(s7%TV*?`T)s8W&frX/W(r77^6S"o*Es*t~> +&c1k-DJ5]YaN_lB_pd/U_8aXsbVI>^`l#[.e([4t$k89IcH4/Ia3)WNc-48K`Poj>b/M97`QQTG +\62m1>`-54_8aF:`qdd9a90H$aisb0A'e%^OHuH/Q'I]!SW];%PaRamCJn8pPF%PtNBq8GEKlTS +F=3',S=#_7O-#?]OIMDd3RcHs`5B74a3iI0@rd$EK8G>5=E]7GMhcq5JU`#2i7dJcqXZ*a@-rF;iD-g^m4NGje`6$-?aN)F`K9hgdQCEi%Pa7`%Q]3MI +R%07K:e>,\PTQ*SOHr:E=AXs@Pa.;qPEhT%R$a,$OD%b=ccjVUbK'FuiQ)PR`m2`IY[gL%8l&!1 +]Yhk^a:QA0_9LBQc,0ku)]5p-b/qTja9]_K +&,cJ-g"uc/rVZZps8N#ts7uWopAY("nKfD,+k?Vmr;HZqq>UElrVlrsqu6Tp"P<88kk"]O!r`&p +rVlisi;WcT#6+Z%rVMpprg#:+P*M9"NgQ&pQ^!ng1N"q1Q'dc&RYih289A;KnbG"pG)3"U,#1!!!$&#nfXBJ:;EZ@N,ae!!*3&"TSQ,"TeQ%*sNNcG("rn34,VP +E,%^0A"rAO>Zu,aF`hY5?haTsrVldEqtWmHQ^!`#PuX-6Mk?/sGU8Q9P`dY92NjDhRZs2#3,1L6 +RZs&%Pl?dUQ]mZ$P`h;;Y5A1qrr2rqgAV0OqY0sg$1[EPnb(brs8W&erXJf*s8;in@NH^>ZMaRt +nc&Of#laJTnFGf@s8RT~> +#QO_TU9!_]s8DrsquZlts82d2s7cQnrpCmL+<8i0rqucqs8N#rrVlfps8Murrt52/q<4-?V6AVN +r;6Nms8Dutg\rf)rr)irrquSXAWr7?Q'.DsR?!Z!PF%N%J2;'tP*MDuR$rmeAOqrMQ]3AKPl?k* +Oe%T%SX5J&PXP3Er;HWps7lEQ3.lj;JVSM/c%\/XH&$g!ItiSfA*r*i_oBU1aMGj@WdJi3rd+Tk +s*>H*H[:!mOHbfr^;%V%_304jG^4[cI!Yd;*-cg[L5h7TY._iq^;mg0F+J7SHZFR]H?ja\I>7`[ +@>MM3]t.*+Y+n@(CdUa%S`em5=)`&"F_kDip](-irr<#tqFHR2Pa%K!F`-'OIUOtLT0 +P*_<"PaILkC-%?CPa%GuP*(lnPE_H!P*TFWqY^6irr;oqrr<#Trr +9DI\RC2C&ga3;]B_pd)S_8aR=bfn5N`kBR>d`i+2'F(nrd)a2GaN2TMc-48K`Q$!Ab/M99`ll`G +XAi>"?C/LG_8jL9a2l?Eb2(-R`l6'Bc-4DYG>aHdR[fV-PaRQ!P`qGuR=I)20p7fhPF.er0kEn< +Q^<[ZLm4*gR$3npPF.f)P`7EKeB#VJ`lH0Kb9_@[Jpr>p1s:P.;0@\GJ9uou?Wc+jF` +-'OIUOtLT0P*_<"PaILkC-%?CP`h5lNK9-gQ'Rl'OHE:qbg+DUb0.fGaMu6Ua:HJ6c-"/9Dbj)" +:eGZ;_8l,f&&uH'dF-4^bruRQ'U?q[a6q"S`Lg*t6X71ipOE~> +$3'u$g#E&3rVlfos7lR(s82]np+%@..J*T>rVccpq>UElrVlorqu6Tup"8m)k5>8Yrr;oprr<#U +rW)orraPj(b#OaoPa7N"PEh;tQBmbuQ'jF"3f0/cPF.H)9N!m%P`Ck]=d#5()*[KS+qQRD-@kMUk1IMMHq:F[k]7L3.KYF),Z-65'G-"8Mot!s/?#'+R?JG].FV +$3C2/!WrH)!W`H+!WE'7"Ubl-E,oi1=VLrO!!!6(#Qb#."U5&-!+,g<(0>U,JPS^XWbPa\3jS;; +li-[5;KQtlI!7a:q>^ +%fcCOUU'Rjs8N#trqu]nrr;lp%fcG's7.KV(FASMs8Drsrr)orrr2lrrr)ir&cMY&eX*,1YNl,b +qu?Worr<#Rrr2otrVldRrVO`9PEM&lPF%JuP*_K#P`h<"1J'WaQBIH!OJ#9F3J!ETOYU(&RZs2& +Q7RrPQC*l"61k-S.K9;DpfMfnK7JH(:78i0M2KkJIYNT/Is=``ikiOK`l5a6`h[p"H['i5HG&r.THZsa]G]n7UJ:s#HLUP+; +_0]!tV.WtT41"D8kP=b%;KHnjGB,_+q>^?ls$6JZs&"Q7Q'dhq-]==[OI)0"4b]8_F@SKJM3sNi +R@&Xd4a*3TQ'mi'PF[r'Pa%N"Q'P,#r;QZprVucorr<#Trr<#ur=&W(q9ZFOY-P"%pAFs]rX]&. +rr;upr;Vj&)'5.Ds8VTf$N0r'mA6>CU!EN7J,~> +7JPraSs1ma3)WMbKm+NN0]j"Q'[]"P*_K#P`h<"1J'WaQBIH!OJ#9F3J!ET +OYU(&RZs8(OX>d=S"5k*0%JIpb/M69cIYF$I=crrIR]I.[=NkR5(A9\sR]"Z&"_nj1,^r=1*]tD.u`PU^9qYBpY[]dig^s0g@`l6$B +bfRlA^W+=1nGDb=PZDb&DI@]HUXm9"g"UL;DJN[0FtLbT7*NNia2,aH6A1GcR$EUXMjKloQ]mk$ +Kp[jA7m2Q_R$<`$R"RC]G*nDWR? +s8N/lgZ8>5"TJ>us8Vim&,H2(r66N3,"_h2r;Q`rqYC-jr;HWrr;6Kn"QSA0mcFHJ"9/?"rVl`p +rr)lOrr;pDmn/b2Pa7N"Q]Rf&QB[N"OcPe`7W=HXPaRMjQoe>CR?igiOHu"-PrFg\KVXosQAST3 +rr2rsr;ZSn;0n4WL4iorhn[1NdAS[SKS,/2>);g]J:DW[EboAV'F50P"9\N%!!<#t"q!5)Chb[5 +q>^Nt"8W!)!X0/oAnc$b#71b9!!36+!9mR? +%KH7CUV$?ts8N#ts8;fns82d.q>L?iaWMNB7K<2]rr<#qrr2lqrr)lrr=T&/s8Mih^Rh=&ZLn1o +r;Zfqrr:dQrr;rrA,Z>o8<9%!P`qH#OIhZ%P`_ArO-VOjE0-NQR>m2n4'#(DQAmb`QB7AqPE7MQ +Um-q)M,3^?rVlcos8&`iFbbO"JR"8o_8OCBW%!FNJqe\ZOoO+Jc,.B>`PS?nDgQVOGl)biI!U!_ +J:`Q9R`*%[Oa(u!I=6HdGBnL[H[U\kOo',Q?s7fT+Ecl27B1VpqrVuosr&JD9Q]mYtOt(jGOIhc%PEM)nPse/AQC!f&P*M;U +4[>9mR?Ys~> +7eYi+Apq>+`lQ6?`m)cJ`Poj`m)T? +JQH#VA$a4n_oTjm2n4'#(D +QAmb`QB7ArP`./DUm[O8KKR`4c-=;HbL2D:EJ]C#HrGXFZadWcS0iuAJ;&5GId,))o]u)FrVPK^ +ZG=/kqSdd&a2Gj3]Xk`#qY:$7\[]VtaN2BAaiqiJaN2B=`Q#j:i;``Tpo_-C]tDD(`P]=#^;S(6 +a2,C([_hn9o&clG2lN]JF#u84`l-<\ff`ANG'A"80[[hZaMu$8eld3^Ockii.X[SESsGS(P*2&p +6qC7BQ]mf"Q'E>44[>9mRus#"P*_#oQ'mu'PEUb^dEBeYc,e#IqoJf[iQ)PQa3;ZI\VaB`92JSf +[)9oSaT'6i`6?]Vc,kPF&e[s\_og*kaT'9d`O/rA7p)>Fp4*~> +s8N/ehWk(>#6+Mts8W)rq>Lg"s8Mr"+h$i10M#Qt>;#6=uH7qG+4 +((:cT!R11Y-uKhlko +Fli#erqcI]BQS9:F&n.ms82]ns7h^lR$*`!Q9nc;Q&h&nQBIZ$M(^M-JrZ1cPF@T"D_lQlSX,P& +PEh@uOd)6"PEqM^@/Km"rr;oqs4[GRr;6?grs.`Sn+6"ns8VTf!rr8trr3<%d3p1[8H8_hs7$!o +s8N&[lLF)us8RT~> +%fc@8UrN6+s8N#ts8;forr;lp$N'l%qQ(VV*+o'Er;ZZnrr<#ts8^&=+Za'Q'@Q#R;SIUOdMH%S;]]qD3C-KQ^j8)FZhFm]!Q@^3IQ&:om +G]<J-C+CGC+[_rd"Nj=F>UJN4?gK^nX&"AtsrP +FB*DAlM1>RqF>7@DfK\qM>I8Lr;ZfjMe8<=Q'@S$>*5)2Od;;rR?`U^07o4NR?O)$QZ"['LRj`r +OHYro6'7D!Q]m`%I:E3R"TJH!rr:^Os8W,t%/^#$k-hOtYHODWrVc +8+tkoA;\+8`lQ6@aNVlL`Q#p=aNDZHaMlQOdu=SC$qJ^ic,[fB`lQ)=`W4*Yb$iQG5'E3[RZs#&R;SIUOdMH%S;]]qD3C-KQ^j8)FZhF< +Q'7K!R>m]"P^XR=Q][l)DHP94bg"8Nc.!thN.cn8;LR9B\$iQ7,\D[ZJ;/PJLYpM6jm;d4hoE13 +\@T;crP/?F(rGr]bL"5D`6$>P@Zun;P*SFb*PEV.qOd;H(PE_2P:"78,b0.lIans0Zb2LDPb/hiLaLmdA;+aSb +;5_=No#MB^a2Z +s8N/\hXLLD#6+Gqs8W)rq>L^!qtg8m.jld!krWN2srVZTl +rr<#SrW)orra5MQE0uuZPa%Al1RF8gRuinoQCC]bP`q>nS!&r&,X-C8S;W_uSW0)$>=+L:Pa[hL +Q21FXs8DrlG\DVZLPT$,qtB$f_8g8#LP:YFIu$k2m`'s&Hu4.$5Yam<8432@(d15X8kDB==#b,+ +=]8I#;c6Oo=BSa/='5H&(0+C; +&-)@)UXJr8rr)irs8;fos7uX#rVQEgW@&l8SbE'_!ri/uqu6Wqrr2rr&cVh1rVZ8]V5p]@qYpNo +rr;uos5Z)kC?\$`TLZa-j>Yd:^F[^EKK[E=iL\@B8Z\@]&O^UCDX['onA@CE\V^U1;`^po.Y +Cd=hl8o8Hihs(1:s8DOJGACu9E&l_Qqu$Kopq9OgPF7Yu?oF(1R?X;!PF%D25t$^#Q&h8oQ'?D9 +NM)ApSX#P0O!\V,QBm`&PAH'Ms8)`prVccMrr +$hW1q@@"[G`l?*Bb5TH^`r='Yb5]Q_`t$5nS!&r&,X-C8 +S;W_uSW0&"=?i"8R%9@CH.'sZbKJ5Z>?6!!Kn;jTj4qk`[(BLAItN]>I=jtjhq$?Bp?hb)a4f8# +iSXRnro+mSjlY[`gYhD3n`AflnacA@lfm^"l0.?rlKRR3k^!'Io^D/;kO8-6nG`(Jo'>W.o_87Y +p%%V@in`n_hOcrD4f"lHChI@s_U-3DaiPWCE,p)6+LokA_SaF=Valc-Q]dG:2NO)jPb*\pQ&em1 +7#dV"O-buoP]\41TTG>/Q'[hs->Jm7QB@Dk@<0Z8`lQ9Ba2uEDqo[m=&')f:aiM5n@oH&p<_epp +`:Ct\`l,sEcH45Vd1-Wt1rRMUa777N`sBYrEDT8-I+\%@~> +s8N/Wh=U[G#QFPrs8W)qr;-C's8DunrV6<;irArQrr;urp&>!ks83K-s8UI.o&TcLrVuoprVQQk +r;HWps5!\SrA=NRpnqSdQ'mo&P%QM%R[0,'PaIc!1KTa,Q(!f#R$)hT>*,)0ir;ZaDqpn,iN/*()D#*l(gr@=..>O+P*CDCPF.PuPF7]#OZ=nPPa%K$PF.W#G"\*` +Q'RSsR>m.s23j>hPaRS?V"Xicrr2urg&;'Nqu$Bl#3P4@o^^N*rr;Nf%KHG,r;Z]l]%m/Ws82ca +rr +&HD?sU>#GCrVc`qs8Dlps8Vrp$ig2*q"saZc/AX"qYpNkrr<#qrrQ'RSG0nYp\P*_E#QB/iQ^Eu#Q'RVu2Hl31Octo4 +Z2ak%rr)cF5_FfBIVWZmq>K3l`M4o8JUr9%J:BcCr8,3-_8X40_8++1_8uSo!6"lU(rjP/]=u/$ +ai208a2>m7_SsF1`PfR.`P_\lG/M28`kop6_S?Er;HZV7$a%'P*CDCPF.PuPF7]#OZ=nPPa%K$PF.W#G"\*` +Q'RSsR>m.s23j>hPa[\CVYC,frr2urg&;Q_rr;uqrr;`,Z`gU:REPF)o)AXgs8EE(s8;`&f_>+> +r;Q`crX&W'qn])#SYYfTJ,~> +"nC2Y>b/\0`WXB,b/VI#aSj9\a:ZS8cH+M`gTJ$3aMc*@`Pop>rlQ5%`l?0Dbfn)G`lQ0>Yut1: +?&lY>bK7fHa2uEDqo7U9s2P)[s2AEdc-_DINg?,tOcj?3K:8*hQ^!l'OY^(%R$F,%QC*h_2Hl3/ +R$3`!QB[Xn>EtkKQAeFsd`TSPc.'3SHA7'$@TM:9h8HY1R2gF%LkUYU-gqKVc0r;HEap$hGCp&"^`p[[nIoBu/?oC28n+uYMnF6#Dqu6WhrV5mRnFQMS +r;6?fp\=[RmGci..s#AqUQRoV0oX,q`Q#p@aZqo24'PlP*Li)Nm#bfai_`FrlFuZiQ)SNaNhoK_6%EP:/+\\ +LV:XGo>hK_`Q69I`lZ +s8N2Zh"q!Krs/Q!qu?]oqu#IQs8W,u"98Aur;Q^"dd?>Ws8VllrVlisg&>7Tb#4UlQ^*f!4]6Eh +P`V5tPa7W"P`_5rQ^3c#P`JILQB@T'PF%MrOt:j>R$X,$:>#:;q>^Eh>BPaSMLe(fs7uQK_Si<3 +J;K&H[0^E9NQ4RF)uPJrcS9arc8fsG'&+WFEDJ:BfB=? +H@'jYG'J1OF8^8iH$FUTFaSX_DIFbuEIonmEGBMoNi6Pr/;3Egrr;rqprPjFFE;Ifch[PmK!P+%]#R=%Y3GES;WQ'G7gqu-NorRq/[r;$Bl +s8N&unEKQ8oB+p/s3LZLs7kI +%K>OdU?;@Or;HWps8Dlps82fps8W)urVucqrVlfps82fqs8W&srr2p'rqPcHX/iD`r:L$Hrr<#u +rr2rtrWC8=P`u*3;3O.@FdJ>SQ^3l%QB[VrQ'I]%OdD;n94jKPR@08*P`LnUG)hiPP`\erqYpEm +r:jH:KmeZ'55,$SrSbZ3V)`sVJ:`E$KK8>lhSR7H_ns:i_uI[S_uI[S_[j]+_nWq"_o8dY_SjI1 +`52Gi!5nfSs2,G_`l#X4`l6)q^r!h(_SX4,_YqCP`#?M/`kK1(_84(+Nl]2R:bm*)DGl@f@Tt=7 +mf*5Rqu$935]La]Da2MBr;HZqoKe_0Q'@Dj/o6f9Q'%8tP`q;nQBRSqQ'di'O-c8oQ'dZ#P`_;Y +8Qg1tQ'7Gt;TSe9rr2rrg&;Q_r;ZWlrVlT:['Qj:Vm#moo)AXgs8N&us8N#q!WE#rs760gr +%e%MO=fK9U`Q$!Cb/VEAr6##[rl,nub0A>ae'6%XaMu3=`lQ6Db/hZD`lcHJb/hU%a9]P^;I*L8 +SAEAFaSEj7aT'9[aSs1_b1*IZOd;AuOHVh*FdJ>SQ^3l%QB[VrQ'I]%OdD;n94jKPR@08*P`h.Z +GE\PdQ%_3'a2Ps>d+Us%J:3#k/(`G$f#4i-TeCSCLP^ko8o(2MQoDe?.n+#l6p%%SEp%%dul1"*/m-aE9pA"@OmHX!&me#ugP`_&gM_Aq5PEqAoQBIAoOd;2rOHl2u +Q]IK$NKolpS!B/(HV.IdPEq>lMajqt`r='Z`rO3Vb2LDQ_p$9Ja2501=A_[f=)#:c`q.7\`l5p< +aMu6@bgk:pccH+)!64TN$HL-)[YdsU +s8N2\hYmBOrs/Q!qu?]oqu#IQs8W,u"98Aur;Q^"ea2M[s8VllrVlisg&FE_s.GkcI^G^"FXFa/.VEGS#b;/^GrFEr(TH$ORUEcQ5EH?ORVDK&i;+AH`u +H?FFUH?saWG'8"NGBe.RH$jmX=t(.oEHu\:ApA9=6`d+Pki2%+s82cpr;Bu2DfC#@8,3)_rV6D5 +G*A2[R#*jpOIq]0PE_W(OdD5qR[P.\OHts!Ng#ltPF@r*R>uApG>afoR?s./g&(aIs8CUL%Jp,( +s8N&un`TK6p$191s3^iFrs&DWlg +&,kLaVX=?]r;HWps8Dors82fms8W)urVlfos82cts8N#rrr2os#laGJQE.-qoDJ7\hu3WUrVlis +1]I+76'[UuR?Dhl>^2BrRZs,)PEM/qT95J#PF7`#T9,8!Ru``&Ng5o>3/3`]Q'@S#p&=t7rqEuo +L4=i+:8Rdds8(m$^r'\MH@U3jKR\\Kn(P^n_o)Jjpqni'_ns=,_nj4*`NG'"_o0O1`59C-_8F10 +`Pf[3^;7_(be]p6\&#o"_ns7*^r"",`;[_`_n8SP*DB$Lc@kaSWKJ,PFRo#Q]dT%R[0&$O.MAqR?s,)R$3kqEa*Z_QB[c& +PXsL+s8N#trRh)[rVu`mrVlZC['Hd:W2TLio)AIb!<2ur!<2oro)9!prr;iHUn"$Pi;8$~> +&+%/F>d))c`Q$!Cb/M?@b5TTeb/hZDrP]#]aNVoRb/h[%`rF-[b5]Nf`lQ6Dbf\#Hrl>AWQqppl +C9GIsqoJTQiQ,EHaNDTF`l6$AbqbBER$Wn[:gA7-Q(!r'Q]mSsQ(O2*Ng#lsPFmr#OdhDpS;rl& +AN>U:QC +Km8&`CGVEE1= +"onDYiW&fSrs/Q#r;Zfpqu#IQs8W&ss8;os#5[-BkMQ=>b5PKBkX^u'Pa[b$Nb;^aNg6#sNg?-% +OI),qQ][AnOckupQ][]!Q'n,*6TU9rQBdbYG5;%,s8)U`G):p,?_I&hs7lNJ`PK=3838OsB827o +3kW4ZG'\B3G5QL]G5ZYYH#n%@AO$Y58nr9;=H#mhF=+pJCs8VuT9Tb^,P`Ipn +J")RaS!o7UQBdf$OB$"`Q^3c$Pa.Z!P*M5oRq?;r<.0suP`eYpqu-NorRh)Yqu?Zqrr<#nk4&$< +ma_=:d/O(F#6*EDn)= +&,Y"VWV6Alqu-Nos8N#ts82fks8N#rs7$$ers//6R&[Q!MQ'[_sSYFd6J,~> +&*L?3?FIkq`Q$!Cb/M?@b5TTlb/hZD`Poa4`Q#psaSj-NaT'E_aT'BgbIW@(>?u0V_u@gYaSj-3 +aBm$1aMu3?e]9\/PEhSu6&oSbQ&_,tP`D&uR?3buQ'[VpPED#nQ'[W$P*MH)P!D$fS=,V'@TUam +^!4aT3cft&G"I2*aN_`Q^U1el_a$.45[SqhGVZ_]h=UXAoD\:YoD\:Ymsj`jl14HEk.S@fq"+(D +md0?2oC;A>mHsB3o'u>Mo[:%Pht6L/m-a94o^qbDlg!d$p[[\Ep$CtSYf6P/ilOoAF)p)4E11Ti +beq6>@de;H1*A`q.7O`r*d`_o9X +"on/Sj8\oRrs&K#rr<#rr8IYTs8N#sr;Zd$nE96'iW&r#r`B$f6Bdb)Ne0]_Cg*BqQ'@W"SW/Vs +Pa7St67\4bQB[_D309nrO-"K_4-l5%P`n_pqtpEdrI871KS*rcp](*io`*dh`l2qTZ"/bqJqeVE +`5ma[F)q)!qfZ1gG'%qA@Rpb+$V"lNGBS1MF*W(VF`VVHG'.tIDdY@1$kZ0QF`__NH$t*dG^+CP +DesB7G'%A%*"WPk>A\kC)/3\6^A1C"W)(t+s8VinqZ$-dgHBV!G&_L\63$fVqu(#VQBIc#85`BP +RZNl!BM"DRRZMJ\>@W_ZR#df#Pa@])QCNqDEg(oFR$s/%:Y#@@rr)orfDZ6Xs8N&urVuoZme$>H +e,KBqrX/])s8W)Ql1!a2s*t~> +$Mr&DY5A8!qu-Norr2rtr;Q3r;?Qms472Ks"XKA6'.A!Ne0]_Cg*BqQ'@W" +SW/VsPa7St67\4bQB[_D309nrO-"?W2j'AmP*8Strr42:qL)\'J:M3Xp&Fphp]'*i`5?GIWF(E^ +ItW5IcfMsZ^;'9W%`6-#b/;61LQ7P&`59F-rko&X^r""-`Pf[n_A:85V2C4l]?.t-_o'7(^;.S% +_oBa9ao94d_T.t+Oc%/r_m_[NBeR9q8#)hRe`d&5q#C-hp&E`,E,Tc6Da46rp\Xr!JsDIfO@E&D +PaIJsO_74KQCedQ'dW'Od)2sR?a8#@;q?U8sYm,PYfp/rr<#trRh,Krsno)s8N#b[]Zg; +WLEATrUTs`s8N#ps76-rs8N&oiMW09U!NRc~> +&*'[#@^sD!a2l?EaMl->b5TTeb/hTBpr36Prl>)^oZ.'QaSsp\".MqXaXT/+<#sl14? +][aYDBl8!,@k-B`a2c\)HB=)RN^lrGQ^No!O(CeEQCedQ'dW'Od)2tQ]mhp?ZD6X9p_3) +MF+r#`Q#p=a8O09a:ZG4a3)]L`4r0U9M/&X9s;ISo#UjNr5AZUrlG,Zrl"lWo#M0\aN)#e?;OL# +R-&o~> +"omuMkPt8Ts8;lrr8IYTs8N#sr!<<%k3_R"lMpn`rr<#Er`B!`8!T=.OB$mrK2[\oP*D2pP*)$# +P*hG5DKeI6O-u+r9TbI'R[?cd7@TF'P]_3Hp\t'_:i_8FL42kjs7uTlr;#Eq^91;4Q<*Wk6:_!j5#"NNSH[:$\F*;eOG'.qNF`qV>?n`#m"qO=DEH$#EH$k!bG^+CQ +Ecu2CG%PD%#QP5BA9NQP)Ib7hp\:e(X+kHTo)&:`s8MonrMN)0Ed;G3DY=&.p>SE%Od;>'G"71L +Sro-[>rI\2OHi=^Hr"O>R?s&#S(OHZ8ADNpSWN09Ws9$mG5rr)orfDb^J#lXf'kO&!=p +$M_W9Zi:"(qYgEmr;Z]ooDe[drVufpr;R'"pSOR_[E84Br;QZpf)G[K=8_ARP*25pL?nqW,]1XA#OQ +;Y"L"D/VZ"e\0#>`:Llb_Sa41`k$qfNfL?\^qmb%_o0F/_o'F2_o0L0b/U68N/in-`P01-a2>[, +^qmn*`5Tm3`l#F4MMm=OK#bmIYs37bUAFV`Au:/smIgJUs8W)rr;EHXF`)>8@rCr=s7bJ=OcYio +7!(kKP+7Vq,$[!bRZNe)H@/M(OI;GtPamu'PE1lt>\oRj6&LemQqGa'rVcfqqu6Qoir8rW%f?8* +rr;]&Xfee,Qg"AGnG`%ZnbrmqrVlWVWgfNP`VY/~> +$K.OdB=c"&ai_]Grl+u[b5TTcb/j@trl+oW#0=s0bf\#JrPncVrl4u\$,jGf='9'e]uJ4naSj-Y +aSj9?aT'Cgbf\#G`Q$9K1l[]hOAgapK2[\oP*D2pP*)$#P*hG5DKeI6O-u+r9TbI'R[?TZ5a[^t +O_\CYaj88Y2e.GpJ8[9od_io=aNhl<]<=f!LIU#l3`T?5e'm7Op%A:Uq"#9koC;8Bq&O`lH-Cc,moAZ"$F!92J-T_8buco>^=A$H^?.^8>@9 +:/m/5J,~> +"omiEm/QeYrrW3"s8DlSrr<#trX8Z$r;ZfSoBPH0s8W)ts8UCD4lSi"QBQ>aQ&BZbPEDH!NKfcu +P`V/l:4\U,4boPiPV#n#P`hAV;05KsPEhJ7\G,mtoSd:;KR&AB`;f]5rtPG*ikrH9PH8K>pA&H7 +4$`2JLOF7@Fo?IaFa!_+'Q\A+=qM;M!!Gf/GC=gbF`V\JG'b7rs`r,i9qZ$Qps8MgcCNFT;F#VhIs8)G/G*SJ\ +=D2JJPaI`*AO:4#Oc2JTKml^ +#ku*.]Dqp/r;HWorVuiqrr;lpr;ZTlrVuos!WE#prs8PsS"ZaeebK+@rr)lJrr)j[iBiutO`F3^ +MfMp`Oe.\pPa@i'OHko&JWitpLRaKk/QJ(#P*^>dE(H+RPEo4[qu6TfMdM3jH&+r-s8)]o'DLM& +]NgPuA&e6>C1]\$q:ra*^\5PF_Yq@d`6,s3K8u%VNj6I:^qIS$`5BL0_u@OQ__KEUW/ch"O,g]g +_8O@5_na((_8=+.`5BX4_97UlNffWg_S=%"7Rr=4r;HLqS#KK1rr5=]rVlisr:i`pDfBQ42;%[' +r:P&QPaI\9Anb))QB[hK6#;pNN';fHIS=mNP*MPqO%XY]P`T$fQAgtaNK0E*^&7U'rVtmVrr3#s +rVlg'qnK;;X/q`BrVc3aq#Ba\$NL&(rUR.^R\7@jJ,~> +#2Y\TDn*^*rlY5[rlG)]!6G/Zs2b5_s2b2Zs2>#[b5KNbb/jP$rQ,#Y%E6?0b/M"s=B9!t^W+Fp +aSj-YaT'Babf\)faT'Cfbf\#G`Q$BD0U7ofE_MaVE`eNfSro"sQ^X/#Q&nalP>XQ!S<9$fn+,u9_:@2giFd%hP`f*\Cf?OaP*fW?Cm^?D5(SE:9Qc\b +Q(3bn8T^)VN`U7fO-MV]M2t0'c,KY&rQ>/]s2P)XilM,=s3(nn`l>N%9M7rR8XI<6o#UjR!6G)X +s2G#Xm)TLQaMP,o;,'o +%fbYJoDeU`s8W)us8;cli;WcV!<2uq#lFQ"s4d>6iVW?KrVlipf`"pe=d"i41lINeHs2JpP"%Q. +OHYitOCW3jP#t;$PETNQ?'(D#=N +EHl_OG'J7SFa/(AC)[0XrW$"2@s!$C865-PqYg'.=JD9bp%eF`s8Dilr:Xr:E,p8EGs&A'oSl%& +RZiYH?@YM&P*D2H>"4I=I8# +$hh-*_uKc6rr)iprr2rrrr2rlrr<#trr;rrrql]rrVl`p$NC(uPbb4]htR'Io_njjh#@9P4MP!Z +NKl>YP+6o'N0]Vr4ACp$P+7VED39u`8U6M`A5?KmQ^*h-FDk0?R@JRlq"=R]@;LLBKnaJGs8Drr +(B==4il.HlWeb6\p&Fg`92P3:`4j11r58KM!Q2eR_[s](_T77dNfK?hZc0i"^Vdqf_u[cmrk\WP% +`YN/O-GfiOL`BL`lH*^f(sOHYlC=[n@*LiJ,~> +$ephQGIYW2cHOGN`VmmXaoKN^`rF*[b5KQaapQ50`Q63Gc-=JTaS3[b`Q$-GagtAS)\c17QaD,PEMGtA8RHl=@me%P@RHpOI)5t +7rN-=N1-2Y3T/?3cU(c`Jr#(j6/g;8`59O:fZ(@efuqjdcRCa*gZ%VioD\:Vn,;c,oCVSI +ZG"#c]tN@pnF5i7nF?/CoC;;6`4isn]))0e +g5Bq6gs4!ZVa[&=7G6#)`l>g1`6He1iV`AlV +$if;Dq#CHad +Pa.MrF'FZrOASDfP*%b36fn(KI!TsUC,ce/r;[3;9lP5q +DK9lCG&qa(Fp<).G%2Eq$2sp,#8(HaH$tI=hY-[@s8$\pWF3%0rr;rsrVu`opNp%aEd2YC7TtmW +KP4MVQ?$#ZCfHagQ#fr$GE@SJK7SD5N' +$hUs&aSu5:s8N#rrVccqrr2rlrr<#nrqufqrr2rtrX&MkOK#:bjno#Trr*$"rr2ldrW)u\rr<"$ +rqEKuOI8+aPF%;LE5;:;+,MhOZ-rZOdV;Y:k31cOd;%m2Ep^*AO2'!KS=kC +jnJQMqu?NlrSGC]TqkQDr;ZfqrV6eXOG?5VJUBV>5*VM!P<4_jG +&($5DJ@ie>c-"2M`lQ6@`r='Y`rF*[b5KQaaoof*`lQ=$bQ>r.aSNmfaMu6@bf[o0941q5V8UHt +aSs0\aND[)aT'B`bf]_%!64uYs2slQs2n]mb/hTAaNKT;NLW1fPF%;LE5;: +;+,GfO#UfYOdV;Y:46STNg,Mb/1K3%74`e8LkBe)aj\J\_T'F;f>OmVQ^9nRf$;CYbL"r'f\Pre +l0[m6mk4"rnaZ5Em^^*I^:q@ihXU+'mI9W8oCMMBn*ff=qUNh$Vbfn6-aSs0ZaSj9Oa9p&/aMPE';bg).iIC~> +&-(#2s8W)qq"t!grr;usr8IYTrri?!rqu]nrtX5Xo],uNs8W)srr)lps8Duss7lWkiVmouqu?Qn +rqcZmFaKC38WK+"P\4T[15h+53as8;ons8W)QJ9Rf=M>.&LrVufmp[l=XH$+:UH?jd\G^4R_G'81LDerGf#R(;/!!rp%CiOT? +G]e.LrcnZpG\q+L(An.I#8'aOF`qnMG]e=OCN4< +"nJLbchIA9rrW/urr2rSrXf,/s8W)rlBe9JYO2;frr;usrrW3"r;Q]tp]('crquf`raPp*s82ip +qZ$D5G`dhQNg>imB4c`NMis5bO-#Zo1maDkRoDY!QV_X,A^Hns8VllpK)$ECd)fUD+HjCJUKbEPCH5PL-CKXP]0cN6]upeJq$a6O%jkbP`InfQBZ;e +HqT`iPE]-oQ&/?5pAb0ks8VrorVZ]brr;rqru1n8rVZ]is7lQlr;HTjs8Vlnd'BmZZ)4f!r6bKM +s8Mri_P*ToU@j$~> +&&)ppOhANL`Q63Hbf7WA`q[XRb503Xb5'*Z`lS)#)TKXo9iPD/YK+o2`l,jdDj8K +rlY8^s2G;_`l?*Bbfn6"aC<'2aj.rFcdQ'9P)`4rP`h8DAqDdrP*.nfOHu4iQ]m](<'GJj9Q+-E +PEqG&G^`t4OcNmSHSm`B@!I*LI!A)-dF?RdbeD*AfY_WBQ"asVccF/Kb0SVsf%oian*B<.nc&1\ +o5s9^na#f=m(C*K_Sj@,]\rAPnaQ/?na>u8m-jE4qprj)`5oj3_Sbd9md'*%naQGMoCMJEo(Vdm +[D9Dl_S3Rmp$qA2g<8sBc,I]@a#KcW376!ic-4DVai;TQ4'?67FDkt]2h$1#4,f5J89fbKLQ@KO +CK5RHPCQ)SJ5p?G:3i1kO?AVhP\jBI99kd+PZN'mKL45-c,[cDc,n2P`l5p:b08$"aeUa1f3=>>7Ub:M[JXo#UjRj2_SMbK@f4H;dO4A(lG~> +!rpd)rr3<&p\Xmdrr<#tr8IYTrri?!rr2iprr^jCp#l;R%K?>(rVcWbs8MZis8DuTrrL?jqtTg#LO"#bH$X`7G5lgeG6`P7E,/>i$3L,*&dh6JEHQAJG'8(P +H$=CVAiUS.qu@K;&PmIlH$FOYIW0.DD09r@?kWYS#6Ff(>m)$VFa87\N7IRurVuijQ@,EKQhpaX +r;ZQjs8)cL4`l$oF(RLeJV/nu:RH`*Lk9\GS!SRtKNquQ4&\16H]sj_P`h%jOc>`sM`jOjQ^dN&rX&W(s8VNF +lgEd4J,~> +"nALdde3P:s8W&trr<#QrXJo+pu.R9XL%KtrVlirrr39%oDed]rVufqqYpEms8N&so)ARe;uHOm +r:j$DP']fhPaIS7B1&;QQ'4=jSr$ZsNKochP-,.:7%/j8:k#QPrV]$8pQPc5*D"d4HYVjRYs +&%6:iR(gGU`Q$'Jcc3rD`o4u@`lQ/]aNDcPb4E\b`l5p@c,n&ObgeY(Q@_u%P*hA5B1&;QQ'4=jSr$ZsNKochP<4)>5Bg=HOHkYc +Lk\QIMhOKKH[p'WKReZ%HrX7rd*g:g`Q6$@e&j_:QRgS.`PKO;`QZ`eeD9Wan*B<.nc&/JoBkl5 +l1=]6]Y;1u`5KO.]AW8Ona?#=naPi2lg4K@fYtS=`5]X-^VT=2m-3a#nb_hJp[@eHqtn"5a2Gp5 +_SNjrAbGZ^leg"Whp'9da3&dHQ"#!ed`K\[`5U!@d^CK8F`qk<3.HC-M/#_LI7/X5CeL"SG=R9i +@?rrP3D4[]Qp6dsNBND`R$rpr7ZWn&Q$?/iO[$k4`Q6-=aj&&P`P][7bg"<%a +!rpd)rr3<&q>:*frr<#tr8IYTs8Dp%r;ZfmfCSS!r;R3(r;?HfI$AaFrqQUEm +rquHbs7UbDEb/$+KSbD=H\#[DQo]tRHqT0XIT1fP6A.R9OckutOGlDoO[>%oQ'IDi-]S+i$Bd?6 +Q +"mi.`fCo.@s8W&trr<#QrX8c)pXGS/X1J'*rVlcq#lXRGPB6Bpq"k!ir;QWomf$;frr;rsqu-Qh +oKAJ&=E'RkQB=+WrVuWjrtXA*_o'F1_o0O6`Pf[4`50F4^5[l-rK)JjOGpE^`Q,j7_SX41 +_SO=1VN-UqP*M>sOH,=2`PBF0_Sj@+a2>g9^qYtjR>d,nMj]`eMo28H%07BH5_;.1O-#QlNf#ugO$J\kQ'DH4N@0_b +PR*F2QBk^>s8V`jrW<,urr)larr)lsrr2p4p%X_@8mCugpAb0krSXugYck"$o)$f5#lX\paJ5H" +U$I4~> +%^BhaSA)kY`l?0Kcc3rDi5c#?aNDa+ar8:3O@rSXDS+0;bJq?6`QZe:G>ul8`kf^8`r*pU`WXB* +bfn6$aC<0-`lH?GbL+GY.#sU#GF"GYOZbdmN0Tcr2O0DW7Zs1)PF@LsO_.gJ=D*__6$n?9:5,!$ +GCP3sK8PD;J:)_ie()OXcbd]:b0JdOG+;lce'6(Sbe_EFdGNI0nF>u7mJQD[mI'E0nal1_\@oZV +_?[lj\_clHn*L&BGO+Yan+ZD(]t:nh_8="&^:ie'm-Es'o(DMDmdKrCo"r)_]thh)bJh31qY9^R +jNd/JbfS&NcIb+FShAF;cHaPO_nO+>dUGseA55"5KS"u*J7<>]3JW689SSg^J_o9X>bf]Ou+j/'SaMl'7`lQHPccOUW/hoN7 +f"fDK_7Q">:e+8X>I25qaT'BgbJgo?;G9bmb('~> +!rpd&rr3<$q"t!err<#tr8IYTs8Dp7r;Zfbh"'q&s8W)us8MroqY*17IRTb+s8(XP6i-i]rr;i% +@[!$CQB7DoMCaIJPF%Dh7$*KtO-PokR?9F!##DB8o8QiFF&4XGBS+P +B/gJ4"p+Z&'*AIM:3(Q(F`MSJH?O^[Ci(6q#5S=/";tclG^"Ooeb&e:rr;rrV.?KXJGB!9s8Vrq +s7H?Q2eGlmJ:i9%Ko(M(6BsTVMMkhOQ%DDVH;8-NG`eDZQ^XC5I@Wi`Ng,fkR +"llJUh=pjGrrrE#rr2rtg\qQ[rV4L*WiNo2s8;fp$iK`]N-dp]rr;lqs82fos6fmcs&AjprVlfl +Zs\uV5Eh1pOGYTCQ]mbuMFm4_SX4. +ahjU$Mia0gQ'.;mO,^`j^Vn(.`PKF+aMYa8N.dFZOcbfkP*1c^`59@._SGmFs82fqrVE:#WIoZp +r:p +%]O5WU;"L]`Q$'Hcc3rDi5c#?aNDa+ar8:5KhtlTF2#i>ai)$1_opLTHYP0Yd`fJF`r!jU`rF-[ +b4E]2>\).!c+Ca3b/MKO_aC)d6+PRk_ofj6c-4SmeD9WlnGr%Vm4Ro"n+Q4^`Po^2`5KR0 +^:E1mnaGi5naGi5oDSF4\\>ho^q[Ru_nj%Mp$_>9nG`!%lLOK7s2;Fe`l#g9aMc'5_>O3*p#aQc +fZ;+Ua33(n=.XVMd`]SOa2,mFakb2i?;"LNI +!rpg'rr3<$q>:*frr<#tr8IYTs8W)tr;Zd4jP]Xro`+mhs8W)rr;-.ZQ'RXnme?b?r^["drVlis +rVfcVP'g;pQBdaiCmL0KPadRtO^;shQBdi#RX.q"=[%=0I$[0CK7eM6P;J5NJV8c4LkgD7F'/,2 +rql`os7uZn'kio7=.[_;qYpEms8;choYQB/F`V^'F8p@fF)c%o&-r@=q>_-87qup_Ed)\OHZF:G +4qIo)"TeT&(BXgH%SCY\FE)2>GBJ.QD/^R"!s/H&!rW+("W:lmG'81heF`_;rVlcqgKp2E;qLaB +r;Zflr;$0_OWfL5L4k>g3`nI[@[`LHQB%8t5ET,mQ][i)P`04@OdV;O +@#gC@m/?bYqYgHmrr;o\rXJi+oV>N5QB=i5q>^Egrr35^lgXH4dJs6prr;m%rVuooip6!os*t~> +"l#rNjS/TNrrrE#rVlish>[ER$2s_6TrY66qYg?irs8Ps8s5s=\s8W$]rr;uqr)8N7 +G>s`kQ'O+?QB7DsRu9Uq?>l!mQ'd`'H;d+34ap%MPsTYHK6]P@15^X4JqSf3KmSPo=S;Rhrt+u) +rVL/iW)]G6s8)]ms8W#rs('s$_o'F0_o'F2`Pf[1_T&p2KSbeSP`q5kOHGU/`Q-$:`PTI/]>_a[ +I"$p4OckfeOcbZa]#VY*`Pfa5]u%\%bD1J&PDPQmNKoTgMi5Nj_8F.*pAb0jrVuipg0^2B:Y,:= +s$char;-,J+GPN&K8>;5Ko1V)7R2-NJ9j\>K1/0f<]Oo&R$!VtN0KSjO'$RlOe%f&N+SE=R?2Gs +Nfls"rqlZkrVuiqr;Z9crr2utrVm`6s7N-cG*.bSoDS^fq>^E\Z*^d?Y++tZdf0:Hs8&Y* +U"Y"~> +%\RTNW4p3e`Q$'Hc,R`Bi5br=aSj6eaMko?<*<@N^])=e`504+bL8A-Obt@*`QH0=`l@/^s2KN+ +a3)ZPcIFdsML/KmQBRUgCmL0KPadRtO^;shQBdi#R!;Im<]b\&H^7'EKnXn:Ou&#JJ:iQ0LPC23 +E_tN>bf%K9`P9L?ges03^QB[>?Q][\tEaXob0Z_\aa26!Eb/hQ>_o9dBb4D4&CBS;MTUMGXarKJ:WH,I>3E1Jq?O%antl2 +q>^Ens8037UlA^$g@5%?qu?]mqtTg#LO"%AErgE,rcnHc"DV'O!!Dur%LGX?Df]rCF`htRAj@.7 +r;[N4!!!*'":e%@E,ol7F*)eSB5]($rVup!r;^.)!!O6NEcuPNMU_:trVuoss5URlVjV/rr:]j\ +s82iV7mVu]I>N?*Jr=o*JUgBUb*NQ&_H+QBR]%N^neh +G]N]Xs8;iqrVliplM_7jqY'_\KqFQr-hIB3qu-O"jlu7%mEtt6df0:E#lXf'ro383l2Q8~> +"P'HJm/$Y["oeK!rr<#Srr2p(r:mRnWiaPCrVZTn$2jNaOH,Ge63$WVs5j5]s8N&srr)fQ6'Ia/ +I$'YZQ]%&pPEqPpG?BndQ'IMuPaRe?,@3DOsK;MTUMG""WEIXd$$H\I*,JUp="aSku8qZ$Kn +s7s!/TSQjmg$nq>r;Zfnrr3#T_#D7L_Bm+:_oBU+HussmM3*pbP*(liOKldEa2>m6_SjI+T7;!2 +K8YhRrK)>aNk39J`l5m7]uA+,b)(@jH]4,MOH5NhP)P=<_nj:/_"Rg.rVuoss5UUnUQfu$q>UEor:RS*YcY$qmebH3s8NB'rqG*@T:D\+ +J,~> +%[q-FYJA/ra2Z9Jc,R`Bi5kr]Z.q1`oY9g`l60D +bg"PG."mj[JX2ObQ]%&pPEqPpG?BndQ'IMuPaR_;;cJ]83_t0O^;e(:daFR`SW$pl`6?BK_p$6@bgG=th=0t,qYKpWn*TT8rVuf2]#i+-85F8QO,%jIO#hGs@X1R4P*hB#P`qM:FC&XM +OI2;nSt)+1R$Nb&KofeBeB?+VbKJ&L`P]U4b0':r+i_F;`lQ6@_o'F5eN%uLR?Iutcbd`C`k/?_ +:.IlS:9D@\aT'BgbK%8Z;b9SfWIO~> +!rq!+rr3<%rVZTjrr<#tr8IYSrrE&tr;Zd$f&Z8aqu?Zprseu*r;67MHD-@]Ab,fti;RQmrVc`l +OEHYE7?j7&Q^3o#Q'[o"S8hVBBpXsGR$*_r:JZ>'NDVQf'A +"OF$Eo(r7`rVcfshu3ZTrr2p(r:[.eWj("Lrr)cp#laW[G+OVQB(l*$q>UEonc&Ofrr#[jOE6G= +6^!guQ^3o#Q'[o"S8hVBBpXsGR$!Vo:/-"uMbc-^<+p]5L3YX]Jq/K1Itic-I>hu0?U8AqqZ$Tp +p\XS]U8L_h^X3#\qZ$BjrVnP,^r+(._ns4)^VIY%^:\f;I<:'nMiX$bP*2#jYf"E!_SsF1`5%sk +G^OdcL5_8oOsZ9NN4R'Ia2Z$6_7me0L3J#lKPuR.M3!p`PDtRB`5BR3_=dj.rr2ppo'YX[NhBmc +rqufpq"=&FJ:W6)L4>#0Jqnl3ItWD"A:JT0?U&p"P`1lj7n//oR$!T&L6soC;O!K2Od_JoPE_>u +QXaTiP"YQFrr;oorVl]oo)AUfrr2os#j"RFP`(TAEqfS5$i^2$p:df;Y-",UqpPHNs8Muqpt_a; +S>FP^~> +&!L^?[)0i$a2Z9Hbf.K@b2LGA`rF3\a;Mt1BinGALVM!SaiDB<`Q?LRF/P=c/] +s2OTMs2K?-aii#ZDI.mK7[KU+Q'R]!Q'[o"S8hVBBpXsGR#dDi9MTo!N)DQh=)3>ALNP:QJ:<') +I>!9!H&-,u="d7jbKS)La3rL'RANie]"?eG_TK[8bKSAkeD9WaoD&+Qna5`6pA"O#_8sF:aN2BD +b/qT=^#8JOnM9V,o_ACahnQnC_8=76`l>p5_nNeIp@7_Fp%eFVo_uV6`5K^!_Tfs9a1T'o\b5[g +oO-b+lIR8cXI?(lc~> +!rq',rr2uprqlrsr;Zfrqr.PRrs\o(qu6WqfB2GbrVulrrseu*rVZK">E5>=P#B^*ir8uXC&@i- +rU`IAQt'p!Q'RZ!R$*o!Pad\6G!(_MQC3l)OH)=tPa%Mt6#f_RLOk)0.YiJ0KR\f2IuK)+4)\qU +@CK8*qYpEbV/`AbEPf`Fqu6Eks7uZkq"2FYH$+1NG'\ReI<]a;$NLA.!!!&t!"961F*N%UG]I\7 +4;@tq!!*-'rW!]8%o."]EcQ;JGBdRC#Qb#,!"/c,$OQe49*?&>EHQALNn!Xtr;QZns5<,+7BNOd +p%eLJQSF2EJ;Si/JV8]-K61U(7RT'p2*=<,@WFmsPEqE%MDAS(QBdf&Q]YWf7ZWmsRf8T^Q'do" +Q]aOmQ=$Nhqu6QorVlipli-q^%J][`Q]mo'>-\,'rVQEirs.cNo^hP#s8UOH!r`#prr3,\lgF-; +J,~> +#0Ng?p%n^erVm$"rVc`qhu4/brr<#tr:QtcWj::Rrr)iorsJV2=H&c3O]9g/rr)lnrr)lfrrflPE)f^ +_Sj:0`5]`fJTc3bJUDp!MN3aZP`q':a2>s:_8VGHm]qra;#KRSH.IY*-(Kn=n$F(/-<6Sgb]4[rF]F%86RP`_Ai0OBp,PEhAtO'QZEBSS +qpPHNs8Murpu&!?R\IlR~> +%uk77[_^#&a2Z9Hbf.K@b2LGA`rF3\a;W%2B3J>AMS@6UbK7cDa2lPr:Q_K=N'=DhaSj-YaSj6a +aMu3<`pq,ua2Q-Dd`s4kN*^=gQBm\uR$*o!Pad\6G!(_MQC3l&NJf\jPEV;r6?5qVL4Xr(,_CB! +K78N*HA?uj2JQi9:n0>]c-b(iN+&<,DSa-&f?D%NbJM?EdGNI0nF?&@oC;58n+?MR\\$&*`PfR/ +_8j[;`4ih>naH#9oCI,"s5:c)]#;_._SaC4_nNq$]'&\Pmd9WAq#C02[CX;p^rO7*c,m]7]!Jp< +o^VG3e*PZ*`5]a9e@s5[1nBsoe'cdcHPpjDG_CBnItE3!IVrIh5s[4b0fVHp>AH>UOHkutM(rA$ +Q'@T"QB5Eb7ZWmsRf8ThQ'do"Q]aOiLe_o9^>o#Muo_o'Rs6X_U^+9N"KU_:$C3bK7rL_4=Op6s5h+~> +!rq!4rr3<%rVZTjr;Zfrqr.PRrsA]%qu6Wqe*6;[rr;lps83?!ANZ2KSt;4=^#Wa +EI1)5MhV!$nOo[X7_cp[eboCGrr*Q1qtTg#LO"#bG'81ZG^OF6$Np>-"T\],"9Sc*!"BE8H[C9g +FE;1X(]jd@qu@Z;#6t5/!=VhGGB.qWG'[aV"onf-!!i`.!!*3$!"/i?@rH@3H]?PHrVc`p:]0M= +p5sR*Efg")2aE"HLOY&5Jq\r0H:UA"?"IVd7QlfpP`q5*2NO&gQ',30PF7VtQ^Eo"3]!1fP*qK! +Pa.E!Q][Sa9pUEEq"jmfr;HZ_rXf&.qZ$Elqu6G+Gaat[C$tourr;oqrsJ,Yn*oo#s8W)ts4.)K +rVca"r8R/6mJMJ~> +#/d4Bo)&Idr;Zfq!WN,VrW2usrr36#oV&:eY2f?SrX8c*pLBAOP`nbhq=jmg!W;uprr)lfrrsQB[YtR$Wr$J5)5YB)2<#s8;iprr<#frY,>0s8)cos8N&rBR#r2Nb\+_rVlfr%K65"aL/7U +Z('GBrr2rJrX/W(s8;cOV4O3N_gh~> +%u"M4ZG=N"a2Z3Eb/M9>b2LGA`rF3]a=>3I]4,&K>*cqHb0%rNb/hZKdS>diQ]XPFcbmuM`l#g; +b08)PaMu3<`q%2Kb/qKCbgD;[Cj>p +_nj'u\%BMr_n`mlg$n7mm-XKAfu(2-^:_.r_na.0`kK$oZ/b<;iop%+s7k'L[_g&$ai;69`5]a3 +]XG0>oBc&.ea_D9`PkutaO8/KfQCSt@WpCq+YRt^IsQZuIt3)uG==_i=CPcV6TBs^O,Sre0o_B` +Q',30PF7VtQ^Eo"3]!1fP*qK!Pa.E!Q][Sa99+$bdE';O`lcBB`P][9b43f%&$d`r=$f_6S/]7nHWPQ+k>\ajnH>a3)TG`LTmq7TPIu~> +&-(GCs8W&rr;?Hhr;Zfrqr.PRrsA]#q>UEoe*65Vrr;lps83E+RmWC*SV]o5s7ZKhs8Vu\r_rjq +s7lWhJT.&9Od)&qPa7W#QB7>tQB=-bOIDK!R?O#,/7k33QC*Rg>TNR[RurVc^ilL+35 +;P^B^7k0@FLPUbAJr##)J5/7=FEVPHDf9VXOI),qP_plKPa7Q"LamY4Q'df#QBtiBHBst_R?Nl% +P*M>sQ],fBN)0BOrVl`pmJ[k!s8Drms7uEM7@]a0QS\72rr;uqr;Q^'mcs92o%F'Crr2rJrX/W( +rr<#tipQ='rI=~> +#/Ht@o_\[er;Zfq!WN,VrW2usrr39#nt<"cYN>QXrr*W1rr2rtrgZ<:P+.8!q>^0gqu?]or;QZp +o);\irVuZmq1X"E-6#8EGoH,1/kT.K; +s8N&urqbpOq".FVVaZPa%K# +>X<\%R?O&&Pa@PuQBRYoDDd;Gr;Z`ps8Drrs8VQe&,cJ+rqufnpuFf3Q]mdpp&=sirser)q9-4P +Yd'YHq>UBnec#pSs8Mroih`6:T>5s~> +%t\81Zbji)`l?*Db/M9>b2LGA`rF3]a=>3I\m\lI>*ltIb0%rQbf\#LdX!U(Odq(df@Imd_T0m< +b08)Pb/VE>`q%2KaiDZCda)E-O>2i^PEqArQBdbtPa@\u3&ZkeQBR`#Q'Wq/Q][W&N&Op#:kKR&)M95JZgFE_\4@NRe-D0MObN5bK@lG`Pom: +]XbKEoC2A4f(7\?`5BL8f>u+YbVPNX1GThpGCYh%);bN4daN2KRa9ou0b/_Pr<(08ULO]~> +&-(JEs8W&rrquZjr;Zfrqr.PRrsA]#q>UEoe*6/Srr;io%K,ttGab"_R96cjrVZQls69M]s8Dip +q"n3@13/GCRZEStQ'.SuQBmbf5$sP9P`h>rQ#eUAQBI]$S2#SLFF&IlK8k_L3gNbaiCQ:P0Or;Q`rqu$Hn$Ld +#JHk?pAP$irr)j!r;HWphu3ZTrr2p)qXC&UXg70erVlfqrVuj(s8)Y;R?`o$!cGdYHH[:$dH?sp^GC+X^Its,KP`3`"_Sa%#oD\dh +s8W)piTU=?UhQPfD0gehIt!$)IWSsj3__JEFDGZ6F)Gi#?&k;@PESk*Q'mf#Q!HG:Q&q,oQ]m1X +BoeLBQ2[-MPQ-mZQ^3Va6fmq>rV-86kofrr +%t7o+[):#+aMub2LGA`rF3]a:$#*\R/WG>FE7Mb0'_.)pHCE`R%_@N/a3"Q-R[t_oKd; +b0%rNb/VE>`q%2KbJqHBaj`Oi/8pZ>RZ3GrQ'.SuQBmbf5$sP9P`h>rP&;h3QB[u.ShkqNDfg;U +I#*T0Ll.CSK7@DoA8?.%GBe4PDJ#aiVK8j7WHEr;Y$Q^rFI7^VIk1b0J2M`Q,s4\EN_Xk54uS^rFF9rlS9ec-FSU`l#d7 +_niq[o_%n=f_++E`5BR"iEbCX&p2Igl[LkC;2JTYX)4tT&RCO:)?F`M>6=]pWJR$3e6OHl5s +Q'GW9QBdPoQC!ej056K3PEl-6s-*JJ&snoDKfmW*eAf>Gb0%fE`Q$!AnAlfoaiVNHd+WbPNfAfH +0u_AZ`l?*Bb/:Z9<_Gt[8rLF)aN;uR!QN7\ap"hH77L4*J,~> +&-(MFs8W&rrr2fjr;Zfrqr.PRrsA]#q#(0ldd$)Qrr;fn&,Q*u4B[o9KOXiYrVulmrTX;[s8N&r +s7tnGM3=0iNLZB!QB@Q#Q]d\M/!5mYQ]dZ%PVI*GP*MGuNIR%ZO&S)#K7eu8LkgS4JTF@c8N0CX +Ec6,EF`_Y"Oel."g;D"SeboCGrr*Q1qtTg#LO"#bG'%b;7Ks)"!!*!!rVus%!W2p)$:/TIDe(j< +!s8T&!!EB*"pY5-!"9B(DKKo4?P!2C!rrE$!<3)s!"0&F@;^F:IZN"MrVc`p5QC':nbDoN-\$Q! +It`f6Kml6]O37+Q5C.0mEHl8B9j^/AQ&grmR[9;+PE^um/:a4UQC*quQUOo:QC!f$PQ$jIQN*3T +Q^)-BpA4gdr;Z0`('"11s82Zlp/$j9Dts&$rqucqs82`nrsJ;\nac8-qZ$Qos3prIrVlg"jmV^* +rI=~> +#J$P=q#: +&:%T'[DU5/a2Z-AaMYp@!oGo)$#.bKJ#Pb/_oQbKS&H_Sj@2 +_nQ!@q=Eh&oA%O-_oBpR`PB=3eN"gtGD1R%N.HFs/3%dWgW;*hBln'-@;8).3.d6POI`#3Q'[]! +MjQ&GS!K?JR$E`!79,J9Q]m`!rg!MLs-3tYQ +&-(MGs8Muqrr2fjr;Zfrqr.PRrsA]"q#(0le*H5Rrr2utrqufqrVm?#b_Is=QqcZ8s8Moqqs")/ +s8Dutp\B_ZOHGfqRZnI>Q!!!'#!WE'%!WrK+!r`0-#8UikI!1(#eFWY;rVfRL +m.()H3GF/'K8P>2L-SK&o^_kVs6DXoFE:eX8"[)a?BUeGO-#cpP*VK$Q>/=7R?`l!QBcbIN0fct +PEh>uQB[]#PEh\s8+uoYs8)Wmn,=(%rVulqrV=9+R4aHks8Vomrr<#qqu6U&p#tr;o&99Arr2rH +rWrK%s8V3Lna$+'~> +#IU;=q>UEmrVccrr;lothu3ZTrr2p(qX9fQYdj<%rVlfrs8N&ss8NT&c%[m5P=XX(s8Mrrr;Z]o +s8VWg6N-f]s7uPLAr_tXClNZ(tWfR[8tmR?`r$R$O%Q2Mmie +OHl,sH7Y#APa[f$PF%T"QBdZ!Ru0]0s8N&prVc']!WW&qrsJS;9pI2bo_ngds8N#trseo&qUr<` +ZETn;q>UBnec,UK#lXc&oVe@PS@="~> +&9M/u[)1&-a2Z-AaMYp@=;Fc,e!'aqrCI`1pueMN'L2cI0kPaM>g: +b08#L`l@Pi;Td))b/i.V>`Y/:R$`hpR[B>'QBRK#78/`0QBmc(O)?S2PaRl(S",k/OGnos;DB[f +Edi4aHtPRqhq[=F.nrl,Vlair/ieD9WaoD8Idm((!H`5fsua8X$Y +a2\(rs2P-+rr6`e[D'Q!`lH->a2c0@aN2B=^Vn.-o)/@aosqc[_SX=/`QQ?It'43dEp(beD&7oDIR$I0//9UPu*@*RZiu*Q'.H#QBib1 +2MmieOHl,sH7Y#APa[f$PF%T"QBdZ#TSPGTcH")Gb0%g)`W=0'o#N*!ccF/Haj/A24Gb,&e^Vm\ +aN2?>aND`H[t[mV8l&',]u\::e]@d1#fk*6\l_Bk:Nh6~> +&,tPKs8Diprr2fjr;Zfrqr.PRrsA]"q#(0ldHp)Rrr2utrqufqs8NW,qZ$?^k4G$YOSf"Vqu?]\ +r_rjqpA+ab9obO.QBRH'O-YusPEh;qO=#jLPEM/oQ]EhGOHu9"OI;2pQ^O&&7G7J/X\M)nF+[0[ +s7H<`nGdtoAp/066)12P2Xf\@_o^I,rVulr?2sfsoYQB/F`V_94WG(7%g<:L%LrpT#6kMB#mLJ6 +#7s72:b<4e$jd+>"pkG;#RL_>"9nr.!=BQ2Ec4_g%L<:J%LNOR$NgV>#R_.R$O-tN+C]M?F+0+u +oDSXdr_;VAr;5bCL4P/.J;K+YkO\KKs8Dujs&@]A6Z'g8r:TJISVNf&R$uQ&q87]`7a'qZ$!_s8N`-r;Z8-Jp(;lqYpNpr;Q`rqtpBm$M`fRoCCu5 +s8N#tdJj1G"QSq>lhc2~> +#IC/=qu-QnrVccrr;lothu3ZTrr2p(qX'TNYe'W-rr2oss8N&ss7m'&p[RA7P\?$Nr;Z]os82cq +s7-(hrVQ?es85ZPQC4#%Oe@\uPF.Q!P*D%TMNj*NU^9NiFrcK<-GC+dbG^=^_G^4X_GC+q!Yf+8TG^+@OG^Xm\H@'f5GlMpsGBe^mLqU^D^Vdk[ +s8W&sr_NFVo)J^R4+i'=H@CX*9]kpAs8W&to)2>669f;*p&+OO7@T%%PEhB"Pa%Q&OcqSOP*D)p +RZ`e'MNO*fQC*l&Q'.DuQ'I>m=hXk3r;Zcpm/@Ils8Vrqs6t&YF'&,2rVccrrr~> +&9(ot[DC)0a2Z-?`kfR8bf\qds2GPkaN2B?_73ZV>@OSOcH-"))p$1Gbf7QFa32TcM-+iNd*';I +_SsU=bf\)L`pq,JbfIN;dapO9R%Kh2O.2/pPF.Q!P*D%TMNj/P*2#nM2=./ +gXVBC.oT_g/^i=qf?_[u@j#-$FE0R:TM-ind'17%^Y$a/`_ORrbgG=th=0t+q!6AA^U;(o^:q7o +^;%M#_SX4*]tV;!iq_f\ZF7l,#+i]g=Oh/Ne*aiSuQ^!_)S(,?nbf\/PrlG,^o#N*!bKS&C`mW"1Cgo`a +dEg%YaMu3 +&,tPLs8;`ns8Mokr;Zfrqr.PRrsA]"q#:^AW?'e7Zrr;uns69O] +s%iHc@$6buPa@N!Q'[c%M+N\sPae#&PF=\-PF%Q$PEqT(Ng-,j;tp%dqXWNtA,,]pp](*h +s7uWAIW9=>Br6DYEq\8-bJDa,rVulr?2sfsoYQB/F`V[m0fUU8/ho+<2)I'C/hSY,0JG+1.PO2) +6p!Y#:-_366UO(%69m[s4?Ykk5=/"FG&g>M6V:$G5=&(=6VBa46q9mE8OPKu5\>+\EHmGloDSXe +rY,=pjmW59>_J#aLkUG/E;BP1s7cNm.Ja#8_s8;lor;Q`rqtpBm$N&rSoCD,7s8N#t +eGfLJ#QF]%ipZC&qg\~> +#I'r;qu-QnrVc`urVZZphu3ZTrr2p(q/s7cNm%eotom/$VUs7uZnU10ONrf\.bR$*_rS!&;cQ^X;,P`hDr +QBdetQBda7Pl6pJPQ,h/o)Jahrr)iqs8DKe,PqH?qu?]b7u]=Kr;HKiqZ$Tprr<#qqYT9ZZF$m2 +](l:(s472Jrs/Q$q59mWS@*k~> +&8kcs[):)0aMu6@`kfR8bf\qds2GPkaN2B?_6m@X_Rc,fn')90hDcd'kW`R`Ue8V&\Je'>qF +_SsO;bfn5uaAU70aNVeW:Q1[0Q][\sPEq>tQ'[c%M+N\sPae#&PF+@tP*VH&Q^F5.MN*dF6Jp/< +dEK@:6.3fu_90^=cH=\EDes?(AtaZJB'.4FaLo:?bPoLfa2uQQhpgKOnaZ:k^!+OEd*g4`bg+Vb +f\"Tue'ZFabKA-$dEL+qleUCOhV[/Fhqlu8e(*%&gYCN=naG&ahObfe/UaO8^n9oY'sQBdf(P*M,u +P(8a_R[BA)P*hAtQ'[PtQ'M?5rg!qZS +&,bDKs8;fps8Mrlr;Zfrr8IYSrsA]#q>UEocg0cNrr2utrqufqrr3K's8W#i?qQP:]_qX+r;Z![ +;Z$Lcqbr?8Pa7Z(Occ6!Q'@JtQBm_sQB@VqPa[euR?!l%Pa@PuQ'.Z"O^#Nqs8D]lqYBp]s7H?h +rVcKhqSb(*D*P,!4Dn8Igr7+JeboCGrr-4'qtTg#LO"#`Dfoo.DJ3NlBkqO#BkV'hAnc.#Deiru +<*a-PA8lI*Ec?#;E--/8DJj6(CiFE3E+sTED/40-Ec?)ADK'`9C2.U)EH-#:CM73rF)uGKN7@It +qu6R,qs3JAqOCT?JV8Z+K7uYcr;6Kn3r]'WrVuosqZ$Hmr;-6;:7RQ6R#mMsQ^3i$R#mVuOdD?" +Q'IN#P*V>tQ]mZ$Q^!`"R?F"7eGK1Cq>]s`$ig/(r;-+XHY +#I1#=qYU[ER$2NnNXKT;7r;HWnrt58/rVuTks8;Iq8<,:4qtg?krr;<`2#[:N +p&8!LP`qB!R?k['6:7 +q#:9mf)GXJ#QFYsVk9QM["&~> +%;fo^MJPp\FFRo^;;Jq"Xj_B_M5sqZ$K`p@RhB +hot<4`lZHIb/Up$ce=">GBn^mJq/8$eBPnK^V@S#bKA)Rb/DB=b0%uYZoaG5QC*btPF%T!QC*c$ +P`_;tQ^*i!R?El#Q'[]!R$X&%Q_0J"1TS^?aND`Lb/jS)rl>/\aN"%ss2lS.b/D9=bKqbN:>!_4 +b0A,N`l5s?bfn&;PZ(.G8ka3;aN2KSaSs0ba3)Q?=\).YDh%~> +"Sgp@s8W)r!<2uq!WN,Vrra_UJG]s8N!Ms82T`_MFDl88AScO.DK'W?G^+CQEcQ7#Fq/Y4CN=?1DDPgCF*2YHFT-M3G'.kK +F)cAHGB.eMCi<m.Gl~> +"L+]>q#1'hgA_'N#Q!hQXKB;4r:p9krsJ]'rql;KB05\^rr2rtrW)usrW)uqrq69oqZ#\FPl-jI +Q2d*;Q2d*IPmg1_u@Ri_ns7,_oK^7bK%B:R)d+Z_8F.._8=(g_uIRf`5oa1 +_8aO2d^Pg[`QQ0;_=dj.rVlg7qWIJIpd.9!L44`+J:9uZrqcZpq>^Bhrr2oq!<2ut%fQG%A:K`/ +Q^*i%QBRK"l'2F:OIC?=qY^?srr)`ms8Mfnqu.3+s82irr:NQmK)YWHrr)lrrr2j)rr<#rjL)4t +Z(e`&rVlcrrRh,LrrE&trrr/!St;RYJ,~> +$"R7h\]2e7aMu3MaT'6c_m`ZK<,](]bP]H\b5]Qj_oU'Hb&LH3cHF<.`rF!]`lQtfdFCM%\%C57 +`lQ6Aai`#ddbF9]na5Z0n+$8Gs7@'"o^qSFq=jpeo^MSEnac8Fo'Pc5pAXmto^D21kk4]Eqnhjn +nb)nU3V;q5nalDLqY9pWmcs60m/6"qo(M\=gs#'8aihiH`lGO'bge-rGCb7#M1g(+c-4#DahuEG +a2l@$ar8@@`Q#pHd7eVCS!T>&OctlhR$X/-Q^*i"POatSQ^X)#@9V+,cHFGTb/q]GbfIfD`Q#mq +`rF-[as5-Qa2u3>`lcOV>^"c=bf.WEaN2BBc-=>I]U2\f6qL!f]uU,n!6 +$23Ld%rVulrr0:qYnbW4`rr<#krqZHuqu$Km +qXfq`P*5d.s-DBe,91Err+8EqtTg#LO"#b +H$XXTEGoi;G'J:XG]e%IF*)VLDeEH+Ao_j1Fa!b1(O:1FF*2_QH$4CNC2[ND,$Sr.H?aLSGlE!e +Ft[u[Jp;Q[Dg"l'2g'(TFb5\)oDSO_r;Q``k5Y2B7=T`GLjt567JZu`qu?ZprVl]os8EB'qtL-K +8"5X*P*Q$4!L&ZEPlI$KQLU4JOIVDr9)&&Vqu$Elrr2uqnc&Rg&,ZD(r:NQuJbf6Dr;Zfrrr2p+ +r;6Elr9O"Jo]YW@rVlcrrR_&Jrs/Q's5rY8m.Gl~> +"gOo@p\k*grrN-!huM$(q*o$kVO9kkD)q=B^rF@ErVc`p +!<)lr!T(Wk__]0G`5Ta:`l5j4_84"+`Po^1`Q#d2`/;+C`5]g7_SO+,_o0I0_84")a2Ps>^RgM' +`5;Mi!6"iQ!5nfQ'Z7c*]ZA"+caf7&b/hH;`PM6Is8N#t(B*R_s7PS@I^Kms8N#r +rr2oq!<2ut%fZ;(i'j#oPEM2tR$a/&l'2X;S<&n,q"OX^r;HWorrN#rq>^6h%/^)(s7SlrIJX!D +rVulrs8 +%qAam]>i"7`l?!=aNVfJ`o5#=b5KBh`l#;e=&a1G`QH9CrQ>/])TKh:air#UF&jd8b/_NCaMu3= +aNDZH`lQn]"YP^e]YtTb/_WHceQt'nFQ2;lg*s*rpT^R.IZTgoD/1Tp:KY] +nF,o9o'bl-mIU&Hp@I\8m-=!7o?k/:p%J.Pnac5LmksY,p@RtFo]bo3lhf_YaoD/'l/9eNfuqR] +`Q$-6[ardL/T>ilNeN@aMu3A`QHCUAouJBaMc4!a:?A=c,df:RT2^A84m^3 +a8X-[a4JB5a2S%t"h/#98PNuN~> +$23:3hrr;lqrql`qrXo))s7Yu# +I$p=eQBdVuQBIJsrK[DKnWaWNP`h>IQi$g_rr;rqs8VrcrXSu-rVu]mpI07IpAb0is8N#srs\i& +r;Z]]o_%k>li6q_rW)oKrr2p&rr<#\lgF-4J,~> +"gOo@p\k*grrN-!huUd#s8)cn +pHk:7Qi36MQ2d*5PmQ>)]_rVuoss8N)qnG`Id*rl0 +%qAam]>i"7`l?!=aNVfJ`o5#=b5KBh`l#;e=&j:J`QH9CrQ>/]+2u:Bair&YDc\L5bK%WEa2Z*< +aNDZHaND`Nb/hZD`W!jkaNDZLaM?'If.N)HQBdYrOcu&sQg^1@Q^*j8P7*V@OZUJ3_9C!CaN4>" +s2b,\--XWe/jP2e=_MJ[+5#2[[^is!bJq]Ia2uKMgsXsHoC;;:mI0N;nHnXVo(DqM[CGGjrpU-[ +o'bo0n+6PP&G,;YmdTuBfXeQ[q"XLOlgOf>rpMW.l/1n*m/QqS`k]aoq=3e4cKa*+bK@iEb.#"- +e(7DuJTcj(M0U;sbfRcDc,\#MaN"5%$-:-*`Pg-JdogYgPQ[24Pa@U4QiE?NPOXnLR?`ek=+/cT +c,RcA`6$3Bb4Naeb/hZEa3))[f>n<>`lQ0> +[q&0(9ko1~> +$23Is-Do7#EYL"EW>k7qXOOus7/T^UQJ;jG':aoiP`dQe,91Err*9)qtTg#LO"#` +F`mA#s*-,FEH#Sd&e#RYEHZPNGBe@XH$FLREcQ;JH[9pN3t2N5>]Y19F`DMEG'J7TG5cb>HZs^W +@V$GY&Lpq#H[::*earb9qu$Hnk4/HNr'`bOL4bD>LI'qoqu6QnrVuins8N!%q#: +"gOo@p\k*grrN-!hu,.6UDfg->oA[d2_q+ebrr)orrVm#W^r+(. +o>CUF&')B'b.NXjNjljC`59=,_>_=O_uIXf_nj1&`5S^;NJbHg_SO+-ai23s_uIS,_o97&a1oiX +KTr+G`Q5d+_"Ia-rr<#ts5W_NrV8`@=,)0YJqH8Gq#: +%qAam]>i"7`l?!=aNVfJ`o5#=b5KBh`l#8c=&sCL`Q?3BrQ>/]*Q?(@b0&#Y?iX,T_8sd?aSj-YaSs?^a<8^V +dP=XgND+,$@AMN%]>1hbe]YtTb/_WHceQt'nFQ8AnItZbp\X?h[^kSlo'l,8na>f3n+$DL&G,G_ +nbDn5^:UlAq=X@Km-t#?rTuE,kj7[/s7lW6]#`Clp%Ik5cKa*+bK@iGcaL[9eCGrn8:H/MM1dP" +bfRlDaN;`J`l?+!aq;_7aMQ0RfK1X@PEqN!O-#`orKlo:%?QmAN.R_nV[A6UXL;CV@dfa8j94a9ou-aN2E2A5#QhC4H~> +$23A4RJiBMQ2d07PmE +G5cafG]s(/'6\VGH$FFC<"K-;$q>^Ha3GjD"L4X_Ns8;orr;ZfqrVuiq&cDV)s7b#J +MNX6eQ^ +"gOo@p\k*grrN-!hu(G"(Wprr;urrr2rrrW)uj +rr>3R?dc;s-N3^t/J_rr)or +rVluV^r+(h_u[cmrkSTOr50/a_83n)`km^mQA`;k`P]L,_o)Jjs24lT&AuH"`5/4-NffC>`PK=) +_SuJj1W72K_7m\)_8FN^O-GTscGIH9]tj=@s8N&urq>F>rV6Ein2Y96I"6Wg;ZHars8DutrVlcr +rVc`qrt#,/pXL +%qAam]>i"7`l?!=aNVfJ`o5#=b5KC2`l#8c=B9LM`Q?3@aN2NHaN2B?aN;ZOcUqq1`6HBCb/q`E +`lQ*?:d*9GLoZ7'P*mDl62414(CLSP3 +eCMmN]sG?$bJq]Ia2uKMgsXsHp[e4N&bGblo=MKG[HR8SnF#]7naGrFnc/1lp[\4WftG&/ZKCfN +oCVYGn,;SPm7?dBqZ$Bes22Lc][6TFnF5>ZlIjA(bfIrH\%9c*f\"Uq?@7?^JSdL$bf[rDb0%cE +`lQ`PKC-_oKmAb5KO%c-4DSaN2B@ +`Pos?aiVNLcn0i3eA]SOaNOS(%a*&?`kfBX<^T8H8Sc#[rl>)[f>ms6rl>;a\R\B*9ko1~> +$23lfJ0Hrr;fn&H)P+s8VmrL.^D&s8Doqs8VEa#Q"'g +MjK`tQi30KQ2d07Pm*:uEVTD1mf!i.BWZD]E,.l1oDIXh_oU=)rVulr&c_b'oYQB/F`VSDFa/1X +H?jc6FVAqCG]\".%L*%9$<;.nH@'m^G'&m9-rH?s[RGlE!gG5lgeG:[fP +@NkjR!sg2aDfp>ZOO`t$qYU3irUfIUrVcZlh(Er)Kn4J7mJd(arr;oos8Dp/r;Zfkq=_0qQ^j2% +R?a)$Pa)-3s-E2?&!30DP*D)SK`;#Nr;Zfqs7-(#s8N&tqYohNPX>-=s8W&trr2oss836's8D +"gOo@p\k*grrN-!huZEV]G/s7ZHks8W'1?tH]=LInb)qBai)?Q +rVc`p!<)lr"5^i2_u@RY_ns7*^qmnc_uIRb_90TMO-brk\\lA%^VRq._u@OO_[XE'_l/NLOctgA +`koR0rkeZNs24lR._ig=aiKs8PEh,tbf@Q8_8,aDs8N&urqc0Qs8;fkr8'#JIt2of54/CKrr3#s +s8MutrVc`prsnl$p9dkaRZEZ#Q'df%QMm*KPjt"DP+%`%P`U*Brr3*"s8W#orr2lprr)j,rqufq +rVu1NO$EF9s8Vuprr;p*rr<#tk-hP#Z(e`'rVlcrrR_#Ls8N#t"o#0kSY*-:~> +%qAam]>i"7`l?!=aNVfJ`o5#=b5KC0`l#8d=B9LM`Q-!aN;`Uc8To,]["Xc)F?BO3+0`mi,B^;%;1bJq]Ia2uKMgsXsHoCMVHr:BaS&G,Spo=)EM\%:ksoC),8o^`"OrpLBf +oCW(\iPN+>]X$\koC_hVoD\:Zmn!'Hs8Dlkb.kU'\B"F>o'YP`lIX5&bf\/S`4XC>cI(:Z(i4_X +Jo<6adE0JLa2Z3?`lQ +$23Lj$s8N&tpe$ZAf_b^Ir;Q`drqud$rqCeg +Q'@Q"rfmAHs-Du9s-^0fqtq,o9W+RUE*uW8s8VfR]Z@_6r;HZprY,>/q"2FYH$+1K +F*2_QH$Xd^G]s%."EJ%[;m?R$*>#mf3=^s8W&tnG`If$2sf!j[b\*m/-_[s8W)ts8W!(rr;r` +p%._8l2U_]rW)oKrX/])r;6Hmk3VR(p4*~> +"gOo@p\k*grrN-!huuL7ns7t`i +ah64'rVlcrrVca-hS@%H`5KR2_SO((_8=(,`;[Xf`5]EMNK06nOL`6F^qmn-`5BI0rk]Dd_nsEr +OcGQbOc.#p`5K^8`P]O,_#D.h_oB[3`M/HZP`:or^rXO/_SGjEs8N&urqtO=rr3E&r:lCXL4Onp +6_!rLrr3#ts7lR)qu?QnrV'?CRZro"PF%Q#QMm*KPjt"KQ^Ni&R$*>"mf3=_s8W#rs7cNks8W$, +s8Duqj@,4tmJd%`rVc`ps8 +%qAam]>i"7`l?!=aNVfJ`o5#=b5KBj`l#;e=B9LM`Q6'<`l@tu29*SVbg+V\.Y0^jbf[uIbK.]C +aNDZH`PKC.`lcNMcd0k[aMl'5`mJ71LQ@[gR$j;+Q'7F#Q2d$WOcu-"S=,@*R`rskb/jS%s2b2^ +s2b/Y+iqpP31l^/C/dCDe^;O\Yf*o\e]YtTb/_WHceQt'nFQ8No`+O_nbhkUnI5$]q!>f0]"Z+o +l1OWHmoB#MoCMM@mHsH8p&!df^r*t)^@M'knaZ,>q"t$eqXj=Jp%7\@bIkd2[_'NIqYK^Fcg'-* +bKS,QdBL:-c-FGXdWJ38LPKe+J'uH[`l?'>`l?*BrlbqraMl6?eBuT'GFOk[QBRZ#rf[JMQ^=,, +ns'rRP*:iqRZN%YbgjqP`5T[9`l?*@b5KQaaoTT'rl#;db07uMd)\�#brPrlY5]%a*&?`kfBX +<^]AJ9Q%Parl>)[f>n +$23B3i_T((&rVulr#QO\roYQB/ +FoHFoF`r"SH$O^]G]n.JEGJ\p#7(5.'*M9TH$Xa\F`2>DG'J=ZH#d^]&,lPr!sB9=D/jQ:DfKi@ +G]n4QG]d_0lV,TG']5"oDSO_r;QW^mdpJXr;QKfBP`HVK0M`mqu$Els8;osqYgs( +qY^Bhq8HO"R?j5&Q2[$HQ2d0@Pn91GNgPunR?^:_o)JUes82icrr +"gOo@p\k*grrN-!huQ'dc#Pl$aGPjFYBP`q>c=82aos8;ips8)`mrs8RPI\pjcDF!^jr!35[`kodH +rVc`p!<)lr"Q$r3_o2Plr5'Dh_SX4/`Pom7NJEa_PF%9=_Sa4,_T'I2_o'@j_%ai3X-8O(PEUl_ +_TB^5a2c9=_8!eb_D&pIbeop+Oct`fMjh`'_o0=*p&G'ks8W)olgXWJrquflqIXDnIXaIGnGWCd +s8W#lrXf,.s8Vun`E8+eQ'RPtPa7X6Q2d*>Pn97KPF7VuR?^=`o)JUes8)`ns7uZmrt#)-s8;oo +ha`f!irAlTs8Drrs8 +%qAam]>i"7`l?!=aNVfJ`o5#=b5KBj`l#;e=B9LM`lQ0=`l@tu293\[bK\AV,DSCdb07lHbfIfD +aNDZH`PK=,`Q69Jcd0k[b/VE/] +s2P)[+j/2AEi!PSAi&)jbJVTD\A5qoe]YtTb/_WHceQt'nFQ8NoE"RRqsXRTs76Wlo"MWN_8!dr +lLj`ImniWDoCMM@mHsH9rnYN-_8XC,_=mftlg4$1q"t*iqY'CFmdfSTV6R_C]X>lXo^qh=cg'-* +bKS,QcG732d)sGTc.Gm#KS4k3/C)P^`Q$+#`W=0'rQGepbf7fOb06VRMO'HmOd210PQ.!LR/iTD +Pn]:KQ'7Po33CKVai_`B`l5j7`lQ7"b5]Q_`Y$20a32]Jbg4?iL,-9``6-Slc-42D^7&(l +77p6k]uU,n!6<^4$HpT7aN:u'9LhflJ,~> +$2!6>s8W&rqu6Tnr;ZfUrr;uurr2iprr^[8lKJ3HqYgs&rqucqrUN:>PT0mO1;t^+f +s81`m_o't$rVulr$NL"uoYQB/F`V_LrcJZnG^4^[H$O@ECfD#T#5nN7$WhCmGBn=OEcuVIH$FUV +D*/L1!%e9a'j,BtFa%nJG^OORF)>u?FD=/s/LMbU%1k@7EcZ>NO4Ek#qYU3irorhIrr*K,s7^J" +KS+tCJ9Lefs8W&tp\t3jrVHhlA +"g=i;p\OjcrrN-!hu2D$`Q-*8P^n::N/R$s*5Q2d*>Plm>;QBhB6%S4S8qYp +%q/[h]>Mb4`l?!=aNVfJ`o5#=b5KBj`l#>h<)n+I`Q6'<`l@tu1<%8Sbgb"[,)&LRdE0DObfIfD +aNDZH`PoX4_8jR:aNMKLbKJ2KbrBQuO-Z3#S!f\2m$/6OP+7l*S=G^-WQiH%_TU-B`Q$!tasG*J +`6ZEIdC2'.S3gpp5hXZ/a3;K4_nWn8bJq]Ia2uKMgsXsHr:BsYs6jdknETK7nalM@\A#_p_8g;LS?_nX()\aK+Zkj.R%oD%bEo^(u6o&R*COHQ?9[_:&bo^VG6cg'-* +bKS,Qd(@$6aMu6@d*>QEI"6f-Dd(W7b/qZH`l?*BrQP;as2b5^$-UhU=H&B(QCjMDVBgda5tPb/_68`kfR7qT'5faN)]J_9gK:5_pW4`m;ZLrQ#Gjc-4/A]p_ql5tjso +^!at/b0/&LagtkS7nm`K~> +$2!6>s8W&rqu6Tnr;ZfUrr;uurr2iprr^^9lKA-GqYh!)rVucfqu9

UEls8N&u#lakoo'Pu2 +li5?2s8NB%s8Cg;m-O]NJ,~> +"SK^.Wpp#fs8N#ts8E#sir/uYrr2rrrWrQ#jI**Thtmajo_eahr;ZZfs8N&ti5W^R +ec#IGrW)oqrrLuloYU[GrPK>f`kmdkNK93`_SjF1_8=%+`5TX3rk]8bai1KHLmOWkNlT&N_oKj: +_u@OQ_>h@k_njF6Ru*,jR#dlY`5'1+_=dj.rVlfpqW@;IrVlfr!<2ut&,uV"6@4N>H\Hrp5\?$H +gAV'Lrr<#urqud#r'?L-QC!foQ2d*HPm3J=Q'7S7]`.p?rr;rss7lQms8MuprVl`p$iKu&qSKYL +\>-D+rR(TOrVulqfVG44SAG)Q~> +"l>\P=g?0Lb5]Nc`l5pf#u7X`7Z`%Od,a. +!13YP"dbL6boA73h`6#U(q"F4Hn*TE-mI1#D47i.=rqt0V]Z%e%de`k5mc;^\f?)(S`lcZA^<+O=aMu-8 +`lQ"hRfNTbl~> +%0,kYiW&rUrVlfor;Q]qiVilXrr2d&rr<#ss8UU8kk>&Vq>LBlrVlis"o\K!s7cQlq??nk?^?kA +rKQ-'%[NBGPa?cCp\Opirr)irq#2$,rk;gCO$GooF`2>?Ak)[tq#16jrVlisr@ +EH?;JG]n=WH$FINFCdBE$O6Y3#<$FFI<^1"eF`e>rr2p"kj8*Drr;rrrVR9+o6tD&MM>&,?"dLn +Q!4"]r;HWps8)^#r;ZKe6C*t%R,O>0QMm*KPRX%GOaM6Aqtp +$2_o>V!%aTs8N#ss8W&urS[\Rs8N!'s82>TX0^OUrVc]qs8Muts82d+rVucpq#C9irVunn@[E:F +rKdJKr072Gs-Di5$^R!CIph[~> +&*0Ni<2IUSbK@oG`l5s=b2LG@`XU#3b/M?C`O&K>=-:/8rQ"uYprEuc_8O79^WOaC`5TuJ;3Ht: +Pm`qHR@9P3Q^*bsOd#@$rKI8Hs-H6EQ^3\nDeRhIa3)KDaMu-8`Q$!Abfn5Mc^dk/ME3[RCM@[$ +>W(Ei`lH3BbgFhY`5g0A\A,\ge]YtTb/_WHceQt'nFQ2KmJZMPmJlWSnau[q]#DJ!_6rh*oC2;@ +oCVYEn*fZ2nalM5_7IIs]Y_>Rp[[e;m-a90nal;@n+$)NqprHqa1]=(g&1X;n`A*`f?)(S`lcZA +^<+O=aMu3<`r3sjbgY!S>Bu!V:ek2(=<`J_d`VR/"3S^(`VmgU`).[??d +S!/V?<6NG&_o0L;d)sGK`lui\dE';H`l5sAbf[D&7Qa46GeD#8d`;d;cG[JV=%l:jQ0a#~> +&-)=`k5G>[qYpEir;Q]qs5t8mUF'`n\ +r;-C#s8Domi5NXQeboCGrr*9)qtTg#LO"#bG^974%!d/EH?jdTFDtM!#m:,+&dqucGB\:UEH68K +H?OR^D/Mi_r;[W9$Q!5pH$FLTF``"QG'.tRDfB,F'FG-F!"9/kCj:ARIuVtMs8Drrrr_KOq#:3k +rVlip(B4/j>_\#fItiH/K7#mkZ2".ms8;`nr;Q]q&H;V+q=Kl9QBmf'OI2>qS!*K1"IG:/PaV?4 +rg*SLs-*ePQBIW#OA>HGnbrsqs7Z3erVuodq=3h%rr:CF$NL,)s7YUBm,e9IJ,~> +#l`JKT%s5BrVlcq!ri/si;WZSs8<6$qXgP_Y/gP?rVlZns8N&sqYgd#rr;h;H@_9Hqj%)Drg!ML +#EbF?OI)3!Pk^ODQ2m3KPR3Y?QB7DOq"t*kr;Q`r)#jI5qu$BlrV]H]W((K?>!m+DDd7AZs8Vuq +$NL,*rSYZ4`7=hbrr)orrVloT_#;1M_Z.IP^b!7:_Sj:3aME^lO-,QgPE(s8W#ns8W)ts8W&s&,Z;#oT>E)Q^*r"R$Ni'P4k.DQ]d5jRJE-I +PQ@&8rg*nXPF%Mo:A+Ydrr;rr!<;rq&c_h0rr2ros7`q,[C2UVq#CBBrX/])rqa^3T:DM)qg\~> +&*pZ/;OP8>aNVfG`Q$!Ab2LGAb5]I!b/hQ@`l#;m<`XR]`QH9C`l5s;aN2NHaN4A#r5eo\#Kb?= +<+gK=Qi<3KPlR0KR1,FIPECugR?ir$PaI^2PnB=HOcYWdQC+22R>Zi"d`oqUrlfl5`P]X6b0nJU +_oB^C1m+\)A8+t-Ecc+l;p^Uh&-bJq]Ia2uKMgsXsHoC;56n+68Jp@RkC +mI'?5p@>i2_SX4-_7fI6o^MDAoCV_Io'Gc9mJ>kb^;\+0`4rtYp$V55lg=0;p\4:Ln*Kf?f=eou +`"g2,^tAV[oC(_cm+9A"aMuBL]tVV2rlG,^s2b2Z0ZqeoFA74=M2..HM1Be/:R02F`lZqS!*K1"IG:/PaV61%?lp9OHGlpS +&-)Idm/6n`rqu]kqu6Tps5Ld%rVcTN`Pf^Fr;HZprYkh6q"2FYH$+7QG]n4PG'J:WI!KsS@q$>`"8i-3$X[t!GBe:OF*VtQ +IX5pP7Ml=-!#>_I(L_E2G]n4QH?=FKH?X+IA2Ol)$2ji4#rc[EI!L4$eF`e>rr2p"kj8*Dr;Z`p +s83Z.oLjafK8GD7J:<<. +"omSRT\'&>rr2rtrr;rSrr)j,rVZZmp8G!n^\ds.rVlfmrrE&srVZX$s8Muqq."o$PEbs0rKR2E +#Fgm+EgDiRQMHdZOcl#sR@'>,OHtus2q%[(s8W&rrr**$rqcZlr;Q^.qj_f1FB3]gNM=G.^V[h'p&G'jrr2lmk4&EM +rr2irrqud8qt3U4J:E<,I"$HuKN2b]r;Z`qq>L?nrr2rtrVlfr%/3\bP*V6$Pa.ArP*l'1#F(LA +PEJXlNqnt?PlI$KQO0%GQ'.;pO?rU?nbs'ts8W)up\a9`ZF.*2iqrc'rr +%.:u?aMkf%='0FN`QZKG`l5p:aN2NHaN2B@b0'\($-('0 +dF(O'F-DphP6.#9Qi3?PQN3L_ns:: +c-4YVbfP'=Vfc0ZB5MU6G&Ls3b/VHFbfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9_na5`6o`"Un +o^VJ=o'l)@]Y2+trkrZi^[q0knF?)?oC_YAo^V>Gho*=NcH*o?^V':5nEoQ/n+H8Ln+cM9p[utF +]u7e)`koIBqt9RLj3R)DaiDKBb0[i9ai_]Gb08)P`l?!;aNDa\DL$bnP)G0FK7Hd.3S;]uaMZ'B +`lcHD`Vd^cbgP$*LPh7USWoD%Q'.O1Pm +"TJG[m.C;Ws8;oos8N&uiVj#\rquZgqu$HugZ7h^s8W#prquZorr)lnrWi?!oK\:dPEta(#Eb7* +2ij&fPPLIUR$X)&PEV/mSW9,)Q2gRXrqu`os8No7s82fkrVcqlfh"8i--#rc[EH?ajteF`e>rr2p"kj8*Dr;Z`ps8;oo'Qe#A +N.6M;Ko1D6Cf>MApA"[fr;?Klr;R9%p&+APS!&quPa@])OI,d.#F(F7Q"a-IR/*$IQN*6MPlHmO +Q^*r!BhIOco)AXg$MsSurr;W[q=O%!rVt=F$N0o's6&J1lJV^BJ,~> +#lj:_Uq5`:5Xn +%.DJL=bs`-aiqoH_oVi"ilDhVbf[rFb0%`DaMtr4;cm\8_p$9ErPnlYs2tA_s2P)]s2b2Z#ft-7 +d3O'eQ(%];pm1uGrf[SLP_M,XOI27-Pu=$;PE:iePEhi'P)+;6^W4@:bg"AS`l#[9`QH6Cahu=` +R\N5jG&D#:F*MIr(!=P9bfn/IaN2E@bL4JB^Uh&-bJq]Ia2uKMgsXsHoC;;r'+9b4E[d`ko[;c-=2DO@qW! +:0+^7^W"XB$I$Z4\S"Q2=(fG>J,~> +"TAAXlK\BKs83&tr;?Qos5EtWrt#,,q"asirr<#ih"'D's8;cnrqufqrr;fn#Q=Si1i&2q#C?mr;HWprtkP3p](9ls8I\#WG?-hF*`+LG^"0s`q]B/ +$ig2(qV]?2`7=eas8N!*s82T`_M! +;g!YGJp`0)JU_u +#laOgU;Ha's8Mus!ri/siVrlUrVllrrqluscCM2Ekl(JZ!rr9!rr;cmrr36&s8MRGClahMPm^6is8DutK6sG,@W67/F_Z#>Da_YCrr;us%KHG, +s8N&si5NUPec#IGrW)oqrs.Dr_o'F2`Pqhs#fXa!_SF+2PDB."#a1=2OHGR>`Pqho4i,"T_8aO. +Z&O[,QBRGlPEh,e`l,^3`Pf[0]u.V'^r2FmOI;DrQ'd\rNMFM0_8O:.p&G'jrr2lmk4&ELrr;rs +rr)j7rr;@aFFSplH\$p&IsFMX7I:'So`+sds8W)ss8ET0qu?]qqTqWpQ^F/&Q'Rc$q3;/TOHbke +KTPtos-3PKs-E\O#Eb@1QT7pqqXXUrs8Drss8N&ue[DfmZD.$id/FCPrVuYrTUhXInGe"~> +%.Mq[>(*uuaiqoH_oVi"iQ2&As2P)]s2YYk`P74'>%+/Cbf\)L`r4!Yb5]Q_`rF3]aSs0baNMoS +)IA;hS+W-HPm^<=aBce!&VUhjag +E-68:F`M(JV9I$#bfn/IaN2E@bL4JB^Uh&-bJq]Ia2uKMgsXsHoCMtOrpTmS0(8;uoD$56_SEt( +`5BI,]C>F]m-X6/nal8Cp[7"O\A5tu^qR\%\[_;-p%._Brp:p"me65E_RI7t_S*h+]tV,.q"+%C +iQplBaiDKBb0[i9aiaV(s2tA_1WIDRaN`A\3F[&WH[1$eF`hdnRl&C=`k'1=`l5sBccsPM_njU? +c-j$_Q'[l*Od26!PkgRKSWK(u3/!CePn'.GPECukPFR`'0KH;Wb4E[d`l,g=c-"&@JOqmh9j>9E +_8apE$HgK1[TuO$=_l4LJ,~> +#QFb_kMuUBrquZqrr<#Wrr2p!rqH3brs.!Fjo,5Vr;>s]#QOPi5s1BsP4=eBP`q8^:hlA\q3;)I +Q'R`#rfRPLPre^=qu?]qrqufqs8No6s8Moqr:nr=XIM_"G&h25GALhVp\+X_rX8c)rVGHk`5L4( +rVulr$30ntoYQB/F`VU&EW:(ZFTul)D.+7g$iBu;!t*!#,G6!!X3I +Ecc;@Ecuk_FEMeE,mabP!<3*/$o_sDG]S.heF`e>rr2p"kj8*Dr;ZZn(AIh.<[fV78Prc;KSFh6 +Xc@W%p](9hq#1g(q#1!`qER*"Q&_,qPaIX0Pm +#la[qTt'pqrr2lr!ri/shu3WSrr3?(r;HKikEE'Si;ETSp\t3mrVl`p#5RpX4d2+mrKQu?#F(F8 +Jl$3LP51@DOco^0rfdSKQ8eR:qYUq_o'F2`VmeV`PfU/a2NpkP`(]gOcYWbOH%)q`l#^2^VIt)a2G', +OGf3bQ'@GnOcbXC`PKL3`P]L.]>)D,ML:DJPEM/oOd;,gUW:6g`PfUcs8W&srr)]UnGi=`s8W,u +)>X=4<@KJ47o*?4K7nJ,WJYiqqZ$TjrVuosr;cirrsnl)qu$:U3/a&^Q'RZ%P51@JO-Z,!H\I`N +pltoFQ'M<6#+1IBQ"3/[n,~> +&+\Up>]dNlaNVfG_oBd?b2:;?`W=6+rlPJ`^S4,$?^/D*aoKN]b5KE]`rF3]a9or+`Q$0FcmLK- +Rf&TRQhQaMP`q8^:hlA\qNV8OR$j>-OcTI'#;5&kb/V<"+_ +<\3"Se&]PQbfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9io.'4rlg!d$m.'uK^q\%-_SX70_8*dq +md]`1lgF32p?_\Pj06D2]thFu^Abbr\FfUip@IhAlgEs(qY\4:^Vmt'`507-]t)Sbo'u,-cg99* +a2l9Cd(R08b503Z`\GQWa4&g%%i88+6;D'2F`0%4JRHmCb0%fM`Pp*LccjAG`4a11dG?cAMj9iQ_oC-G$HgH. +Y?4Iq>'AEcJ,~> +s8N;ijPU";rr2in!WN,Xrr)lsp\XsqdIHPts82`lm/@4aq+*o9R$@-+s-EnTP^tuQRJE*XR$X&$ +PEhH"M`X[7qtg?jr;ZcqrtbP4r:g-_Cmh/(Ao1't4$5bf4]qCVqYC*us8Domi5NXQeboCGrr*c7 +qtTg#LO"#`EcQ5DG'J7SFDYP/!WrE)r;[K4"U5NFEH?/FH[C'VIV):a"onc(!##J9!!a9IEcc;@ +EcuqZHuj-[$3Bu'%KZ_@2f!MYEd3Pmo`+mhrr3)am.gSXs82d3rVuKfq1jF7]8flS;K#$hV,l%E +rVcHiq>Lp%s82`d4`sOOOIDK!PE)40Pm#pQFS!<`6s-E\MrKIPNOckc)Ac)AprXAi*s8;co +s6&hDp"e^-s3glHr;Q^#h +#ljh.TWn1hrr2iq!WN&Urr;p+rr<#sr;Z]kooZ8\fDY^Kp\k0mrVl]o#5\-d6BIIrrKQu?s-EnT +P^tuQRJ<$WP`q;rQ^F.u4A8cPr;Z`os8W)ur>GY5s8Mlop1fnf9[\%fQG-rr;f5[^EQA^A%L&dJaLQrr)#WTq@pcpA]X~> +&,,(7?Ym*daNVfG_oBd?b2C>C`l5s?rlbYna1\`J=C-ftpr`QV'#r#8b/hTB`Poj@bLJ4'NguT- +rgai2KM-#61* +OIDK!PE)40Pm#pQFS!<`6s-*;Gs-3bF6qYnLb43O`aihiK^o:j75t+:l_SX72d`;d<`knKO +9i55Qg%0^~> +s8NQ'i7e52rVl`orqu]ns5EtUrrVrfrqud!g[+=ts8;fprr)lsrr;olrWiK$qK>YlR$dE/#EY@; +QCKR"OSP.PR$El$R?rqf6#1L,\b?%&rVZWn(]XI6s7u]2>HNZ]92oW`n%;fOp\+L[s7uX%s8Dom +i5NXQeboCGrr*c7qtTg#LO"#`F*2_TI=6EaCLA4b!rrrr2p"kj8*Drr;fn(]47/ +qYg3cs8MTho0RuOA#uA1o_\Ocq>("#s7lKf;He!_;+G)ZR?O)"q3;2QFARIMR?*R-Q2d0IPm3S? +Q#KTep[J1^rm,[j>s*t~> +#lje?TW.DYrr2iq!WN&TrXSl*s8W)rrVu`gT;Ag9rVccqrr;rsrr)lrrql^"rq^e4M3XA)PkUFL +Pa.>uPEq^k8s&h5s,mbUR?rqf6#:L*\G-""s8N!5s8N&ur;XQ7W.Io<;J=tU]33VXq#1*hs8N!, +s8N#trr;rT`P]XErVc`p!<)lr"Q$r3_o2Pl(W!o&_8F.-MfsPtG`e)NOcYTaOcI8s`r6\@&]=f(f7BdJaLQrVG9ET:V^qp\o[~> +&,>4N@UuRU`QZKD_oBd?b2LDU`l5p:aNVlQc,mW*<`N:I]ZA1:b5TWbb5]Q_`rF-[aqVq:`l5j7 +aj&==5_Y`"R[TY4Q^*j8PQ-pJQO0(HOI;;uS1[EqqNYKUS=,_0Q^*M^5A"FWRa94"aMu3<`lQBJ +ai)';a4R1ZUjbcj4&!Q?SN!Una3;]Q`l?6HaMl6Aa2Q6MaLT's]@G*Eb0%cHb0Skkg[Oh+o^hJ9 +lK[d/q#8II_SEe1a8X%K`597!md]`1mI'K9p&"?e^qdV%aMtm(_83gu](Ysmo^VD;me$)Hd^I!1 +]>Vn7aMu'0]t)SdoC;A3cg99*a2l9Cd(R08b5TK\`r3t3ajSG[eBuaug!AU*,A"AcUm=Nrai2QI +aMuMHHaUUo#UjQ% +Eli8]q/Ct6UsY3`5fjEa9p,1]p;Vk;dl3QoRH~> +s8NQ-h:DW+rVlfrrqu]ns5EtUrsnerrr;lqrr;6HlK\EKrr2iqrr)j"rquZjr:p6oq8Y+=Qgg7F +S;Wc"O-+Tpplu>RQ'db_=[$\EF*:LUs7uWkrVdW3s8Milp.hK^=/.nSp\t*brql]nq#C*arX8c) +rVGHk`5L4(rVulr)?9U/oYQB/F`V\MI"-ZrH#dO1!sS`*"TSZ&!"B#??ZL71G'A%LE_d8NquHa( +.K]_P!!sC9f +rVQNks7l:leb3p>VJ*@6q>^3crX\r&r;1Y1HYmhHBNIHXQ^@K4#CeIWPaR_tRJE-JQMZpPQBdV> +DPdC5nG`=b"Q]+En'q@:!WN,Hrr +#QOVGTqpoMr;Q]prrN,tir0Pirr2ios8W&qq>^BdYbS>9r;HZprr;rsrqufrrqud$rr)]5/:NkI +rfm,A$'^^FMjTcjO`k40Pn0(@Q'db_=[$\DE-+tNrVQNmrr*f6s8Vrpp.M-S;kZ>Nq#Cs +`P]U3_SaEqH?agcrd"s0OcPTbNKK4@`PBCj_umip_3Y(H*-cmUJW#DFP)YN]Ur^Ei`5BFas8W&s +rr)]UnGiIdrVuiq0)tkKs8)corr<#op06)?CkeWoZi'b$qYpKos8MuqrqufqG=d$qEcbtr5`D%r +plu)60n,@TPED:,Q2[$JPmNa$:prr;Ke%fcP-s8))l\[A`;kPG5UdJaLQrV"^7T:Vb&pA]X~> +%Jo4`ARD1G`6?BC_o9^rb2^PC`rN0fn+Pm;dnI[$7aOdZ'2&X/?>Q^O;2Q^*l"NDs)9e]l8.a:QM< +c-+2K[#[jN6qBnJ`lc6Ia9p/1\VsH^<+Vudp4*~> +&,cJ-g>Df-s8N#ts82]ms5EtUrrVuirqucuoAK'!rr3,srqu`orVm$"r;6Bhrr2lr:]17m^/g/B +R$Er$R$3u*QC!o&QC!o#Ng#csQ'@bk="'DtR?`u%Q'IPuP_Cf%DJj`?DJ;<0qXsjfp&G'gs8Dip +rpuXtXF?!"q#C]Fn1Ec?,8:)EtGA +R$!c+P+%GL/V'@TOHQ&rPDY0ZR?j&$R?Ef%QBmf'R$NM\6LXsPnbrReqYgEtrT`eDld5Y2!WN,I +rX/Q#s6Sn3l/;R@s*t~> +#QF\SU8cW:s8N#srrN,tir0eprr2ios8W&rrr<#j^n.^;q#16gs8Mrqrquirr;ZfrsOGoBhR?a#+KNBRgOdVJuQBd`!Q'?tVA8Z4-DJNlKp\OXas7u]p +qZ$Nks8MY[CoMc9p\OpirVc`js8N!,s8N#trr;rT`P]XErVc`p!<)lr!T(Wk_ct!q^VRY"]u>,< +H$Xd^GBn^tPEM#gPE3Gq_o9O1ai1E3E.<:^I!BjaLQ7IYOcYIB`59=.`P]^2R6>C^Z +Ec,f8>Zm8RR$Nf!RZNnrCb:1-PE:rrPEUl[P*qW"PaISrQ2[!IQNib/JjAf)r:'[cqYpL%r8"un +]!.k#rVucArX&;p^n[BiU>#GCJ,~> +%JfCsBk*(6aNDZE_o9Xpb2^PC`rsR$X"tPEqW%Pad>-.$p'aQ'7N!Q^*o%K.^\PD0Ti*==2_N`llK: +b/_NJbK%]Hb^X#pCi@eGc,n/PbfI]:^VS"4`Q$-GaMl6Aa2Q6MaLT's]@G*Eb0%cHb0Skkg[Oh+ +naTfNnaQ2Gs1H7jb/_H9^;7q;c,IQ7]C#4[oCDPRr9M/,aNViRahu!5`l5m8_RfR=o^2)9o)/@< +]u%q5bfRlD`llQF^qRY5p@n4QkgAbKaiDKBb0[i9aiaV(rPn`Us2t;]:rgf+cd'k]coRkk6.!]q +^rjpB_og'Kcd9sM0P,EAE,T]9?! +&,lP.f\lT*s8N#ts82]ms5EtUrrr5nrr;rnrr3&PmcXTL"T/5squ6Nn"8r&nr;Q]ms%Mn]7sKiM +Padu.R#dDrQ'IZ%Q'$rXQ&q/oPa7MfF@DFQPaml&R$X&$1h_5RG&2AFG?nP^?krVu`m +qb*oa9(`/[p%eX_r;$="s8Domi5NXQeboCGrr*Q1qtTg#LO"#bH$X^ZFD5P"#Qal(rr`)t$k-Zd +F`;>B@7_+9!sST&!!3'#rW!?:>]=b1Hu!b31'[d]rW)s"rW!K2!<<**0kklXH$t\%o`+mhrr3)a +m.gSZs7QBir(m=lr;-?jqt?,!VfJ:)qYg?gq>UEkrqQ;/3,sCaH?"1LD08ToQ]dZ'OHc-$OZe5] +PF%i(Pa%&XK8c%[Q'[T)PFdf$R#d2ZIV)1Lqu?3c!WDoorrr8bn+,_rr;Y4Err3,ekj%Kjrr7K~> +#64Y[USZ-/rVlfr!WN&WrW`E%rr)fqs8Dm*s81<6Y-dNns8)cprVlco!<2rsqYpNp%IjBdGD2$> +R?X,*NKKM*PWG(nO,/FROHPlnQBR&F7?iaqS<9/*Q^![jBR=W=C3+E;>?g7ir;Zfns82fos8)Zj +8Z&1OoDedbrUp3irXJo,rr;utrSYZ4`7=hbrr)orrVloT_#D7O_$@]j_7n'5G^B@9#'tQ?I"@09 +rfKU0`kfR,_oofsIs-3iGBS@YGC"anNKTHdON>8K_o]X8^R0:kIX--bGB\@]Jr5SNMN=RT`P0.% +_"Ia-rVlfpqW@;IrVlcqqYp?k:&b(js8MbQGG8uCrVlipq"k$jrr;ciEAh]\BQe69DejDfE0ZNL +R#[>qR#a=ZQ]mc,PE_;hK7f,IQ'I\sSroM#Q'[MiKm[H&r;-H`rX]&+rVlfne@;rqY,h?rqu"k@ +$NKts\YG^eUZ;:OJ,~> +&H;44D-qn,`lcHC_o9X^V@Y,bK7]<^%_0kn+H_RkeF^Hc,e)VbK%N:`5]m=_nl*@m-aK1qY8^Y +_p6HHcH!rC`5]m<`4_oBpDb07uRH#]HfJCDES +`l5d5aiVrYg0#k=HYdnDGAqA?9lZJ]Q'm\sQ^NptJ^* +/Cr%ko#MBbc,n/L_lmuG6:apZ]#i"5dDu[=^UJ/^9ibuHme_M~> +#6+Z&f\Z3!rr2rt"8hons5EtUs8VurrW2rkrr35KmHX?Ds8N&tr;?QsrquZkrr2lr:]((ir/X*F +L51SROd)B"R$O)+QBI2\JVK5OQ'7N%R#->GT9>D+P*:um;`Af6EHQ/BG\_Cg46ZP1s8)Znqu6Wq +om24eEi\j4s8)cprUKjps8Domi5NXQeboCGrr*N0qtTg#LO"#cI!p0]AR#WI!VQL'!<<*0E--,10TM9XR[TP+N'2WSR#R8sPEUuZJUrT9 +P*M?$Q^*SuP)>9VMaarOq"t*]rW2uqrVm5qmIKc)l2Ue]s8UOHrr3,^lKdZgrr7K~> +#QOeiVP:g#rVc`qrrN,tir0\mrr2lqs8W&rrqcZpl^+`[gA_'Ks8N!#rVlcprr)lnrr;mls8@sC +=+l<`R?3W%P*_DuQB[JgK7AW:QBdZ"R@&h]/t\;jR?EbqPuBS^BlA'/EHGi55W\0.o)J[gs82fp +s7LYeUMm.&s8W#ss8DrrrVuoss8W)t%KHG,s8N&si5NUPec#IGrW)oqrrLulrkf/]_o0d;_gH`T +H?jg_rHh._J;]PQOcHig`5][3[G> +N/s$eR$<_j4+*9[NKT]nPDt6HJVT5JQ'Rf'PDb]fL5^qH6a?XaqZ$*b%fcJ*rVlW7[^WTA_>O<. +d/FCPqs^b^S=ZJDrr7K~> +&HD@HF'Ndt`6-6A_o'L:bf\te+NDC>`lQ0@c-=JM`PSiY<`tNt_8FI?c-4>O`l5s;aNFJ&!65#W +HGdhReScd%GCbC5Nff`kQ'IZ%Q'$uXJ;0,NQ'7N%R#->GT9>D+P*:oi;)E9-E-?/BF(B#E-HFKK +bf%NHa3;o\cWtFYArt6_be;':a3)K@_8F79bf7ZHbfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9_ +nalDF$N9i"^;@q5cHOAIrP(tBaj%i@^$,=fqt^0Z\$`ohaN;cVbf[l>_8jaB`P;-Ao(_JAq:!-q +cHOMW`lQ0>_ns=3aMu'Fq=sRTl-\kLaiDKBb0[i9aia7srl4rV"2Vq!b5TFPbgeeKVCp*2aNM`P +bJMHGgauZDEH#i@E,TZ9EFLS\OH>luQ'.%fI?^+YP*qMtNJ)k6LQ.I^P`q8rP+7_gJ9GubQ/0^- +bOW^cb0A)O`PJT_5s\%=H,%A;ajJ0:bJ:5j;GC/,eF`]i~> +&,uV/gu%Gts8N#ts82Wks5EtVs8N!)s8N#or;ZfCm-F!9rr`2rr;QZp!ri,qrVl`p%J]tuo_FPE +JrY;AOI):4Prt:mMhd">I>X5RQBdYsR=T-LR>[PsR[&=rDJsZ?DKg,@HZO+I/C4=is7u]oqtp3I +KF),r8B2=e_N0Tcf5_G/YR?s5&OH+gDKS+r5 +MiNdXrf@MBKSb)'7/-NLs8Vudrr;rqrs@rXp%$]6s8MusdJaCJs8V!Am-*=*s*t~> +#64\sY+N&qrr**"rr<#trS@Gds8Muqs8W&toq&4ibPh>;s8N&uqu6Wqq>O+gq#C*\q2eC(NdZtL +QBd\uPELr_KnFu*MNa +&HDIXI9:0l`QH?B_o'I;bf\qds2P)[)oftCc-FAI_S08V=b+)s`6$6Jc-"&F`Q$!Ab5B?[`c]PC +e&fneEB88tG`.KEPEM/pPE1TUKS+]1PEhH!PEM>bCJU@VRus)%HqS6kFEDGIEH$/?BP%mYe]Q7X +aiMTLe%e28O[RgKaMQ$6`QHEI`l5s=c-42Ibfn/IaN2E@bL4JB^Uh&-bJq]Ia2uKMgsXsHrpq?% +nbN3k^V\%6b/hQ<^V@V#_8XI6_7fU;pA"[I[^X/j^;Blj29*\R^V.M'`l,Las6f@Io#J,Kaj%]C +beM$4^q[Rs^r!t#chdM3p>aQef?)(S`lcZA^<+OiaSs1W`Q#m4`6$->`PTXCR8g&+>h$a0aN)BC +ce3A-D0'Z=DK:,KEb]`4AknS[Mj0Qb5D"rVR?s5&OH+gDKS+r5MiN^PMij6]K7@ZF-.g\jeBZ&' +a:HJ9ai(rh>S!pF5ZinJ,~> +&,cJ-jl,A%s8N#ts82Wks5EqZs8Mrorr3<(r;QNls4c`'kPbD`qt^*drr2p!rqu]mrr)j\q>^?l +s7l,j=akpZL4kG@N/W[MKS+r3Kn+fEc?&AFEhkHE]WRas8)Kh +rsea3PGhd(pAb!erqcZnnbrprrVcTN`Pf^Fr;HZpr_*:gq"2FYH$+7LG]$Uj#QOu/":#/8!WW6+ +#6Fl*"UGcHF)Gqg&J#!s/<"%0m=tBm4fI +I>ubKs8Drrrr_KOq#:9mnbrOerr;rr8,)mgQ`X'6p](3ls8)cJ6$-pbI<9LTDK'QBDg61lH'4h^ +G>3sPQ^F&'R?NM`J:`H-JqAZ0K8"o6M1^>;J4f&*rr;ios7-'irVlfqrs@iXp@QW0s82irdJaCI +s8V*GmHO!:s*t~> +&-)Y+\Xokls8N#rrVuosrS[\Srt,2.rVlisqYg,nVQRi5r;Zcos8Drss8DosrVld[q#C6ks7u2l +>(2$[KnG5;MMd7EJqAW.Kn+fJ8"s]mG9NJ9uTe +G^4XaI!L!aI"I6;NP*3Ib,BH-IXQWjI=HKcIX?HgH[UO*P)mGma1TKUFEi(XH[0j]H[L6jI=6Tt +L67Oka2G^.^VTUCs8DrrrVG[Gs7cNks8N!qs8N&rrr;urrVuonqd#Dd:=f4?r;Zfos4KYYC2nQ= +DKKT1DL-/CD+Af3SrRqdLkq=`Q'Ic$MMH_6KS4r/KS>&3JVSu/I#*5Cl2U_^q>UEarXSu-r;?Q\ +]!f#SRI:(Ss3UcFr +&HDOcN*'Gl`lQ6@`P][=bf\qds2P)[*Q?%Bbfe2F`5$Io=*:p__oBpFc-"&F`Q$!Ab/h['b5]P- +`k]X8d+6OdPt5q>Jq8K.LlICQL4b#-Jq\`-Od_MsR$0[`89a!5eWK/AAp;_S5L9q>]H\]#)7u^Ve%+^rOC4_nj.'_o'+Uo).qSa03(h_8F1, +_8?2es1eTJ'thE!eGAt2n`%m]f?)(S`lcZA^<+OsaT'E]aSj-XaAU%!`l#d9aN)9=`lQb(LS$W9 +bf[iJe'H^V.rK9MJT5USDfK]BDKfthG`eVZG"daLQC*r&R?NM`J:`H-JqAZ0JU`**NJ)Y,Be$sO +dFZL_bjia`ai_`D]pVY]5>4hW^r4R?$HBlL=\qgpK]`13J,~> +&H)S.o&Sp2s8N#ts82Wks8V*X"98Arqu6U%rqZTjs8VZHlfA$E"T/&jqu6Qo!WN#qrql^-qYpBi +qt6IKL4FZ(Ljju0KnTGX"b_Y]Iu'6dQ7nAjPCdjKOd;AL:NCN#D0C#DEH?;>E--5::&";[s7uTf +]OIt!F7oS-q>^HorVZ3b$ig2(qV]?2`7=eas8N!Hs82T`_M#6G,9"p"`-$Q*8oH#=rCrX'5"U>23!!!NbB)ZrX +IuVtMs8Drrrr_KOq#:9mnbrOeq>W,Fa]bO4@fH6(s7cQG4EbUaE,9Q:F*D\IAoMj/EB]JMPW4;P +R[9;$P*:iYK7njRK+NWfK7/B,MHWaHs7Q6grr2fbrX\r+rr<#lkk+W +&HDb-a.T^Hnr:0ass8MrprS>#nZEBtqr;Q`oci+3u +US"$IaSl/ +&HDUfS69!k`lQ6@`P][;bf\qd+i_UGaMl-BbfIuE`l+$9<,SYG^rOUBbf[rE_oBd?bfIm'arSRG +ahl-@bg+Rg3I5jlIYW?)Knb53J:`FDQ)@FDu2ABl.d(=ub3[ +ccj5Jc^d^sG$W_P`P]j;b/qfNc-4E2at:]R`luZJ`Q6-@`QQ]N\\G_fe]YtTb/_WHceQt'nFQ8H +p[>K#[(sJj]t:nirk9#X^V@=g]Y1oGq"iLG[_08a^:XBS)8!Sq^qmdr[^iuZo_e^b]sG#R^:V"k +]=#6K\JVog[^ +&H)S.ro`A3s8N#ts82Wks8V*X"98;oqu6Ttr;$0N.Q\8Kn]MZ2h?U9K7oDTNgYrtP(e*ENg)MIDKBN;DffrGC3OrHEH6A.B`.c-qtp@i +V6!ASpAP$jq>^&5o*+;>(l'+tc`%MB?`$k*LN#n%:X(1Lln1)UT2#S@RT&ebff&eYch'GCub#oGF+GBn1Q +N7@M"rVlfr"6f+Hrr2rlrq$.Hq>:,4Ml13is8MroqH%BMEHZSJF`_SDF)QAHCiX_tCR%53PEh<" +Q'n&$Kn=l,KS+o1L&HZ7K8tY;HpRW,q#CBgs8)ccrW)ios8V +#64\ueY/_hrr*-"rVuosrVb^Srr3N-r;?Qns8Dlmk+&N^iVWKKs8W&urVHNmr=f21q#16kr;Zci +bs$i9KmJW,JV*fP2h?U9K7oDTNgYrtP(e*ENg)MHD/s<7DK'E:Ap&<>Df0`"BDh`.r;6CfU8glM +q#(0lqZ$Hms8;los8N!,s8N#trr;rT`P]XErVc`p!<)lr(#HaD_o0?[F*M_XH#n7UH$FU[H?j`6 +H5:dTL53:WO)fo"E-HSPGBS4YHZs[ZHN&1%H@:Ff\\=#NG^+=YIsZKeG'qt1 +_nl$Gs8DrrrVG[Gs7cNks8W)qr;lotrr+eTr;Q\:M54[^s8Dlmq,M'HE-6AEE,TQ2EG]r@C2e;l +Bp1f+OctloQ'n&$Kn=l,KS+o1L&Q`9K7\r1I]!er@^%D=(s8:7C +$2qc8SXZ2%rr;tJ~> +&HDXfWEW>e`Q6-?`P][;bf\kbs2tA\s3*@?aMl-@X\;`/R('`JbK\/M`l5j8aNVlLaNDZLb0%fM +^Ve13`Qurc].SAXJUp=p$C\am+9A"aMuBL]tVV2rlG&\s2b/Ys2Y2_rle0\aMl3EcHaVPajsOA +T3mr3`5^'U5[.o;E-62CF)>f8DL$;=EHY2oPX0PWP`_B!R@0+iJq8K+K7ei2KS4r+IZ9)5F=Z(m +aNVoHbJMNoa:H83b/Li9:dI3-HG753ai;`L$H9c-;bg+jVX4?_J,~> +!;uir!pAV/r;Qfpq>UERrWE3"q>($is830"s8;oseF)>jrr3?'q=jdcs8W)ts8W&srVmQ.s8Vrn +s7cHkmDhbNKS>#3KS5!VKK"O7L5(/3Q'RT%PF.Yo9MJi!Ciai>F`;AGDg6>;F)c>AED#S9qAeS' +HApAGs8Drrrr_KOq#:9mp\t!gs8N&us8>Ifp\O5LWMrbhr;ZUuB6&!6DK9f=F`h_DEHPu?F)H"] +9l5rXQ^O#(Oc"dCK7\i4Jq8Q-JqAZ/KnP)-:\a_^rr2iqs82Z_rW)oqrrhELo)%8BrrMuri;WcV +rr)oqpAPBulf[^&j8]/Us*t~> +s8NQ%h4gUdqu6Tnrr<#trSRVSrrW2urVca%q>U&WYd2jVq>UBqrr<#srr;rqrr2j1rqcWoqu?]m +rr;B+7tQAHJ:iH*Jc(-YJVJo.L6\'fRZj,)MbHiO?#+J)DKKf7FDGu=BQ7s1Ci)hHpAb0iRW50L +MYd>Or;Zfps8W&qrqufqrXJo,rr;utrSYZ4`7=hbrr)orrVm/[^r+(.a/le[rj;j=[^N[C[f<^+ +[C +#ljea\6i6l^;^)ms2G)\b2CA@arJLA`QH?FaN26B]2;jAM7C:?ai_]D_o9X:b08$-aSj82aMPp> +_8XR7c/-jO20OG#K8,)6Jq8K&It<0*L44lBQBI]#R$NY(9jV%ai_cMb/hTA`P]^>bfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9_o_IM9 +o()DD(A74emdTiBqYKmVo_.qFmI&Tmq=sU\rr36&s8Vuiq"t'is8W'&q"!dos8;ThrrN&prr2rt +!<2fo'D'u=n+#c*cg99*a2l9Cd(R08b5TK\b5]Q]`rF*[b5TU]cH*uDbg"ARb/)?F2kQj2ccXM[ +5?;N:DJ3m-F*);:D/aT1GB.P?4A'FMQBmu'R?\*s*t~> +#5e>us5)r#rr3)uqtg0gs5X+Xrs8Q"r;Q]nqtpEc,u83aRK'Pa.Q#Q&UOtKFriiKnFl-L4t&3LOkA38bW)^rVlcqnbrRh +rr2p#jQZ71h>[ESp&>!Orr)iurquZmr;Zcqs8N!(s6&n7kM-%:r;V9~> +#ljo&m[^,_qu$El!r`,uiVrlUq#:^#p\:_dZ,lY=s8Mios8D`lrVuiq-N3VR8Uu\JIu8i1KS4`0 +Jq8N*JV&`?O-u>tPa$Pl5&tC[FE)>=rG_[S%WZB,F8Gq8p-PUN:&4Sarr)otp\t-krr*B,rr2rs +s8Clp_o1+(rVlcrrVca&hS@%H`59F0`Pqhr!6+lSrl#Aa_ns:3_T0O3aN2B@`5MYms25_m`5K[1 +aN_]I_8*t4^Vde$`l,m:`Podp_]-G3`lH-9]Yqh/b/V9:`PKC`s8W&srr)]UnGhYMrr3]0r/5g# +DjC.pdm.YkDK0Z8E,T]8rc/QhEH5r=CcYpVPE_>tP`q#Yrdk`7KS>&.KS>),L4Xc,Gt7T*s7uWo +s7?6irsnu(qWPZ*\?;=gp&Fsis5EtWrVulns8;j'qY$k\R\Q\DrVunJ~> +&HDY"eRMd)\A#r,dEK\N`l@#Zs2lA'`l#^6aNDZI`kB#s>ZZ!UaN2BDaM5I/bg"DT`q[XR`rF+. +b0AA\Uc*=KIXm?/JV&K"LP(22K7\`5OcZ$!PEhD];*8`.E,olbqXXUZoC)JCp@@hLrpp3`p@eL\*;&t!p\OUWr:os\o^DA?im6uC +aiDKBb0[i9aia.ps2t8\s2m[L`l?*AeT,B&Aq&@]Yq'.%Df'?2F`qhBC2S!.DfT`9C,fCKOd)3$ +R@'"iKnY/3JqJW&ItN8tLPUG4D(sJccH?+,"3/=!`q.:O`XTi+^R8:l4%2T@^s'g?grT<2rQ#>g +]j"-#>].^Vs8%6~> +#5e>us5W5#rr30"q>:0ks5O%WrrE&tqu?WsrVH?hrr_iCmdL/T#lOPus8W)oo_8@bnc&Rg%/dq@ +I#!K'I>`Z3Ljo;U'8(mkMOBirQ^O5(IlDUmDKK]6GPQ7iG&V\G6`KeRH\/8=W:Bocl2D(jrVcTN +`Pf^Fr;HZprWrQ$q"2FYH$+9/GQi52EcQ5DqKF(oZ,G\KKU +EdiFbHusLPF`hqRG'8.OE,orAHus'q;eU5qFaT1uo`+mhrr3)am.gSZs69Lns7lWcq+d`f9'c2^ +8:#,rq/Rj(Df9W9DfSEeK9_ghQBmbqM1^G6KS+r/K8"u/LP^V@MK_trr;HHirr)lerqud(l0@m8 +i;`iTq>L?nj8T#W!WN#rqZcutrr<#trr2p'j7DNlg]. +#ljo'o;A7cn,31brr2rtir0#WrVl]o%K?D-qY81*YIsK)s8W&orrN)rnbs'rrr;i.;0mnMG^G9s +Knk*TJeN]cKSYt\P*MB"OFB*3EG]c4DKYnsrG`?kDfoqbXSM[L9mrVlcr +s7?6irso&+r8,0!\ZVY"rr<#rrSdbUquQcqqZ$Km$N9+YT:V[Uo_ngiJ,~> +&HDY(hK)n6W4U'rf$V^\_oC]W+O&!L`P]U4`llQJaM#3B<`3A3a32TG`k9%*c-akY`Q%Ji&&cZ? +e=o-EItW)pML^G8Hi8R1Jq8W4R$X#&R$Wq_1imMJEG9?7rGhgT&8c<#J9]m+9A"aMuBL]tVV2m`>FJ +8'&iqaMu3=^X:'Q23X[ke(UHPDJ4*0Df^&EF)5T/CMe!1DfS?aJ!$%^R$sA&LkLG8K7ec*JV/Q& +KSFo3L1iU"ccO)GaSspsO%`?8uMH)c$92`4iXAMP^=FJoss7h*~> +s8;os!q5+*rr3,uq>L?niVriV!<2ups8E)uq=spg#g;]"s8N&tq>UBn!rMZbrr;Qgrr3E%rNK4T +KnbJ7JqJ]0rIbi:JqJ`6PEhDtQ^q?jUC]8S`JrS:Ps8Drrrr_KOq#:9mkl)(es8Vht +Dl&58q3supF*7;!-Za9HEcc>/7"^J`PEV?"PD=jDKS>)3KRnf/Ljt,4KR8GHnbE%^r;6Kns7-*e +rs\SdlgsQ/s8Vrpr;ZfWrr)isrr)ckrrrr7K~> +$NL,)qR<,sj88fSrr<#t!<;'X!rW#rrVmE-s8DutqtB?DYHdEhs8W#rrrE&trrN,tnbrajrr;`h +Y>Y@Q"c.SWJUrIPJeN]cJV&]?PEV/pQ%siHCNFK;C2s2krG`?cEb9AgS+to;Wh!&Zs8Dugrr2rs +rXJo,rr;utrSYZ4`7=hbrr)orrVloT_#D7N_>qLQ`;daR_Z.M#_S=41^raEKL;LmK`P]U3_ns:. +_ns=._Rdk*`5]rsPEs/-_nsj4&PEM&nQ'$ZKJ:`E*K7nf/K8=r.JUhoq +8FZHSs8Dcm!<;Tg$30u%d(?iuV69XnrrN#qiVrlUs8Musq>LHneXZW2"M4I/s8RT~> +&H2M&k([,JS@Z_de'Q@Y_T(TV+O&!L`P]U4aNM`Jb.tTi:fUSp_91$C`P0+.c-OYS`Q%Ji&&lZ: +bL_qAG^kF*JqJ`.K`-N:Jq8N+M3=*fPEqMgI5,GUEcl/nEo]5naZ5@ +naGT3mIKuJeA/ukp[mtGna6>E!:g$Z*:iIgoBlARmE2o_nFuMCl-J_JaiDKBb0[i9aia%ms2IRM +b08#L`P]I7e^9RbQ#gKpKfNX\EcH)?F`hbBCi4'+EHQ8-6%FiTOHPosP_OjDK7nl0KRnf/Ljk#/ +Ir]`jdEg%\`5p%!aof`)`Q%Ji%`ZQ,[s(V15Xo4oaN;cId`;j>aN0`E8PN +%fZD+s81X.s8W)qqY^BniVriV!<2uqrr3#qq>L=!c0a`gs8Dlkr;Q]tr:fsbs76-us8;fpr:.3k +I>`T0LOoGYre1<*s+Co8OHu9"Q^*8ZC.i\dDgH9rEY!,6DfSd%mUVK_>/L.5rqu$[$ig2(qV]?2 +`7=eas8N!As82T`_M4G1Ed2tVF)l;BG5c_%F`DSTI +#ljl&qoGG,gA1aH"TJH$rVtmV!rW#rrr<#t&HDb/s8)HaSuo3Mq>C9ls8W)ts8N-!rUKjrs7uQl +qsh-jI>WH*Kn')Srdt0&s+1c4Ng,ioQ'6iSBhEJ_D0TjpE;abeDK]l:<."%COK)Buqu6Wqo)AXg +rr*B,rr2rss8Clp_o1+(rVlcrrVc`shSB-.rke]Q!Q;nT_Z.IP_A0u*`4X18]oA&0`Pfa5_Sa=0 +_SX4.rPB5h^;e".ZB'X/bK%?2_SX71`Pf[n_ApJ1`PfO)aM=U0Mlb"9^;@\%p&G'jrr2lmk4&E= +rr2rqrXf,/s76-gpe[Z`;pTtqEcu6qE;sniE-#o9EbS0\Ko_OcP`q)\JV*lR'7tjhKSOr+KReo4 +LdUh7q>^Ens6BRoqu?Wg_RR(`S]^g-rVucph#@s*t~> +&H2D$lC2-bO1WHVd*9bS`5^fX+O&!L`Poa7aNMcJbe^p'<`N1_]Z/49`PKC3c-OVR`Q%Ji&Br#1 +e'6('3cg+/MMd(AKS9>Ws+LE)%t]k-Q^*l$KS*i,EboW=D#JAOD[pu/Cd_jc:P>E2UX.'-b4n*ff:oCMMB +p?_PEpuB&jaS>Juo(DPArUKmY*V&Odp%.eRo$XeJg%k:/mc)RZf?)(S`lcZA^<+Oda>1cS`Q63G +b/hT@bIl*QgH:Rb6+q82CNF<3F)uJFEGo]1EGoi>Cee`"NKfZmP`CKMKDpQ(K+`lmM1L;7K8P/+ +/CrIpb/DHBb5TTdb/VHia:5k`@nSmM6@ZYda32QGe&Vs?`kI7-8PNNgk4nuQJ,~> +!WW,trsIN:r;ZfpqYgHorSdbUrs8W%r;Q`rrqlNirs7NCmcjcNqYC$frrrDsq#:jM-qu>p[$ig2( +qV]?2`7=eas8N!*s82T`_MnmMM$Y=JZGm8G7F`qqQGlDjr +HZsUP8eD@;->%.:H[Bf4E)$$qD0u)!'QA89EcY,_Lk_(^RZrhfJ;/i6KnTGX%tTFcLkLP1KKSPqs8;osqW[tZ +r;Q^(kO\<6g&M*IrVc`qec,RGs8N5fkO%Wsrr3#us*t~> +&HDb/qq%L7cM7D/lJq/N/IY39)JqJ`/Jq\i3Pa7GrP(&+$6ud-`ErBtVE=d))EHcA3A[Z'HN,8Lnq"t*^rr2rs +rXJo,rr;utrSYZ4`7=hbrr)orrVloT_#D4Q_SO+g_u@OP_>V4`]tqh5O,9*Y`l,g4_8F71`5BLj +_DB0I_8ia9PEhQV`50C2^r442_o'=,_Sa@1]YMV(UPtM'YJe/k`P97^s8W&srr)]UnGhqUrr;oq +&HD\.s8;lkb>kI+=G'LfBm9Jorc'-#G&M>>:g&O+OI;K"NJ;q7K8"u2JV/T*KRSZ*Jp2c,lMCJZ +!W2o^rX\o+rU%2*\$MRhrr)lqr;GURs8Vimrr39&p:R,iStk'9rr7K~> +$N'YqmB'o$K>#@NrlYA``5^fX+O&!L`Poa7aND`LbJV*+EDK__\AZS1_o'I9bg";L`Q%Jis26A1 +_8t-KIRes?M2-qEJV8]/K7nr3K8,&7Q'[Z!PC/""7<3?fF`VVDEW0kgEH$#@AlDX- +s8N9$s8Ud.mf*4hrr)lsrSd_Us8Drrrr`5tqYpKo&Gk,Lj8]/VqY:'is8Mfgrr;Ke-3*o@qu-Ei +MI)0gKnP&2KnY24K7no1KRnZ2O-5rtLOaP7DffmlEY!A5E,eO(9q\@ZhtZsEs7tpY$ig2(qV]?2 +`7=eas8N!)s82T`_M +%fZM,rT'fI^%hX-rr)lsi;OJirr2rtrr)iprr2rrrq4m4YIaH,rVlisr;cirrrN-!o):!7s8;in +s8DqR>`!f[Jq/H*K7\Z*JqAQ*It!35OI28eIrmqmEbtYmrc&KgFDc&<9S?$/UJB_CqZ$Tjo)AXg +rr*B,rr2rss8Clp_o1+(rVlcrrVc`shSB-.s2+cQrk]Dd^qde'_Sa:-b/KF(PDkaG_o'=+_u@UW +`59@,rk]kia2PTKN0''fa2c-9^qn(1`P]R._84"+_SO:0V2L=uOK&5qs2PM`p&G'jrr2lmk4&E= +rr)lprX]&-r;ZflrGd^kAXYMnIVA\!s)J'X!H3)ZD^%)cJqArFOG\dGJqAW.Jq8N+K8+l-H@^m+ +7Gn.Fp](9es8MutrU'Rpr;ZfS\[JuMUA+Wcs8N#riVrlWp\t0l#lO1qSt2FHjSf)XJ,~> +&,Q2#n\AsAEP9TAbfRuI`Snol0a32K>`Q$'Ebf[oD`q%1t`Q#^0 +_TC*VFAR[?LkgV:KS4u0JqJ]-K7JH.Nff`pKRIu/DKBaqF8p7ZD\6u9EG/lFGX\!g3P!8Laj\>R +o>i&o`Q$-GaMl6Aa2Q6MaLT's]@G*Eb0%cHb0Skkg[Oh+r:L$\!:fpW&bPhto!lEL\&%\+nF,u@ +nEo]Dnbr%jlM1,=^V%J!`q9'#p@IeIoDS2$n+#l;naubPe[rE,]A!#Ro((tim+9A"aMuBL]tVV2 +n&PXO`PojFdQL#0kYcEF*2PDD/F94E,oo:E]JW)Ko_O^LkL;-JV&K(It36, +MhQq9Jqnk7^!Y-@a2PX2aND`Obf]Fr&B`;@[=V%<6UsqY^W"I?bKAebs2OrWqT92^X(+t!94Gs5 +qu?PD~> +s8N9#s8Um3j8Ju[rVuinh>[BQ"9&/pqu-O#f^.Yus8;`hrr2rtq#L?^r[.[Cs8;omp&=f!ArMY" +LP:A7KnG#2KS"f3LPCVIR?2rOMD00gFSKkeGAM>:5F5ucJ<'I)s8Moql2D(jrVcTN`Pf^Fr;HZp +rXf,,q"2FYH$+7QG'.qNG'J<3H3ee>F`VP@?6TgW!!3O;FoH\0H#mtDEd2nXH?sg`B2fEB!X&WX +Ble<:F`MYGF*;hTHMr+&F'L@(!!WE16>h$iD0_)io`+mhrr3)am.gSZs69LnrVlilr;Zc[9W>$^ +4B-0?q/R^$EcH,<2M-C9OHPTXKS4u3L4k/2KnP)0J;B2;J4[9Hq>^?js69LkrVuo]mIgA=k5YJU +rr2rVrr;orrr)lsrqu]orrh?Clg*a5s8W(K~> +%fZM-r:@(bY4;Dhrr)lsh>S&err)fprVlirs8Di^SZ9*[rVZZp!r`&qr;Z?e-NEuCrr;ojs8->; +M2-P3J:W?*JUrE)J:NB.KSGPSNdcP8/ot`IqJ[$dE-,i9D*=+mX*fp's8W)qs760gs8N!,s8N#t +rr;rT`P]XErVc`p!<)lr!T(Wk_uIUR_ZRcn_SZ;f:r1#d`5Tj8Q&greQ]fD,_nj.+`l?'<_SEq% +^r"72^lOD>Q&;-Tahkj0_oTg8_ns7+_SX(*ahk'=MNj6cXM_uj^;Rk\s8W&srr)]UnGhqUrVuco +s8P(Sr;Z`Z8uJOR3)OF1E,T]7EH,r:EH,o9D)?cjM2m[UKnG#0JV&N*JqSf0It!-1Isjbop\Fje +rVulr!<)or!<;Qf$2skL]!Sf@]Cu4%rrE#Vrr<#srr;rsrqud%qr+BCSt)eKrr2qJ~> +&,H,$o@84j@^X8$bK%`Ha5P,>aoKN]`Y-A7bfn2M`PATQqh7HW,Qb%b/hZGdE;(% +,0%UAbfn/IaN2E@bL4JB^Uh&-bJq]Ia2uKMgsXsHoCMVHrq$0[!:TmVrppirrq=4>]Y25!p$qP? +oCVP>mI0T8rUUQsna='#`lc'>p%\.LoCDYTnc/&"mI0N5o_S.0]Xbnl^u5%`n*/lYm+9A"aMuBL +]tVV2n&PXO`Poj +s8N9#s8V$:hYmHVrVlcmhZ!HQ&H;V*q>^?ls4cf#pAb*er;Q]q!rMfknGXg5s8W&qs8Viglq)k] +M2$h;KSG/5KnY27KRni/JrG_IIt9RtF)u?sEXm&0E`7BSWMiG]qYg?krTO4gs8Domi5NXQeboCG +rr*H.qtTg#LO"#`F`qnMG'J<2H3eb1LdEI!Mmo`+mhrr3)am.gSZs69LnrVu`os8DroOF*[I +N$`C_q/Rj(E,p&;6u[p3KS>)3KS>)7LkUJ7L4t56KSP&5:VZf*s8Dups8)c[rX\u-s5WS?qV_;O +s8;]js8V*X"T8/or;QWo!<2uqs8N&u#3P7:l0nZNrr.E~> +%fHA+rqj1"V!7UPrr)irh#@1-krr)cnr;ZBf.0'2Es8Muss7uKX8V;JG +JV/H(KS"f.K7\c.ItN9%MN!@>Il;.`EGt_n&92Z+EH5$)6)CDKo_eaerr)Bdrr;us%KHG,s8N&s +i5NUPec#IGrW)oqrs%>q_o'F1_Z%IQ_Z%A*^r""-`lH)eNKBa5`PTR2_Z%@l_ns:/`NYJbP`C`dWkHBk`5KLbs8W&srr)]UnGhqUr;Z`p5Q1WZ +s8W&sr/Z,oG).>WDfBW6E,fl:DfK]7Ebe!ZKmnW+Jq8Q-K7ei0JqJc2JqS`1IYLV2qu$Kns8;oo +s82fqs7-(!s8;f6]<\W5h"UjKrr;rqir8oVrr2oq!<2uts8E<#c_@/*S[\Iorr7K~> +&,?&#p#Cm6>-,Q\aN)BDa5P,>aoKN^`rF*kb08)Mb/20/?!(6Z^;\"0aSj6`aMl-iE$_T0U3 +_oU6HdE=1_Fb5=(JqJc0K7no1KnFo/JUr`=M10t6E--2BF*%;"&T;Z2FD+-`4Jnc-d)sDKaN;Tq +a)0 +JV/Z0LP:D,H9A(XbfduF_T'I7b5TTeb/hTBo#M<`d))V\5r_G,PIJZU`lS/%ilM/>rQ+cV#ekmd +;c6MBjno&WJ,~> +s8NQ,s8ViHj8&`Trr;orrSd_Wr;Q]nrrE&sr;Za&s75"1lMpn\q>UBn!rVrnl2CtdrV,hQKS5/: +nUq-tL4_F%G&DL!EY!/1Fusl&UM["#s7u]nrr;6^$ig2(qV]?2`7=eas8N!.s82T`_Mrr2p"kj8*Drr;!W$N0WfX/\X6;0?o"rc.sY#]Xd/D0'neE/"+@ +s+^E(#DIb`K5tZ!r8IV[qu?TRn+ZP/rr3-#qu-Qpir0)Yqtp +$iU)(s7k*6Vq:_CrVlfsrSd_Us8N#trVlcss8Mus"o?'-ZbZ>7rr`9!rVl`poD\[frVd$$q=-t- +JV3HD#ChGZ2J[DNFSTkdDfBbXF+^*#W:Kubs8Drso)AXgrr*B,rr2rss8Clp_o1+(rVlcrrVca( +hS@%H`5BL0_ns=.rkT)^_8FC4bE\0LOctoiNlM%7/]5TKahbs:]Y2)$\sSGBP`q>hRE3@b_nj:0 +^W=.)`kT@.`PnsBP*_;iNf0n9`!s]'_=dj.rVlfpqW@;Imf*.ar;QTn)#j4tW2;n':2t5kDfBZ8 +E,KN;CiX\aDhIt>rdt`5JV&K+K7\]-JV&GkBD2<'rr2rnrr<#grX\o+jh8=8Wg`_]rr2rtrr(jU +rVllsrV[6*qu?Tns8Vi,US46R`Vf]7J,~> +&,Q2'qW4e]?CJaO`Q?3Da5P,>b5]Q_`rF-[aqi4DaMu66ISs<`\]M_+aNDZHb/hQ@`q.7``l5p: +`lQ +^Tb>c`QZ0=oCMMEnFH&5o]tr;m-X?9p"?me_SX()^Z#%_oC1edm+9A"aMuBL]tVV2n&PXO`P]^8 +rQ5,]qo1G:f/'+s5B086F`qeCCMe3:E-Z2;F?XPpKnkG;K7A?"K8"r1JUrH+KR\Dm>YEMmbfIm) +`WF6(b5TTeb/hTBo#MEcahrp-4[)J2ZG=K$`lZEHb2UMB`rF-YapuV8c,[oIb.):`:JtMam/?s7~> +s8N<%s8W#MhsgXF!WDrRrW2rrr;Qitr;?Qns8;os#Lr#&s8W&nrr2rtr9!t^qteT+LkG2M#D[hF +6$%$gD>A2_F)XI8;l?9io)Jahs8;ool2D(jrVcTN`Pf^Fr;HZprYkh6q"2FYH$+1NF`qqQG^4UX +H$44EBOiD!!rW*3!Y8pcG'8"LEH5uFD/t/IF&rr2p"kj8*Drr;!Ws83)%B;^])5]cpFs)SNfEH68;Ecu.tA:=9,s+^E(#D7_bL +I'esrSd_br;ZNWmITl0s8)cqqu$Hnj8K/YqtpBirrVuprr)j(m-EltjT#8Xr;Q_H~> +%K-5)s8:cHUWE3/rr<#UrW)utrr;rsrr<#trr +%/Kf#qsD()>Dg,5`l[)Ys2tA_s2P)[r6#&\&](2==Ce_N_SsU=aN2NF`Pojga99N%`Q64$bl>`h +a31D2H%(I$o7I="JpV)nE,]o:rH%pW&9MhMO%Z+26Hmp$aO//N_T)2g*lc1=bfn/IaN2E@bL4JB +^Uh&-bJq]Ia2uKMgsXsHrq$0[!:TmR<9`oCoCVbN_ns.!]u.e,^\70cn+6/>mcjB.o)/(SjLqt5 +_nNn,`5hK>nac,;n+5c6mI0i)_"Nng*`PqAg&&ku$8NK%.@_'FsaN2KGb2LGA`rF-YapuY8bfIrHagbbN9NG`*nbrK<~> +s8N<#rr<#RhraqGEd)_EDGqDRqZ%rK/Sf?KH$=IUGBS=ZEcZA11_9Wf +!!!-*!t.G4F*;bUNR[V#rVlfr"6f+Hrr2rWrYYS*r`>Yh;*f/AEH-&@EH-)FE--8E5"C\0LA6E+ +K7Zb4q>^0_rqlWarr2p*m-X01irB&Prr;lmrr;$X"8r&nrql]rq#1-j$K^X;k2ZLAr;?QoJ,~> +!W)fprrqkiU:0aorr2uri;Nr\rr2lprr2os'`S(0rr;rkT<,N2U""s8McmrV6BloD\ahrr*B,rr2rss8Clp_o1+( +rVlcrrVca!hS@%H`;@IP_@af&_og!@RYm2hP*;#gNf1oprPUk<`l>d4a1fX-O,B*eQ&q)jNg[u- +_o'=/_o0I2`4j48_l/ZTPa%>nNfT1"`5BL2_SPpFs8DrrrVG[Gs6]gas8)`mru:Y2 +&,?,'rU\BS?Z`]na2l?A`n&60aq2J$=&iIp[)U5/aMu6Bb/VHla:QA1`QHHOccjJL^r=Mh>^qS# +K*m0YJ6YQ]Ciji?EW'tYE=cu)1ff=&9;^.X_9C0Dahu-ia<8LA`luZJ`Q6-@`QQ]N\\G_fe]YtT +b/_WHceQt'nFQ8NnQG>Jlg*s-mIL)Gq9-Ca]t;"t_o0@anF,i;oC),9lh1&Er9V,(\%TMi_oBO5 +oC;A?mdBK1n+$#@HrQ%%BaN2B@`PopA +ha*9m8NLX.Ec>u8DKL,KDf9N-1-LDDK8##3JU`6)LP:A3It<0'IWdWDd*KGIb0'S)"j4p-`l5pf +a9or(Z~> +s8W,rs8NDehr"J6r;$3es5EqXr;QZp"8r&nr;Q^/rqZToi829O=ZSEVT;(rr;rms8;-\$ig2(qV]?2`7=eas8N!'s82T`_MpU-kr;[!%!X03LEr9tcFE;\KEbS;b"U,#-!%7pL"tOJ/Fa81TG&qtPGB.J-3=#Zk +"98E*!!!9iCNXlIIuVtMs8Drrrr_KOq#:9mir0ems7OlCUR"\]FE)8?EcH,AEccJKA5,75q1e]u +s+U\p>ke0os7cNir:9jdrsRoXo'b'-s7ZHlqtpBmir8uU!<2rs"TJAprVlcq$K^[@j6$CArVZZp +J,~> +!WE#srrr>.UoEeZrr2usi;No[rr2lprr)j,rr)fps8Mc'V68&7s8N#ss6fmcrrE&tr<`K's8Dur +p,R\Qnq-mo#(KB0E-6#9q/?mcC.VX+LMutarVlipq>^EnoD\ahrr*B,rr2rss8Clp_o1+(rVlcr +rVca!hS@%H`;@Fc_SaC0`Q-#cMiNsbPa.AjN/P]nr5:_;_Sj7-_mbYbPaISmP*M2jR`NIc_ns@1 +^rO4-_ns9gMiX-gO-,N_OcQQ^_ns=-_=dj.rVlfpqW@;ImJd(aq#:6l)#)Q]Tp&,PEc5l9EGof: +D/XH:@S8h,K7a)Rqh"`u#_[nI>PJ-qs8W)trr)iqqu?3cs8387\\#>=nGWCdrVuoTrr<#urr2j, +rr;rss8MlhgnUL5TX4:hrr2utJ,~> +&,Z>*rq>?)@UlIRaND]E`n8?4`r='Zaq2S(FAl@nZ-(20`l5s?bfIfpa:QA1`lu]RccjDH^;nII +,^On0K*m0YG=FK+EGKN5EW'tYE=d2*6r]\$JbYnaPSbm+9A"aMuBL]tVV2m`>@HrQ,#]rl?)! +`Q$?P[R$.<8m6:TD/X?3F*D\HEG\`?0Pu8ire2,?JV/`5Kn4`'JUrN-@Rntp_og!Abfp(2s3(Pe +aN4>"o#M6Y];\Li4\/)I^raaAh8oW9s2b/]&'W#5`Q#d2SlJBV>(kZ&rr2qJ~> +s8NQ,qu-Q_gu8;5qY9scs5EqXr;QZp"8hoir;HX*qu$KnfC8&)s8N#qq>'ses760hr;HWors&2o>Vs8N#srrDu]rX8c)rVGHk`5L4(rVulr$NL"uoYQB/ +F`V_Lr-/KjE-5r%+qP+`qu@c="VG?dF)uJIG'A%NF_at`"T\T,"9JZ*!!k)hDfbo%*d2jKFE)D2 +/.`!d!!*0%!!WE-5&5:dH$t\%o`+mhrr3)am.gSZs5O"cr;-6YG*&V58p#)nrGi0bEHlPH9:]:5 +q1e]u$&+$pB_VE(p&G'frqlWarr +$N0o&s8W)9U8-WArr2usi;No[rr)cnrVca+rr)cns8VuRS?KNqr;?QnrrE&trUKmes8W&urVld% +s8)cqoR:8'KCa[#K8+Y>?2oAXs8N#srrN&toD\ahrr*B,rr2rss8Clp_o1+( +rVlcrrVca#hS@%H`5BLl_@si(_nO43_NB\6Mj'EjP`Lc`NQ1t95Jt@U`59F/^q,)VOc5KcNg5fi +OI=2/`5KO2`5fR,_99]^LlRUXNg#N_P`q62`P]O0_SPpFs8DrrrVG[Gs6K[_s8)`os8W$(nop.j +@7>6WE,kkr%<63*DfJ@<=a5RNJq8LMK)L<-Jq/A1Ab>j!p\4[as7-'tqW58u^9"L2rVuoss8V!U +s8W,us8;rsrVmE+rr)N1US"6N_tj91s8W(K~> +s8S$aMYp7bg"<"a:QA4bfn>UaMu04 +aj\[P=b;4rK*m0YD`Up$Dej30EVjegFA4l`QpSU5b0%fLccsJF`q.7q`l5sAbfIcEaN)9Cd`Au6 +]"?M9`lcHEai_rbdbF9_oC;AMmoSoFn*^&LprL7i_8F+(^Vdt-_=mBen+6/>nF6)Fp[Yc/_nO+- +_8aC-^rlHEoCD89lga<3pAas7]thP$_oK^3`kK+Aq=O4Hj3R)DaiDKBb0[i9ai`tkrPnlYrlY8^ +rPff"b#j(_@S(QXCi=<5F*)GHChPqi8o&g(K8#$YK+j#oK7SN%JV/W*0iZ]Ia10.1b0'_-s2tA_ +rPnBK$,Np*8j>d3@(4)Qb1ar8b5]Nla2>j6]STW^9j+(OpAFpiJ,~> +s8NT-qu$Kig#`86q"FUas8V*X!W;rrrri>sq"Xabs8VurrrU^;k5G;^r:p'brVuHfs8;ips8N?# +s7Z-clTp*lKEm3S;8#/6Ed@J$%sUQcYBklsrVZQfqZ$Tns69Ljs8Domi5NXQeboCGrr*9)qtTg# +LO"#bG'F)uACF)c>GEc+2# +VG?rAq1Js+LIniKs82fqq>U9ho)A[h$0LjQo[Ws@s7uQkr;ZfUrW2rrrVm'#qtKsbrVlg#i8j1i +hu!EQs8E#uJ,~> +!W;rrrrrDNTqTX(rVllriVj#\rr)cnrr)j!rr)cnrr35pR]UBuq"k$jqu?]frr2rsrXJo,rr;utrSYZ4`7=hb +rr)orrVloT_#D4P_Sc8f&BD]-O*Q>:OHG]iOcGH`NlV.;rke]Q3l\tNG'o@1N/rsYP`_#iR`NIc +`59I1`PTL5_k)1%Mi`gTP`UcfPEDrc_SO1-_=dj.rVlfpqW@;IlMge_q#:6l(Zn/cU-iU3EcQ,= +EGof9DJMJnV+cPpK)C3!K)L<-Jq/JAYkJ(os7lTis7-'os2_p^[@c1JrqufRrW)utrr;osrr)j- +rVlfe\"]IcT\'&>rr<#tJ,~> +&H2Y.s82,`Ala>maihrK`5^`VrQ5/^`r3jh`lQBH`j8KE?_#']`kfL1bg";uaSsnFc\RqQ[KM`5Ka8_oKU- +_T_lMo^_G +s8NK*qu$Koi9Bb2q"+=\s5O"Yr;Q]q"TJ2jq"t$i#Q4Dqs6Jb0oD\alqtKj^rVuHfs8;ips8W,s +"TSJpCM*$g#$m#T6?$j]q/QdC8Z8FXqYL0jrr2p!rVQWZrX8c)rVGHk`5L4(rVulr$30ntoYQB/ +F`hm*GQi85F(?[1rW)ouqu@07@W6C3G^4U^GApas"TAE$"oJ?6#:aA(EcuSLF`DbIB0H_)!!!'* +qZ%$05](XgG'o;!o`+mhrr3)am.gSZs5O"pr;ZWgp5XNpHVn9nF)c8BEHc;EC.J'i6huK4KEm*b +M(u(,s8)]oqu6Kjo)A[h"Q/bDnCdg@#5nAqr;Q`rhu +!W;oqrrr;`WM$ZprVllriVj#\rr)cnrr)j,rquZkrr<#lZCeGKp\b$hrrW,qqsj[crrE&rs8Vs# +s8;P(A:]C)JdI'_?AJ)Wcai)-8_Z%A5^;%7,I!L6qO,o6YOHPcfRE3Cd`59I2 +^WXI,TR(s7I#3oGOctoiP`Vuc_nsC1_=dj.rVlfpqW@;IlMgb^q>UBn)#a8jH(B+T@W?F,EH,o; +BldrWp[LS'K7a#Ps+:3%s+1N)K7bbRp](*iqu6Bjnbrpn^UghSU\Fcdrr<#Qrr)fmrsJ`$lDgPL +S>tiOrr2otrdX~> +rr*B,qru(>;e):ar/:?`P]U4`lQBH`jfe]>(OZ@`kT:+c-OVVn]29aaN2B@`P]U1 +`R35f<*+Bso7I3rGYibN3rWjpDfP\r%s;#GTT_"Zc-+/Ib0A8S`::ni`l5sAbfIcEaN)9Cd`Au6 +]"?M9`lcHEai_rbdbF9hoD\8\oCVkO`jiFgaj%c?]tM>&`P;-9n*fl>n+-,Fo!Q!;_8OXDa2Gp6 +_S=Cnq"F@Jmd9E>q"W[U]"P\mai23<`4s!sg\(1.nDhj]f?)(S`lcZA^<+Oca9g#1aMu6=`lQCiFE:Ec?8?E*P6Zgb*euJVAmXKbB#hIsum"KnP;8+cO^g^;Iq0`r='Z +`rF$X`WF6(b4 +!WW/ur;Zd$kNh@3rUosbs5O"Yr;Q]q"T8)jq>C3k%fH5#s8Us@jo>>[r;$-crVuHfs8;iprr<#s +"T.jeK8&iK#Cf5+pLRQMF89he:3s'YVY^5fs82fnqZ$Tnl2D(jrVcTN`Pf^Fr;HZprY>J1q"2FY +H$+7SH$FLUF)l24/e/$crW)s%!!<*!%0p9XEclVPH?jI8'*&78!!33(!WE'5"Xn#$F*W"SF`VD7 +57n&!!!*'%"T/6.#=*-KG]nCmeF`e>rr2p"kj8*Drr:sV)#F7/s78saV`e+"F)Z/AEH-8B@;#0, +oS<:-j +"P;c&kO8BLs82lsJ,~> +$N9o%s8Vul[@aAmrVllriVilXrr2lorr`8ur;HWp#5QoAZ+Ki,rVllsrquB4c[E">N_X(nL.rr2rqrquWms82Bdrr;us%KHG,s8N&si5NUPec#IGrW)oq +rrLulrkecR_>_=O_c4RlNd,_pJV&K5Nf]?bP*:pJ`l5m5_8*t)\p\XOIPnC!rr;usoDejh!<2utq>LW\_6LSQYP%nns8W&ss5EtT +rVQTrqt&kIU'.!op&4gfrrE%K~> +&HD_-s8DEAJl,O\ccaJN`Q$oYr6#&\!64uV'#r#8b/q>_;HRYK`l#R-`m)iPm)TUT`P]U7ajAYn +4*>n$o7IC"EAQ&&<_mROEH1qu&TMkfH)+JqdEKYO_og'?c-+)sa<8LA`luZJ`Q6-@`QQ]N\\G_f +e]YtTb/_WHceQt'nFQ8Nnc/2^o_A=]bI4pq`5TU6`5'7.`P]=]nF,i;oC;JKos_0B^q.S,bKe2J +_nj(4qtfsWmdT];pA*IS]>;A#]Z&"3`lPm-]%ZiKnaPSbm+9A"aMuBL]tVV2m`>FNs2b2Zs2Y2_ +rlkDb)p#k7`7!-tU80\FC2e06EH#rCBMqXUgY@"%KD^K+KnFsUIgq$cNIc^n7FfT'`P][6rPniU +!QN4[b5]Nbb/hTBrQ,#Y'ZeG<\qj +s8NK)rql`ql0IO1s8;fos5^KAmd'`Krr3&trVu3_r;Quur;KcBKnB,R ++,59!JqJK/Ir/urpk)IaEHH)@E-?5@<(sEdrr2p"kj8*Drr:sV+8c*rq#:3jrs\o,s7PUJq:GZHqtKjarrW2tqr.PQs8N!!r;$9h +rs\;UlfdI%s8Dlmr;Q_H~> +!ri5trr32u_kNpcrr2osg]%0Or;I!%rquAUXgdHirr30"s8W&ss7?6hs8W'!rVlfr#5e8q<-EkE +q19oIIt`K,I>WJfC&%IV;/gGoCiaK9DfAWFVjgWXr;Z]ps8N#rrUBgcs8N!,s8N#trr;rT`P]XE +rVc`p!<)lr!T(Wk_csmn_S=(7_Sq:YG^4aeI=@!2OHPchPEa1_8=:3S9K+&GC"O]IYa)MP)trkY/J5o_oBOcs8W&srr)]UnGh>D*rH!;qYdX.V1_0R +F)H);Ec?)9<."H@_a]-.J:36%rdt'#$A*qZJ:g&Kp](6lnc&[gqu-Kn%K$2%rr2rpe@3-*Ra^m- +rr`8ur;HWpir8rUrVlfr$iKeuqSB#'SY +s8O_T)2grl,Gjbfn/G_oTmGhEbn' +I=qBM-&-o%J:i9/HsTe'e7CdYE-6)BEHuSB;+mgK4O;3m_SsO;bfn6!aF2(I`luZJ`Q6-@`QQ]N +\\G_fe]YtTb/_WHceQt'nFQ29mI0NCrl?h7 +ccF)TP#S*,6Z@$]Eboc=G%jBMdG(HXIuB2:NJ*.DK7SN%JVAl;KS4_)aj&)M`W!mV`W!mWaSs=) +`lQBH`P]d>b/;38bKS,5CHasT6&iM!`P][;dEfeJ`oG,Cb08#J`r=$h`l#a8a2Yc<<_l=iNp-E= +s*t~> +s8NT-rr)lsoAo$$s8N&ss8UOH#5nN$jQG[qr;Zfp!W2i_rr)j%q#C*?5DY#Fq1Ki@Mh?P3M1("2 +g&L]3:iUMtF),r?DK&.0Wa*mFrqZTmrr)l]rX8c)rVGHk`5L4(rVulr'*%k(oYQB/F`r4XH$jXD +?m?*aq#CBqrW!B.%VKHmH#@eD>7U]7"82^+""7o&Ed`=XFCd?@"pY,.!VcX'"?UOHH?OIjeF`e> +rr2p"kj8*Drr:sVs8O,:s8DRuT;PXsG&V;:FE2/=A:"%GrB,+MM2?b9JGY$"K*Ha^Jr4;eqtpEk +rquZqqtU'frr`8qp\t0l%K?>+r93\BmFVCC6lJ,~> +%fQG+s8N&se"<5Wr;-Hjd/FUVr:dXqWn7:MrVZWns8W)uoD\ah!<2ur$3'u#s7k/.KnP$QJf]K$ +K7JQ1I=a'$s7MgVE,]i;Bln?2Db#b_=jHjCqYpNprr;rdrr2rsrXJo,rr;utrSYZ4`7=hbrr)or +rVloT_#D5U`P9:4aMPlVIX63aH[0mbIY[HQ*W5s8nm@l]:LA6aDJsW9 +BlIO-q=j_DC3YDbIY3.LK)L<0JpN6$LM(c,s8Drro)AdgqYgBm%K6>(r;6N]^q@4aT^;UUrr`8t +r;Q]qiVrlU!ri6!rVm6'r;HN!U7\$MdJWnAJ,~> +&Gl;&s8Vu`XAhlWcH=>I_oC-G&B;]*H"^;7b&_SX4i +`@f!?bPUr!naQ&DqU`?m`l?*F`PB=,`lH'8\[U,ap@Ie3cg99*a2l9Cd(R08b2:8tb08#Gc-4C& +OJ5Z]F)5Q/G'.V<;cq;df-Y0\Mhlq@Knk;5JU`6)LOkM;Jll:0d`TPKa2e+trQ$2*aMu6Db/;-< +b0%`D_op- +!r`/trr2rt!pAY&rr3#rs3^iFrsShXlfA*GrVuooqYfUV"o\=AC41m3KH>MoM1^D4F^4eCrJFBp +DJsZDBle6*=KRX"nc/Ldp\Xsis69Ljs8Domi5NXQeboCGrr*c7qtTg#LO"#bH?jdUBkJq'#R(;4 +!<<*&qZ%oC%V9j5H#dY,$NgD9!rrB)!!*'"!<`N*"!_>oH[g6ZAMXbr"nhp+!< +!rW)srr3?)k,4i_qtU3fs8URIs8NK'r7[R?_"dp,r;QWms76-hs8;lqrs&DuFD,uTKDpK%KDpHE +H@^j&JV%rHp](5N:3LGjF*M>;DIlnJMeV\\rr;cnli-n`rr*B,rr2rss8Clp_o1+(rVlcrrVc`s +hSB*->/J1o^Vl1SG^"F\H['jbG'\^rNffKa_8+(+^V@L(EclkZG^b'dH$FXdMij0^QGp_]`k]O1 +S:,L+G^+X^I!^-cJV]>MQBnGg]=u>)_=dj.rVlfpqW@;Ih>SMnr;ZfmrQS3gk +r;ZN<6@F]BIYigYK)UE&Jd@*`IXui*oD/@arW)urrqZQqqtg9jrso&.s8MuqrntH%[&:V3qYpKs +rr)fprr:pU!<)lqrr3E+s8);`TUhdQl21M[rVqB~> +&GZ/$s8Vrc`*cGia2Hp4gALF-o&S-`f?)(S`lcZA^<+ORaT'@: +bfSG@5bX?1D/F67EHcS@@GB5Zd(22^Ljsf4N/*% +!ri5urr2rt!q>@+rr2updJj1G"o\K$eFVSsrrrE%q>('hl2Cqfo@Q9[NJ)lYKHGu&Kn=u1Kf\r" +qY$"HEH?5>EI)YC7%U5Siq`KDrVucos8V?_$ig2(qV]?2`7=eas8N!0s82T`_Mrr2p"kj8*Drr:sVs8O,:s8N&lHA/P0@rld/FE2AB>#4ejr;WBkK7eo4IJJO& +Jprr9LMK9LrVu]mr;6Wnq>C6l"oeDpq>U +&,lP,rr;uroX(ErnbE.]s3^fUs7lW`S$]EZrr2iqrr2r`rr)j&o%-!SM1^;0K)C6EJqS],J:`E. +3VDt@pQ83iEH5l6G]7IdSY8p=q>L'es8VEarr;us%KHG,s8N&si5NUPec#IGrW)oqrrLulrPMgU +`5KNJFF87VH$js`G^=X[I"m`JP)7#q]>)1dGBSCZFa&.XGBnIWG'\h"O,]IKaM>@,`0bakI=HEc +IW^'dH?jpiLl[UUWQ)`i`koRbs8W&srr)]UnGh;C*rl-;rVcD6KrC9lrVqB~> +%f-##rr;ogeok55[_g8*dE)@-%_fuj=D(Zn\]2b9aMu?@nAmf9bfn/I_o'^<\LVr[JUiH.JU`,t +JVB#>MhQe1GU1nbc-()hDK^5BE-ZMC6(!s'a48JN`6?6Bb08#L`l@SjIE'7Gbfn/IaN2E@bL4JB +^Uh&-bJq]Ia2uKMgsXsHoC;;=o_81![(X&b_8F4+^Vn15`lQ`PTI.`PoO%h#-d6n_qg\f?)(S`lcZA^<+ORa<\pIbK\Pf +@&Zrl-,#`l?0B`Pp!D +a2l3>aMY&q76*e"Qb:2X_nj@8ccsJI`o>)>b5]K[a:-,-a2u)e +"TJH"rVlfr#k[!-s8W)nq>A_@s8NT-s8VHFm.:8WrVcNds8D-["\Xi(L4P3WKHGqsJVer38C%88 +r:2RDF)Q/ADf'Q-D6A;FqZ$Hmr;>OQ$ig2(qV]?2`7=eas8N!1s82T`_Mp=B6C!;c]prqt^R!rVrnrr3`4r;6Eip](9] +kj7]umJm4bs8W#prdX~> +s8W,t%0-;)qSAl%ht[0Ks8UOH$N9l%qR`N+`q]T4rVllqmJd%`0E+P"H@g[&JqAW-KS4u0K6i!% +J;$VAs8W)i0i`40EcGr3EF`jeHAVLurVuips8;lrs760gs8N!,s8N#trr;rT`P]XErVc`p!<)lr +,i6>S_o0F/ai/XHHusRWG^=[]H$FUYH%:^3OGgfd^;74$H[Ym<3.67"G("X\H$XpmN/j:F_oKg. +Sp5[0H$jsbH@:-fH?jd`J;'5EXhhur`50:_s8W&srr)]UnGh;C+ohK?qZ$6L8$ALPDffu9DKKi9 +7aUr1q"KGIL4k87JUrFPKE$N0JVSQ.K76&[r;HHjq>^Km!r`,trr3Z1s8;cY^Uq%]SFZUXs8Doq +s8N#ss5X+Xs8Mrsrqud(rqOL0St2Urr;HQmrVqB~> +%f6)$s8W)kif%2NS%Ze[dDum=`PBO.J6Z,jZH()3a2Q9Bn]3r;bfn5L_nj79fJ7o"K78W1Kn4]# +I"-j-K85D5Gr2bXe'5oJ89/cqFDbo:B5FM\E7iaccbmZ?aND`LaMu6ja=YEN`luZJ`Q6-@`QQ]N +\\G_fe]YtTb/_WHceQt'nFQ;Ep](9(YJ7Za_SjF4rkpV7`l#[2_nNYMp%J7Q\A,qt_8=14^qe%2 +`59=(^r*t*mdU&Po\@!n^r+14_nj70`l>pq^_OW)]&35Tp$^kcm+9A"aMuBL]tVV2h8h=m`llNS +cc%Z6R724CFDu5BDdtB#bgFhhBL[#cJV])8K7SN%K7ei7H\?QW,Lk#\b5KQ`b5]N_`rc-42H`o>&Bb/hTBaSs?^`s]i)]n'6V86_PDo_SLcJ,~> +s8N0"rVlfr#l<63q>^Kkp\`M>&HDb0q#CBW`7JG=d=IZ/o4>3u7b +rV4o0E,9l=DgHJH3MNHJo(`.Yq#1-LrX8c)rVGHk`5L4(rVulr)ZT^0oYQB/F`D5:>S7DU"U,)4 +!s&K-"U##4r;]%g)f0bA;\'6 +s8NK+rVuloqTkk1anYc4s3glRr;ZfqkE3$Ukl:Y\rrDuarr)jMqtNU+L4G&/JqAW-KS+o/JU<9+ +KO"!Gr;HKC6>gO_CMe<:E]9Yf:%J,Zr;6Klqu6Wqo)AXgrr*B,rr2rss8Clp_o1+(rVlcrrVca- +hS@%H`5^'7G&r%QGC"OZH2`.aH?XU\H[^[.O2A`OWH!96F`i(XI"$BgH?OLYH$OdkMNu<'`4hFQ +H@1-aG'\@SI!Bp]G^"@TH%q0W_Sa7,`kh?Js8DrrrVG[Gs4mSoqu?]kqZ$SYD6%\^C2S03Dfoh_ +[JBk#s7oYWF+sUEs+:9's+1Q*Lk0u1J33W*rV?HhrrE&rr;ciqrso#(g:Ou+UV6O's8W#prr)lU +rr2p"rVZTlqu7#oZ)*q[UYPeHq>U?mJ,~> +s8)fqrr3<"kG;cpJ%=eu!`Pom:`Pf[3_7mIk]tX15r8Olk_Rd@s^qmt)_SX"$ +^q@1e^:h;Pp%\4+Y.VQf^V@\"\A,bo^V@In\[T2`hXg@.mHDm_f?)(S`lcZA^<+OSacHaMT +f[k1IU2XOZF*M\DFCHkgd*p:jd5)nPI=hHP%tfFaK7e]4JpDic-JQhfb5BK`b5]N_`r +s8N0"rVc]p#MeA,s8W&lqpGBOs7cHkg%"\+s8M`fp\t3Zrr;m#qYip2Ne)cVKH?&/G]-!Cp\k-f +s3NiSE,]oCBQ%"$[qDW5s8Muss5 +rr;us#Q4G\WhZrjrVliFrX&Q's8DnoVQJ5Br;Qcpmf*.a$2j`hG_pp#K7\^QK,oPuL3.6!U&"`g +qZ"o'G]%ASnI'[C]pAb-jrr;lps8VZhrr;us%KHG,s8N&si5NUPec#IGrW)oqrsdi#_o'F5 +VL*`3FFn^]rceBe!dAm7rd$/CI>*Eg`h.I&Ed`RdI`4s.(p&G'jrr2lmk4&E-rrr;6Nms76-b:na[MEHH&:Ec61mWVcPi +rr)lb:O@]mJHCFUKDgB-JVSZ.7IC$OrV6Bjs8N#trVucqrVca+r:J1E]X=3hrVZNlr;?Nms5 +s82cp$Ms,/F]i:Y_9C-Gd`;s1`6--jaT'Hqb/V94^;J4P2Kb"2IY!3,Jc:-C +JV/i8EFUYRda?4Qe#F^6EHHGMASP.gYZZb(e',kSa2Z4!ao]Z(`U_(u`l5sAbfIcEaN)9Cd`Au6 +]"?M9`lcHEai_rbdbF9_pAX!Y](kd]"5Vc\\#Mb +\$icS\+9+3\@ATP\&61u]XkP\]">Ve]=GDYZGY&bp@%;+cg99*a2l9Cd(R08b2:8_`lQ' +"TSH"rqlZo#N"P(s8W&kqpPKDr!WAss8([Lm/R+Yq=agfm/I%_#6+6\JU`?.pk0`?Lh:Dnq>1!c +s7WrjEHZ;BDfTqfWgd#^s82iprVufSrX8c)rVGHk`5L4(rVulr&c_b'oYQB/F`D+f6:+.-3^>k- +56!eG5".Ur3^,ko2)Jr\<_uRf8k;QJ8lAP\<)HCb91qlK8P;*IDe2jQ=&Vpj:Jt.m<`N:';,'b^ +>Zjm$0Ond=H\%:.o`+mhrr3)am.gSZs5Er!qu?Wnr;Q`lql+G2KiDo3E--&=:i5t*rql`frU:3ll1+?9d/X.ErVQTorqlfrs5O"Zr;$6grsel$s7uQls5`M9 +lfA*DrVlruqu2*~> +%KHG-s8;lpr;*aoV<7XRs3goGrs&>se<[2LpAY*lrW)obrql^"o07YOJqepSJfo\oKk+oiqu-No +s7j)kDKK`8D/jVbWgHcXs82iqrr;rprr2rgrr2rsrXJo,rr;utrSYZ4`7=hbrr)orrVm>`^r+(/ +_l09&VPBf]V#I4gU_fc!U84W\S\MkGZF%'GYdCgB[^*!AZa0S;0=.sgYb&AF\>HU@]"5D\[^ +!W2]krsJ_rj+^Z7T=i=ib0e<1`sTW#Q:kCsWkld!_sb\Haq)S4_8!b(e(6C)Jqo#/K8'5U+G"if +=&d`"d)j/Ga-JGoGBA"IDf.\3O[@@BaihZBai+/#"3AL%`U_)!`l5sAbfIcEaN)9Cd`Au6]"?M9 +`lcHEai_rbdbF9_o_74qgZ%/Jk2u[+s5kckinrSIhVmACc118aj6H.(n*of6o'bi5nF#c5md09) +k0N2cmbI0uo`"P-o^VJ@m-jK6n*oi:nF6"ko^MG>hp:Z@aiDKBb0[i9ai`M^,K@UCbKS/Rcc==b +>+U=GDK^#@D/2F;e'Q7S`k^'N2-PQbKDpE&K8';X$%d\TFZ7Uba2l@"b5]Q]`Z*(A`Pp!Ecd0eT +begTF5qt&^:qF]laMPp9b08V]'un>;b0A2Z_o&pD +s8Mlps5jLKrr;rmr6tZFr!`8ts8DuUo'HDQrV63fs7-(@s8MoqqY^6cp.KmiJq8]/KRno2Lk(>; +@Y"=NrVQNhs7ol8Cj'o=F_XU;V-q6prX8c)rVGHk`5L4(rVulr&-)P%oYQB/F`VPBE,]]3D>e8L +D&$r*EFs<8D/`uuE,fc2Ci464D/4$.rc/0^G%GN.AH$rVHHkrr)Y:BodjtM1L;3 +Jr+o.Knt:Eq#:L?k +s6K"@mcO9DpAFpi!ri,sJ,~> +rVuos$N9o"_PaqH]C2IkfEW^8e +oD\[f)#a5OArD+eLk(&-J;8K&JV8G8p](9mrquNis8Dut"9&/prVca0q9?RZ[%ke>rVQWprr2lp +s8W)sir8rW(&e(.rVuors8N&-U7\!MbPqP@s8;lqs*t~> +s82`o$23bX>uQ]l`QcQRa:HP6`PfX(>?P6r[`ut7`lIPh29*MQ^VRt=gcp1CK7&6"KnP>;M1'r# +9k2c$d*'MHbK`4UATr?=G%F(#QVsp4aN2B@`Q#praof`)`l7Mi-cX-Fbfn/IaN2E@bL4JB^Uh&- +bJq]Ia2uKMgsXsHoCMPDoCMYLq>C*fq%ESorr;lqqtp3^o_/(VrVcZjr;?Bos76*epAXt@p&=[_ +q"OX[qtp?jqtg*_oDAC[r;?Bgs7?0]o'bu)cg99*a2l9Cd(R08b2:8u`l5p@c-4>L`QlIkO.T6d +EGoo;DJ)Ynd`9&9`R!/k@pt7CI>33&KS>A8KS"i&/Bc&S`PojkaT'E_`>ctEccs\S`l"ci4tnuX +JAKLRb/;6?bfn/JaNEJ_s2P)[s2tAd&'N,/\8G;@:0sO^rqlQ`q#:;D~> +s8Mlp#P[-:kPtSWr6tWQr;$*es82iljmVsDrqccsrr;Qg0DtkMq>(!brqBH8MgpV>IYWK1K8"o= +IVs]1q>L!dqYp*]q/pq!EclD:?)Eg"pt>WSs8Domi5NXQeboCGrr*-%qtTg#LO&c>s)e3[rH/'^% +s*/BD0Ki&4E5I_EH?;KH2_pdGPubUEos8Mus$2aDks8V3MrqOtArs&H%s8;fps5*_Vr;6Ejs8Vrrr;Q^%l0Rd&h +uE`Lr;HWrr;M3~> +rVuos$N9o$g7k7Lo_ngie,KCI%fZM-s89U$ZI&LKs8Mupnbt6@s8Vros8;om4ItiK' +I>iMiJb]-Bq#Cr;Zfms7uX0r;HZqrVZQks8DusmC]j=[@Za`r;6Kms8W&t +s5 +!W2inrsAPo]O=TQZGk#0e&W-Dc,doC`4pn*=`q0maN)<<`q%2)`5^!9_T'L>e3Ii-Jr>5*KS#,; +M1^_,=CKS#c,7fGa2-3^B5qa/G]RCqQ[i&gc2P`_`<+'#aSs?^aT'9Na`RN#J]#)S7fB?LPH\$KsKS>)=L5L\;I6jpSb/VTI_o_br+NhpN`Pp!Dc-=JN +_6oJ'2*"&iVT6s)`P]^!m:s8)Harr7K~> +s8Mio"lA=ms8W#FrXSl#r;Zfns8UjBl2U_]rr2rgrYkh4rVuomrV. ++>.R2FTH`4rd=`lrHU#AH$"CTAnOm`1LtKJG'\I[G^4[bI!U$^I!:$eD/XN*1*0),H$4C_NR[V# +rVlfr"6f+Hrr2rNrr;aFpN)=q@Ua@kF*VXuRJHLPrqHHmqt0bEFbGL#JVSc0K7ec2MKqY[s8DZk +q>^9is8W,srVllqrr39&nFQG:jT#2Xrr<#o!ri6"hYm]Vrr2rtrr2iprs@cPlfm:+s7Q +rVuoss8<3%nu/:WkPY8+rr2p,rr)lsjdWHbqYgHns8DNfs8Nu5rr<#ps895oMM6>3J;/`*KR\<& +HrO8CrVQU*rn]eWCOL&;B0i5o9]Q-Or;Z`pqu?6drr;us%KHG,s8N&si5NUPec#IGrW)oqrrLul +pqujC%Dg$$_90WRQGgVW`5BIk^]D9erPCD-^q.M'^;m[?R)R.c^qmq,_ns4(^qmn*`4s:2^;\=5 +UQ;Ora2#R0_=dj.rVlfpqW@;Ih>[HSrr2os0)PM>EJ^Su?>sLsG\Tm=qY'shr;Zfpo_C=bJqef+ +KmnZ)JUiH.G!tm#s7lWirr;lp#Q4Q#s8MuprVlg)rntW$[\pV7rVZWjrr3*"r;Q`RrW)urrX8c* +qZ$BJV4=!JWqZMms8E,us8W(K~> +s8Dlq#Q+AOCfXZ5`6lX?>.7^W+@8`5_Di0uhAO`QQNIcdA"8L5:;:I"?m"MM?\> +G="C9bKIrJbK\>\_CfP;HZ!h<4dVZqa4ec:`W*sAame>bQbkh;5n*TK.lg*s: +miCf^kOJ02pAX^1]A3&QmHir\m+9A"aMuBL]tVV2hT5`:rlR.=_o'@5do_$l>[MJ`E-,e^L>'V` +_7\"BdaI,"A9NELIY`W4LPCM=M/=QXeBZ(]_og!=aN4A's3)J*`Pop@bfn8Q^oi&Z2`sE;_8jdE +_SjO\obfRr9PZUXO=aJirs8Voiq>UDE~> +s8Mio#3b.(r;Zcre,B^PpAY*lq>L?QjQQUC!ri6"nbt3ArVZTnq#BkLLOXu4Ljk,.N/3.BLNZkt +qu?Kfs8;ifr1HW'GB%MA@8n&%CNXfFrcoE.I!g3aG'8+UH$sjSB2B9T2J[;RH@1!_H@5^A(jpURG^4gcE,T)E%2)Zb +G]n@]NR[V#rVlfr"6f+Hrr2rNr\"6Jq<1JMW((lUCi4B<3Ka7=r;$Berr;ch9m)DKJqJl7Kn+]+ +L5BGsp%SL`s7uZns8W#qrrDoprs7r]o^L6-s7lTmrrW#kr;Q]srqtaSs8W&ss83?*s8VTKlg3`r +s8Volr;?SF~> +r;R-'rVc`o\Yu:Oqtnh@rr3B(qu?]lYGSVequ6Qns7?6is"FBLqu?Qnnj8.]Jq\r-L4+r3ItE;p +>5J3trVHQlr:Tu[7W_1j^r"") +_8X=/b/'s2M7(C>^;e..p&G'jrr2lmk4&E'rr)jNrqbeKUn^7qH>@A;EAisXs8W&tq>^Kipe>jf +Kn4f0KnFi'JUrPbM"UQCrVulss8;lqrVum1rr)fprVufl`P/^aRcsbLr;ZTlrrrE#rr2rth>[BQ% +fHA"`1WZlTtC4$s8W)urVh<~> +s8Dors8<3#l@iVKMS[<\aT'Bnc,[c?^qt%f=I?Vi`-`59O;eBlmq.XHJrMMZV0H]akD_=D/sN0FCK3\?u+B:b/M@!`otJe`l5sAbfIcEaN)9Cd`Au6]"?M9`lcHE +ai_rbdbF9_naHDCqsXLN&+&KOq")2.bkL_tmHa'&li$5MlP/aQoC;DEkHqSDs8;HWmHNftlKdd8 +m2bNVkO7p1q=)n>ZfV&SmdfJcm+9A"aMuBL]tVV2fuP5S_o'^?d)\)4T0[IAB5)C*/U>gd_naR< +cd^P$2.6E3*.j$)LkC>7LOi*1cd:7ecH+#FaN2NHbfn>U`l7ks'$%GU=@>,56D2-7bKn&EaND`N +rl3g9s2tA]&]i,:ag?Cl928lZk4eoUqtg0gs*t~> +q>UWss7k=0mJd.7rW2rnrr3?$qu?KBl086JrVuBd1&1eFs8DleoLOacL4t;=K8P/2MM4crp&"R[ +s8)]ooZ,lLGAqGC9mrqtdTrr3)uqu$Bkrr70OrqZHjrVqB~> +rVuiq#lXbOUo1d"qu,"Crr3B'rVuoqe"!V[pAXpfs7?4Gs8)clrr)fep.:$dKS"f2Iti9!L4W'g +p&4gas82cpo>f]FF)Gf3F`'@>UI4\Rs8N#tr;QNlo)AXgrr*B,rr2rss8Clp_o1+(rVlcrrVca! +hS@%H`:Uq^`5BL2_TKu^LmFUP_SX4.`5T^5_SlGms2=rV'?%f-N/WdjaMP^1_na7/_8*k$_#D4i +_S^KfJpX&-:$grr<#trr2irrr2rsrXSu)qWkVs[]lq6p](0kqY^Bnrr<#Wrr;os +rr)j)rqu`^Y+_J\T@s/ArVuos!WW.L~> +s8Dors8*$!n#']$DSa]@&BW2;`l5g2P"f/%Xhhop`Q%Mj1WI&IaOSu"fA8H7I#3]6L4"c*J;&D8 +K@.u`]ue+2e&S6(/p)#KC2n5YV3`XUeBu@W`r*pV`rF-[b4As6Vo:mHs6*mHsH7oC2=\[^soao^D>:kNqL"lg=00 +mHs6*m-soFe@)p!k4S35o\e'^f?)(S`lcZA^<+OSaT'BaaMu7!`B1lWe'2K>QYf]@D/sN89.A%J +^<=O8cH",Vf+_5'Jq/K,L4k;8It;_cg"b-*bfe)I`lQ +q>UWps8UU.ir8u+rW)orrs&E"s8Um9hu3QTr:0b@s82fon[1Q%Ljt26J:`Q2LP^k>:g*emp](9m +rVuLs9QYSpG^+7K<._2hT(i*Vs8Vooqu#^X$ig2(qV]?2`7=eas8N!'s82T`_Mrr2p"kj8*Drr:XMs7n5GnO'OZ6uHsaGAh\B3`5qNs8Vrqs7u6`EGg8XJUrE*LPLM: +N/Ct+WW3"pqu6Tp#6+Msrr<#trr3/mmIg8&rr2otrVlg%qtTs`s8W)rir8rW%K-&!r;Q`qs8V3H +lKI%%rrVrjrVcbH~> +rVufp#QO(aU8[SXrR1ZUrVufps8VuhVQ-rdr;?Tpo)A[h(]=71n?bH&Ljk&1I=Qs%Jq\o.:0ISl +qYpL.rr;Op95o&bG'7kE;Lk]^TDJK_q>U9knG`Ferr*B,rr2rss8Clp_o1+(rVlcrrVca!hS@%H +`:UtH`(S7jb*\*LQ_2=8_8=(-`l5m6`5KX6`5KX5_o7:fQAqKU_o'I0^WOL4_SEt(_o0L4`5oou +O,9'\Z,+8l`kfLas8W&srr)]UnGh5Aqu?]o/cY?,XJA*uDfKo:F)!d9s7u]pqu?]noDETFIt<-" +J:WE.JV8f4>0AUS+6To(r@_s8W(K~> +s8Dors8*'"o>YKH?F@f#a:H>6aiMN@]s1mK?^ndJa2[\k0ZM2Nc.CI;.qF$QL5:M:KRnl4KQo^I +gs*g^`l5p@_DX&XGADPLChlt%VdP&$b/3tqrPeu]b08)Po>hum`Q$-GaMl6Aa2Q6MaLT's]@G*E +b0%cHb0Skkg[P15!qc*Vqt'dY$hjMjq8^"Y^rc?BnbqqUnc/(XmJlW3o(2ABYdqW_cM$l"o'>H- +mI0N6naGr6nF?/Hp=m`lQ +q>U`us8V*:i;EWTe,K=G#lFZ$r;ZcNk4S`R!W2fcrr;gHs5B,>DM*OpKS,&8IY`T/LMa:-jqu6Kjl2D(jrVcTN`Pf^Fr;HZprWrQ$q"2FYH$+9'G5l^b +EtiV/@OM`p!rr2p"kj8*Drr:[N0E:qJrqMCaWJ+SlF)Z,?BgD=ir;-Hnqu-?jp[WE3KS>29 +KS"f/K7&Q1F[q5_qYgEkruV1:qu6Wpr;-HniUcp4df9:Gs8Drqs8;Zdq#CBnr8R_Trr`/nq>:-j +"nq3HlKIa9rrW#kqu-PF~> +s8Vuqs8N;s\"9>Hq#/Y?"8r,trr)j#c(D;fo_ndhoDUKEr;6NPOATnJJqS`+KS4W(I=QudZ1n7s +r;QHjqu$,<1gFj=E,TW1:8F4IoDeagrr2lprql`brr2rsrXJo,rr;utrSYZ4`7=hbrr)orrVloT +_#D4S_Sa7._YM+K`"U&-Q]72lP+p"4^VIY%`5T[4_nuDh$Gsg%`J]bMj'*ZZc9u!_8a=as8W&srr)]UnGh>D!r`,trr<#t$ig,(s7hF\VL_rcErKr"AjH(i +rqZTorVufqq"&Q5KSG89K7JN)JTZWrEC>QUq>UBn!<2rq!<2ut&cVh1rVl,l]"5#:q==Rcrr;ln +rr`9!s8V'W!W2fmrsSi+p:d/lTV8pnrVl`prr.E~> +r;R0'qYU*6'IpSJld`fVI +]u\:=b$H/iF+ACMAn4]8Q93RH_nsLmb5]Ng`l5p:aND`Nb4E[q`l5sAbfIcEaN)9Cd`Au6]"?M9 +`lcHEai_rbdbF9jo)nOSnalYJrUU`squ4mV`P9.2p[e"HoCM\Lo^qbHrp^Tlp@e0k^VRq+ch$_t +na>c8oDS;'oC;ABpAO[=^q7In]&rqena5Jbm+9A"aMuBL]tVV2hoGoBc-49.`W+"5bJhTLdVr9] +ITL&tF*2S5.+-MgaihW8_SaaGdp>juJVA`-JU`<(I#*2_0ketXb5TC'aND`Nc-48K`Po[2`kn3B +2`*We]u84;`5BI4b08)PaSs3;h=0/pA"Xes8DutJ,~> +q>Ud!s8ViOiTgICqu6WprW3&urqt[QrVm?%s8;iqs30rls8W&or:9h>r;ZIM7=C&DJVo)0KnY;< +L5BJarqcHis7u]kr;Z]iAl!AgDfTtmOf2ECq"Oabs82fmr9=1gs8Domi5NXQeboCGrr*<*qtTg# +LO"#bG^4Q3G5c_YG'.kGCh#%3#Qk&0+DQ+JI!U$XEH6,DH$Xd^F)4kp"pk>2#rld@F*MnLDJjB5 +F`qnKEcZ&*5nX2%!!!F"Bm4fGIZ;kLs8Drrrr_KOq#:9mg&1'i +pAb-jqu?Qmpm4j$J:rZ0Jr"u9KnYD6N'I7>qu7*&qtp +s8N0"s8W)ts8N?"d\3DLp&4pirW)usrr2rSrr;p,s82ios8;GQ\$bJsrr<#srr)lnr\4nCN"'/F\7anpiF!5\ZQ3lAhN^qde( +`kILiP*1Z`Tu=d__oB[7`l5j4_Sa=2`Pfa#OGT*]PEiMh_na++_=dj.rVlfpqW@;Ig]%0Os8Ec0 +s7u]jeO,Y!9Q5)mDf%bgqY^9kpAFq*rVlVZ;KdPBKn=l1ItiK(KmS\>r;Q]qs8N&s!W;onrsnu* +f=JT!Ut>G@qt^9lr;?Tprr<#WrW<&rrr)j,rVuMiT:DUOd/*eAqu?Zps8W(K~> +qu79*rVucSVHd,N]ZA=:`Q#p=b1XiTaiM`Ha2#R(Zr1@?U;"Rb`lQLk^V7IoBS*ccO>P^s0grPK;YI7uLM4,:Ytb/2-;_oU!Cbf\$+`o4uP`lQBH`P]U4b.;:d +7S@'^li$VPrVlrts8RT~> +s8E6&rqucqs8Drs#MJ2!s8;Qis8N#srrr5nqu6Wqhu4,_r;Zfps8V]@lMCP\qu6NnrVl]l')/_6 +J;f,4JqJo3L4b>5Lg*i.rqc`rq>(!tpionWF`V;"W/O6frqlcqqu>RQ$ig2(qV]?2`7=eas8N!A +s82T`_M +qu?]p&cVh+ntW(do`"mjrVZ]ns8Drrs4mVRs8W$&s8DQ3T=!5Irr2utrquirrr;usrVm`.YZ,t* +JUrH+M1:2-KmJAQ;LJE=qu?Kkrr<#ts8Xc/7(OHYol[DTr!_nj.]s8W&srr)]UnGh>Dqu7<. +rVQWns8V^U:8F"HDJsDdSc&EbrVm?+s7lWfXY=gMKS>&/K`6Q&K*-^Rr;HTo"TJAtq>L9l%K6;* +pVF;I[& +rr)]n(%'F^?"^LfdE');`Q?EJaMu6Bb/hT[a>V2\_o'R8\qip]L9nY6_oBsGb/M-1`QHHMb/hZH +aGiW4M1U/)K8YJ@JqeZ'906G-b/_cEaSs0oaNDiVbum_UG]mXrU4bG+e',hQb0'_-$d-Q1`l5j7 +`lQBJb4E]&`l5sAbfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9_naGl8oCV\Hna,Z/kj\E9a2Gs=]?^!9mHa*+nauVJqY9IHnFle:]=c%t_SEqNq=X1D +iQplBaiDKBb0[i9ai`J]rPnlV.`TWScc=,Ubq2M`P"'"tBL.F(bfIlLb/M31^rOa?e'o;4\Mrqb/h['`r=$Zb2(,Q`l,[:cH!lAa1\9M +846 +s8E6&rqlWns8N#t"mXk&s8DKes8W)trr`)lqu6Tpir8rT"9/?#rr2p%cKX6ds8N#qs8Drqr;ZX1 +s/f7PL4Y#4It`B'Mh7"&=4I*Hrr;foq>Lp'pKMB)YFa8IteF`e>rr2p"kj8*Drr:sVrVZ]pr;R3!nD#d$ +M6'oqGu]UprVuiq(]+..s8;iqo_(n*JqJf/K7o#4K854uMu*GOrr`,lq>C6l#3b[Lh!+k=dJa7H +s8MrprrqiPm-Wlqp&BO~> +qu7?/rVlfppq*3!gAV!Hr;Zfps8;lqs5*bRs8W$-rr)fWS$B9^rr<#trVc`os8N#qrt25,IY!$$ +LOY#+ItrK0@oC_Lrr3)rs8N#srtGD1rVu^tBQ%QLUnpRFk4S]Qs8Mrp!<2lqn,E=drr*B,rr2rs +s8Clp_o1+(rVlcrrVc`shSB-.s1n`Q_u@Re_o0F,_T0U7Ss,:tNf]iOc?-W`PTF+_8F:+aM,C2_o9cuNfB3`OHu,n[)9i!`507^s8W&srr)]UnGhAEqYpTqrVlg+ +q=EDr +s8)fpqYq<)i.kKAPKD(d]t_P0d)sGL`lcHF`nnd2`l#^:b/U2K>$[N,`Poj@c,df;^W"@?c-",K +bhA"EI>*<(Kn"l0Jr"i3>!B1:cc3uBc,duG`Q$!Dc-+@#?ug*JTV+@tb0A/V`lS/%$d?c7`l?!8 +`Q$!Ab4n*TN1nb);Ho'cGCo)%+S]>DD"`PB7Oq=X1B +iQplBaiDKBb0[i9ai`M^s2G)YaSs1OaNDcSbf%H3+]4,t;dF-*CXp\N`lQBJaMkp5`QZ9@eBHZ, +EI*(fL5:S>KS4r*=DQ7%^V@\-cd0hV`5':1aMY6:5r^kdFh>Q?a:ZD+^s13Jai;<7Ki(3) +s8W,u"T89!s8Dor$.Rkrs82fqs8;forr`)lqu$Hnir8uU!<2ip"lJ>(qu?Wfrr;orq\8k)1PgX= +L4=l,NJ;q=LcP/*p\OphrV?F'qt]>DDe3m_H;cMfq>Bsbg&;BZrVcTN`Pf^Fr;HZprYbb5q"2FY +H$+7QG'.kIF`r"WG'7tA@P/?!qu@?4,\hIHG^4OVF`_hMI;s(0*!cBA-Njc5BQ80?H$+7NFE`"O +EH>_T('OjB!!3-##Yo>\FE`.meF`e>rr2p"kj8*Drr:sVs8;ips8NT,rVZ]i@6efuWi/3nA+KQt +rVdW2s7Z?ipAP$bFDZVeJV8Q#L4Y/8DI*,9rX\r+s8W)qr;6Bks6T%Ao[ +qu?]q&cDY,qU_=6]`.s/rr<#rrVZZns53hUs8W&urVld$qY@P%[FYBs^L44l3 +ItW?1KR8B)2=^M9qZ$QnrVlfps8N!.rT6Od@rJ)e;_FR7rVHQoqu6Kmn,E=drr*B,rr2rss8Clp +_o1+(rVlcrrVc`shSB$+s25>`_SX:-_oTgM3Ds8W&s(&e.1rr<#n +?pAQoW2)Ua@IO6prr2lprrPeJeA&c_h0s8;osrV?,fTq%aJbk_84s*t~> +s8Dcn&bk@c?p-CKk5$[D9l+aN2C#`<"!"rQ6n:bg(q_H@(F% +ItW?4Km\N&.G3+j`lZ0>ai_cG`Poj@bf@oI2JQc>SodOJLYC.j_SuMq"Nng,`lA"s"3/F)b4o_?VD]tVG&`5'+3p[[e= +mHsH6nFQ)An+-(b]"H#&_SX7(d/NY:nL!bqnaQ2EnacJJg;(87^VRn)^q](.p$hD.cg99*a2l9C +d(R08b1OcLb/hN?aO/R33cIEdUH)7HcIg@^aSj79aMu?:`5f[;g"'A4G_L[&JpiB+K7@8ufZhFP +_8XL?ccjJJ_8XI:^Rnpr2+0O!]Z&@@&]VT)c-=GQa2,/q:IRcTV!7[Ks*t~> +s8W&ss8N)trVlrQguA;4$3'l$rVuopq>:*hs5X+Xr;6Ktr;ZZ9nEg/Ss8E#rq#230qtp0p\OpirquG*Lk:>7M1^S:LOaeBk5,)Wr;Za(qu-Qos8VrZme,`,rr:FG%K6>(qYgn*&^%s*t~> +qu?]q#lO`%qs1;UY4;Gi"9&,qrr)itrr(jUrr;rq$i^2'rn*UH]^Yt"rr)lqrr;uurr2p8qu*!a +L4+],Jq8W-JV-^lqY^Bnrr<#qrr2lrs8EQ/pAXA44K,)BDeq;Ws8W)ts8;lps6fmcs8N!,s8N#t +rr;rT`P]XErVc`p!<)lr"5^i2_u.Ff_ns7+^V\"0ad\6GNf]HeOcGQt`khVjrPSZP2oi[lLQn$a +NK9 +!<)]m&c(Y0F')q[aMc!;aNM`KaN2BWaT'9Zb"]mp_ns9V9O_\2^WOd>_o9Xb/hNSeg`_XTfHau.D"3T]>MY.r5],_`Q#p=aNDZr +a<8LA`luZJ`Q6-@`QQ]N\\G_fe]YtTb/_WHceQt'nFQ8InJ1Naq"FR/^:_4t`l,j1^cdH;nF`Lu,VJThud`KYQqoUV7bJ:s;b0A>[9lkE,KSP2:L5(%p1We:o +`l#^5aNVoRb/2$:ai_)@82i[tA@B4le&W-@_8sgCai265Qr[$W:1h<-qY1#?~> +s8W,urVuosrr3PrgZ//1s7lHfs8N&ur;6Bhrr;$Xrqu]o%0$/(s4u]%p&G'ir;6Kks8N&us8Er7 +qtpEmnm-?mMM$_:I=R'$/bJi:s8Dutqu?Kk&,cD)mX9bjBOQ+)E(Tcss4RAZs8Domi5NXQeboCG +rr+SNqtTg#LO"#_EH-#AG^4U]G'.J'-4^@c!s&B%!oF*`epo`+mhrr3)am.gSZs53hSs8W'/q>^$E5B^m_ +D*tD$8aZQUq>M3-rr<#trr<#pYuc($IXZp)HB*qkLA^lErr)`pqY^?rkjRp1e,B +!<2`m#laP8T;^Bs)3 +F,,R%LkC))JpJs&7J^;7_)`P]U/ +^WQ6=mHa0.nalACqYBj"]tM5!_SF.+^:hndrqIl7oC;26n*'ZKf"o;B_Sa=1_SNptjnJH;nDhj] +f?)(S`lcZA^<+OTaAL+(bf\)Qc-48A`l#VIF)c895cpb@cHaALaNDZHaNVoScGdW;`mW>^NB_$) +IKCY6qV`l5p:aND`PbJD-@c,ZVZ4"`cbU:SFce&W-@`Q60Fahu-2EDoS->(YQ$qtL,@~> +s8W,urVmW3qu6WqqqU3!s8VifqZ$Norr2imr;Q`UrW2rrrr3H,s8;Zjs8UIUBH;Q6!ODK9cB<-7j.r7_,Xs8Domi5NXQ +eboCGrr*c7qtTg#LO"#_DfKiAH$Xd^G&1V2"U"u2qu@<2#:+)/H$Xd^G]e%RBOqYR&GuMW!<<*, +2JR/NF`heKFa/1TCdSd9#mC;/!<<*(!";YBEc?)GN7@M"rVlfr"6f+Hrr2rTrr)lsrr2p+8Rup[ +F`1AhY).<$s7uX1s8)`pqY:!cqXmR'LkChAJ;8Dp=o&*tqu-`rqtU'arVm&tjmr''i;Wc'rXAi$ +rqu]os5EY@l/DF0s*t~> +!<2fo$2so(q:hO7^[qL)rWN9!rVlfqs8W&Wrr2rsquH`qrs/N%lBSlto_eXe!r`&qrVlcq)>jF1 +5(\$7K78N4K6'QWr;Q`rqZ$TfrVc`nrt#&-s4C,EPX9;/DKAWqqYg\h@%KHA+s8DufUS=3GU! +rVmi8qu-Qpr;H?OZsH^UYf4],bg+5Nb/hZD`lcH`aAKsr`QZTQb/(j4a3(JR@WJNhb/(g0b1"nc +aMl->b/h`NbKS?ZG'f7'I"6j"DEHk.b/q]9b0.`Lc,dlA_oB^8cI]]oT8bj>BQ&)h?H9asrl+oW +kf=gb`Q$-GaMl6Aa2Q6MaLT's]@G*Eb0%cHb0Skkg[P150CS;olgOHDrVt'O^W"42_o'=-_7dt` +nEoQ/n+62As7QAuZd-G+_8*k'^:h>/p&=_6p@@b?mI'WBhnHYAai2*:`4j.&]B/e[o((kfm+9A" +aMuBL]tVV2hoIq&bfn5Pc-OVT`6$Ra>]k%.APQL0H!&D8aN2NHaN2TMe]YkI]t__6c-J7WKn>83 +JV\>\5hX`6b/hTBrl>Ync-F2HbfRAK4u"oV@_TRsd)Za>`m)WC`N<6?8l&ulk4\]Hs*t~> +s8W,urr3c5s82`ns8V6@kl:\Yq=jpfrr2rsqu$Hni;WcV$NBu&qtg-gs4lW"rr<#rs8)iprr)j9 +rquZjr;Z`oQLp$s7TuiWFKU7G]InL7]Z.Zr8%>[s8Domi5NXQ +eboCGrr*`6qtTg#LO"#_EH62HH?sjZC1J[s!!!)t!##D=,\qULH?jaYF`hG.%KQP0!oFF9(to`+mhrr3)am.gSZs5EtSs8W'/r:5nAF*N"% +6h=QOXAIL@q#1 +!WE#ors8T'rr)2aSZh>XrsJ`)r;Q]orr<#srSmhUs8VutrVlfr#lOAiWi3Jaqu6Qo!WDrqrVulr +ru1n:rVr3dLOO`.KRnPA2Tbptp\k-lr;Z`orqud,qZ$.rPGM]#8p5)jE^[&)qZ$Eks8VZhrr;us% +KHG,s8N&si5NUPec#IGrW)oqrtF8)_o'F3`5KR0_8=((`05RoK8okk$':1/OHQ6U_8=%d_E,HKH +?aphNKfQdOctrjO.sY4_ns7,`59R1_k_L$IXR6@OH5NaO-5U2_o9O4_SPpFs8DrrrVG[Gs5!\Or +Vuj-s7D=CDf^1p6Ln3CW(tt>qYpNn!VlTirsR^EIX6]uJ:`B09t('!qu6Qo%Jp)&rU\7I\[eHlp +\k$:rW3&urr3<(fqFn)R],?Jrq?AB~> +rVmi6qYU6ir;Z]cc>QTiUVb:&c-!uGb0%fF`lcH`a;i4=`QZTQbeq9Z#:o'cD5\@o_mbK\,J`kf@%]B/e] +o((kfm+9A"aMuBL]tVV2hT5Z>3c94e4tYVgP+=P8_u%Llb0A>T_Sa@6aj/AI,^"?f +IX[$(JiT4JbkT6ibKe,NbeKfY1b(aUSA<+]dDumCbJq`I`P%@38kN!)`:*I!p]#a~> +s8W,urr3c5s8Mljs8VWPiW&rRr:pRf^rVcTN`Pf^F +r;HZprY,>/q"2FYH$+1LFa/1XH$41@/IVLWrW*W5!!*-*,\qULH$FLTEcP\(!!E3#rW2rt%L"b* +Ecu_RGBIq@Ce#0Cq>_'-"T\T0:2Y,nGC>J#o`+mhrr3)am.gSZs5EtTs8N!.q8u$HG&1qWo(pR4 +Wg[Ajq>M-+s8Vros7uWfL0]LkKR\i8JpUGgqYC+"r;63bqu?Zqs6&qFkMZ@>d/FUSs82chs8VET +meQ23s8Voop]#a~> +!WE#krt+t*ZBO-,WhPEE5j`P]U0_"Ia-rVlfpqW@;Ig]%3Nrr*K* +b!C&gBPTj(qoMg7QXKUfrr;rr(]+13qu?]os7_4OJr,)-LP:2&;tU"es82forsef%rVPrn]"4oH +q>('jd/FIRrr;oqpqihhStNOfo`'F~> +rVm#sq"t$grr3T-ieUf9P.Socbf[uIb0%fF`r=-@a;r:>`lcQNbf.Q@a325s9j2/;_84%/bg4V[ +b/hTBrl@%?`5g'J.sHZ%K7J>u?r;9t`Pfa3_9L-Kc,dlA_o9X@b+VLtKhgBW0P>EF?6n%FaMu6= +`Q#pqao]Z(`q%3!`l5sAbfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9_oChhHmHa02qZ#-`^;.S% +b/VHB`5TO)a7JffmI0Z?qYp?&[)g8*a2l<@`50=0^X;`Jo^hV@n+6#Fi4Ze@_nj:6bK.]B^V.8@ +p\47NjO*>GaiDKBb0[i9ai`D[s2tAc'$AGDW%Vq+AR?n6fsj\GLdKD2rl4rY)Tp:NahPX1`QlkF +9RDYNJ;Ar,Ccg"gb/VNDrlPkp`l?*Faiq`1MF&jJ5@;4JaMuZL&B`8D`Q-!;Z?&u2:L0"@o_nL` +J,~> +s8N,trr2rsrY,&%qu?]Uk3E!ErVZKkrr2rtqtpBmir8uXs8E3"qt^'dq>UBrgu[f"rr3)urr;ln +rsSi(qu?ZqqYQ^gK7NrU.tNA"9`"\^s8W&rqu6Tms82`krVuIhX/8\SqYH"9G'ItC:Aaqbs8Vij +rSd_`s8Domi5NXQeboCGrr*T2qtTg#LO"#bH?X[\F`qS7-4p=W!##J:"9AN+$7';)H[0dREc>A( +!Wi3!rri9#%L+\(F*DqZH#[Y95S!r"qZ$Tsr;[618T&TqG(>Y'o`+mhrr3)am.gSZs5EtVs"s`Q +s8Mlb2gB=cBM\F#q###hY%t<:q>^KlrVu`oq>^Hkr;-Bc8:?5LK7AW'I6RB$s8;oorWE)qr;-Bl +$1@ +!WE#nrs8Q&s81`GTsadsrs/B"rr2lqs8W)sj8K&Yr;QZp'DhY(qmNT4jS8cRr;ZfrrVZWmrr)jT +rVu]kRpCMmK8#&2KR$2dr;$Bmrr)]lrVZ]nrVZWnn5,pT9]Z'HLI-')D/E#ErVZ]qqYpNlrr<#h +rr2rsrXJo,rr;utrSYZ4`7=hbrr)orrVloT_#D5U`kK=,^Vn"/N.H5$IslZnO,oE`Nf]Hr_nO+0 +`5':0\UJUIH[gmeZn]s8UOH%K6>,qu?TfWLfQJS^dT0s*t~> +rVm#sq"jmarVmGrZs?XF]#`4C_o^!Bb/hTBrlX9B*6,t;b08)Pb/hZ?`PfN0Pb.tj2aj/-oR[6+Uf%=aoC2dir3Ru?rcca/D +a3)QKb0%fF`q%2E`l5sAbfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9_oD8%Kn*KW:r5upm`lQ-8 +^rj^>`5BF+a7/Hdo(;JKrq3q3^rFU?aMZ-@_u@Rn_pS/Ln*BH3nG*%A]"5o$`Po[1aNDQ?^Uq); +rq?olj3d5FaiDKBb0[i9ai`M^3l].ZaiVQFb0A +s8W,srVuos#P\#hs8V0Ej8T&ar;ZZnrr;upr;Q`Urr('grVlrMmc=?H"9%ukrr)j3 +rqu]is8)clqK=lSKnP50LP/+@rVulos8O2>qZ$Kls8N&uQ?TKYNVi\Nqti'gEbe:Np%eIUrr;cP +rX8c)rVGHk`5L4(rVulr#64SqoYQB/rcJKlI!TpPB.+5kq#D!/"9S`1+_uLEFDc/=>T3\J!rN$6 +!X/]/!!!3YC34fOHZX.>3YDZ%!!!&t!"]56!!!3oCiFKFL6'jVs8Drrrr_KOq#:9miVioSs8)`p +0`(Q:DJsi/=TA-pqYobMWh`GhrqQNnqYpNjs8N&nqZ$5s8!/OZL5CLI;#9e^s8)Tks83E+qu6Wq +qW@GMg@bLDq>^EArWE)squ$Hn$N&fNna#B +!WE#krs&GbWM-9Squ6U$r;Q]orr<#srSIPNrtG;0s7YuT[D_h7rVlips8MuprVc`q#Q"Jss82Y7 +2u\F7L4+i06HoB-rqufr+8l!8rVlirs8J1$Vg"'rrqlTh06(oE8$DX_r:^0jqtpBms760gs8N!, +s8N#trr;rT`P]XErVc`p!<)lr!T(Wk_csdg_Sj@0`K,@iFaAI^G^Y-sNfT3[O.+,4]u@e,`jpS: +H[^0eH[C!gLQ.L^P`h]Y`PfU._8OEgIUCLr:risCNa#ds82ips62nIT1o4`q>^Kks8Vrqrr;oqs7WlhNIcV3LO_N`q"+F`qu?]o +rr2rtqu?[(kJ"XESAk*ps8W&te,KCIs8Dut$Mr>MSsl(Gli$k_pA]X~> +rVm#tq"jmarVmN&_J`R^V8:BuaMZ*Ab/hTBb0&\as2P#[s3+Qc_TBj5Y=r/?XhDj"bJM9Cc-=DN +`Q#p5bf8#Uem0eZLk1+sH\"2Zbg4/A_TpEMaNMN?c,eAaF_.7_G1G$gfA7HWBPKerbg+AIaN_TE +b08)PaMu6jaF2(I`luZJ`Q6-@`QQ]N\\G_fe]YtTb/_WHceQt'nFQ8@oC_eJo_HVA]YMP._ns7* +_9'd;^:VAXqs3nDqZ$9&YJA/rcHOJN`l5m;a2l6Io^q\?lL"3BgqgbFa2Z?B`5T^:aMu'.]]/YV +n+5_gm+9A"aMuBL]tVV2hoJ[7]?.t9ccO>W1h1?C:H[@Qa2HNQ3hi$&f?V1Rai)0@_9U-F^VS4> +Si_mbJV/o62EfsDcHj>G`lQJ`6#`J:JFP[En:*e +rV$8A~> +s8N-!r;HZqrWr;pqu?]bjPfP*rrDrprW2oorr:gR$iKeqrr<#rqu?$;gALsPpAFpgs#U/Wr;ZWm +s8Vuc3J<0:J<,/6?AA@Qs7ZKiqu6Wns8)`pp$YhUX\n`cs8VikP#HLJG +s8Moq!<2rs$NBS1T;0[0qu6WnrVliss8CaPrr3]2s8Vups1P28k4ncLs8;orrVZTlrVnDDrr2rq +ml5lNI=I<,KNj-*q#C*gqtpBmr;ZZnrq#SUTr:WRp](9hr/jnVEreGar;QcqlMge_rr*B,rr2rs +s8Clp_o1+(rVlcrrVca$hS@%H_T'4$rl,5)H$O^`I=6Khrd7:kMiWm[S]A@\aMu!+GB\1[HZjg^ +GBnL^JW,VMOe0P1^qR\(`h@g"H$OX_H?X^aI=[9:OHu0?aMbd0]YF.>s8DrrrVG[Gs5*bTrsei) +qXsdbX$plFAQJ['rr<#o,*?f@G*2P!s8Dorqu$KjrVuolr+fnrIt3B$J:9]Ts7u]pqYpNp&H)D) +p\N4N]=4-qqYL6lr;Y7Fs8NN,r;ZZe[%Wt\S&P7&o`'F~> +rVm$!qYL*erVmN(f8j0?MSR-LbeqNEb/hTBb0&M\>0>19`59I1bJnHo>aN+Ca3;9;b0A2T`l5s; +aMH*IeC)\gI"ZimK62fJCXU;K]u\17bgFGN_T:$FbrV5d4k7a!d)sp[4_K%^.Dsied)a8Gb0%rP +b/hTBo#Q7!`Q$-GaMl6Aa2Q6MaLT's]@G*Eb0%cHb0Skkg[Oh+qXF%Oq>A@C]YVV1b/VE;^:_D) +`koL3p?_DFqtKim\%9]&`QcKE`l#R-`l>s7cLg_qlgXNAgUt#8`l6$=_o0L-^rFC2^qf(.p$VM4 +cg99*a2l9Cd(R08b2:9;`lPg?aMH$HN&kfs?TliXa25a5eq._8D0*nBb/_QF^Ve46a3)N?eQc[A +Kn5&.Ir?X^g<%LX`Q$!Abf\#H`P]U@\Y<@d/O)8!aiquO_oC0H%a*)@^r+!s@nTKq>FFjWo`'F~> +s8N0"r;Q]qs8N&o!<2ut!o;nor;ZcqrqufriVrlTrr3]3q"asirVcZis3Tils8W)uqtpCPirVulrru_(:p](9ls8RS&WbAI1s7uKjs7<0aDfT_^p\+R\oDe^e +s8V?_$ig2(qV]?2`7=eas8N!/s82T`_ML*frVccioMq]c7e-NTq#16lrr<#rrV6E`22-[8MLUX_7H4(?s8Dur +s8W&s!W;rprsIuWo&93?s8Dfls3^fIqu6TorsIcOlKR%&s8D]hrqHGC~> +s8Moq&,uV.s8W)pgmk.JqY1!hs8N#ss53hUs8Drsrs\o,qu-Qel_(c-p@e1Xrr`8ur;QZps8q>^6is8DurI=e>,VYL2fq>^KeVbLrDCdIjks82NilMge_rr*B, +rr2rss8Clp_o1+(rVlcrrVca'hS@%H_SX%$^r294H2i1eG]n7SGC=^`KT(nOR`WLgaMYZ:G(4a\ +Fa/7WI=$9aHA.@(_o9O3]>+%=s8DrrrVG[Gs5*_V +s82ZlrsAJ87<3?]4o,-TrVn/9nkl!R7.L +rVm$!qtg3hrVm6"l*t2-FLo$#aN=G(g;s95>0>19`PTF2d_2GM?ZNNe^<=F5aNVoQ`l5s;aiDTN +`m`;eG'\[gH$k!j2:U($aN)HK`R2HDbfeMiA9"/CP1A'u_p-QPM*#Nn?nC!Yd)NiFaND`Nb/hTA +o#Q7!`Q$-GaMl6Aa2Q6MaLT's]@G*Eb0%cHb0Skkg[Oh+p%%\IrQ)LZ^;Iq-_SX.'_n3Y"a25R2 +q=aX\qY%G.`4s.*aNMTGa2G[*`5]d6dJ3D(p%dq-]=Gi%`Q66=`PfX,^V[q,]=-_lp@@h5cg99* +a2l9Cd(R08b2:9:`kB+0d*U"+/o5K=0%\Cc_7dS(akK@XT.eI;`kod<`Pfj@`lH$Kdj]s*KnXc, +67fq!d*0JK_oBd?b/hZD`PfU5Z%#7u2*,`kcHaVQa3r$>b0/#G]tC%<92/](_sm^)p&BO~> +s8N3#r;?QnrrW,or;HWshr<;frrE#srrr>tr;?Tpir0#Wq>:-js7m!$rr2rlr;Z*:hYmHVqtU'd +rr2utrqnbUqu?Tns6*!CML^D8M1(%_qYU6kp&+^crql`pqV+uGTiq0gs8Duns8Vql9QYAn;#1(i +s7H6erVlisl2D(jrVcTN`Pf^Fr;HZpr_!4fq"2FYH$+7KIW]-I%Kut9!Wi?("pP26!!*3.#mqe] +HY@%q$k*FB!!3?2"98W,"9\].#QtMjAo2X8C-)q4!s/Q."9JW0"o\K5!T#QH$Fn$eF`e> +rr2p"kj8*Drr:sVs8W,p#ljNnAoD]Zc1q;<-2dcBs8/j+YEEl"r;ZfqrVulls8Vig<)&%&JVo1i +K_kHCs8)Zls8Dotr;QZps6U-Wm+VL>r;Z]ks3^iGr;Q^"o]GW0hq7r.!WMrhs*t~> +!WW/ss8W'0rVlisrVc>aTr$ZBr;?TnrVccSrr2p"rr)cnrr3B(rVu`jq8]S@h>-dBs8W#trr2pR +r;ZTmr;Q`\7n&2]KS>81J6;RBrVuThqu6Wns8D`E;59acp\k-ks8)cqqP-T"EGJAHrr3&os8VHb +rr;us%KHG,s8N&si5NUPec#IGrW)oqrrLulrkhsOb/hAXI!U3fI!U'`I!g6hH@CO)N/j=?cG7<. +Ed2nUGBS4VF``+WH?OF\MNEmi_8+"1^RKLqG]n:VH@(!aGBnL[H\%$;N3g:9`kT=)p&G'jrr2lm +k4&E-rr2p)q>:3`:h4UEorVccpq#CBiqG^.?L44l0?A/1Ms8Vrn +s8Vuqrr3K-pAW.I\@AI%o_eahqZ"tBrr3E'qoGD$U7eLZqu6WppA]X~> +!<)lr!r`#nrVm?*p[m0\?XoS7]Yhk6b1aoP`l5pEcP-a2Gsrb!a=j`lQ6@ +ai;QGb0[mP0n+@tK8Fhp6Ia<&aM#U4`Q#gAcdB);&`Q#d4`l,a5^;7e0 +`4s=]s75pVYdsbKs1oSl_7n",`4rq"`5TO8nFHDTpsld`]t_G&`;[XR_#M+b]YD;$\``YVo^1\b +m+9A"aMuBL]tVV2hoIjua2uBGf[Ml^Ana*-c-FDI^Ve1>f9B=4JQC+@c,n#HaMl$AcH+Hs7u*.Z +KmHU4f$)Rf`l?*B`l@qt&B;f.Z):Vb00W(-^rjpC`m)oPs2kej]Xr_l9Mo#@hY7'MrV$8A~> +rr3&tqu$Hns82lrrVlumiS<\srs8T's82Wirr2rWrW;ukq#16mqZ?]qrquctdH0Tkrr`)nqu$Hn +s8Ef3s7lWorr)fqppU,(Og8-1q>:0irVuQjp\.[(Ec=7oo_J@` +r;?Nms8V?_$ig2(qV]?2`7=eas8N!-s82T`_M1)bs8;orqYC$c?C%3ge+`kApAP",rVHHB8;)VIL51=GpA=Ua +rr;`mqZ$TorXf#,rVuookO@rpn,NFarr;rDrX]&'rr<#YkO@Zgn,NFcs8DZkJ,~> +qu?Zp%K6>,rVHNk_P*[:s8DusrVlftrr:sVrr2usrqufr%fQG+s8W&qnY*(up\t-hrr;oqs8Nf- +rr;urs8Vo$9n7kLIu&S?kkb>Wrr4#9s8;]koP'>h=NL@;rr)irpAap];J9rb4kB?*rVli`rr2rs +rXJo,rr;utrSYZ4`7=hbrr)orrVp9^^r+(.a2,TLFa&+UH?a[YH$ag[G]nCZI"RHOai)9-HZs[U +H@L?hH?j^[G'\FYI"@$/TZG9r\!qniG^O[UG^+CYH?OLYG]e:_M2np]_oB@,_=dj.rVlfpqW@;I +h>TA2rr;fgM,nV8:8@Uap](-js82Zkqd#DU>LWEIs7ZKls8W)srROJkJU`?*ImNl.qZ$Qpp]('d +rXo20r;Z`S]=PMOaS>f3s8W&rdJa[VqYpKcXdP`PU! +s8Dors82cp'D_:um?_*(ai_cIaNDZF`o+oW`l#d:bfn/E`5TsGb/18V=Dk7S_o9gAaMu3= +rl@=L_8spCa2u]UPs0PJLOXu&1X"7m_o^$C_9'U8dEtjGW'mW5bf[uEah#a@f0:iT`luZJ`Q6-@`QQ]N\\G_fe]YtTb/_WHceQt'nFQ8Enb0r/]Y_S*`59=,_83k$ +^;9f]7_d7HqYTQd[Ca,jbJqB6^V.Cs_ns.%]tM)'o_nd\gVUD2_7dIr^V%D!^V@S!]=bhk^utUd +oBGA_m+9A"aMuBL]tVV2hT.^saOADdF@p@a6Aj4>_8jF5`kfL:fh73d8[6FZb/2KGa2u2ZH+_;<`Q$*Gb0n?AbJVE;Y%(4$9jXaaqYpNnpA]X~> +rr3&tq>C6ls8N#t"oA9!kMk7qrrrE%s7uKghu3]So_8=a;uZ[hs8;fpr;Q`ejPg%:s8;]gqu6Wq +rr2iqqu?Hjs82Wgq2Ag=Iu&]3>*Aj_s8)ZnrVuops2/'DMJ2hbo_nges8VfmrUE$jE-42.pAad_ +r;HWps69Ljs8Domi5NXQeboCGrr-7(qtTg#LO"#_EF1%,#6=o,!s8`4#Qk&,#6k>3!!NZNA8P'X% +1PeBqs8;oqs7lTlF_?;ZJ;8_WX8;epr +;ZZos8N&urVlip#Q+Q$iU-4+h#@!<)QiJ,~> +qu?Zp&H2V-r;HZpj//TOo)JahrVc`q!ri6"ir8rW'`In*r;Q`ps8;`nq>^H.VR#%Rrr2iqrr2rt +3;NUKs8W#nr;)=ZKm\]-Jl@[*r;ZZms8N&uqu=H6WekEds7cKlqZ$Tis82:HD/OARn+m"Xs8VHb +rr;us%KHG,s8N&si5NUPec#IGrW)oqs'X^!_o'F3\qb`\H@C3fG^+L[H?a[]H@'j_K8Z,9`2n9- +H[^<`GBJ%RI=69`H$XgaGC>@8`kng:G]\4QI=6<`G^4X^H$Xd]G'A:`P+fb3`l,m5p&G'jrr2lm +k4&E,rXJo'rqUeCCN!`[q>U9hrr51Ys8W)ne5`W:>5S?rs82ios7u]nF_-,UI>*/NXSr2!rVu]n +s8Drrs8W)ts8VuqpqXSQ[ArTgs82iqs814C%KH>*rmdd3S=QnSrr2fes*t~> +s8)fprr3#tqu-QppBU`l]PLn\VRcZJs2b5_s2O$==j"b%_og3E`P'@4a3V]K^iN@VMR1.Cd*0MI +_8aR=b0S)P^;\73_912L=c.idI"+e5f?DFT_oBX7b/r;07Akf6e'GnQcG@?:^!bEX-Z!^8,Ke0V +^;e7nao]Z(`q%2X`l5sAbfIcEaN)9Cd`Au6]"?M9`lcHEai_rbdbF9_oC;"T\@of'aiVN<^qd[t +^Vn%-]Xtkja8#JgZ*M![`PTU.\@K8e]>2;#^q@%`^Vo^:kK^cP^UV.t]=YbhqnO#^]Y(hrg%b4/ +m,ZLZf?)(S`lcZA^<+OTa>h>ha3;k9:MOiQ3S)R"`lQ?LaiM]FagFU:NBYb3^sC3M`l5^ +rr3-!qu$KorVlis&c)D*jQ,4os8W)urqZ?drr<#XrW;uiq#14+rqufms8W&tpAb0>ki)O@s7c?d +qYgWtrVufmrr3,rnO/(]re2bX6gO^Nr;Zcrs7u]h:8Xp`l1b2Ss82irqu?Zks-HH*Dg"8Ao)JXc +rVlisl2Gc(rVcTN`Pf^Cq>L?mrr)lrqt.[ZH$+.G4YJH8+s\E]-n$Po-71/i-RL#_,8_G:C.13I +1bggG3&`fU2*3cY2)-sD/O!H&E+hm+5Jb5X7=h91a2HE--DbeFEM:s8W)s +k3W!Es5ukje?$mf37brrW)rr7_,Mr;HWps8W'.rVliskj.g-kNr6Hs8Vofs*t~> +qYq3-r;HZnr;Q`oq66Wif_bXHrVlfrhubV.[.4r;ZQhrr)lkks'cNLk1##<;6Cl +rVulsqYg?jrr<#urX]&*g:t;3UW!0.rVccns8C[N!<;op&HDb0s7NaoS=64frVZ]pp\smdJ,~> +rr)irs8Dor'DMA'pYC:*=GsT)aNDZHaNVfH`Snm>b/hK>b07rG`l#sC_9U3?X@ZT&S%[.kb/V96 +`lQqX`1_g"G6CjlGC[gXk36iniPOh:(3M`:W]Zg#_M]kht@XiS`\WiTB:_ioT4V +hs/kgp$M2+cg9?,a2lEId(@$8mE#7GrlG&\rl@(=b0AGbasgh?D'WN8_TU-Bbg"JV^rOC>>'uo@ +Oj(hnaNDT?bfIgVI=I**H>GXgai;0:`QcKGrl4uZs2G\oaN(H(5r(D\EkoT4_SO"4dELIgrlY&X +&&uT.c+@[e:Jk5IjRi +rr;usq>V!)s8VlMlK8-Hrr;okp\Fgfs5X([r;6Ejs82fqrrDurrs[*?q#CBmrV6?grr;oos8;j) +qY@*iLOk26IT*BAqu6U*r;QZgT5^i[MYd;Orqu`nrr2j-qk6],G[ODCrVcZfrVulps69M&s8Dom +i5NXPcLq/9rqlQls8Mc/KQqZ\F)u>>D>\5MDZ4JNC]A)WBP2'NDK]i8E+j0,DuOVODuFMcDfB`= +FE2A?DJj<.DfBZ6Df'FlD$FotE,TW3ErC+lI#H>@q>C9mq=s";rr<#tqs"(rpAb0js7uQlrUo27 +Ecu@\h=(@CrVuorrVlis)#3PlWi&efp]('hr;HZcF)$DcK8"_Lp@nRd$i^)$qu$BlrVuosrVlg& +qWdPAmFD7:rr)iur;6EOrX/T&rr;usr;6Eirr)itrqucq"Qo=Jm+Lk-J,~> +qYpQprVllsrr39%f:AbDo`"ggrVlrurVbaTrr3-#rVlcprr;rr$ig4uk*^Hn +rVulrruV.8W)84rJqSSMXnVbnrr;iprqE%&WI0R"r;ZcorVccrrVud"T1X0I?;UFrrrr5us8Moq +qYpEmrVlisrr+#>rr2rss8Clp_o:=/rVlisrr;lns5Cc2`PfX0_8=(g_u7FO_>qFN_Z.L\_Sa6Z +^W=41aMPsr_Z.OM_Z.OR_>qLP_Z%FX_Sa7,_8=(,r5/KM"N&*q_SQ5g&AZ3Us8Mios8;l\n,3+^ +rr;Qgqu?Zp(\Rh.r;ZWks8VoT4`GIZ2r*p%s8N&ur;QX8rr<#nmmj4L;"XS`r;Z`ps71/BJ:rB' +HqsG3s8Mio&cVb.rVlisro:o/\[&.+qu?ZprVliVrWE3"rr)iqrVm!!rVc`prse_[US"$GSDX2C +s82cmpA]X~> +p&G'j&c_at[TusKZ,"`lZ??`59[@`6-1"au[V` +`PojBM*QE6JU_c0PK(J]aNhiF`Qa$DSS)]dcHseVa2Z*;`lH3Fe:p&"Cf3CKe]u:RbK\2KbP]N_ +aT'71`Q#p=b08#J`luZJ`Q6-@`QQ]N\\G_fe]YtM`QQNHbhgq'lg3p(n+-,GrqQQhrqHHcqtCcs +o^_LomeH8FqY'g^q"XRVo_/"Wq#C$lo^_SBoC_kWq#L3cpAF^cp)!JroCDD?mc2a^h8mO\dEg+K +^<=U;aNF(p!64uV<6!#%bf/)VaNhW=bLbCg.:d1%,JD%:`l-$Fbg4V[b/D6r.aSj*Y +aSs0e_kg=&8Q033lMC/Go`'F~> +n,EdVjk]n8s8Mihq"t'is3goHrrV!;lMgedrql]kr;-HlrZD%;q#=eXLPgh9IT-%?r;HQnr;HF] +Vl!)\s8D]gs8Dlprr!B!9O;Xa>^c5>p](*gqu?KVrYY\6rVGHk`5Bmprr;upq#16lo=fj!EcQBq +H2MmdG5l[jDL?YHG'J(RGk-1VH1?4WGmf(\cggo4s8;]dipZmH!rVrnlMaNXq"t$err;iflT&m' +68rTLr;Zfprr;rqrr)fqs8;VRI&D"Sr;$9is8DlM8V2\KM2$MFrVuirs8Momq>:*is8;iqrqZTo +nE003f)G[Mr;Q]qs8)foir8uU#lal'rquZjr;QZp$3'o$s6T(Eo'"p,rrE#ks*t~> +nG`a_XIZ!1p\b$hrrW2trR(TKrV!Cq\Erkdrr`9!s8;lqs8Duss8O2=s82h)/qSh3J::Mos8;cj +s8Dun7]3%Rp&Fs`qZ$NmrtGD1rVZ7Z>\nXgI.[@7s8Dons7lHir;Zfr"9&6!s8N!-s8N#trr;rT +`P][Js8;iors8T"rnkN-`5BOb_uI[S`W*mV_[*ot`P'40_8aIb`;.=@`;7CO_@62=s82`ks8VBP +qu$Els7?6es8N!Es7cEhqu?]pp[("\DEp*no`"mjrVlipr;HQls8W#iO*IC:Rf3-_rt#)*gIH^D +I"d6'Q2gm]rVlWm'DhY,rqZEccF:9oU"]GCs8W)rrVliVrr +o)B:"qU]^a,Gcc4)IbehI!askEO`l5p:aNVoQ`l?6H +aMl6Aa2Q6MaLT's]@P3G_8FIAb0/Yoh!OIrnFHSMs763[#O;*Ulgj]:o^VPKo'u>Jndt!4mbc7/ +bKnY_\%^&*`lQccF2H_o9dBb/h]Ha2Z$6`P86Y/LNS>PJY;Y`lQBJ`l5sWa90H'b0'_- +( +nc''ss7kO5mJm4aq>:'err2rGrr'dW6%"'5K7?/*q>C6k +rs\LFJu!Ffo`+sfs8Mrorr2j,rq%gdDJh[dq"sjdrr;ipl2D"hrVcTN`Pf^Cr;Q^(r;-Blr9h+J +FE)ACqK2=Os)\HiGB._KG&kuQ$[dr\med%aqYU!Gn,E=gr;6EWrY>2,s8;iqq>#ItEd;cOeare> +s8Dlor;IZ6rr<#sohDHi7.BpMs82imQ;rZrMhP6$s82KgrrE&tq[`W)rr;ros8W&troWV;iT:(= +!W2lqrrW)nr8R_Ur;HWnr;Zcrs8N#trrq-@mI0'+rr3*"rVuljs*t~> +nc&gmr5bM)\bZ.&!ri/sci++#S[-<1r;Q]urVHQoq>UEo%f6+uo07JFK7n\>`;9B1rr3E!G^uT/ +X7Q>jq>^HlrVmQ1rVcZoo.4otCd*7CrqcZos7u]krqufprr<#trX]&.rr;utrSYZ4`7Fk^qYpKo +#QFW"i53=I`;.7@_Z.FV`PfO+`P]I<_@FAto`+shr;$BmlL+QIrVlifrr2rqrX\c&s8;iqqYPb% +F*_lMeF`b?!ri/sr;H]prr3o7oLl'^61=RJs82ikPu<3eL4N +o)Asnq<4/LW%QeB-.]r5KDka2uQWe/)_+?n>^7ccF;NaM?%!aSs<^aSa%'aND`L`Q$-GaMl6A +a2Q6MaLT's^"CQK_8FC>b0Ao$jn8BDnbV_GnGhq]oCD;9oC;4qn.=X+kh=2#bKJA[\%^&*`lQfi +>c$WUqY0gXs*t~> +nc&sqs8Us;huE`Uq>C6ks8ULGrr38XjQljGqt9mdrr3&srr;io*rGp9qohNfK8##'=S`!os8;ZM +=0.ukp\ascs8;lrq>LcuogqtiG]6MEr;ZKirrDfXrWrQ&rVGHk`5L4)s![mCr;Z`a\qYHPF`qqP +G'A+RG'A+RG'A+RG'J4UGBe:TG'.hKH?sc6G<'hjG'A+RG'A+RG'A+RG'J4UGBe=VGB\4SG'A+R +G'A+RG'A+RG'J4UGBe=VJ!&7Lq>^KmqtK+=rr3&tqu#aYs8N]/qu??ho/CH(E+3SOs82WhrVlfp +rrN,trr*u8Zsg4nGlIL9s7u+JMhcn;HVXD1rVufqs8Mrnqu6Qo!W;oqrrh]Wp$^!$rs8Q"rr<#t +qt^0Lrr;oorqcO!rr;utnDEEnlJqjC!ri&qp&BO~> +nG`^kk,+oNhY-mI!ri/sd/FFLpU7'-iVNQQs8Vuqs8)`pruM%;s80r+M1UG6FB85;qu6Keh,C;C +;>9tbq>^Blr;Z`p$iKZg:18<`:dG$[q>UBpp]('gs8W#rs8W)t&-)Y.s8N&si5NUPebf+:rVlg% +rVliU_Sj=1n\k@Erko&Y^r+76`5KXb`;.CB`;7F_`5D6Irr2rps8VBPqu-Kms6BU`rser)s7QEa +2JdAQ?to-1rqllts8N#rru_7=rr2lnZX0bbFoM77s7kqDLP(#*GYIr.s8Vrnr;Q]q&cV_(rr;us +s8Vi0[_BGFp@\@_rrW2trr2rWrr<#rrqcZprXAW&a/,H!Su1cKq>L?mrq?AB~> +o)B3uqX)%5=')!,`lQ0=`lS/%d`=Ae_745SqhW4D*q"4.Jr:BpY#Oq0Op@\"IoC;DIoC;DJo+:$-jjqGl +bfeDX\%^&*`lQ_p-$HbTU;&@o64ThpBE]`5]m@bK%WCaN;TIc-_bOUip5$bKJ>X +aX2CgK7Rque]H(aao9Eb`kfR8rm)A#]tD2!X&(T86oh'P`5T^8aNVfH`Q$iWr5o#\rPnlY&'Du0 +_hD;k9N,fSoC_nWrUg,?~> +nc&pps8V?UBqrqu]Arr)j$dIHB!s7lHirrN)rq>MK5s8)`op1\;qJVo.MUAXids8?Jk +V-M"3s82`mq>^KjrX]&.q.Ma2DK\Rhqu?Hcs8V?_#ljl%qV]?2`n(+gAcDK&rVuDsL4+>kF`MSE +FE2JDFE2JDFE2JDFE2MFF`MSEF`DPFEH$)BF`V\HF`V\HF`V\HF`V\HFE2JDFE2JDF`V\HF`V\H +F`V\HF`V\HFE2JDFE2JNOkBC+s8W)qpuCiBrrW,qr9=1squ?]ms7qUDF`VY1]_qU'qu6WqrVc`p +rr3r:rVc`iqd>bn:tG@=qYOfFM1:A2<5A>0qZ$NnrrW,qr;?R0rqZTop%%hMe`d&4rVQKks8W)q +qu#=Mrr3'!r;?Nj!;uir"l/>'ki)(2rr`8uqu-3fJ,~> +nG`pppUZih^\Ig.rr2rtcMe%Es6Q;b\+BRu"oeH"s8N&rrZ;+;s8Dutp1J,nIt`G>T_\B_s8-/^ +Tj#G.s8)Zlq>:3jrrL:!ds8W)ks*t~> +nc'1!n_]:&;gc6s`l5p7`QZTLdE"5`a/MR2?`1lea2Pp4c-FDMaND`LaMu*@`m32c:0;moMh3pH +f#YhQe4GUn9rZCeb0%iDaiFA"s2b5_&C8bQ9-\(YB/?F7d_NN8a2S%touJ5o`luZJ`Q6-@`QQ]N +\\G_hf$).O`Q?BHf&Y<1ki_4!mf)\SmKW.In*fT/nF5oBmd]cBmL\8"eS_c,muHaN)?@_ns@4bfe2Pa3mP8V*VZs2b2Zs2b5_%Euo0Y?t='<*tdO +qY0mXs*t~> +nc&Ufrr3/Wm,%dBr;Q]urquZkdf04F!pJ7uqu6csqu-HhrZD":qtL!dq*p-lKRo+WqYguqu$Eds*t~> +nG`dmqr+6LWUB`brr*$"rr2rErW`<"_kaKaq>LB>%:Mg];brVHQoqu-EhrVlg-r;6Hfs8W)tlG:*B +U:gErr;Zcqs8UdOqu7-)r;P!:St)OPh"UaFrUTu=~> +nc'0up[,\#>@XkO`Q#m5_p$HLd)\)b_KALLICRJ@`l5g8:=>&+Fb0%94`Poj:rQ+u\rQ$/%`Q$-GaMl6A +a2Q6MaLT's]@G*E`Q$*GaO/\[`n8hoh"on%h>Q41h$;lphVHuEi7l]:%ahl=e&fJIb0A/>^rsa: +rlXfQs2nBdc-=JT`l5R0a33,[88;sT5(1r.ccX>Na2l9@`k]=+a3DiOaN;Z+8=br;hUU4B@WHjW +HsL14aiV`Fb08)P`P975cdTqQ_S +nc&Ugrr3)cj4mZ(B=@3qV]?2`7"P^s8;]eqY^6^d_*3#rk2.B]tV1o +]tV1o]tV1o]tV1o]tV1o]tM(m^V[e$]>)(p^;%Cs^;%Cs^;%Cs^;%Cs^;%Cs^;%Cs^;%Cs^;%Cs +^;%Cs^;%Cs^;%Cs^qJ\"r;R#ujmW3Ks8;cYrY52.qtg-T4)o1_75s]8o`"acrr)forZ(k7rr;us +s7uQjFH!/3Xn\eJMMd+FE+&D5r;HEhrs8W%r;Q`rrqQ3drri#]p&*)6rr_ulqu#.H!W;rqrrrE" +q=sa^rr3/alg!cmi;NZYrqlWkrV$8A~> +nc&mos8Mi'URK'rrVlcqdf'aTrr2WbYHkUmr;Z]pr;HWpqu.W9q>^Enq#A0,IY<6!L+APcqb3]` +9^29Js8Vopq>:3jrr2p)rR*uHEG]MhfD>LBs7uZms8N!-s8N#trr;rT`P]XGrqu`ns(D9.r8l\l +gu7,Hh;6uEh;6uEh;6uEh;6uEh;6uEh;6rCh;I8NhV?uFhV[2IhV[2IhV[2IhV[2IhV[2IhV[2I +hV[2IhV[2IhV[2IhV[2IhV[2IhVQoVrr;cirr;u]mem%_s8VKc)?'R6s8Dutr;,_>D/4/W2"(D; +s8N&trVc`ps8Dp;rVliqrr$knUh-V$VCdOUItVTCp%SLcq>^Hlr;Q]qs83B+rVlisnC,"V]U\Wj +s8)Tlh>RESr;QTn%K6.mZ)!q^TY'ahr;HWcs*t~> +nc'1"rV5?#=]'OW_oB^4_p$BJd`<*BaNM?*@8g3g]>V_3`lZED`lQ7#are^J^rOLAb1N=KG)1p+ +K,/ORd5.&c6d +n,ERfs8:^A\?!WW)rrs6s;7BRf`DG,fkE +q>UEls8W#ss82Wk%fHA"s7o3!GBRsr_Yj3/kl)G!rVcTN`Pf[Ap\Xmaq"OXbrr2HSm-!m.o(2\I +rUL'\mI'Vpo)nONo(N%^#lFJ[n,E@er;>dX')DP'q419'F*:Pbo(i=^r;Q`qrr42>s8Mrqs8N#t +s7cBV9<+sgnOS:cLP^U^[J]t&r;QZls8W)trr3`0r:^-iq +n,EXhrRRaBXS;Ylrr)lFrXo2,s8N&dS[H<(rVQWprVlisqu.]9s8W#ss7lD4Bn1_eI:Rd!Quf-J +L&(cKr;Zfqs8W#qs8Dp-rVuQjpdJ_6EG\1_rVHQnqu?Nlr;Zcq%KHG,s8N&si5NUQf`1sKrs8W& +s8;osrVuo_rr)j!rqcNld/FOTrVucos82fZmem%_s8VWg!<;rqs8NT-s82S\8oSZg;-!2as8N#t +!<2ut,5hK@rVliqrr<#pr9R"QV+pDJIt*$%Hr.0Irr;rsrVQNkrr3'!rVc]p$N/Vi]=+Z_q"jsh +rVlfrrr(dSrr3*"rVlforseo$eXrA*US?? +n,Emon#9f%?a[YgaMGd:bf\AT'?S;?aMt/HOb/D?A_u7UTa:cY:_oogBfed2aG\f43dE'SR`rg1`l5p7`luZJ +`Q6-@`QQ]N\\GY`dE0JPbfn>Qa3`5gin<5GlJVX""5qtjj3ccoiSDVu`5p$?bdkU7`l7r"o#LmP +aNFM+>0+_(_T^?ZL-KNsF%ARAbg42HaN;NFb/_B=_o0^Bc-4;Q_p-7ZR$p=p0m%brLO;OZf$)=T +`Q-$Cbf7Q>`lcHGbK.N+I6/u40m:(KdF$.]b/hTA`lcNJilD8Hb0%`Drl"oXaSs?^a9obM=%>eX +?aK.nrVlg!rV66fp]#a~> +nGa$uqu?]]j5]k5s7lWoqY^9>rW3&srVluicL1N-s8VrrqXXUsr:EO4LP:J=4QK,9VG@!drUKje +rVlg/pPhslDg-5Dq>:$bs7ZKgq>]p_&-)V,qV]?2_pA)Qr;-3_r;Q^!r:p$]q=4@Pq9o-Bq=O@W +rVm0&qr[AGs8W#pn,=(%q>^Khs8W#mp+U!$EcZG1FSPk/s7-($s7cQgNdRmQEE%dHN.bncqtp?e +rr2p)r:fp^s8VK\qsDo4rs8K#r;ZfpqtpBls5O%Xs8Vusrr2p#rr;ugp\t0rk3D1&kNhsDs8M`l +J,~> +nc'1!rr;of\tPkDpAb$is8DutdJa^Rs8W&kd@dqjqYgHorr)lsqYpHnrr*K&8:Z;BJV?/E8>r:W +qY^Xs7uZorVlfrqYh--qZ$DP +HDYe&;MKXSIUmBnr;HTorr2rtrr2iq%K",U\@&:.qYU3jr;HTmrrW,qrSmhVrVlg0rr)fms8W&t +s7cAnTpMOI\b?%%rVulgs*t~> +nc&sqs8VcEM,dB.\]Xoi!QN=1a:lb;bg+;>L.GBb[DU21ai;?>aN4A's2Z"r`Q#p=aN`$bH%q*. +IP'#/S<>\\d)jB(`r3srb/hK>a3N.W89f3!AmF!;ccaMGc,%3;aN4A)s2lS+`P]U5bfn/IaN2E@ +bL4JB^UUc%bfe8TbfduEaNVuVc-=S@d14^\f#ktN`l?*D]>W"7`W"$Oa:?5/`Q5sDbJVTJb089M +<;pqIED9T`cG7H=`lQd)X,C`Q$'Eb/M9;`l?*A +aih5e;_BR_8$0YOc-FJVbfIc@`QZTLilD8Hb0%`Drl#GebL"5Jahbc/<'EoPIbXPmrVlusq"js` +s*t~> +n,EUfr;ZHIk26.;s8;uor6YEJs82cpr8-E.rr3#os7$!urN&nLKnP)-:O]?aVXXW`nbs@)r;HHk +Jm32>FE;7GV>gDms7lWoqZ$E^rX]&-rVGHk`5C!tqtpgUps/m=!ri/rrr3)uqtpBls5X+XrrW,qr;HWtr;--crr3/alLO9"q"Xjh +rq?AB~> +o)B=$rVuosps5S,Xml;hs82iqs3U`Qs8)ZnmCfL8h"C[DrVu`nqu79-s/f+IJ:E&q97*RSVXjcb +rqQNjrYPV3r;$AC=)2nrE,$btrr)lsq#CBks8)Zmr;Zcq$ig5*s8N&si5NUQf_YUPrr)fprr<#e +rpp*:rr2p+rr)fps8;'Ir;Q`qs760hrtP>0s7lKkqtL*_5=B:"FDa`OFo21:s8Drss8W&urVZX- +q>^Knr^TS"?1EbkqA +nc'.!s8Vu\W`W&/ZGXl*_TBgFa:le?ai)3AXDgd@NjH^EccX8IaN4A's2b5[!6+rW&^&IY6%"E@ +IWe8*Sm-fabf7a!`r3ssb/hZ@`5gPD:2bK%CKh7&g==Nq_T^- +n,EUgr;ZfTjOO5/!ri5sdf0:E$2X]%rr<#te*$&rrrMojqu$3f&,-#pKntJ=Gu1?+L?no`+lg2/75VI;N5F<8.BOs82?c&cD\(r;Ea/Y_c/3N.Q@[nbrFarWE)qqu6Tp% +fH5%q>1$Kk5Xu%s8;opr;QlsqtpBls5X+XrrW,qr;HWsqY0jcrrqfNmdfMprr<#rnGe"~> +o)B7"rVlisr9:2TRbn#Cs82iDrXf,/r;Zcos8D;\YIX?'s82fms8N#ort5&+7tH>EKm-:eQW*b\ +q#C?mqu?Kk*<5m8s7hh'5?_oDG%O.YoCi4aqZ$Tks8N#rrr2iqrr*E-rr2rss8Clp_o1+'r;HWo +!rr9!qu-*bnGgo8rr3?)rVc`qr9*JFs8VTf)ZTg:qYpNppAb,j2/$uMG\C01:tP^Gs8;osrVcit +rr2lrrW)utrXf,-s8T3/WeO9%LO=5HnGN7ZrrE&srsSf"mD?3AYHduqs8;lr!W2fnrrW,qrSmeW +r;HWp"TJAtrr)ir$2jA-St2OHVsO<[rr`8urVlHhJ,~> +nc&Uerr3B%ctQHYS\`=d`6$'Ja:QM=b/VB;ai:DY;IHE9bf%NraSs3Y`W*phfe.H%LPC%PVNM`P]U5bfn/IaN2E@bL4JB^Uh,2 +d*9k[`PfU1b5TTdc-488`X^)7bf7WA`l5sA]>i4;_u@gMa@!ta_nO(6bJ_iYL)X91F+8()E]:AP +aN;6:`lQ +n,Ejnqu?]ch;7Q!rr<#tqpPKDr!rT's8Dcls7Fk,qu?ZlrqlWfrX]&#JR=1\LJX&5>fZ[>s7u3a +'`\13s8;Tja[B3PEcQLg;#L+grV6BlnbrmqrVcTN`PfdIrr2os!<2`m%fZM-s8N&ts8N&ts8N&t +nbiFd0`V.Prr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;uqr;QZp"TJA^ +n,;VPs8Nf1pAb-lo07D8Ec-&AJ+<=6r;HEjnGX!ls8)Ef8X-5TI"%#dJGT6Cr;Hfrq>($hs8W!+ +p](9Pmd9Yts8W)ur;QZp"9/2prr2rXrr2p"qt^-grVlonrVlg#j6,n!h=CRF!VuW^s*t~> +o)J[f$ig5&_P*^:p%A=as3^iGrseo+s82Wls4!gIbl.A7qZ$NnqYq-"J6[_OKhdT,=i^=;s7lTm +qu?Kk'`\(/s82Hg`^*OBDJse\;#L(erV?Hms8E)urr2iqrr*B,rr2rss8Clp_o("$qu-KnrrE&s +rVud*rr;utrr;utrr;utrr;ucs"+0Lrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;utrr;ut +rr;utrr;urs8Dp$s8;'Ir;Zfdrr)itr:g3j%eDi*C2Ra*Dg^sFrqlZirr;rr!WW/ur>GV7s8N#t +p](6fr^;gE<-NVB@Xe1Prr<#tqu?Zps8NH"s8U-\\[.mrp\b!i"8_omrr2rtr8IVUr;HTo!rVrn +rr3T-q;83CStVarqY^?ms8Mrprq-5@~> +nc&UfrVm5iNa#b6[CXB!`l6BI&B`AB`PoX1cH1o:;09=__TV\prl4uW'#r,7@7u-"Lf9M>;Qn0Z +`kTU9qo8HQ5K_!dbfe8mZT(d"CM7N637uF"ahZ$=a3)WNbf[rE_o'L +n,E[lr;Q`rg#:W_rr3#srR1ZRr;6Kns8DutrVtg7mJd+crqlWhrXo20s8A-bM264RTp7q=s8)cq +nbrObrr<#t$i9GcEHc5@Eckr"qu6TspAb*]rX/](rVGHk`5^I0rqufkrXJf)r;QWnr;QWnr;QWn +meeU7r;QWnr;QWnr;QWnr;QWnr;QWnr;QWnr;QWnr;QWnr;QWnr;QWnr;QWgrWiDcmJHn^s8VWg +!WVuort+hs8o/KcFEDP3Fo24;s82icrXer%rquZU:KXTV:5*,2oDeddrW<#pqu6Trrqucq"S:L; +o[3X;"8Dclqu6Ttrqu]nrr;$Xrr3)tq>'serrDoprrr,Tm-*WarVlonq>C6mrq?AB~> +o)J[f$ig2'j/AiMf_54BrR(TSs8N&tqYU?,q>U_DPGrVuiqrVuiqrr3T)d^R!.Sal^Zs82irqu?Tlrr2rTrW2rqrVlrsqtpBm$iKk? +Tq@gLU[e-WrVlirrUg,?~> +nc&UfrVm5r^2@CaP./BO`5U0G'["bI`4Wt1d)EY<8m%Ik`66"r5elW&(&U?6%Ol7=/(j: +i7PoebONY<`6ZWNb0A>\h.(J>EG]Jh5LS$/ah>d6aND`Nb/hTA_oBpEaMl6Aa2Q6MaLT'u^Y7&Y +c-!o?`Q6BQbfnDZ:aNDZGaN2ZH6<0h>:P)VfdFQFZaN2NF`l?*@`lA#! +(rO"Z?S3lk2kn47e&]VJ]>M_6bf[rE`Q$lX( +mJdOls8V06gueY:qZ"qA!W)forsAW%s8CO?kl:\Wqu$9hs8NW*p[C.iIRp0678p;`qu?WbrY,>2 +s8N&uqu;OSE-,o?B6?61rUg*h!;l^#ab]rVd'% +rr2imr;Zfrrr2p#m/-,*g]%6QpB(6fqYgHorW)lSrr2p"qtU!brVllmrr3/ejm20bn,E=grqQ +nG`sss8W&rqS&Ys[e]k"s3U`Ir;QZorr3?&qW+B_]D):%s8Moqq>Lp#p@1+fHq'd078U&Zqu?Ta +rY,2*s8Dutrr7mVDfTT8Aofp)qt'ge!W;uqrr)lrrXSu-rr;utrSYZ4_pnV^rr2lqrs&H$rr;rr +rpp*Zrm(QCrr +nc&UfrVm2sifRPICpq7&ajJ0Db0/#J_8aR=aMX`G?=p=Q`6-4aW,>N8Y2hC8!_NB +bJ`ql)9^1Ia2l?DfPbfIcEaN)9Cd`Au6]"?P=bg";K +`5]sIccF,Kbf[95&]V`+`lcNJ`Q$3`Q63Bcb\#VGtgqdX'oa942JqV`QHELb/VF"`Z<.Ec-=))Il0)73FB&)bf7`F_7db+ +b0A2R`l#^6ilM/Bs2YhmaND`Nc,IT3W+o7*;-fIIpAP!js8) +lMh.fgZ75ks7uZmd/F4Irr<#pqYpKun_W4!s82]kqu6Km%Iu)^C1aPo?#FWQs8DufrYPV2s8Dlq +r:K\OBQn?7J8AG?qZ$EerVuEe'EA%0qV]?2`7"GUqu6WprquZkrr)lerpg$9rr;uurr2iqrWiDc +mJHh\s8VWg(]XI4r;$Ba88iTmDfB`68,)iZrqcZprUKmequ?R$oK7h_8>DnFG$ak?rr<#trr;or +s8N#trrhWXr:S>5rs&B#qtKp^rr2p"rquZjir8rW"8hlgqu-O#qu?]fj6?!ph>[EWqYU*cr;Q]t +rql]hs*t~> +nGa!trVlfpr84HNV;V@Ps8ULG&cMY,s8Vums8Vc8XJsMCs8N#ps8DrqrVum,o.FKcB!$DdCiAhC +r;ZBf)ZTg:pAb'hs8Vih7;-gZDglD'IJEj=q>UEor;QZprr*E-rr2rss8Clp_o1+)s8W)srr<#s +r;X,&r;Qcrrr36$k3`*Hs8MuerYbb7rr)]no1!S9E,'90D+=?ts8Mlps8DrrrVuiqrVuos&c_k1 +rUW%#KL_f15]U0&rr<#srr)itrr)fn$LPU;]Xaa1qu?Wlqu6ctrVZZns5O"Yqu$Em&H2P)rVlfi +c_[2'T<.GTqtU*h!W;ogs*t~> +nc&Ufrr3B(p[Q"2<`YU*aNVcRa;N%b/hTA`Q$!?r5oVqeC2MM>AIiK +DbaYDcdBbQaS!`j<_u`l#^6b08#I`m2?@d`02Gb0':r)9p:B`50mH/RWL?EH?,2 +1!7>SaMuHIaiMR%`rF+$bf[i>_oBd=`5TmJf-kci7AHP=AjOMZ`Pp!FcHO<-`?*%Ae(*!`M*2k+ +5)>b5]Np`lQ +mf*:drVm2bj5]P,r;$;>L.gs8Vrq +qXOOsqYpHdZ;ZF/?%&Sm@8Qpurr2oss8N&r!<2lq)!^_iqUGQFqu-Qpp%\CXqu$Hns8Mrnqu#LR +rr3-!q>'pequ6iQipH6hnGW@eqYpBrrr<#tr;QHjJ,~> +nc/Uf%fQG,r:mb!U:L1!r;Z`prVuiqs8UpSrr2uprr36#rqQ<#Y.1s8W)sq>U>* +AO3;i5_OYRi;EWGrYkh9qu?Qks8W#sqc%'FDJj32F?THms8W#ss8;lps8W)ts![mHrVufR`P][F +rr2rrr;?Nlrqu`ps8N#rrr)iprr)iprr)iprr)fcr%7mHrVlcprVlcprVlcprVlcprVlcprVlcp +rVlcprVlcprVlcprVlcprVlcpq>L?m#Q*ZNr;ZfrrUKk)rVu]ns7uLNCMe'/EcYehqu-Nos8)cl +rr2lrrVlcqrr2rt%/$i#J:LmOUi]s@rqu]os8N#ts8Doo$cg&o\Xr!ar;-?kqY^?qrr)fprVlls +rr;oqrVu?c!W;oprt58/rquflkc12FURT@$qt^3grVuor!<2ZkJ,~> +o)B=#qtpEnrVQBMJ6l,j]uJ+;b5KB]`n&3EbK.T?b0%]F^:%cS?(JaObfIfDrl#esb0%fHb08,R +da^us6Dp8-FE]R\e]c"Rb0'_)r6##[6H7*fcH*rD`4X491feL7FDbr&*n&*V`ko[6aND`LaMu3< +`luZH`Q$!@a3E&P\@T/ZeBlOje'?4ce(3!f_o9^AZd03-b0%uVe'ZC`d_NuQaMl6Co#M`lbL"/P +b/r-Q?YX_(EGel9ahu*>b/V]GaN4>"s2[LKaMYj5`lQ6=b0\P*6[*fXI&Cp[1=F.]`Q? +n,EIdq>U?m!nuc%rr33#s8Voiqu6Tp"8r&nrr2rPrr2ips!u4Ok5YJXqZ$NoqYg?ks8Vlhr;Zfp +p0LsPV/:+%LO2tps8N&ms8MrrrVuWk!<;ur&-$9IA9)d;F*^"Js7u]pq!n@`r=&`'i5ijZg"+^# +cHsr9chu,ucd:"bcd:"bcd:"bcgK.4cd:"bcd:"bcd:"bcd:"bcd:"bcd:"bcd:"bcd:"bcd:"b +cd:"bcd:"bcd:&7dKIq?nGi:_s7$!ts7u]ns7q1DF_l/3Ff'$GrZ_C?s8W&trVuWlqr^A&LPURI +VQW0VoD/=`s8W)tr;?Nlr;HX'o'>r@kOANMo_eagr;?Hks83-$s82ipqZ$KYrr2p%r;6Ehp\4L_ +rrqrOm-UNqr;Q +o)AdjrVlfrs8EB'hP6[BhY.!Kr;HTos8;rsrr3#urSIPLs"=?H>2B3J_]Df]i?48]'Qs8Vops8)]rs8N#r +s8W$,s7tQl_8k3]e^2Ufcd)I7!77pqqp,5f"O5$UrV-^EnpO,eVAT)$uUMTo/oDTX- +qu?Zns8N&ps8D.KKS+r.4/&c@:A4Ycrr2rsrXJo,q>1-hs4b?$[]dmKrr3#trql`nrr[PsS"HP:-hrqufqrq?AB~> +o)Adgo_A@a'(`YK:0dmHK#AScF">8>T:aNhoC`l@kr ++3)CC`l5p:aii/^_6L5Q_nN[gZEpmAZa7'GYcb47Z*Ue8Z2_-;Z*(72V9%0,bfe-!a:cY>cGduK +da2;]ARB.Q@usF0`q.8.ai2EB`5op>_pR#V0n"Y+GrVb,0/(MlbfIZ<`lucTbJh?_o9jDb4E[h`l#d>bf7WEbfRuMZZf/;9NZ)E +jS/ZR!rMimnc++~> +n,EIbp\t-k'BS05li7"\s8Voiq>UEorquZjrr2rVrr;oprWE)qrr)ir!mBj'rVn,>r;Z`ps8W)q +qu$BkrqfPeZ(F@7K85=SebT7@s8D`lqu$?]rX\r!F\5D5C6ks8W'$r;6Elrr2p(j72d&iW&rPp\XO\#QOGrrVuoos69O_rs&K#rqlB_qu6U!jl5aq +h=LIB"9/5rrq-5@~> +o)AdjrVlfrs8EB(osU<^^\@^(qu-Kns8;rsrr:gRr;Qcrrr3B)rqb`M\'4UHr;HNlrrW2urr2rs +rW`>t:.h[]6N2QFKgX5\s7u]nq>^Bkqtg +o)AdgoD&7`'):=>;GD>Fai_lNb/hTA`Q$!?rlX$;rl-b8b082P`4).-=ECab_SjF7aiDQHaMu6@ +bfn/Sgc\$(PrO)=Ll"1(bK@fMa2#^4`5TmubQ>r.aSj*m`Q#p=bg"=0/N-0j7guoMcd0YSc2GZ^ +aT'E^aT'9[`=U&2b0eVV]u%e.`l5g2_o'?j_u7RS_[4/p_n"+Db07oGo#UjR&'rD?ahlWRF=8t# +4(bf7WAb0/2BX'A%a:h,pCmJHq`rVQHi +nc++~> +n,EIdq>U?m#lNf?gAh3Ns8MupfDbgJ#6+Z&rqu]jrVluPg#W&0ruM"4rqZToqu$Kor;$Bcrb.Ck +=EfLQLP1=rr`9#p\Xsi"RkaI +nBCn3!r`#oo)8mls8)]cs8Mr[rr2p+rqlTjrVcceh<"7tg&:pOqYpHnrr2QiJ,~> +nc/Xgrr3E+rVcWEX.?*DrVHKlqu?Nl!<;$Ws8W&s(]XL6s82irZ`CUlq#1*hs8W#rrr<#rr;Q^- +o_i?\Uf_hpJq8B"1&ghAqYUL?irqZQtrqQ3_qYL0g +s8Jtqq>:Nqp&G'js8;osnbs$ss8;orp]'m\o(2VKqYfm^/cYeLs8;oqqJfVjJ:iK+Imfd);U>C@ +rVuosrr)irrVlispWL:a]q+`lrVuorrr)lprr2p'r;ZZno`+pgrquf`rr;osrr)j-p%QM&T:VdQ +lMLPZrVuosr;Zcqp]#a~> +o)AdgpA4^e%/B%kCf=K(`lZHIb/jP$s2b5_rl>)ZiQ)#Ar5]Spbfn>L^pmlQ?\b`'bK%]Oa2Ps9 +rQ#hqb/E.7KUkkVJ:ic9J0s0sb/hcPai;?Gr6#&\!QN4Y`Y$;7bgar[JS8V/aOS_\e&ohNrPnlY +rlY8^r5Sc["jbWEd+HtJd/VOnd/_Yoec45#eHjUDdEoqS_T'Uda:QM7`kom;_q!&ae'uspcHXN& +a90W,ai48!/CMqsc-=JTaN4>"r5]Pk +`Q#pC_8Nq+b/h`F`P][7bfn6!aT'BnaMl':cG[AI;bBbfDT(W-rVlrtqu-'bJ,~> +n,EIgr;QWo%e\K1kl:\^r;Zfrqt^'crr:gRs8;iq$NBtus8Vurs2=$_rr4);pA=[cs82fqs8;]l +rOZF +mJm4c%K65&o>dQ!\G,k!s8Muprs&K$rVlfrs5EtWrrE#qrX/N%s7-!XT"2Pro_ndoqu6TprqlTl +rt>7=>cEo[Kn"f.J:fk(rVZ]gq>UBoqtg9ns8N#rs8W'/s8Dcio(2PJpAb-hs7u]mrVuZlrr3<' +r;Q`orr;oorqueprr)for! +o)AdiqYU6k%K6"hes0WDCqIX.b/h['`r=$Zb5TK^`o5#"&BN#@c-=_`dalsndEp(_`R"J% +s2b,\s2b2Z$-1'.c-F\ccH=3*aJm5[ao9K^bQuS=bfIfD_8jRda:HG0ahka1`lZf^g!A*o_9DGj +*QHCK_o0X=cd/X7H$t6tLP:/&9VIM6d*0YS`l#^n`Xfu7[]"!s-TWr[^!"[CcHQ:/rl4lWs2G\j +`llE@c-ODNb/hTA`Q$!Cbf]Lts2t>^%`Z?&dD3(k<)$+iNo'0srVuorr;QcqpA]X~> +mJd1ar;R$$fAtrks8Moprr`/mp\b!irqtaSs8;iq"TJ?!qtg9k$-;*&p](*aqZ$QkrtkV3:T:'T +:O\+QKR\H-I8fq8s8Vrqr;Z +m/I+crVl^%i2WWMgA:jLr;?Qmrr`5tr;Q]qhu +nc/XfrVm6%p@ddaF')G1^W-/lrlY5]rl3s=3QfRib0%fHbfnMX`6>cuU.n6sQ,1VhcHX8C`Q$!? +`Q$-T2O^'r7sK]AN/<(9BJe)Ye^MO]`5ostaT'EWa:H>:d*'qge'6IccHjSV_TMhss2b5_!mJg0 +rlG,Zs2G#["3/F*a8O)Va8a-i`5]g;aiV`KaiDB@`kod9o#MBc^W"@.^rsj?bKS5QaMbd3o>psS +0?qPWaN;WLgbF##IZSl4Im.1;KUu)/cH+)H`P]U4`l6$,C-!Xs1PNEacdC:cb599Zb5]Q_`XTo, +aNVrLcHF5H`l?*@rQ=]P!m8a2rl>Sh_84%(I8a$?=)5_@pAOacs8)fpp]#a~> +nc/Xgs8N,trqud#jkSnWs8Vuqrr`/kp&+dgrqtaSs8;fps8E)rs8Drs$1-gJ4JW!s82Niqu$!`&-)D#s8)Wms7cQnq>^9hqsj[arrE#srs/Q%r;HTl +rViJg"onQ"s8W&drXSu(s8W&qpAb!fs8;fos7-(+s8DlqrVQWpP?EHnMLL,3Kg +mf*mus8W&qrquQ.TVAgdrr;onrr)j!rVQNlrr:mT!WE#sr=Ao-q>^3hqtS=9ZI&IJs8)`p+8u3= +s8DhWQ#!E(It`P@ +c/h3`UHJDOrr*B,rr<#rrVjaS^T,*HqYpBpqu?Zqp\t0ls8E3%q=sshq>UElrW)uhrr~> +n,ECdrr3B'q"jU@Qrm7&[)'c\aSj9]aSj-rPnlYqo\oZ +&B;i4aN2<>aiDE?`5T^6`Q"ps&B)H$_SX71`Q-*DaiV]I`Q%Ghs2khhb/_H<^od +1 +o)Apnr;Q`rr;QWo#6*N>gAh3Prr3)tp\4[cs8MrTrr;oorrW2rqtpBqqV(02rr;urs8W,r)?0Z' +1lS5(pY%WYKS=]*MLC(Fq>U?mq>^KbrX\o+s8)Wmr;?Tpr;Z]js8VTf%K$)%qu$Hms8N#ts8N"j +rs/Q'rr<#ts8DKe#l=T$rV6Bls82fq"9/?#qsjY's8N#tp\FjW4aMd?GDM<0IRqWTO`!jXr;HQm +rVuo_"Rtm)s8Mus!;#^Z#P[V(nal\Ys69O^quH`orsn>Xkj%9ds8VuqqYBsarpKf:~> +mf*@fs8W&r$NK:iTV'p8s8;forr2utrqlcqrr:mT(&e.1rVlforVulnq#C$5W4q0ds8;ckrtkY2 +PV.]`8G(UrJqSf%Jr+o,7/-WWs8)Wmr;Q]qrVd9's8Vuos8Dors8;opqYU +n,ECdrr3]0q#(![aDY$VOhAZQaN2NJbf\)Lr5Ra;"3Sj3b5KE]at:f`bJV*4Z%5\UK=AqDb0.iC +_oBd:bAS)VbfnA4bn/(<`5]jhlncHOAN^;J@@-Z4KqHART.JO?TjG#gGEdEBW1`Z<.Dah4QN.4%2FXLc6bbg=2K`l5s= +aND`Nb0%fHrl,PmbfG_[Vo5@9iYrB~> +o)Apnr;Q`rr;QZp"o\JghrO&#rri>uq>:0irrW2tr8IYTr;-Epq>:*frrUU(l2CY^r;QZqr;QX0 +o6,5Oq;X_nJqJc3IYTp_ZMX[os7l*_&,cJ's8W#srVlZnq>^Kjr:0ass82cps8N#rrr)fqs8Doq +U&G#j"TAB!rVuBd&-)M)s8)cnqu6WmrVucns7-*gs8W':r;ZAu5_k#HMLgD6K4oB&pGqX>qYU3f +r;?Qnrri/ho'FX"rrrE%r;QNio)8mi?lgZ*r;$ +mf*mus8W&qrr;rq`2'*3q>L6irr2p#rr)cnrr2rVrr<#urr;rsrW<,trVlg'r;HJnYJ'5ps8Dip +)#aC.mW*6>pu4SmK7\c/I"jRYYPJ4js7uTmrVlcqrVd?*s8)cqrVulsqZ$Bks8)]ms7Q?ms82cn +s8W)urVuotr;chqr;cimr<3&tr;HZarX\i's8)cnqu-QkrVufps8VWg!WW/urtG(85D4N:Lk()2 +JnB0$oJYt1qu-Knrr*E$e&9#5T^_jYs8Durs8N#tp&5~> +n,ECdrr3]0qYgHkm$;*ZA@B=n`lQ_rPghTo#MEccH48W`m)THc-XVV +c,7KB`q.84b0J8Q`P]s?Q7IB9LPpV0I=>@#e'SoSgXFBh`l?*Baht#e3[QI>V8LKo]u.e1`5T^8 +aNDZLbf\*+a:ZbK6N[X^e&TGIaN`&Wbf.K>o#MTdaNVlNaND8_<(^"_@?fL@s8W&rqu-El"9&)m +rV->B~> +o)Apnr;Q`rr;QZp%/^))ddQ;ks8Vuqr;HKls8:jTs8;co#6+Puqu$Bkrr4:kkj8?LrVuQequ?Zo +p\OgN=nDKF?@m`^L4b28KO0f8s8;osqoSi2s2"[Ts82cps8;e9>DIfdL4=ko:haqIqYpBgrqQ0` +s8;lr"T7ZWpWid +li-tarr)ls%.p`SLWr;ZfprVuiqrVu`no)JUdrr;`lrr8Gd!<(mUrVc-_!rr/rrr48CF'=6G +K7\K)Dbk"bq>(!cqu?Zns8W#sqYT$]]"FR&qu$Elq>^Bl&c__*s8)cqoSjk.+!lC0s8W)tr;cir +s7?4&s8Mrrs8Drmp9U]hS"Qb +n,ECdrVmQ.rVlijeSSMgNP<>!p.@[rlc,df8^;\+2`Q$!ArQH(r`llBKccpYE$kEbN`luHDc-OYW_nj@a +a;Dq9_TpBKbJh&(:e+)ZEkLc;s8VumqYU6hrr`5squ-9hJ,~> +nc/Xgs8N,trr)j$q>C9eh<3brrri2urVuosrr]nl:MbW9JRh#<[\\BDs8N&p +pA=a\qu?Qns69@RjPU"8rWN9#qtp +li7"a!W2orrY!_JT!7n^s8Dunq>LQ4O!rr2irrr2rhrX]&-s8W&tp\WI? +RA$1Ba8#Z5qu?]q!r`,toDa=~> +lMhOrq#16im&X,]D76pm`6ZQIb/h[&`o"l:`r3mV`W4*Xau.5S[nKY/XM)g#dE'MJcHFJJb0e\_ +B,*I;I"m9/JUUB4f>u+R_T'R6`l?*@b/hQ@`l?*@r6#&\oZ$jN#Kk--`Q#p=b59E_b5]PV`rF0] +bl5cbbl5cIaT'E\bl5cUa>D&abK@]=ahU%t?$^m@<@]bhK3QXM`llEEcH=,JbIY*15V"3<hcg_T0d?d_s+h=?]8M?^fpE +s8W&opA"L_r;ZcppA]X~> +mJm1brr36$q#CBSlIYk.s8MrrrrN,sh>[BQs8FVJqtp3bq"4Rcs4lo5s8W)tqZ$Hfr;6Eiq>^9] +?\qlP?"/P79hVYfr;Zfrs+10Kr\"!GrVZ]is8B_l2_e$diO*V"r;?HeqZ$E`s8;Wks8D'Fo]ap+ +s8Dims8Vulr:p7$s7cQnq>^1>)D!*T.ba[]rr +lMhIqqYpNos7*"]SC$s/rr;uorVlirrW)uWrr)lqrqZR%rr;TUV6\MGrr<#trVmQ1rVZKkqt"6R +=@$+tK6L!]XShtms82fos7?6es7uZms82fqrVc_hs7uZhs7?6`s6KXsq#C(s7lWe-PIaF)(*u0rVclsrr2osoDTd1 +rVuors8)8pU7RpMVX=?^s8N&urr;uss8Murrq$/?~> +l2MCjqu?Zlen\GkNjHR@aiqoMaN4A#hoPf:qo/TTrl?M1bf\/>Ue4L-Y/JZ6bfI`GcH!iB`R;oN +3bgo8;-83`3\,p2bKe2Jrl4uZs2tA_s2G#Xs2b5_rlk>`rlFuVq8``Z`Q#p=b5KQac2Pofb/U3q +"3/F'b5B?\`r +m/ILnr;Q`rrVQKls52ehrr3*!s8W)tr;ZctrqtRNrr;us#5nAoq=sj_rr3AZjSSuWrVZHjqY^?l +rtG5.rVQMoBnV()8A=rprr;lqr;D3GWW!M0rVHQor;QQeahkr$o)8F^pAFpmo_JFZrVm#VjR_]Z +rVuoq"onStq>UEirXSu+rr<#gBI#&D*@A,js60Fns8Mrprr;iVipu3hp&G$hrq-3lr;6Kfs*t~> +l2M=nrr2rto$X,(W94!TqYgHnrr;us!<;$Wr;Zcqq#:m's81QL[b(3Pqu?Zqr;Q]prtPD2s8;es +BS:t(8A4flrVucprVliorquffrql`krr)lnrr)fqrhBGkrq-6^rq$0Xr\=HOqZ$TorqZ<0_89II +rVQQgrr;uts8)cqr;Z`fs1u@a[\!9orVuosr;HZqrr2rtqu.**rVuosmq!Rc%i-=mqZ$Ekrr;Qg% +fcM+rquW=W1KrVT[3Q6rr<#t#Q=Z%s8N&trpp)>~> +nc/Uer;Qfoqu6U(iM9deA"pQM_op@ +b.u-Ac-"2PbK%uVdaj=MChbFRT@1m.cH",H`Q%nus2k>_r5ScXrlY/_s2tA_qo8HQrPnlYrlY8b +rQPAeaJ-]QaSj-Y`W*jT_#_Hno>h*T_nj1,_u%FQ`pUo;c,moEaMc%ag.F(-S.#*UqOOab0AD_b/VND`l?*Bbfn5NaMZ$Cd`Frd*=WDdOjh_Wb5]Zgb/hQ@`q%1d +a2Gm6ai'*>8Pr&eWp&sLs8DffpA"Ubs8Muhs*t~> +nc&Ugr;R3'rr<#qr;6Nog>UfOrr3<$s8;forr<#tr8IYTs82fprrN,srqc`mrVlfup!WI2ru:q7 +s8;fls8)Qkqu?TiqY'[`rq6$`s8VloqYu-GW;Zeprr3`.s8W&qqtU!ds82`op](!erVQTkqYgEs +hWXFma8Z,=rr +l2M7mqtpEnqt$\YTu-?qs7cHkg]%6Q"9/?"s8N#qs!RdFs8)WFTtoLVr;HWpr;6?jqYC0gs82Tg +o_AIdpA"Oas7lWks8Vrp!<;!Vr;W)^nc/4[o)J1X(Ae%1s7cQnr;6<`p\b'fqu?Nmq#10grVmE- +p\hnF_nDfAqY^ +nGiIcrVm]1qu?]ddWAo"I':9)_T^0D`l?*@bfn5haSj*\aMu<@rP^>-aND`PcHX#3MFD*?[DB\o +`lQ?GccF/Oaj85UdEU%ke]Q+\cHaAP_TBg=r5o&]`q[XQaoT`/nAtOIrlG,^r61kW!6G)XrPeZO +!64WO"3//]s2OTM(!FY4`5/6Z8OlTZGiS>gqu?Wk +q"Xabrr`/pqYg'dJ,~> +nc/XgrVuoqrr3K-r;Zfjg$.2^s8W)nqu$Hn!ri,qiVrlWs8N&rs8Mus!<2uq!rMrmrr3)ieF*;7 +rsS]'rr;fos8;oms8N#t"8;Niq>UBsrr<#os+10KrW<-!qu6U/o`+pfs8Mcmq>^3hs7lWmrqQHk +rr3,bm-a#Zrr39$s8N&ur;$6fp\k^'q>^KN.N]i\,Z"74s7lWYrWN)tqu?]qlO!(Ah>70NrqlNh +rVm!!qtp +mf3:crr3H+s8N&uqTth3UsB#=rr2ourr(OLs8Vuqrr4,?qYU-gs89m0_;+tds82iqs7lWor;ZTm +rVlispA=mfrr3-#s8Vrqo)8Xhk5P5WQ2^OXnc&OfrVlZnmf"X5qZ$Tpo`+pfs8Mcmq>^]^Y%K-8's7O+%R@p+KfDPUF +s8Muos8N#js*t~> +n,NCarVm]5rVZ]jk,DTi?B)nCaN;NE`l?*Bc-4>ia9'B&aSj6^aN"4us2HM1bf\)H`lGZ48oB]s +\\u>-bg=GVbf7rKd*9kccGITH`QcZNaN2N?chtrbaSs?\a8j6YaT'Babf\)saSNpVaIUKNaSa$X +`VmgHaSs3Xa8j6Y`W*sGa@O@iaj%o@c-")Tbf.rJc,J#M^WO[DaN;<6W0pF?0/YS\[_Tc*bKS,K +`lu]Ob/hZHb08#L`QGp8cF"#b&/Z'9dE0SIccXE/aT'ERaT'BscG.<*H;m7%9l%$&q>:'hrVHBf +rVc`uqY9j_o`'F~> +nc/XgrVm*$qu$Hns8;lr"7PO2hu'pWs*t~> +n,N@cr;R-%qu?]j\>>e!meQh]s8CUL!<<#s,5qN?s8W)ts8Vokqtm(j_;b:jqu?]os8;iqqZ$El +qYL6jrr36$s8VloqYg?`rql`arW)urrqQMErql]orVc`qs6]dhs82ipp%n[f+T2$7s7ZKls8Vop +s8)cqr;QBhcc*N*U[n +n,ELeqYL0hrtbM+pA"@9GZRsa[(su/aN2B@aNDcPb2C>@b5KNbb/jM#s2lb5cI'VM_73EA@>qD/ +aN2NEdDj,J_9U'GaiDTCa2l<@bK[fB_8O@9rlbAbrlG)_"Nng,`l7nrs2alUrQ#5`aNDZHaMu6s +`;moLaS!^SbQ,fVa9'N.bl5ikbf\#J`l?+!b43PLbf.`F^VnI=b/:m6b.c*=a2c!9b/DNPg!m@! +7k,`<5,5QpbfnD]bf7E4_oU'Hb/h`Lbf[rE\]Vt7`DI9[$l$4taMQ!9aNDTD`lQBJb4E[hb082M +^6;et6psq4j7<6Jq>^Klqu-Hm"8_`bqt0o=~> +nc&Ugr;Qlur;?BirrDrqrs7NDjm`^Hks8;lr'E%h/rVucor;$Bfs8Dut +mcX!,f`(mQrqHUEls8N#tq#1d'qu?]Ykj.p/ +hYmKSr;Q]krVlutqt^0Zs*t~> +n,N@crr2uprr3<$s8(iQTV]^)r;Q]srVY%A.f]MIs7lTns7cEdVlmi.p&Fgerr)los8Doqrr;ip +qu?Wps8Dorr;ZfpoD\Xen,<=er;QHjs8Jbmo)8Xfmf*._kl(kas8Mfns8;oprr4#9rr;utqu?]o +s7lWhqYSg]_RQB!o)Jahs7lKhrr)llrr"j>s8Dusrr;usqu?WopA]X~> +n,ELeqYU6jrsnu(qYKpal*4W%AVn.,aN)B=ai)6@bK\&P_TKd9a2c-?_oC$Bb0%rNb5TK]bR2M6aMu3=`Q#p=aS!^Sa9T`+ +b0%fH`l@nps2P)[U;dJ[b0%rNbf\/Pqof,dbf]Ou%*HfQaN4>&n]3B%c,dcH`ko[0 +_T'U5`Q6$Ba3)K@ahlBPaJiMr*@EM%[`$8.bg+SZ`kT7(`lu^,b5]Zub/hQB^r4OLd=2Z;J(2W] +^;@hfaT'6`aNVoQb/jS%r5eoXs2Ynsd)a55AkYK]8mo:"rVuiks8W&rqu6cpq"XaYs*t~> +lMpn`q>UQVj6,J$rs&E$s8DusrTX:lr;Q`nrr)lns8Mlpr;ZfqqYgQoqtpU:"s8N&ss8W)[nFQ,#rr30"q#CBnrr)lqrp]r<~> +m/I(bp\td#]q:ahg\:^IrVuoqrr2ldrr)lqrXo)-s82fos82irqu?Torr)iqq>^Bl$N'Ic[_Vb; +r;6HkrVlosr;?Qms6KXcs8N&[rql_Hrn[SRr;cinrr`5trVc`q'_VD(qu?]pq#B9l_n2q^qYgEm +s8W)s!<2utpAPU#rr2iqs7"Q_pAb0krr<#orr)isrr2iss8;iq&,uP&s7Y9CS=6+=g@kRHr;?Tp +rp0T7~> +n,NCcr;Z`o&c_L]OC2$rS\N1c_oKm=aN2ElaSj-Wa>h2\bJhWGbeh96^WOXFcHFAO`l5p:`lQ6D +bfn/Lbep>B93A1*`QHE%`5Tg;qoBu(bg"AO_nj71b07oG`Pop@b/)97RScC@ +huK=rrMrprr3#ur9=1arVlWms8;lr#5eH"rVHKkq>UEl!WN#rqu?ZuqpFHar;R'%q=jdd +rr<#trqufnJc;ABs8N<&r;?Hirr2lr!ri,srr3&ms7ZHl"Rka;m+MC +i;X;NSYVg[qtL-gs8W#rrr;NfrVuiq"o\Grs8W#rrs8Q&s8DfmrVlforr`9#s8Mus&H2=TV7FS? +s8;]ls8W)us8DlprVqHJUAb5lrVl]o)#jL3r;HZqq#CBjs82imrmf-$^9$#^rVu3_&-)Y/rVQWp +q>('brql`qrVHNls8N!!rVlfqrser+rVlifor+FTQCkGJr;Qcqk5Tr~> +ir9Mco>tWR=`(pg`l#g:`Q%AfrPnfW&]_u1ccsPYb/V6:`lZ`Q? +hu=)ThX'+ms8Mfms8W)tr9F:]rsJT%r;?Ehqu?Zqrr2rorr2p"r;$-brr3H,s3KZjs8W)qs8W)t +r;?Qsqt^-dJc;8?rqufqr;Zcq%K6>'rqcZis8V?Jp!r7)s69Lcr;Zfqr;Q^#p](9krVlclrW<#p +r;HX$rquWls8N&ur;Q^*lJ1gkpYu&Ls7uWms8D*[J,~> +iVs5`qnnqrRa:m1s8Doqs760fs8DrsrsJT%r;?EhqZ$Norr)lnrW2rqrVuos%0,k\X0oqBrVuor +r;Q]qs82orrr)kJrh9>kr;ciprr`5trVlfrs8EQ/qu?Top\s3e]#CVcq>(!RrWN0!s8Dlprs&5t +s8;iprVHNns8;lorrE#rs8Vj#]UbgaUn-$6s8N#t!<)'[J,~> +ir9Vfp#;BI=&4jlb0.`@_o9dAb4 +hZ"&MkO@+'s8;lrs8Dimr9=1jr;Z]ps82imH2%49s7?-arr2p%rqZ?ds8W&srsHs5mJm4_r;Zfr +r;?Qsqt^-eJc;>Ar;6QoqYpd!r;ZEhqtpBms6p*[jN[Z'l2D1hrVuoqr;69ds7u]pqu?Kks8;iq +"T8)mrVQTo&GuM-qV(E+lf@U9s8Mrrr;GaWJ,~> +i;X5_o=1BiUA"TdrVc`nrr;QgrVufp&,cJ*s8VurpNH6+s8V`hs82csrVQNks8N!1s8D>V\&nFF +rV?Hmrr2rqqu$Hls+10@rr)j"rVZTlrqud*qu?Tks8D0"]XkMMr:oIS%f6/(s8;flq"t*es8Vur +q#19nrVlcq&,H/'rr2rmgRk=8St!=]rr2ouqu,XVJ,~> +ir9Vhq!6Ld=^#(>bL"2C_8FLBb4I0aNDZLb0%fF`P]^Ac,7<5 +bK$_X>&0tP`koa8^q[q2aMu6Bb(7X,a:?A:c-48J_o9dEccEr8^Ac(]\AuM/bd`R$.k*8G[(= +h>[o;mbmm?s8N#trquTil2D(ds8Vojs4JhIEqK))s8)`nrs\i&qu?]pqu?]ifAlf,rrN)trVm!! +r;6DCrh08hr;Zckrs\hurV6?js8VHUnF,-1s69L_s8DorrrE&trri&qqYC0erW2rrrr3T0qtU$c +q>^Kkr;ZfQl0\',h#@ +iVsAdrVH#RUnQ!'s8W)urr2rgrr)lprX8Q%s7uKjf-DGUo(Dt]rr)orrr)usrVlZn#QFMEVmFtJ +r;Q`rrW)utquH`qs+10Brr)lsrqu]prr)j-rr;uss8)N+]!f,Qo_SUfq>U9krVlZnrVccr!<2ut +"SVllq>^9i!WW/urVZ[$q>LctjUZ).NrVuosr8ms/~> +ir9Dbqt97!?Wg?`^X:(#_Z.j\b4beq9; +aN_PY;GD54]>_k5`P0++aN_rJ_h#n$aSZ5t+Xe^$POhr;6 +h>[oPhs'(qs8VurrVcTjlM_=oq>('jr8'%N,pAKKq>^9drr)lsr;Za%rV?Kjs6\J$qu6Trp\Xph +s8N&uJc;;@"oS8qr;Q]lrri?$r;?0brsA#^oAo!4s8;lel2C\]rr2uqrr32urVlispAape!W;rr +rt58-q=jd`s8Mrrs8(R8o(;/?rVllorr2utk5Tr~> +ir9Viqu6Hi^Rh6sgA1aIs8Duss760fs8Dp2s7uKjs8:_)*?H2]q"asds8N#rrVZZprVZ[1r;ZEd +`hp5so)Jadrr;rrrr)iqs8RZLT`4rj!<2rqr;QZp%f?;+r;=@B\ZWI8s8Dujq>U9krVl]o!<)os +!;lcq#5S5ss8Vfmq#: +iVsJeqt/s0>$"q#`5op7_9U9Io#UdLrQ$nC_o'XBaJoCS((#$-a3;?=aNVoRbfn/I`Q63EaMl': +`Ql96GsbAWVo-Qma2c'9aN_rJ_o@8KS]Dhqc-OYW`l5s;aMkp/`k]a5XHu1%-R_cb^;SF?bkfEX +`r4!U`X^&2bK7`Fc-!rEaN;ZAanWsW`r=*raMu3G^ +huE`U$ifSWkN`*IqYg9jqW[tiqu?]or;ZVE,U4EZ\,H4%qYgTpq>:0jrrN&squ7)bjQ?@>s82Zj +qYU0frVqHJT`4uhs8MrrrVd6'rqufrp](9Xp$hM&r;Qcpl2D4krr<#srVucprr)`ns8Vlgrr)j7 +rquKdq#C?ns81j9lgaEBs8W)us8;ips8M0\J,~> +ir9ShrVccko"Cch[HRPgs8N&snc&LerVd?)s8W#ps8%3d*#^$.qtg6err2p%rVZZos8VuqrsS\t +\Z`Eko_e[fs8Drs"TJ>trr7QKU&P)ls8N#q!<)os!ri/trVm6#rqXFK\@/=*qYL3kqu6'a!<)os +s8<9(qu?Zoqu6Wqq"k!hs8DorrrE&trt##*rnX`KSY)Ffk5YD[s8;lr!<)'[J,~> +hu=2blHtAj;/rVTbK%NFaNF(prPnfW%`QZ8`lQEE=:c5X%$T,^rl>)^rQH/#`Q$0KaMu6=^;\%5 +_mj2PmV`llQGa32NGaN)9@b0Im#a<8LA`lcNLb/VE;b085R`kn'M91V]PLX#Pfqtp6hs8VuYs*t~> +i;X;cqZ$Tpj6>A!s8Muls8D3]%fcJ*qZ$Njqe@LNpq=sjdqu76+s7cQni6pW[s8W)m +q"OR_rVllqJc;AB!rW&srVuoss82lorqlcqrVm#dnF?(krr3'!qYB@S&-)S)rVccrrVZZprVuil +s7cKnr;QZps8!,rq>UEohr=1qk2uR?rrrB$s8N#rjo9i~> +ir9ShrVQTorSF<>R+_66s8Duqnc&LerVd?-r;HKlrVH>#)]TnAh>7*Hrr2p3rr)fprr;ipq>^Bk +os:F(h"^pLrVca!rqlWms+10Crr^ +hZ"#Zl*k8(:QrN:b/MQDn]:[KrQ$q?`lH$Eai;b.'+bNT][P3Nb/hZHb08#I`mN2T`Poa0_Rd_+ +_l[<m\`5Td;aiqlHaN;KGa2?-ta +i;X>brr2rtrS?`!s8W)ms8N&XrWi9l+<_pYpA=[b"8quhq"k"#r;$?ls6%>[o)Jaep%%kUrrW,o +r.4j?rqucurquNdrqu]o#3tXIo$RL:rr<#t!<;lo&-)J*rV-?lrr;lqr;Zcqs60F`r;6EirrVue +pAY'qiU$%,kNMdB!ri,sjo9i~> +iVrrWqYpL%p!&nqV;V:Orr;lcrr)ljrX/Vt6lI!b-1^m1rr2rsrr)lor;cirrs/Dpae68koD/@b +#6+T!rVlcqJc;>Arr)iq!WW/urt>>0r;6Hh_n +hZ"#]p"Z0C;HTU0bf\&In]:[Kq8iQX)U[@t$4@1Oe^Mje`l5s=b0%`FcdBtV_8!h(rl#Pg_7G1i + +_90m@b/MQDaMu6?rPnlYs2soR(WOA3b0A8V`l6! +iW&rW%fcJ's81X8mGIsBqu?Wpir02XkU%As)IiI:rWN9!p\4U`rr`2rqu$Em#L)E,s8VH[qYgEq +rV6;Arh9>hrs&K#qtg-_q>C7!n+#u +iW&rW%KHG-rnOHDV69gmrVu`arr)ljrX/Vsj<5E_'OCA/rr)lrrr)lqr;ciqrt>8,q!b#ich7>3 +s8W)qr;Zfrs+10Crr2lrrr;uurr2p+rVuljs6%A8]=ag/qu6TtrVQQlrVlcq!rDrorr3<#rVl`p +s8N&rr;HZ`rqud-rVZNiqu?Wpq;eHDT9u+AjSf)8s*t~> +hZ*WO$LtfQ=]oIQ_9:0Bn]:[Kq8iQX1!e:i$O74G8(H)4`P]U5b0%fHbfn5L_84.4b/hQ@bfIAg +5ZW<:a2-*I_nX.6dE]mcaJ-cTarAF@`Q$'Hd*9MGb1+;.Fupum.kR-n_T0d=`lJ)$s2b/Y&&HH+ +b0J5Mai_]JbK.fC_u7UTaT'ERa;i4=`QHHMbfIc?ahPp,ULI(o78R^@pAP$krVQQQs*t~> +ir9)Zr;QWo"7tR7i;W`XrVuoWrWiK"Zm7+D,_l0prr3H)q"Xads8Mojq#: +i;X;ds8N&up!T_0T$m<3q#Bm`rVuQi$30e*+!_aHK)GWHrr`9!r;HTos8Dusrr2utrr3/ul^593 +nGE7crW)tLrh9>irVulrrso&.s8Dlor92/7[(;n-qu-NprVl]prVlfnrri2us8)QirrW#nq"t*Y +rr)j1rquWis8DuqqR`>lR\HA!qu-Qmrr1mVJ,~> +hu=,`q>0gHZYroCMS%*KnAtRJq8iQX1!J(nOpMg2$Y@l4`PKC0b08)N`P]^:`l?6KdET\Mc-4&3 +Tgi.,XN8;ua2l9@d+$9jaJ-cUas"jG`Poj +ir9)Zr;$6i"6\V-l2:S@rWi>sr/DpH,)Z6rrVm?)q"aphqtTp\s8Voiq>UBq`p*9trs&H%rqlNh +r.4jArql]urqlQeqY^@%jmh[!ec5[Ks8Mojr;HZlrX\u,s7lWorql`iq#C9lrVYjXs82lrrVmB+ +s8VN?m.BT&kPtSYr;Q]q"9/2proO01~> +i;WiUrVca%qn&MpWo!OKrUKmcs7Q?tqt^)F*ZlDWr;QZp"9/8rr;HWsrr)iqs8W)srseM`S%[>E +s8Dlqs8MrrJc;ABrr)iqqu7$&s7bira1JdZo_JCa!<2urrr2lrs8EK-q#CBmqZ$9`s8;oqrVcc^ +rr +hu<`Tq#:*rl&K.N?(\mL`5_AhrPnZSrQ6h7ajb,6$jULqb/M35`QHELb/(g0`lcNOdF6F_aNVlG +^pTt$>_&lf^;J"1`R!&XJ]OS,s2k>]rl#YmaNMWC_nELTI3omR0Li%R`Q#p?aiaV-s2tA_rPfAe +aNMNIeBQ.``lHQLbf@[#`rF-[b3m@LaplG3^:V"2=]A6l>)qS:rr3&sq"s%MJ,~> +ir9)Zr;6Kn#Q+Ats3pE%h#793rr +huE`U$N9i$s5KZHU8RV]nG`Cdo`"mj#4ZLW\+'@qrVm'#rVcZmrr2rtrr2rtrVlg,qtg3JV8(CK +q>U?ks8W"JrgNicrt,2+rr2'!^VI"VqYU*grr)fps8W&rrr)j-r;Q`ms7cQlp](9js8)corVu9a +s8Dlp')h\+p@Y>[S!g%LmJ6b\r;Zcqi;\<~> +hu=2`qY'X^oYbTP^W"IFci)*%bfIfJ +_SEjQ;-Ik7\A,boajA;TJ]OS,"Nng)`Q%nu)p-(7\[.uO2\?lZ9s21Hc,R`CajADU`lQ +ir9)ZrVlcq#5S/rmc!NfrVtjU#5%rpptu#IqYgQoqu6Tp!;uils8*'!s8W#pq>^9irrUd6li-nd +qZ$ToJc;8?s8W,u!rW&qrVm#lkOmTjrr3?%s8N&urqZBhrr;io&-)Y-s8DcnZhsRqrr2rrs69O] +rr`2rq"t'j#4CX@mI&X*rVm-$r;ZfrqtpBRs*t~> +hu=/brVlisr;":#SXIjus7-*es7Q?ts7H?ip>,TArVlfrrr*'#rqu`oqZ$Tos8NW+s8;oli2X?, +li7"]s8VtIrh'/is8DrsrtbS5s7kWu]>Ub^p%n^bs8W)srr<#tr;HWmrseu+s8;ZlZMF:lrVccp +r;Z0`rquirr;R?(o=UonS"ZA(rVlirrqucpqu6ZqkPp&~> +iVsJgs82ZirVuTQS6]#cL:>1Bo#UdLq8iQX1!%AKd*^1Je'ZF_`l5s=b08,S`PKC0bg4PXaN2TJ +`l5d<`Q#Z[8Q'N#]YD2&ccXC]aJ-a#b/hQ@`lQ +iVroUrVm9)r;HZqhWt!mrVuoVrW`Dur;Q]os8)]rr:p*drr`8rq>:0krr)ruqY^?pdF@[brrDur +s+10Drr;orrY>J4rqu`os8W&algX-0s8W)qs8)Zmrr3*!qYL-drX\o+s8MupZS>Y`qZ$KlrVu-] +rVm<(q"4=Zs7+t0o'5Jlrr3#sqYpKsr;$0fj8XW~> +iVsGes8Mrqs8W)nq4aIZT&TV:rr)lirrC6jr;Zcq!<<#ss8N3"qtg6hs8N#trt,20qZ$Qm +qqnBPbjbQ-qu$DDrh9>gs8W'5r;6Nii5WC@ZGZ)0qYpNos8MrnrVlfrrr2lr%f?;+rVZPt03J2K +s82cnr;Z0`"9&/rrr)j-r:n*tR@]hDXS);es82coqu6`ss8M3]J,~> +ir9Vhq"jsfs8W&kl.g/[<_K(#`q%4L`qd^Taqr.=c,IiLc-4PWaN2BBb08)Pb08#J`Q%nu'ZIu/ +`l?*E`6HBB]9Q8dCmq]F`Q*PNTZI/U+i_F;`QHHN`k%dW2]3\o?(/F>`Q5m7aNr8X`P&t)b/h[& +`Xg&4c-=P[L^#T`c.:(]aijY&s2b5_o#M]kc-42H`Q69I`4^_$8k;-JHeRc`s8VrjrVccqqr[p/~> +iVroWrVlorqu-NsjQGjZqZ$Kms8N0"r;?*a#QOSus8;iqqYL0nr;$0drVm#tq>C9mrr*'#rVuok +rVlrRg?AJ7#lac$rqu]kr;Q]q!<2uqJcUBqqt^-Ks*t~> +hu=2crVufos8MiITpV[Up\asgs8W)t!r`,tqu??g#QOW!s8;iqqYL3jrri?!qYU9kru(h7s8W)s +qu?]ls8M]Q['7C-r;HNmrr;usrVufprr7QK_>aH4q>LHorr2`n%K?>&s8(Hb^U^;Gq>0scrri?! +r;6Hls8N#qrso#'s8&rF*?nPYqu6Qlrr)llrr)lqrr;uurr2irrr)j*q"pSSTU_dNo_JLbs8Muo +rrE&[s*t~> +ir9Vhq>1$hs8;`ipuo,#92Js%_u@aU`rF-[b5KE[`qd^Tap?)2^rXd?a3DX&aSj6aaNDcPb5TE\ +a;;h5_o9^>b0S;Kb/Cl^=%m.e\%fc#b0'\(rlP;``l +f)GmChr=.gqYpWqr;?Nns8)foir8uU!<2ut"oeGtrr<#prW<#pqu6TseDB]os8Vm"qYp?jp%eOb +rr2utrqc]nJc +huE`UrVmW3q=qn&S#W^hrVZTjrr;uts8Dlorr2rWrr;uurr2j!rr<#trVZZpr;cirrtYM0p8=k# +f_kdIrVliqs8N&urVZTlr;V?I_u9r?r;6Ejrr2lqrquorrVlTl%fH2'beh0*VW[gRrVlirrr<#t +!WE#os8Dp-s8)ciY9G&)+"+YtrVuoqqu?]qrr)lrpAYa's8;cos8)WbV4sNMUn?B=rr)lsrnd[*~> +irB#Vs8O&:qu-Qppun8Y92o<2`l5p7`Q?'>b08)PaMu6WaS[b/M9 +iVroWqu?]qrr3,aj6>_'rVm#us8DlnrVuop!;t1B"8quiq#:9qk1oG&rVuop"T8/mp&=pi"8quj +r.4jarq-3rr;6Bip\4R^rr2p#jmDQsf)G^7rX8c$pqS-q*@<&)o_e^e!<;oprVlotr;HNkr;ZWt +r;Z`qs8)`p#3Y7 +huE]Trr<#r'D2%,URS"1r;Zcrqu6Tprr)cmrr2rWrr<#irr;osrr)j%rV#fhVS:[Urr3#srr2ou +qu6Tn!<2rsJcR$s8Vrqrqa:-R\-.>[J'RNs*t~> +h>dNP!<)os%di,)>XhGP_8s[>_SsI7rlbDa`o"l;`rF-[b5BK_as"jKc-=>Lb082S\>WV"?[o,n +a3_`Caj/2TbfIc@`Q$'CJ]P^L!6Y;b"3Sj3b5TBraND`Nb0&#L`5fj7_Qo_&.3T]`OKlXna9'B# +`W!mVa:HJ7c^kLQ',Lapaj82SaijS$s2b5_!6kDd!mJg.rPfJk`l>j8b/V`J^N`sF4[iD2iV(n' +J,~> +gAh3P!<)os"5W&"iVriZpAOphrr2oss8::DrVlutqtpBlrt",.jRW?NpAb0jr;Zfpqu$Hn!r;Wh +Jc,pOUhp&G'irr)fkrr2otrqu]k +rXSl'q>:-jrr;ZMk3qKtime!Y~> +hZ!TTrVmE-qu$;^MVsXB\fDg@~> +huiQ)2B`Q#p=aSa3[a8jB]aT'E_bR_e1_m4G] +C3ukiZHC>5bK0\&s2b5[!m8a0J]PaM#K=Hm`Q63C`r +gAh0Mrr39#g#M#Ls8Vohrr3-#r;Q`rd/NtC!<2uq#QO`%s7jFmoD\airVca%rqlNhs8W#or.4jb +rWW5pq"ajequ?Qm!<)iq"Q].Kk1oq8l2D4ij!>lk*[6F4rqHHks8)]err2iqrql]trquZlrVm&[ +l1F/qhUDLT~> +iVruYs8N#t%fZM.rVlWfc_ID0XS)Jirr3#trr)lTrqufhrr)cqrr)j,q>^0GTYAbIp](*hrVl`n +s8W)ts+10erql`qrr;rsrr2rtr;liprVm/f]tD"]Z2aIrmJd(a&H;La+s%X?*/!e[pAb*kqYgBm +q>U;dLVr@IKrn%1#~> +hu!l`1!pW+H!aMYp:b08#L`lQ$@^77u+ +DP4)J`QufL_SaC9b/h['b(7XOa90Dq^;9ce)90b;`P]U5c-abYaht]kHorf,0M/[`c-=E%a;<(C +aMu3<`lcK9!sJl5$uO;;aO/2U`5hhrp;m9Rrl+oW'$/5Bc,IK:_5(a<9hJ5m[-7>afDg@~> +g]%EUr:g*frr3Gge*6&ls8Dror;Q]nr6Gs8V<^&-#ue.N:!no`+jes8W)os7uZkquH`ls8W'.p&+jhs6AtB +l0%*\s8VuIs*t~> +iVroWq#CBn%Jfb3TV/(0qY^Blr;Q]os51*jrStr2[@kb=pAb*hnc&Re!<2rs&,uT6-RKTXJFW[:qu?]qq>C9k +rqcZmrr2j.rr;lqs7Z)gStVREWjqs)p\reEJ,~> +hu*leR_4;,E7d`mW&Qbf\#H`PpcVs2G,Z`lA#!r5ScX+Nh^?_8sjCaMl-Ac-k%W +X$'!\VR=Ie_oB[7`lQ`Q$!@`k%UN1F+@rEO!+#b/s4q(s:+J +b/VE>`lupm$4QtKB@>GUbK\;S_p&)!s2Y8aaN4>"qSa,faND`XbJqE/[;Ar?6q_$Jiq2rqs*t~> +g]%EUqt^$arVmG[i:#J#s8Vlkrr;uqqu$Hndf07G$2j\trr<#orpT^_rrUd"g%kXMr:os[rr7QK +_uBW7!ri,prV6Qmr;?QkrrhNEo((B1rrVoes69Lnq>XG=.=_6mq>^KorVHQmqYgQoqtpBj!<2cn% +fZ:uqZ$T]lLF?1in+50eGk%~> +iVroWp\ta&r;6#aS"ut^9is8;lp +rrN)rJc +hus2G)Y`r3sY`r3jq`lQ5bc-42HJ]P^L+NhsQ`PK:'`QHTWdEKVJ_847*[$4B7*$?Y\Xieu/]uKWa +(s:+Jb/VE>aNVrc1B@bef@7sfccXAJc,KY$s2b5_!6G/Zs2FuTs2>YkaNDZMccsAEZ[,VC7SQp' +f^\ggs*t~> +iVroWqu7*&q=s[_rVuooio&nTrr39"rr<#tq>($idf07G"8V`fr;HWrq=ade"7^Bg +q>C3kJc:-grVm#Zlgj&_rr3,us8W)ul2Ckdq"RsJqYpL!rVQWnqZ$ +i;WfVq>Uj%s7uTjfr1C4V<@CIs8W)trrN-!j8T#WrVl]os8N&s!<2rss8;rprVm<'p[ZY#^!lKN +rqHBjrr3#urIOsarWN2rq>1$ds8W)srsSN"lG^TUY+t:Qs8Dlqmf*7d&cVb/p@VF?q#C?nrVQWn +qu?His8N#ms8Dp.rVlcprVuomi0pI.S=Ze=rR:ds~> +hu'm'^V';-Tp+cHX>G`Q6h9jVk1]Z8(:bg"DT`l#^6J]PaM+j/'UccsPM`Q$0Me'H1U_nN=VFZ(6[*%R8ZbKIuK +_8sXfa;E(Dbf\#H`lcQUcdFRYdb3'raiDQE_Tfjo`rF-Zaof`)`l7qps2>&ZaNFM+%*Qu<\X6&i +7S6U"\an5LJ,~> +iW&rWr;R9+qY9m`s8Vurn_rcqnGiLes8N9%q>($is3glMs8;Zdq>C3k!r)Nfr;Qi:hWXt="9/2n +r;?SGrkna5rrN,srqccprr2iq"o[KGp>Y04rrr;ts8Dinl2D4lrr;ojr;6KmrVlisr;6NjrWN/r +qu$Hls8W)sr;Za,s8Dusi:641n_s +eGfjSo)$J)Tq/^jp&>!krr)lUrr<#qrqufqrW)oprri;ur;ZZnrt55-o^&-T`:Wd'rr2rsrVc`q +Jc +huC]ZS..`luiV`l#gUaT'6\aNFM+!Q`7Z_^*4Bb08#Nbf\#H_o'I7 +aN_lJ_SE^Y5YYd][*$V=dETbO_84-BaMZ(BbgFneccX8H`QHHQccX5@Z(>ed+!;@dQatDcbf7K7 +`l@De'$AGCcI(+eb0S;Vb/_TFa2Gm;rPnlYrQ5Gf`l5j5`Poj,Z:/YQ#kkb>Z +rmq+"~> +ir9)Zr;?Hl"8r&nr;?QtjPoOlrVca#qZ$Kfs8DuWrWE2qs8;lr%fHA)rVufqrVcZkq"Xacr;Qls +qtpBkrs[B2k5YJ\qtg?ls8Vuqs8W'"s8MnHrlP->rVHNqqu?TlrrqrQo',&_rr2utrr3*"r;6E@ +rWN/rqu$Hmrs/Q%q=sjaqYgBm#2eS2o]b91rVuosf)L7~> +huE]Tq#:s*r;=-rS"dt#r;Zfms8W&trSd_es7lWkrr<#rs8DrsrVuiprqud!rVZTlrr2rtr>5D1 +oWG4&hu!^?js82fqs8N#trqh9Gao3(OqY^ +h>[TSqYL*frtPG/qsiKu<_?;=]>;D)_pI#[ahc!Ua;)S9bL"bdb0%W=ahu3AbK\;Ub/hTArkfbq +`lcNMb.tZk>t\(LXi/W3d_s#?]uJ4;aN2NF`IZ+Qah6X`PojUbl,]`bQ,`Z`r4!Yb5]ZdaN"1t(!4P?cHOJTai:j!A5Plj8m7eC +pA4[9s*t~> +ir9,[r;?Qls8Drorrh9SkNMpDs8Viqqt^9NrY5;1p](3cqZ$Qpp%SL_s8Dijq>:0grrrE!q>'pc +rr3)fcg0oqrsSi+q#C9jrVZTms8RZLb5MYDrVZWns8W)trrE#rrsIcJkO$s^s8Vrnrr2p"r;6Bh +df0:E!<2rs#Q4Jtq=XOZr;Q`rk6gYIn*fQAs8)cqqpk^s~> +huE`Up\tm*rV5ZQX.#m6rVcWnr;Q`ls8V*X%K6>#rql?_s8N&lq#C6gs8W)srVZ[,rql]irP4u= +bjtf4qYU +h>[TUqY9pdrtYM/qZ$EWb%b +ir9,[r;?Qars[`BlJqpErr;rls8N&WrX&N"qSlInq>UBkrr3/os8)Qer;HWqrqlWnqtpBpakcIb +rrW2trVc`urr)irJc +huE]Trr2utr;RB.rVlTGUR@jThXgF?s8DusrSd_^r;6<.:uD!ErVZZp!qlTlrr;ur!<2ors8Mus +$iBkojdW?jn+lhYrVQTsrr)irJc +h#@HQq"k!i'`7\%s8VuYY[gI)>ai7Qb0&\a'ZS2:SLqS+f$DF\bfIHAaNVlNb/jM#(!+PA +bg"AR_nj*oSOH=eR'Fh'S_84.6rlkbl`PK=(_oBd?aSNpRa<8XLc-=JR`l5s=bL"JUcH*c7]7NpM91Ms"e+EG/ +o_/76s*t~> +ir9,[r;?Qdrt#&-s75.4jludEs8Durs8:jTs8NM^-79qnrqQHlo)A[hrqlZo"oeDoq"t!grWE)t +s7Q?j"6.bqnbrIhrVulrrrN,tJcs8Drpe,Op~> +huE]Ts8W)trVuos&,Z@naeY])Yh]*Rrr;utqr.PSrs@@',95J8pAFs^rr3*"s8W)tquH`ps8Dp, +s8N&js8;][ZCo"as7lNkrrE&trrN,tJc1$grrW/qrn%1#~> +h#@ZYqYU!!6Y;bs2t>^ +'YMW/^SY:"?%',g^W4IcH4,H^U9eg?8aAb/Q\pjaP+eU_84%.`lQ_nN[=>uF*d=)G28rqH-Yp=0+m~> +iW&oVo`"pjrr3B&g>CoRs8VurrV6EOrWrP_/gDJ_0\64%rrrE!r;QWnrVm'!q=jXZqu-Nsqu?]j +rVlunb2VL]s8W)uqZ?`rs+10irW`E%s8;`hqu-NumGmQjdd[58"oA9!qt^0hrrW)nr6kTEquH`p +rrr>tq#CBmrr3/Zk2tjgf)>UNrq?9heGk%~> +hZ*KPqu76,s8W&lcCUK!]Cl'os82QjiVj/`i%,rh*@oS7rVlisr!*0#s8Dlmr;6Nnr>,D0s8Vil +s7Z*0S@6<6r;QNjqtp?ls+10jrr)j1rr;uss8Vure\]/!S'1I(qY]pZrVlrurVlfro)A[hr;QQm +s8N&um/Ht`(&mk%r90oLTqe0Ff_>%;s8;osqY^?Es*t~> +iVroVq>UTrqtg0drr3N-o%]jFla:HM#"p+r8(qJ>Lc-ODI`lS/!rQ,#]rlc8& +aMu6=bgF>NbIt0-5#YjfZbsZ#`Pom>aaqOSa;Dn2^WF^A`lH*>WJa%_,UYNsZH159`5g.$`rF$X +_Z7^IaT'9[aT'BaaMu3u_Ze$!aN2B@oZ/,sbfn/J`Pop@bfnGT]=tnO>#S?r92r@cpAb$\pA4d= +s*t~> +eGoOI$2aZ!s8Ua;hqn#(rrW&qr8IVcpKT0i,:"V`rV?KirVufpr;Qruq=j[[r;?QurqucorVQTo +"3]-Mo)8Rkrqu`ps+10krr2p!rqZHirrr>WhW*&PrVllprr3)rqt^0hrrN&pdf'@HqtpBkrrW,q +q>C6skNqKsjP\hlrr`2rr;P4GJ,~> +hZ*WTs8Dusp\t^%q5C?aW6G,9CpAam[qu?Zjs8W)sr;HWpmf*(_ +r;Q`ro`"ghrVlis&,lP*q>]`hUR@dLTW.bZqY^BnrRV"!~> +irB#VqZ$Ql!<)iq%fZ(UH>ZbmL:=t4a32lQj2`1^bfVgQ#n[^YYgph;_Ssd<`l5s;aNDZLb0%g' +`YQhAb08,TaN(EN6qM'IY.DToaMu9BaaqOTaIb08)P +`kfL2o#UgQ!6G#Vr5eoXo>psS!65#W(WOVAbK\#?^SG^G7o3/fFQDuis8DilrRCjt~> +f)PdLrqm*"p\Xsis6Sb'h#.0Qp&*hK&-)J%IOZ?\,UTeoqu?]jrql]ur;6Bhrqud$rr;orq=t!d +rr3)YbM_mgrri?!s8W%KrlY6>rrW,prVlg#kk+N(de<\?"SVlqq#:9m!<2uq!<2ute,BIIqtpBk +rr`8ur;HWp#4'e,puUN'rVm)mp\b!grqb4GJ,~> +h>dHPq#:m's8;QU\"f[qg%b:@s8;oVrX]&(pN\#")'1!)qtpEnq#C6i!<2ors8N&s(]++-s82`o +qu-Qg_5"EXq=t!irqufrrIOsirW2lorVmQ*k/"jGVl&&As8Vins7lTns8N#qrUBgdrVulqs8)]p +s760errN-!rr*]2qYU3V_jd6jQ_M4`pAP$crVulrs81CIJ,~> +irB&Ws8)fpr;Zfo!<)lr&H2M+s6J!`?rpKn\%Bl3ai`Yb&'E5BemfO,%hK&*c,\#M^])5!`Q$!A +c-4>L_8!h*b08#PbL4PTcGIK:X`$j5@%OdJbK.]FaiAtRb/baG^r+78be]lp2Cp@*4+FKH_Rn"< +`5os:`QHTYe'5kJ`q.7Yb0A8VaMl'7`Q64$bQ>r.`r4!Sb596[`W!ah`lcNJa2YopI83@*6s>St +kP4rGq9f4m~> +fDkjLqtpHnrr3G]hW3Mgs8Vllr;Q`rrr2g!rr<#tr;?!^%K-8$JgDWb+Y1"urVu]ks8W)ur;Zck +rrMlnrqlfnq#:9qbhh7Rrr3*"s8W&qrW)lqrW)ukrr;nIrqucos6BU\rrr8`n*Sd%rr36%r;6?d +s7uZnrr`2rqu6Tpe,BIIqtpBlrrW2tqu-O"map^nkj[@"rr39#r;QTkrqlTlfDg@~> +h>[KSrr)Qj%K65$k,>#NV9er4qZ$Torr2rrrr<#drXSi)oR.f%)]U95qYgHjs8Muorqufrr<)rp +s7cHk%f-+tgnD'djn/TOr;Zfqr;H]rqu6Qoqu6WqJc>ZJs8W&s!<;Whrr;rr%f?;+rr2]M`4i[R +`Td-prr36%r;Z]ps8N#rrVuforr)lmrr;rsrr)lrrW)obrr)lqrY>J4s8;f_^RqEsPc(;)qtpBi +s8W#oe,Op~> +iVs#Yqtg9hs8VuorrE#srtkY&_fK!^=GON*aO//O`l?*@b0%fFaN4A'nAl-ac.L]a'+kTV$&csJ +bJD=!`Y$A;c-=>K^V7J#b08&Ncc+2SrlYee_6Stf9j3da]=u,%b/aG$rQ>,\rPjE0p;m*MrlG)] +prNHSs2ZM/aMGd3]="2E3$TIg@\UQQ`59F1`R2T@_SaIBe^`!e`Q63CaSj-YaSj6laNDcRbfIc@ +`Pop@bg"ASrQ+oZ"3AX+b5B?\`r3mVa:l\%k;1q"sd`s8LIHJ,~> +eGoRJ!WW/urtGA2rVbF6kiVpFq>L*ds8Vrlr;6Kn"TJ;qrr;Ke%fQ/%nqJJ8)(@$1r;Q`prr;cm +!rr9!rVm*$r;6 +g]%9Qq#;'+rr)`ns7GBHUn+@=rV6EkrVulorr<#t"o\H#rr2lcrXJi"s6kO_*>KkIp\Xsiqu6Wo +s8Moq!<2ur!<2rss8<9%rVl9+Tteb9p\t0mrVca#rr;uqrVc`ms8Drqs+:7Ms8W&us7QBdrri?! +s8W#rrt###k.J:?ZD6=WpAP!gs8W)trr3#us8DrsrVufqs8W$(s82fqq>L3is82corVu]ms8Vck +*rZ* +i;`iUqu?]pr;Zfqs82ir)=,:W=\;VY^qe=;`5KR1aj82N`Q$'FccjQ$a<8UGgX'R@#65#3cHFAP +`Q#p=b08,Tbf[rC_8F10`lQ6uapc>/_S^Kl!<(OLJ,~> +c2SLTq>C9lj6Z*is8V`ks8Dutr:0U^rr3&tqu#s_rr3E*r:cp1/L@e(rVuoro)AUf#QFYuqt^6i +rVlg"r:8(jir&fYrVQNkrr2lr!<2rprVlcnJc>]Is8Mlps8N#qs8N)urqufq#6"T$rVcThrVm6$ +iqi#nhZ*WNr;HWpo)8^jrq??k#lal%qqe+Dqt0CWs8;ipq#:EpqtpBm%Jff!s82irg?\S&mFM47 +rrN,sr;Qluq=ss@s*t~> +df1![r;HQkrr<#me"`P/W:Ku\s8Vuqrs/B"s8Muqrr;Hdrr3K+qXg@$.3Ytpr;Zfrs8W)ts8Drr +r;Qp!rVc`pqu73)qYg +dJs7F!W)Wkru(+$APZ!(X2VftahYj>bJqcG`Poj@c-=JTo#M`kb0nSad=DE1"HM'Yc,mrE`lQ^0^T`e`7TYG>Y//#o`Q$$Bbg+PYb/hZDrPefVs2b2^J]Ir7`l?!r +_Z[ruaND[)bl#Q]ar&.=`5BR4`ko$SP[Gmo+s0FN^VIt6aMl7"b5]O"`l5p:aN2NHbg"Y^^rF=0 +`Q?r.aSX!Wa;2q>`PfjDcc#@mV;HTdUp\FgkrVQKjfDg@~> +c2RhCrr2p.p#kQ!i;`iSr;-r,II@Is8;osnc&Of!WN#rqZ?]p +rql^)f[8aEs8W&pqu?]pq>:$g!ri,prqQZnrr<"MrW`;tq>:'er;?Qor;ZWor;Q`qrr2p$qu-Qp +qu$Hn%HQpMjkT\3s7Q0eq"t!Zrr;j)s7ZEkq>:$+,pT\ks8V9]s8W&s"9&/rrr2otrr2p%gu%,\ +mb-t*rrW#nrqufrqZ-WIs*t~> +dJs7G&c_k/rr;rhaJPZ(XlKHVr;6BhrrE&tr;cirs76-us82ipqu?,k+L1b@s8;iqq#:9mqu6Km% +K62%rr2ffZD=tMo)8OcrrrDuqu?ZprVZ`qqu?ZoK)YWHs8N#r!<2rsrr)iqs8<$!p\Ogf&,bV)^ +:gYLf(&e8rr;ors82fos82fqq[NT"s8VokpV.gmY5&%sli-k_qu6Wq'`J%2s8MuprS=?GSXuLF^ +@D'rrVZZp!ri/te,Op~> +ci5'br;6Eho@ojI;bp_oaMGm5`QHBIccF)C_o9^Ac-#Uu%`ZB0c-P4iOoUNkdEfnSrl+u[b5KNc +b/h['`rF-[`rF-Yao]Z(`;[Ro_RZXO7oj,bWjT^bbK@f?`Q?->b08,SaMu-8`Q$("blGn +d/O1Hr;QTn"PDc#hqJ&/#6+Grs82]krVlrsqu$$a&,ZD+rVlWgs6TIZr;Q]ns7-*gs8W)squQWl +q>Ucoe'ZkArVuopqu6Ttqu$BkrVlotqu6Blr;Q]qKDklKrV?Kjqu$Hj!;u]n%fZA*s8N#ts7>aF +m-E?]rr36!r;?9`qYL-\rX]&*s82imq>ZF*)CHcfs8(pXs8W&s&HD\*p\b'krr<#Vk2bpkj4aJ3 +"TJ8or;QZps8LULJ,~> +c2S1Nr;6Hkq50m\T!%Y_rs&E$s8N&urr2itrr<#irX]&,s8Muqq"OgRo`+gfrr)irn,E:c'E%h/ +s8Dfjqtp!5XK&_`li6qZqYpL#r;ZfrrVZWmrqucurVZTlKDt`Iqu6Qo!<)los8<]3qZ$Tnq>^?R +e%rf3WNtsis8)cqrr)lprr2rorX]&+s8;onp\osq'I"XUrqbs[rVucos8N`1r;?Tpq"s!JTqJ6M +T<%DTo)8Ics8LLIJ,~> +c2Re>rq.,shK<.'9P:ZMaNi#MaNMWHaMl'5`QZQKo>h`f_T0a@ccjbk`6HfVbfI]E`l?*@b0%s) +ap$#3aMu&b/_B=aNVoTc-48J_o9Xa>jrWW>uqu$ +bPr1Rs8VuVV4ONW\FKOsrVuopr;HWsrr)fcrr)j*rVuosp%\Lcqu?Klr;Q`irWE,urr;lp!<<&t +&HD\+rr;cnqU_RD]AiG^s8Moqs8N#r!<2ut"9/8srIY%Fs8N#orrN,trqlcqrr3`4q>L +dJk9drr<#no_/(Wn&00G;cIeC_og0Ga2#U8bf[rA_8c#drPf8dc-anYbg4YXbJ;08rl4rYr6##_ +"jP94`lQ7"ar/FEaN)<;_SjO3^p8Va7TY23\\c>*`5B[?rQP\nb/VE>`lcNOc,tXZrlkAdrlbJe +aMu7!`?3+@b08#L`l?'Ftrd"IRHQ +lcB%Es2b/]'@"VBcGdZB`N3BI:/k%pHc54@qYpNoq>gE?s*t~> +dJj=JqtKmarrDinrt"&MkMkJ#s7QElrVuciq"t!ho)8gkqYgHlrVca"qZ$HmqZ#gZ"98B!rr2p) +rqZTkqZ$TRh;Io'rs/Q%q=sd_r;QHjJc>QErr*-"rqucnrr2iq"TJ;oq"t'j"n1jIlIY>"rsA]) +s8;osrV-3eo)A[f%KH8(i$T`o*@ObBo_ngLrr +ao;kKrqtcPTUqsloDeF^s7uTms8E#snbramrql]pr;HTo"T&/rs82ZmqYpNns8E#uqu.?1rqu`p +s8N&rs8M`hm&d+cbO#*%qtpBrrr)cnrVlcurVlcoJc>WJr;H`srql]urr)fprql^.jN"g?[]@RG +q>UEms7u?bs8W&qs7ZF's8N#tq#&ki*#o_<9AT1;s6K[_s8;itrVl]mrso"l\YkdcR@L20qtL'f +qYC-nrr)fpfDg@~> +dJj4Frr3u7p@e@]qWbe1=A`.B[*$2.b.Pa:c-48H_8F73o>hH^`50F5`lZQQc-=8P_ofgl`r=$Z +b5TWbbll83`lQ7"asbKV`lH->`Q#sGa18^R<(9GpQ)qC*]u%e1b08,Tccs\T`Poj_FR`r4!Yb5BbhL)M +&ek`e28%&SbNm7J`rF-Yaqi1AbK\/O_l@WU78?HVFh@&2rVufqr;QNmrR(Xq~> +d/O7Hq=jabrr2utrr3)RmHEC&rri>uq"ajds76."qZ$Tns8Vuos8W&ms8;lrnc&Lbs8N&u!<)ip +"T%lgs7lNls4m_6oD\amrVQEgrr)lrrql_IrqQKrrr;utrr2p$rquTeq>C3k"n([@kLnYhrrDll +rri5us8DugrX]&*qtd]K-QsKZD"RT(qZ$*bs8W&sq"tX$s8W&koDejUk4eK +c2SIVs8MrrrVcWTTqe0Sh>I*Hs8;lns6optqu?]ps8Vuos8W&ns8Dutrr2iqq>U?ms8N&s!W2fo +rY#80r;Zfks8Vril*ROqaQ`['r;HX!rVZQirVlfr!ri,rJc5lQrVlfrrr2lps8M`l)#a?rcG6rj +U:'Lfs8W&ts8)]krqQBjqu6Tpq#:6l%f?+sYTY,-(F3_cq>^ +dJj4Frr3i6qYBseqtKBiBNRl*PeY/Yb/2*:b08#Jrke`Uo#M?YbK7]Dai29BbK%E@`5]puaT'6_ +`Q#p=aSs?^bQQ)0`lQ7"asY9Pb/hZD`59O=_9L0A];/n48RRCS\@fSk_8a^He^`'k`PK=*`Q!JM +29`aMu*6`5KmEcc*oK_SsF3`lQ7!b5]Q_ +`Xp,+_9CK$(E*tq&5(-he&KN"aSEjQaT'BobK.`Dbg3D39LqH@UBqr;ZNjq>gKAs*t~> +dJjCIs8;ckr;HX+rr<#^kiV!^pAb0is8N&trqccps8VWg%fcJ(rr<#srqcWorVufonG`Cas8N&u +(&e14rqlWlr;6 +dJj4Dqu79,rr2rtqn](rU8?98qY:*frqufrrW)uhrW<,uqu6U$rr;lqs8N&srVc`ns7uZms8W)u +r<3#ts8N#rrsnu,q>^Hns7XU2UqP@Eq>UC%rr)cmrVc`ps8N#rJc5ZKrr)cos8<&trVc`kru1k6 +k0UiT[]-t+qt:!brVuoprVccpr;?Nnrr2rnrql^(q7@jd)]U&ko)JXbs6fmYrrW3"qYpL-oZs)! +R@B_Cd.[D:s8N#tqu?Wmrr`9!rVkFKJ,~> +dJj4Dr;R]6qYg?lqW4#Q7nZd?_8jO<`5]g`koa9`Q?'=aNDZH`lA"s +s2b2^rlG,Zs2b/].*0WWb/_WHai;X`is_X5[/W*Xfo(B_91*QdEThQ_nj1,`Q!JM!QN+X +_(WdIbg"JYb/M33_o'=*^V$tNGu-%?/2CV)\@]r(bK@l@_o9jFc-42K`P][7aN4;%'?J25`P]R5 +c(5X\'bV"(`m2TCb4*LJ`r!ghb/hZ@`lZ93Le^N.6VV3ljSJfS"Sqriqu+nAJ,~> +cMn"GqtpBls8Vuqrs7HKjPT\2s8Mrprri5pqY^9LrX&W!s8Vuqs8;Zjrr;uqs8Moqs8E]0qtpUNps8;fo"8r&jrVca"p[@k;f@BWq!ri/s +rVm3&qYpHns8Mios7uX)rVuZfDB(/LaR]B.s8Vrqnc&RgrVlip'`It,qu6WprVuoms8Uj5m.'Z5 +iUQpI!rVlnr;Qp!r;6Eke,Op~> +dJs4FrVlrurVZZp$iAA@U7J40q#10js8;lqs6fm^s82d%s7lWor;Zfpq#13l!r`0!rr*-%rr2lp +rr2lrs8Dips83B*d@[5HanPT.s8)Zns8N#t"T/2urVqKK!r`&qrVm!!s8W)srVZ[(q"j="]"P,; +WTX0f)o_@Ir;Zfns6os_s8N!1s8Mros7u]j +\u20kS=cY(qu$ +b5VqJqYC0kpu7oE9LW-E_#DR`ai)*9a2lBGn&POPaSEjUaT'E_bR_t5aiM?O`l5j1]XW_n:L%LsTa_T0^: +bjidO`rF*raiMNCaN;NA_T'C4\oh.M7n69\U>tnDrVulqc2W:~> +c2RkCqu6Tp&,Z.us8VlVmG?b#s8;oqrr2rtq>pTnir0,]rVc`qrVca&r;Z?cr;Z]mrr2fps8Ec2 +qtp +dJs7Fs8Mus!WN&rrs\54U8"-VoC_nYqYC$cs6]g_s8;j"s8Doqs8Mus"T8;jrVc`qqu6Wos8Mus +s8;]m&,5bj_O7RBdH^T-s8W&trVl`ns+1.Xrqucorr<#qs8W&prqud0qrG`,\Zr*:i:HsBrr2lq +rVZWmrr3H(s8)Kds82fnqu6Wqq>LNkSVs7u]pqu?-aqu6ZqrVuor&H;_,s7Y'L +S"6"BTZd3/r;HTo!<2ur!<1=EJ,~> +b5VPAqY^?m%e7T"=&2Fq[(j`2`PKC2rlkJib4kk_nj:2aNDcMK#e;Ac-=AL_o0F1_T;`"/'cMa +]sYDPKN0i]/2C+i[DTJic-=5D`Q$-Eb/D->ai23B_SsO6aNr)Lb5TK]`Y$2,`6m2b'L'RXcc +aSuAAqt^!crrhiRk31\"rrrDtq>^Hei;O5dqu?]os8;`jrVlisrVHKlrVuiq!;uin#Q4T$s8;fl +r;-F)hq-fInc/XfrquWhr;Z`nqgnbGr;ZTsq"jm_qu$9i"mk^NleL4nrri<#rVZZnrrrE"qtL-c +rVm&qs8;oqq>UEirXSu+r;HQIp&+jir;?Tpr:'^as8W)uquZlqrVQU$rVucQm-sH/hsrr1FIJ,~> +dJs4E!<2or(B4@6rVuoe_5Ep$VY0W\s8W&mr;Zfli;O8equ?]ps8;]hr;HZqrql`hrqufqrr)j+ +rVQQmo(hmbSu9$DnG`7`!W;hGrr2onrrE&trsnr$qYK3i^qd7PWS@7KpAP!nrr)fprr3&ts7uWn +"oeQ"s8Dcms8Muts8N#trser)rVP:?qu?]or;ZfplMgb^(&n74rVccroDIFBU7RjHU!3?4s82`m +rri?!r;HT?s*t~> +ao<1Urr<#sqWuOfA5Q90[)(#7cH!fBd*0Dta90T/b0'P$s2t>b&'`/=a2H0DbKeJ\e&fPE`qmdR +b5B<\`r3mV`;dgjZaQoK9i+r1Oe];'cHaVTaMu6?K#e8@c-=JSa2Q0Cao9L!bK.T3ZD)M51bpX; +9p!'4_Tg->_o)Gms2>Mcb.l'?bgFSZaNquIbK@s+a8j6Za:ZG6_oBgAX2`?2d)a;Qbf\/Po#UjN +qoBf#aMl3>`5]j8[D%u.9hJ&W@\DNJqu-QprVQHgrVQWpqu?WGs*t~> +ao;PDrVZTgrr2p-khtRcirB&Trr<#rqu?]SrXSu+rr)lsr;4k3qZ$Ehs8DrrrrE#rrquZorr2p$ +rqu]os7uQl%ckpbf^]"Aq>'m^r;Q`rK)PoNqYC!arqQ]orr)fpr;RH(m.9Jli;N]Urr;ono_ndh +s8N#sr!iZ!s7l?fp&>!jq#C?ip\ko_eC^rVk=HJ,~> +dJj@KrVc`prr<#ts8NW-s8W)j\=]:cXS)G\r;ZfPrXSu+s8N&uqt\P,q#C0es8)]prVc`mrrW2u +rr2p0rr)Kfs8Mccjg1\a]A*2\q#1*iK)PfNrqZR/r;-6bqYpNXc,%?/VR+kEq"F^es8;lrrr2lr% +/^)(qu? +bl@_A!WW/us8W$0qX)dg>>J4-\AQ/+dEg%YaN!bkrQ=rWs2tAc&'E/:`l6'Ec-iQ5dFQFYbkfB\ +a8=!uaMu3:`Poj:aN2KC]Yhh+]XXYJ8PN30U9D&ArknlWa3'"T2Tj7gbK7iHb082Ua2,9kY,I.b +5r^535^BNMa3`,U_oKO.`lQ6@`Pos8beUs6`mN8[a4&8PrlG)YrQ#PaaMc6?aiMZH`lcWQbKJ/Q +o#UjNqoBc#a2Gs:`PfR*[uOrg8P)liOlZ60s8W#qqtg0dqu6cqqYU6As*t~> +ao;D@rVlg'rqlZos4?Mnl0/-H"8i&rr;Q`UrX\u-s8DrrrVu+30td8\qtp?lrr)utrquZmqYpWr +qYgBm$2X]"s8V<2fBi;3rri;tr;Q_JrX&Muq>0p^q>1'fqu6lYlgEodd-^f3#5e/hrqcTkrqc]p +rr3N-p\"%Uqu?]jq#C6krVu`irX\u-r:g6kq"k!gs8Vrms8VWgs8W&ss8;oqqYq!%jQ#Ckm,Qq% +s7lKgnc/Xgf)L7~> +dJs4Fs8W,us8W,u'`\.2s8W&kV5TfZ[dF+kqZ$Tlqu>XS&,lP.rr;uqs5kX[\Ffgtqtg9nrVlip +rr)isrr2g5rVZ]qrr)fjs7cQ\_P3m?dI7)7s8N&srr7WMqu7<.rVQ9fs7lKklGL6D[Ap=Up&4mi +"9/?#rVZ]qrr2lprsJPtmd^&OqZ$Noqu-QmrXSu,q#CBiqu6Qos7uQls6K[as8W&srt>8,q"E=? +T:2LFT!J"grr;orrr)isrr)cqrm:[q~> +c2RnEqtp?js8W'2s8;EAFCn0ID6:k"b0ePU_o]phaSs?UaT'E^`sfr,b0J_[#ni`TfZM82a8j9W +aF$VT:1,1t3 +UU\1eb/hTG`5fj9`r*mga2>a-cHG%nc-+b`d)jPLrPnlY&^&26aMY[/`4a%/bKnMVaj/,taT'E_ +aSa'p_SNmmOBbIQ<)?kUh"LaIrr)`mqtg0fr;Qlrq"Xa9s*t~> +ci=%Equ6Zqrr3<&qu6WqhrNbPnG`IfqYgHQrW)forsJW%n7a$f/V*Knr;?TprW<&rr;Q]irsJc( +p&Fmcs8)]jqu6U!pY4Q`oDJLcKDtoKs7l]mr;$?rm,[NncJAI!%K?1rp&"dgqu?QhqtpBkrso&% +pY_$=/q;7ErVuims7uWurVuins8Vrnrr`2us8;Eds8W&srquWm#P6a6n`o<"o`"jmq#:9go)Jah +f)L7~> +dJj4Gqu6j!s8Muqrr2p.rqlMpV4O9knG<(YqZ$QjiVilXqu6U0qY]_l*#^5Qnc/F_r;HWprr2lr +s8)`prsSi)r;?Nnr;ZZjs8Drss7H`d_kjKFe)p9%s8@NJrVllsrr3K-s7>[HiQApPZ_+V`o_JLd +!WN&srrDonrri?"r;?QnrsIbA:E=]*q#(0jqY^BlrW`?$rqufrqu$Hrr;Q`oli-qa)>sO7r;6El +rm7R8TpqUH^ZbXqqu?]ns8N#ss8MuurVl`p!<1RLJ,~> +c2RnEqYL*brt,+sg4!L-:N7M[)C&, +`Pfj@`l-!taT'E_bU:TXaNV5157Lhpcd:%\`6?3>`l?*@b0%cG`PTX9_8sdBcHXMSbf9%ks2tA_ +&]Vl4`50:.^l2Jj9MSVrNQ^qlrrr,nrVcWjqu6cno_A=5s*t~> +ci=%B!;u`o!<)`n"mF\"jP9V.s5Eqgqu6WqqYm?:.39]Y:=K";rr)lqr;ZcnrrE&rr!EB$s8W&t +s7ZHdr;Qoab15A8r;VBJ"9&,prql^#q<@25k0N/`r;R0!r;?Tpqu$Kor;?Qlrt"u+nq/PA'dY+J +oD&7_s82Tj!;?El"o&&rrVZWnrrN,rnc&RgrVlip%fZM.rr<#sqpt'!lM9`-qYpTjqYpKtrqu]n +rql`qrmq+"~> +dJj4Gqu?Zp!WDrnrXJi']V1pkWS%4Mr;ZfpnG`Feq>U^Ko +s8<#srVl]o(B4@6rr<#ps7u]pnbr*sS>WX2i9g1:K)YcL(&[t+r;-3go\@Bt\uV=qrVlisrqu^*pA4-&-Q`mE+ +bl7eBq"Xa^rsnnqiJV#:9NmRqc,n8Ua7.1L`qd^S`Xp&'_oKsBeqFJJ%1rt$YKY2haT'BW`W4*Z +bl>icaT'6r`QH6?bK7N<]#r1-`3a_Y8PEH=OI`_mK?,=W^qe%:eBYk0RX.pl1H76E@>Ckj\Auk3 +`l?-@_SjU?aN2NJrQQ)!d`c5<'ab][!6WL.b0%T?_o9X:aSs +ci="A!<2or!<)]m"mY.6hs'q8rrrE%r;6KmrVllsrVZ'^&HD\,rr2gu-QaNT,:+S,rVlcq!<)op +s8Mrrs8E#rrqd-%qu?TnrV-9hr;Z]kqu6fUcI^q>qYpQprquWl!;u!Y!W;rjquQfpmJd+brVl]l +rr2lop&=pis8N#qrr2Tj#4CU5j4)BDqZ$To!WW,rrrW)srr2rsrX\mu/L;Va)&jYEK(o +b5W:WrVlforr2lqrVuopp:R)oT!d8Fs82]mrrN-!r;QZp!<2lqq>U9k!<)or%Jj*L)&sM7+!-mG +qY^ +dJj4FrVm$!qY9mbrVllsrVmW%fSEU(8njU(b/q`Kb0%fF`Poj:aSs?^aSX!QaSj-Y`>$/,aNW$h +$jdIU&J#4sd)sJQbK7m%`[AjPccs_WaMl'3ahu3A_o]s6_o9R=bJ_<(MGlT+;eqGq[CElc_oDJm +s2P&ZrlY/[rl43D#0P$0aNDTHn&PRMaN"(tr6"rY!li=$r5el[s2b,\rlG,Zs2[FI`l5g4_S3.: +HVujW/0uZFQE@s?_p$ELbK7`D`lH?OaNDTJbg"J[e'`LQ&/Q6$'F4hHcI1"T`l5j7`lQ7#aq)k> +bKS;Sb0%`A`5TX3b/X;!!6Y8]rl4uZr5oVm`l>s6`4;">;b9Y`=aSceo)/OfrV6BqqtB[WrRCjt~> +ci="Dp&>?tq#:13jqu6NnrpKgdrW)lnqu6Nlqu?TorW2usrr3'!rVlcq$iU#$qtU$fs8;osrql^" +o^25*ceA-hs8N!!qZ$KmrttV4qYpKlrVlGd.jH;a*ul:D*@!2mq#CBYrqucrrqu]orr2g&qtg0e +r;-?jqZ$Hkrs% +aSu8>rVulr(B=@4rV<(`US=XFp\Odes8Dutr;-Bkq#Bpar;RE.r;)p,)]'V3)]r&C7)rVZQiqYL$P`MBEGa5H:Zs8)Wm"T8<"qYU0is8EB*rr;rqrr;ur +rr26`"9/?"s8N#srV?Hjr;uusrqQNmrqZRDrr;uts8MroqYU0fr;Q`rrVccrq>UEfs8)ZlnCl!s +]rIa2fCo4?rVc`prVuj:qZ$Kms8Vlor;ZcorVuPf-QX3G(Ddr0)BLB^pA4g\rqucrrr2lrrr2p" +rr;usq>V*+s8W&tqu?Hii2EH@USjQ]m/6k_rr0h8J,~> +bQ%S?p\u!+m+#TM;,CMl^;e7=cH+#H^:_;$b5TWgb/V?:`q%1N`r=!l`lH6GFp&$V(_R]"1pkHN +cca;KrPnfW6c[-M;aNDZDaM5a+ +^7/A)6r.)nHHPLInG`Uhqtp?@s*t~> +_>aoBrVQNls8VKEjQY7orr`,lqYpHn!;uil"8i#qs6oses8W)ur!rMM:*pr',TeGJpAb!fs7lTn +rrW,pr;6L!r:Tser;6BjrVlotrVZ["o$,G3i:?mFrr`2rqu-Kn!WDrpr;ciqs7ZHWr:'^as8Drm +r;HNkr;Zd#rr)cnrVlcq"oeAprr;lkrs/Mlk3(p`d-CT0!rMonqYpKo*;][4r;6Bip&Fj"9dCW$ ++s&$W,TJ'M+_LcLqZ#j[r;Qp!r;6EirVlfo#lXYtr;-Emrr)fq#2J>*n_W-frr3-#r;?Qn_Z,,~> +_>jQ5s8W,r$1YHqTW4aJqsaR`rrN,sp&FO\rVuoq&,4FC+Vbh5(aZifs8)]orr)lqrrV'*rr;rprqH3MW1KBKP+TA]p:UEU~> +^&K)EjMu[J:Kpts_S"%;bf.H5_oTm@c-=JR`l#^6nAkXPa8X'iaN:D5%1/]rPnlYs2kDeb/jP$s2b,\rlbDcaSNn)b/q`F`lH3AbKA#P +bfe2Ud)Eu@]=Y__X.4W?2(0^q/7+^T`PK@0aSs?^bl>g1c-4;JaMu6?bKe2Zd[)Qm":u1V()[o! +'+"q7gWR[^`l5s;mDoIN`Q$!Ab5TTeb/hZDrl+oYs2tA_&BD`,_ntdRV6sPMsiV'tbJ,~> +^]+Z?qu6NnrRg;pjk]q9!W)`nrri;qq>C0irrW2tr:0aurVlfrrr2lps7ZJD.Nol_II$k3!W2ik +rY#/-rVuils7Z?frr<#squ?Tlrr)iur:g3errgokdGO9drrr>srVHEhp\tBpqtg3equ$'pcrqQNlrquZtqu-HjrVlfr$N0_ss8Mros82Zlqu6lejm:mKf'WG9"ShT^qYU-g*rYp7 +s7u]pq#C0bdTS1L+"&16bk/4c+ +_>jQ7rr3B$r7e$FSY;n:qtpBls8W'#qu$Korr2osnbrUgrr2oss8<9(p&'4a)]0fGlM^_`qu-Kn +rVd<)rVccpq>^3erVlisrqu]orVdc5s8Vrgq=a@8[%=/$^tAM[qu$Hns8N&sqtpBkrr`2tr;QBh +s8Mrr!<2oorr)iq!WW/arrN,trVHZorVlcq!<2ips8E#sq#:Nrs8W∨Q^,qWuqP]#(qRZHW(= +q=jXZrr;usrVmu=qZ$Tls8VloqtSQ?-mKZV*`pMTYoar)(*4j@s7uZis7-*grVulqrrN,tr;Q`r +(&\%1rr<#sr;ZHKUn=KTTWFmGq#1$drrE&9s*t~> +_Z']9q>:0k)XlmuCL9_.=II%HbKnAP`l5s3DjdE*]u.q2_oKj= +`Q%nts2YJgbg"DUb/q`GqT9#``l?!:_o;Pprl4rV#/eEt_o9^>rQ+rWs2b,\"3AX-bl,ckbfIfC +_nj1/r5^>0bg+JWa2Pm1_8F1-`5T[;d*0MI^9F8jF]^RV3\r3OCT"VX`lH3Fci(r``ZN.7bg!uF +cbe&Od^)=](_@>e5dB"4%M0?d&eh(raiaG!n]:aMs2b)[rlG)Y( +^]4<2#lFT#s4Hf%lIZ%8#lX]"s8)Njr;QZp!W;ibrW)onrX\l*q=_lW-:m_-rr;fls82Wk!<<&t +!W;oqrs8T's8)cqqu$Hkrr`2to_81]#5Qcne)06_rVllrp](6ls8W,uqu$6gnc&Ugo)&^hq=sd_ +r;Q9es8E0!qtpU`uoB5&pkh=;:r;R!!qYgBfp&+[cs8O,3r;Zfis7,B&.NolV ++@`g9r;65.,U"BT,>n@;s69O_s8W)tquH`krrN)tqYpfrhWaFombc=fs8VusrkSPa~> +^],2Mrr;omqV\'FS#E+@q>1'erVulps8W)trVlcrs7-'grVc^.s8N#os7c-',9]JEs8Dunr;ZZm +s8Doss8Muur;HWp%/p5+qZ$Tns8N#trr2os(&Rk-s7uBcpA+R7WhH>t^tS8Pqt^-grri?!qu$Bj +qZ6Wnrr2fpr;QZp!<2inqYog\!WN&qqulutrr<#rrVlfrrUp1*r;-9is7Y^6d(m6"X/!/`rVZWl +qYgEn!<)Zl*qfL3s7QE`l?js")B0Ya[JKk!p2;)l)AsPiq#16lqZ#s^rr2utqu-Nn!rMoqrr*E) +r9Ve,TUV:BUS$W@rVHHl!<0k8J,~> +_Z'W7rqIN4s8M]V]4bJ><*,a/_o]m>c-+8Wb/hQ>`Q69Ib4/]s2k>crlk_mb/hQ> +_8!h+r6#&`s2ub3ai;98_8O:0_nj.$\@8lLRXf*K3@u^0.nt`"\A?/+cILRsbf]q)rP],^`k014 +c,7oH`*iQY&ets0QIaU8r?e^;X_qSqpDqo\fW( +_Z'l?rVZ]qqu$L9f +OXDOs+!;Vrs7QEkq#9G(+=/$M,ddUOkPkMZrr2Zl"9/?#rqud#iU,_!n`J6trri<"q#(-,s*t~> +^&JW@s8DojophbKV5r)Cs8)Nfs6KXarVZX+s8N&qqu?KfB%?hZo(rCcq>UEkrXf&.s7cNmqYg3d +r;-Hnq>^Hnr;cioru(e1p%S@YpAFRUq9l+:Wj'CslL=WGs8W#nr;Zfq"T/,orVcQk!WW/hs6TaX +rs\o*rVZQiqYU0frVlfprrW2trVlftqu6Tp&F\`1`kJmbX.H]Oo(MYJqYU9l"T8,mr;QQm!<)os +)Yj7-p5gRH(`OG6ScAHas8)cY,SqC6(a$$]rr2fpn,E@er;Hcrr;?Nl)?0R5s8;lrqY/O0SsH7F +TVMAVrVl`pr;Zfrrknbd~> +_Z(MPqY9j_rr<#sl-WsD:/tY^_90d:cHjb]aSs0ZaSs?Pa9'K+b5THs`lQBEbLFnf6a+kc_T:*H +_p$-?aN4A'3m>jpc,%BC`llHHbfIuK]#W%>b/V94_8FIBcd'\Rb0%W8_n!:cLJgc98m6@gMOh&k +aiDNLda-(UrknlWa2\+prkncTs2OrWqo/HPrQ+oZqT/ZY!6G)Xr5eiV"3&:$b5KO6b/VE<`PopA +c-=__aM5?sXI=QO;F3H&1,q-mKrMMm_T'U;b0%fHbfn0-`rF$X_]ck:ai_]MeC/LN((:`c#_C^N +cd'_c`=X"6'b1V7eBZ4Xqo8-HrlY&XrQ5l#bfe&E`llB:PuCOQ=\r:Bf%K9Zq#(0irPnkf~> +_Z'o@qYL6lrVZQlrr3,Uio\tQrVlusqYBpcrr;ltrr<#^rXSu-r;ZKdqu?Hjs8DrsqYC-jr;Q^& +rqQNnrVuios8)`or;Qcprq-EirVuosq#:Tkg!\F&iUQpErrDobs8W)uquZcnqu$9hqu-Hkrp]sf +rW<#pq>U-kq>:*hoD]!nr;?NnqY^@"rU]::j58M>j7rHM"9/5qr;?TkrZD1C6,s*t~> +^&S-2)?9^6qWt#PUmnF=oDedcrr)`os8N&urr)f]rr +_>aN5rqZWnrr3W.keq7@<_H__[E?V6bf[lD`lS)#n]:[Os2b5[!6G/^&'`)9bg+5PdE0JN_T'U: +aSs=Abg">SaN;HAf%JR,d*'SK`m;uT`l#R+_84+5cI(%baN)?LdEKSBZ'fAp3B]c1EKHotZaRK[ +^&Gqc_o9U7a2>a2_nj1,_o9U9aND`Nb/VEt`r4!Tap,r0aN2BB`r!jS`VdaUaSs?[bU^iU`Pf^4 +`Q66Kc+LZuZ`'.3>X:5"/hf.XFKVp\ajS\gdE0>D_8XRBc,fk'rl$&#`6H?Qc[lH7#S@RXHJ6fd +ahkpBb0=?6*uc"-7+06#aSX!IaSj9WaSs +_Z'l?q>'g`s8;fmrrqTEjQbXmrr3#qrr2p"r;6Bhrr;Qgs8Vuq%fcG(s7lWoo`"mjqYpNmq#1m* +rqQNmr;ZEGTum?1p](9krqucsrquck#P[les7Q?eq>($qma]V1hrXA)qYp`sqtg0er:U$ir;QKh +qtgEiqsF@_s8N#tr;QR!q>:!_q"agbrqcWqrVZWo$3'bjmHrf^dGFZprr`9#s8Mus"9/5rrV?Hm +r>kq9[oOIo*@MqOl1juIqu?Znq>^9G.3BWS*c(TOl2Ch`qu$Bkqu?Tn(]412s8N&so\o$"l0RTn +s8W&tq>U +^]4?4%fcD&rr2WcpUI#iUSPlqrr2rts8N#t!ri/snc&Rgqu.**qu$Khs8V`js8Vrps8Drsqu.6. +rV6Emr;Z?AS]1X'pAb0lrVc`pqYqQ5rr;rsrV$'es7ZEgqX;_3TVJm-bhVFQqu?Tnrr<#ts8W)t +qu?Wo!WE#fs8Muus8LsVs8E,urVc`pr>>J4oAeHD]:'frr`5tr;HKk +&c_h.rqa!!(*4>>)Kb30()\!'p](6ls8VKcrVuoss8Dcm!<)lr%fYe?WM,lK +SYNIdrV?Khrr3#us8Dr7s*t~> +^]+E3q#1*hrtY(deq@O/;,hqFa3DiPai26?bg"ASnAtXOqoB8i`Q$-=b0e#Ic-42MbJaD"s2b5_ +s3)2)c,.Q@`n&AIJuIPRb1"_`c-"&DrkTht`lQ6?^qn(.bf7E7`l#9sZ`]jE<_>_H6r[fCL6nj@ +]>VhjbQZ86b/hZDr5J]W"Nns5c-#n(q9&]X#0+a(`l5s:r5ScUr58QRs2GDeb08)Sc-OYYaN"1t +s2Gko^qI:\TSIVu:H^Tq1ce'8N2<\f`PomsaU-/1aN)9;`5]m?qT'r%a2uWUPrf6a%2K7Ub1+VV +aj%lF`QcN9*ZZ%-"%UY]b/hTBmDoIRbf\)LaSj-YaT'E_bl>iu`l#d3WJFeV91DfgIamZPqY0me +"9&,qrP\_d~> +_Z'rAr;-?jr;Z]prr)j0mcNWok4nuVrqucqs8;ckr;Zferr2rqrr;p(s8)cqq#C?is8Mops7uX( +q>^?lqZ$8Q,qUPmEn9s`quH`prt58.qYBm]qu$6_rV6EmrVlirqu6s$gsja(h;IYqr;Qltqu-Hh +rqcZmrqHUj%r;6C6frsJ]$n*0$$kM+_Jn,!%pqYUMK7s8'ef*[MjK+LCbrr*#sr;?Bes8W) +^&J03rqcWo%0$2!]V:pgWQk,9r;?Hl!ri/snc𝔒Q`p$NL#'s7u]oqZ$Qlr;ZZn&GZ;'s82ig +O!#eq+`>d#qYg?kq#;E7s8Vurs7lNlrVc`nq"O('Z)Xb-]"ueRo(`._rr)irq#:3iqYp6h"TJH# +s8MZjq#9sd,6%K;rVQ?Zl/^.+]",)@TrPrhp@\1Yrr2ios8W&ts8;cmqu?Kk,Q7Z<`@)QE()e3u +o_\Iarr;lqs7cQhVA^Ep'e-Nas8N#ts6KXas8MuurVlWm&H;_0r:o[&TqS$PUn+piq>:*i!W)ip +rke\c~> +^&J03s82fq(&7.HMd]CS=GXH0ai;<;_oBjCc-4?#aSs#>J4MLP3^cYLHBY#+ +\\5bpa7m[Rb5'9Zb596^`lQ0@qo/ZU`r$HO.jRW6K!ri6"rVaY6J,~> +^]+E6qtp^9j +r;Zfrrqucm!W;rmrs8JZcHO_iio]n#rrrE%rVZQlr;Qcro`+sjqu6cts8W)prs8W&qu$BjrVlfl +rsASnnF>Yqccb)8o`+sjrqmi;o`+g_qZ$?jrVHEkrqcZnr;ZFo,oS*R+)CKGrVlfn%K6=uqi)gD ++sA:bq>^EXrr;lrrr)j(rqZHfp\=[cq"t$hrs.66n*K<#hV\;3rVQZpqYpZsr;?Q7s*t~> +_Z0Z8p\tp)qsVLnS"u^iqY^ +_>jQ6rVufo(%geccsW'aSj-YaSa3MaSj7+aiD?;bK$4e'G2)i%L>(Z +cH"5Ra2c0<_T9^7ahu3=b08#NrlG&\3QB%S^UgkSQ#T_i5!DA-?[J*5XL5[S`5p'Bbg4Y_c-",H +`5U$Mcd'e^cd'_Va2Q$;`lH0Ab/ha)aT'9jaMu?Ba3)WObfRoE`lH*u`F$[-bfIT5]t:k`YGRnL +G@XW=4$G\a1d,&qTsM8C_8XF6aN2NFaMu6=`l?6=b/V96`kBL5`5U*G`6$'Be'C8m&0);h;Ua1A +b/D08ajS>`D@@$f$OL.bc,[oFaN4>&n]:aSs2tA_s2Gnm`Q,s +^]+H9qt^-grr3#trr2p$qrm2)i7e21#lal#rVuohrVY+Cs8N5srUg+=rZN@%-QFNY,UK/NqZ$Tp +s8W)us7uWnrVuosqt^$^q>C6krrW2trqcX%mG$(4ce.7?kP>#Hrr`9!s8Drp!;cKjqYpHn"9/8r +qX4@nr;6NhlfR3ci8NPIf&HK$rrE&orso&,qtg0dqtg3iqZ$NopAY(9rql`js8VcldO61\*[)]W +r:g$cqZ$K`SfT*s+sJD)s7uWWrW2rrr;R$$r;$'\qtKm`rs-sAoCDG:hr4P6"TJ>srr2`n"9/5r +rl>%h~> +_>jQ6q#CBm'Dpq7U77pY[.s@nrVu`ms8Vins7?6fs5j7[ruCn7o_p*S(`3l.(*X\@,bsc&s8Dlq +s8N&uq>L?mr;ciprrE&sr?)%=s82Q_pA".0^ojQ.VR""Ybi@jQp%nR`r;$3drVlfr#QFc'rVZTj +q>UBmrrN)rq>U?ms8E&sqYpEpr;HTnquQ]mrVuos&c_XlkN_$SaMPQrY,7n`Z-DV6q$6fsrVlcp +rVc]o!WW/prrE#srrDfms!%I>s7u]po_m&Z(`=23+4U8br;ZcrrpcO!+;l.>,FSQ+rVli_rW3&u +rVZ`qqYq0)s8Vuoj.**AS"QOQ\GZ'trql`qrW)orrke\c~> +_Z']9qu-Kn)ZBO0qu6KdmE_D085rr5[^sApb.b^7bJhfMo>psO"NAC#aN45#!Q`FUaSs=&aN;T: +_SFb5&/c>r(^_#j&-dO$c-aeXb0.lJbJX>"r5pA1c-=S\c-=DP`l?-@^q@1SK4@J72*=T?D0:l( +TW,6*]=tql^;'Z_&]Dc8bK7iH`P]d+WW!UD!Uons7lWWrqud2r:p-^pAP!gs8N&uj7)[8r:AS*s8Muss8Mcm"9/5rrl>%h~> +_Z']:rVcNk&H2V,qsq\$S"ZgipAOshrr;us!<;Whr;YmX*rkm3s8&H7'c.]1()n,0*?Q=OL?&%( +qY^0hqYC0dq>VT:rVcZmrVliqqtp^Bms8Dorrp"8A(`4,5:%eJb%J@,",9.OG*GOd4q>^9is60FarVZWnqYq3+rqZKEWhc)LR\#k` +rV- +_>aN6r;RZ5qtg3hrVcWeh3;>E:fqD:_8jX;b/M??bOWaS`WjE%`lQ6Db5BHbb08#uaC!0&^WaiO +'b_Q+*XiPg'GM)c&Sf86e'H7ZdDs8Qa3VcE`lQBKcdC4hccsVP_o'U@bJhE:_nNUfW/"kU7n,j3 +85ro/E-RY:TVnou[^`fY^qde&_ns=2a2Z*=aijM$s2QY0`5T^9aMl3@aiqoI^V@1XU7%-tH"U>W +7mo^05X%P+<+giPXKoOS_Ss[sbQH#/`l@trs2I%>a2cccF5L_84CCa&3N_ +*#fVLc-FGOccMJ-(D[`,#>2nZajIoF`l?*BrlkDblc9g\`Q?'9aiD37_82=@<^o5>9i[_Gn+m"] +rP8G`~> +])Vd/"9&/rrr2p-oASrqhrXV4qY^Bhrr;lCrZM%:s7H(^+t+WV+bV3e,T@aH)]U;>bP_;Uolk1J)-db!72i8j4qqUb`Xq=a@Glf[ +_>jQ6s8Mlprr!H.r:\1,Tq.d`g].-Js7cHkr:0dbs5s;'s8)cqo_(os*uPe3INfdQ'Gqi.)CB%9 +p\=[^q>^6dqYU +]`8$1s8)iqrr)j.p=YgEF+s%L2D@['f% +MBHb$PQ:8f@&*kb1+MTa2Z*2>-cHF>Qbfe)Mb5TK^`r +_Z0W7qu?]ns82rtrVlfr"oI9@kMt:qrrE#qs3goHr>kq:Zn!+:+r:U'prr;uqq>:3lqu6Wn!rMurqu7-'p]($\o_8(;W10=.r;Q^:rVu`hK.%`\,TfPQ +icHIe-QsU*\G?1#p](!fs7Y^V!W;rqrs&K"rq-'erVca$gZ.Dcp[[A:rr3'!s8KG+J,~> +^]4?5!WE#orso&.s8DW7URe$RX7#ueqYgHErr)lsr?)(;YpL/!(EA+tnWtOJ*?H.=*Z6A#[dj.f +qY1$_rr2lp!<2lq#6+T"s8W&qrVnSNs8W#nrVQBhqtKU>c+'mKTqeNdY-G:@]Yhk:e_8m=l1=fN +rr)ckqYC!`qYC!^rqRQ*m,QsSe'H7Z_nEUk[BHR)T:MOG[E7(apA4OXrr3,ur;Q]oq>^?kqu79- +rVlcmq#CBd2V59a^RL#:uq=t!irqZNlrW)utrk8>^~> +^Ae?5qY9sdqYq0+o\H6R:eOo#YJnW&bKIoH`p(SBao]f0b4`pT`rF(^bKPtZ&K)K&E7*$W&K)B' +(DRYn(H@o3eBlI\e&'2Ib08,Tbf[rC_84%,`P][3_o'UAccsSQ`P0!u]!AQ>VP'*#B3S#!7R]^4 +6UF79RFTa,`QZ0?c+_9Ab08#Nn&YOKs2b2^(s't=`lG[&^9N]&>Z"*e;I5jOnGWCerVlfrr;FA0 +J,~> +_Z']:qu$?k!WN#orW)iprrqEMi9'"jrr;uod/G'ar;::P,:"H`cM@M>oX%4;+X8!L*>fkJS,3-a +p\Fghrr)`prr2p+p\Omgqt^*crVlcmr:9jkpZ^VjcdVjD"P;2Vg=lP\!o2ViqVqJ3!oD_drn.Y1 +eCE$qd*p\0nc&:_s7ufoqYU3j#6"Gss8D`aqu6ctr;HWis!@43o\,3q-mp>h+1h7Go`+ses6:aQ ++!MOI<@T4?+!)Ssp\+X_rr3)tr;6NYrr;oprri?!qtL$ers7rKl/h9slK@g +^]4<4!WE#mrs\i(p')BTk;)AX;=QM1.Q +p&G!irVZ`qqu6ctrVl]mrs/Q%rr<#tr;HWps8b;$VO=!JTqeH_WNED3\@K5a +pq?X<+1\ni['?g7W268^SY2jd^s1WtnFQ>Fp\XshqYgEnrr2p"rr;rrrr3N.p\t0jr;HTns8N&t +s8N#srVumDoDSUGP"?lB+X.l7p\jdbs7u]X*?Z7@'Hp@$+!DO@*h +^Ae<4q"jsart#,&hPXpk9j)1l\\uP+_85Z_rlXuVrlXoTrPg#'bKA.%$6(0-)6D'-dF+F>'G)#n +'bLc\&UDjQd)=>SaSj6_aMu-s_)9-L`l>a0aN;TGaN;QD`59F4aN)05_8O4)\[8`AQ%3RJ7Q`=[ +2E*TX5X7h3:Jt1n='/I$qc3Yp*`5a/8k;953AW67,9IpN0LT)aLRP0J\@]MqbKIoHrl5Mjb0%fI +a2Q'=_n`k&`le8()Tp%<`lH3CaNDZLcGIlO[:q3'%h9*OQHRC^rl"rk`!$&U*!m6F)AF,)&J'NC +bKn5VbfmuC_p$9Gbfn5N`l@Sj"NJF"`lS)#&]DZ)^Vd=( +_Z']:r;?($Xrs\\ll/pjYf[A'jcd'T-`XL&5b0/)Yf@f'A +lLOrIrrrB!s8W)rrr3H)r;?Hdq#16kr;6Els7lTls"= +^&S-3!<)orqYq!&r:Ja3VOEpRg@kFBrr;?aqZ$3eqYpm!r5g3)&0;fsqYpL,qt^!2B-89<(Ej_? ++<6./s7uQls8E0"rr2lqr;SDJr;Q`pqu$Bks8W)rr;QZns8Muqrqu]kqY9m\p\O[UkMFb5a1]'k +XJr(nVP4!`rLk:1VP^8kYI(dS`6?immIg;Jq"agaqYU3jqtL-jr;6Kns8N&u$3'l$rr)clr;Zfp +rr>P6rVulnr:A+&UR@aBUSd8JrVHNls8W&gs8W) +^]4<3qZ$Tl')28&s7YBY?s?)g>*QM9bLFh[o>gpSrlbGdaN44toZ7!N,/qRIbKcgi&JHB,8^>At +`m<,]W_*X3(D@i*(D$UZbgOPQrl+oTs2>&ZaN4;%&'`58`Q63C`lH-Cc-4>Na8O4!ai208^V7@k +[^s>k9`@fc:bPaF:esth>$Y`TFF]C@V6-i'[(!TW]tVM%]u8"0_T0sE +air#SbK7lIaiMNDc-cI1s2I@Gbg"AQ`PTI/c-4J0C(M$l)%@N"'GM)"dE'JJbKnXd$5X9p',)K"% +M*@(d)aPQbJ1m7`l?*Ab08)PaMu3<`q.7q`l5p:aNDZLb/MH=]Y:b4=&;+N7U0iKi:QjFrVcWeq +YgHmrVHNrrVQKja8^Y~> +_Z'`;r;?QlrrE&qrr`9#qYU9l"m+n8j50#!rrW/sr;?Qor;Za!s8N#qr8IVsqu6DE.2jWT-aisO +rqufqs82]TJL;Q^)^-:K,Uh=Crqccprr2fp#6+Ptq>1!dqYpd!s8W)ss8W)t"o\Ats8N#prrE#M +rtYJ/qu$?fpA=mgrVlisrqucpr:g!aqu6`rqYpEjs8FtUrr;urr;-6)L+"Dk,9%gL+sA-M,pSHL +qY^^Bgrr2ifrr;onrqud$mFUXmmd')err<#t#5nN# +p\aaar;Zfrrqlcq_Z,,~> +^&S'1"T/2ts8Muss7m3(pu/3DTpqmon,!"]s8W)trri?$s8N&trW)uprqcZerql^;qu6>@,8215 ++L1nEs8N&rs7uKPJL)?W(`XA6+!fM;qu6m"rVcZlrVlcq!<2ut&cVb-rqlTks8N&urr)fprVZZo +s8N!#rVlfor;QWqr;-Eds7QEcrq-!Y!;?Bc!quB`r;$Nns8W)rrrE&qrs&K$r;Q`rrr2rtr<<3# +rVQHjqYrMPrVc`or;-3&JgM]]*Yob5)Aj>**Z^.9qYgEnqY^"5*>KJ2*>B]=k5>)Us8N&ss8N#t +q>^Bjrql`prr)lorr2rqrr<#uq?lZ+Tr=WQT;\^NrVlg#rVuoos82Efs8L% +_>jN5q>V90qYL!_s8Mrkk.5D-9L`-2[`6J5b0%g)`r4!Y`rF*[b5KNeb/hZD`r +_>jQ7o)A^hr;QrTio]I_g&:pVrr;rsrqQHhr;Q]ur;$0dq#CUEorrrr2fpqm.[i,pXWY +ZMaY#p](6ls76-hr;QTmr;6KkrrrDur;ZZhr;R#[j72L&j4<)ds8Mlqrr2rtrqZTnrk\Vb~> +Z2Y@6qZ$Qmr8FTKT:hjShY6sIrr`6"s82fqrr2os!ri/sqYgKprr2rtq>LBor;Q]q+T1FJ)\s5. +9(W#]rr2rss8W#os7)C'*Zc=>)Ajjcr;HWp"oA8urqu]irrE&srrW2urr2ourr)`nqZ$Ek!WE#r +rU0UYrVZZfrsA]&rqufrr;Z`qrr"/@rr<#ps82ijr;Z`ns8W)f_gWdM+WD.8*#Tb:,Tn-J(*[nu +r;Q^/r;ZVt,8;+:)',mVr;ZNkrr2rhrr2p!rr;uorrE&srVultrVlg/qu6WopuSEFV4=3OS[.5P +rr0)#J,~> +[K$7)s8+&:s8VfV]5_%P<*!P%\\cV;a2,^3_T9g<`Poj>c-OVVb/h[$`W4*Yb5'*Yao'4Hai;07 +_@@A#)Ab^]2.M_ZRlt`lS)#rQ#Jf_8!^t^r"+6b0S>TdEDO8!6tMc36&eW +`Qc6:bJVEHdF?=7B+Yaq(D.Aq%1W[V'G_Gm%T^oq`PKO2bKc4]%NQZ.&!PJbdD=)MaN=1t!6Y;^ +#KFp2ccs\V`r3jr`lQ:7;+F;W>(OZ]rVccqrUKpfrPnkf~> +YQ"\'r:U'h&aSKAki:Ums8W)rs82]nq#(-jrr`8tqu6BjrVlipo)9d3rVhZo,9J9\W;lhrs8Mrr +rr<#qq>^Kd\l'Uo+sS;'rr3E'rVuorrr2rtr;6HmXT&.t7K!2aqu?Tfs8;]ms7ZHls8Dfos8Dij +ql4Zc,U4NU*Zl[R)_+I>hRb*_B[unXqu?Tnrr;or9ICf"+!kUms763iq>^Kcrr;ltqu$Bjrr2fq +rr)j#rVZWko_JIc#l +Z2ak$s8Ni0s8;/kUS4?SW5eQ)rVQTls8W&ts8DrsrrN,to_njjo)AXg%#GfA(`jirs8Dutrqu`p +&Gu8&s7*Qm(`F82*1?d*s8;lr#Q4Q!s8W&qrVlirrr2rsrr2rnrr)j!rr;utc2RP=%/g/(qu?Tf +s8;]ms7cNm+oV9;s8Dilr2O`a+WhaC(`=G=(aqq4gUA=NA'suLqu?Wort,,,80JZ\(E[2Zs763i +q>^KcrW<-!s8Drpru:t9rVZWjqu?]ns8W)mo[B_6UmIaIVonW.q#.>pJ,~> +ZMu!Eq"Xmhq"EjhKk"7b='gKe^;n.1^r4L8`l?!:`le;)!m8U*qo8ZW"Nns4b0'=s6-$pfCCMF/ +*u0R^aiME9^;.M#b/qfUeB4.=&/Z<&&;/TZ`kB1-cd'qabJqB8aihN:b07rG_o9dBb/V98b08$+ +aSj*\aMu<@rlG)]q8iNWiQ+g;aMl!1^r47L +YQ"_&q=X^crs&8Tkh>7^k5G;_q#'pbrqZTnrr<#]r[Im80-MGX+sZ[Yqu?Zqr;Zfrrr;uor;ZK[ ++s.sL-(k,8rVu`oq>UEnrVlosql0Q"r;6?js8N&rrr5+[rVlisp](9kqu?EhRj':),8q[C*ZuIO +<0bu2s8W(3eG/tAs7lTks8W)sq9C96+=&0VbQ%V +Z2Xh'rr3]3s8DihaJ>c%Vl-p"o`+sgs8Dutr;H]pqYpHnli%7kmOT=q()n=`s8;lr!;lcq(]OI6 +qY^BblPgWX(E].Crr2rqs7uWmrVc`uqt^6jrr!-%s8Muqrr2rt^]+62s8E3%rr2imqYgEorVc`r +rr2pBq#CBlqZ$9dRNNpu+;Pq4)&sM?;O#Z.rVcY+de8aT);9s8Dcn +nc&Rgs8N#rr;QlurVZTjrt55-fZ9ndS>)CEU=K&7qu-NkY5a"~> +XoB%2qXj")RUol!='BIS]?JL=bJjJ#s2b5[s2>#[b5KE[`rF-[ao]f0b4E\>b1+QQ(a'_3$d?u8 +`l6!;aN;HEcHOAPe'QVW'c.GoK%/)baM#^7c-Xe]c-Xkgd`fq_dEThRaN`&TaMYp:b4is[b/h`H +b0e:,bgFh_b/hTDb0%iIbK7cG_oKa9`Pfa7`k9=8aNDiMe:%c=%1rs]%20Bb'Kp]Jf[n^)5HN5\ +e^DR^`lZ9@aj-ss(`45,$`DS*`QuK?ammIP`rF-YaoKZab5THrcca>H`l,d1Q$cJ+8l8&YC9-%O +p&+gnqY9j^qu*u'J,~> +Z2Y%-qtKm]qu-Kn$eXLuk2c(4s8N&nqtL-irr<#]rY"k&+=.pK-D1>9rVcZos8MurrVlg+rr;qh ++s\?X,0'Z[s7QBk#lO`$qYU6js8T5#rVZftrr2lr5Q(QVs8Vrms7lWkrr2rppg,3`+!_XJ,:=[B +Y2oESqZ$3fpAb!hrVH9gs8;fkqu?ToAge`E*@G4fqYpBks7$$arrrE"qtp +Z2Xn(r;HWp'E.e)p"-%:StDjqo_%tYrr<#trVc`qrVQTms6T^urUd!-+;>_:S,`Ecrqufqr;HWn +rr<#t$i6>3*#]h<_Z'E3pAY'pr;QZkqtp?lquH]prr2itrr<#trr<#:rW2uqqu$Trrr2lr4oYKX +s8Vuos7u]mrr2rnp0&US)^#e:+=&%7XQ0-Pqu?6ep&FmgqtTjas8;flqu?Ql@NlU*'d-]Oq>U9j +s760hs8W)rr;uuus8N#tr>55,rVlisp@5PdTUqsNXeOMBqtU-hqu3buJ,~> +YQ"V$rr3r7oBb,-AmA,-Sb/_N@^VRP$bJM0<^s0d +Z2ah$rqQQkrVm<&f&lD\khc@>qYU0cq#BFSs8=AB<$N2&-m@jPs8W)urVucns8Mllr;?N`-RBiZ +,Tlp\rVZ]qq>($grr3*"r;?Mmr^["fs8Mops8W)urVZ]prr;orq>^6fOWPPi+<)dT +Z2Xq)s8W)srt"o&o[BP4V449Xhu*3IrqlZmrr)orqu6QomJ[Ikr;';5&f`/;kPP8Y*<,j8q>C9l +qY^ +WrE\0o'P&-Bjt+5;d5j4`mN2Vb5TE\`<*lnaSs?^aSj-Ga?dkjfK0cW)&WRma2c0=cI1Cod*KqS +_Sa=9b7#'t((pc%cHF5Oa2,a=ai_cG`Q$*Hcd1(fbfIfFcdC"[`l6$?rl+lVs2b5_s31Je!mJa* +ouR0QilD,BrlkGerlPYjbfIoG_o9R3_oKg=rm*RRb0.cQbLCG7%iuGo((*'Qa2cBMccaGPfZDL^ +a2u`CEja<@aN)?GbL4!0()eJ:':@G"_SsU8o#M9[_8!n,aND`Occs_Yb5TC%dDs;I]!7B"9MIuD +8mcPXmIL&Ls8Durqtg*_qYU6!s*t~> +Z2Y+/r;QWkqtg6irVm2[f^.qfh>I^$br;Zfrqu6fuqtTsZrVm0& +jQlC$kjdcar;Qosq>C3fr;QluqtpB%s*t~> +Y5\M#r;R9'r;,l\RAZXMVq1hCr;QZnp\t-knGX7(rr2lo^De76(`di#rr;rss82clqYL3irtYCB +*>KG,)iF=cs7ZBcqu?QlrVZWnrr3-#rVc`prr36&rVc`ps8W)ts7?3is7QBks5EqWrVlfps"aTM +s8W)urVHQiqY^$Wo^htQs8)Zg@j2m.,>k&sr;Z`qs8Mfms8V]grV#--80T::p\t1)rV6?ipk0_# +'Ghrbo)&IdqZ$*b!<)or"98B!rVcWorr2p:qZ$HeqU;:5U6hCMUnR;Tq#: +WW*\2o^Ch]E`Q=::LBI-air&Sb/hTBrl"lYrlY8^rPn?J(!4P1CO1_8ajJf$r"E +b5]O3a3'hW%2KR`luZLbf%HEajJYgdF6Ij`QcKNeOU;g'-0Dpb1+h^aihZ>a3`A]f$VRFAh=Du +Cs1/Ebg"5NbL(#;%fRFP2UBRh_SF4_a9T`&_8F73aNFG)!6Y;^*5p1A]t05)91qQA>[VBtmIpS[ +r;?Nip%nO^qu*l$J,~> +Z2Xn&qYU6k"9&/qrVca"eE?2[h=LUF!;uiq!rVrmp\b!hs8Vims8W,u%fQU +Z2Y"+r;6Hlrr2p.rqZKgq:_F4T:ht#oDALbrVl!ks8EW/qjS]F*Z6KA#+rV:8 +*h<90r;Zferr;rprrrB!qYL*grVmi2s7*RaS"6%?URT@#o_eObs8N&uqu?ZprVc`%s*t~> +Z2Xn'qu-No(&e(1rV6$KfWAO[9i>,H[DgA7c-4?0aSs?ZaSEjMaT'B^a>(`YHjgE!&K&1.aMPX0 +a3;cPda#qM[_0]-/I3F7&dlCubIYg=\P\I+d*KtV_SO.-rl,,\_8!b$`r=*baMu6@bg"E3bR2M6 +`l5j5_8!b$`W!mQaSj-rldmZb1"hedDWekH=]Sf&Jkgug<\*mcsHqh&I_n"d`0,E +^;8%%4>gl1k2Vs8)Who(`+\YlB4~> +Yl=_&rVm'#s7uTlrr2p&pYFonkM>(nrr30$r;?Heq"O^brr<#orW2usrr3]3rVU@S,p"-Rc1h25 +s8Vinrql]mrVmc/dO6=Z+X1Y#qtg?jp7rrW/6n7]p&G!hs0)DrrVZQhq>'R2\W^u41*@ti,UOZU ++se_(r;HThX"#86+sZg\r;ZWlrqQ<^`.00]-lsBT*[DpUlMU\[rVlins8/-*+ +YlF\$(An(1rVuoor;$*8U7S!OTWd#Bqu-Nnn,N.]!WE#srtPJ2qdplj(De+5o_eRcs7lWor;QWm +ru1RV,9.=6*+f*Gr;Z]fTcb=&=H(Jrrr)fqrqQNirW)oorq6/)]Kp`r;Z`nrVucpq3)^7)^->M +p](9lrUKjfrVl]o"TA8qr;HWp&,Q%LVjX-IR@BkE_ts3*rVHNurr;urr;HW%s*t~> +Yl>O=s8Diiq>L +`PTd=`koR7`N0Ud',M-NeA],B`lW`9#STF>VT@'^b6c80`l#X-^VRn/qoAf^c2PreapH//`P]O, +^:qA$rl4cTrPmj<:rU2ca3E&\dF$(>Qul7f'a5*W&f2;t(DIBuc-+>WM@pU:&e*@AbfRW:a2ZEN +V.U>P%g<7T(`jD#^W+C6cHjYMda3.E',;5h;o?\sa3!kmrlY8^s2P&W'ZS5:b08#D\X$r0<),qV +=`'hspA+[e"oJ,jq"O`js*t~> +WW*)"r;Q]nrrpj0jlkshrr<#q%K-&$q>L?nrqlTjrVZTlrr<#gr\^f)+Bgdo`"mes8)Zn +qu$Elr+RAu+W;f[q>^Koq=e2@)^HUT+t.ZEl1b/Rr;Z]nrr4nTs8W&os8Drss7lWkqu?]nrr;ro +rqlTmrqu]or;Q`or;Q`qrr;los8Mrqs8N&ns82irr;Z)Ed,#ZP^qY^?mrUKjn +s8Mlgq>:'crr2lr%/U##qq^H+p[7Y4jR`BN"oSE#rr2ipqZ?]prilEQ~> +Z2ah&rVuosrVuos%/fajUn+$MW7U\>p\k'j!r`0!rr2`nnGXO.WZ`5r*>ou1Yl=7ns8;oqrVuiq +s8Mk+*#BG),LZAdrtG5#=WS7t)^-4HF0k!#qtg6jrVlfr#6+Z&rVHQmrr3i2s8;fps8;osrqufo +r;Zfqr;Z]os8;forVmE*rVulprr;utq#C6ks8;ofr[7aBs5V8$Me=4T+WVUG*$#e3)AsM7(D[l+ +-i!`ApZ`k<)]L*-q>^El,l``O*?Q18+!275(`4&4Vu-Jns8MoqrV6.3,90FtrVQQns8DKes8N-! +rVZ[3rVlisr;$XO$V;rVHQnq#:?nrr)lr[f:j~> +YQ"b&q"X^ar;Rf7q"F(%DduX68m%+_a2cELbg4ANaiVWEa2lBDaSX!JaDfI`%M9Eu(DKW*e]#\T +]u%@uahGI(aO*Zq(`Nu!Zc^;'_8jql&e5]i'+#+OR*=+/b/h`D`6$$=`Q69D`m2WEaiD3>_o'R: +_o9[7^r*t)bf7T@bfIrMaMuGZ,"V%1a-h()75d% +M9Hs)As:s#g1?8bK1/*(_ROIe()OX`llnJ'bM2o$kEjW&g/>7'7n3Ba3W,OaN)BM#7q;&VpE5t` +QlZLo>i#rcd'_SaN;NBa2Gs +WW2horr32nh=9gljl?@?%JTerqYpHlrr;onq>C0hrr<#gr^-9`-la?O+!W:%ZM3thrr<#qs8Vol +n/ro%+Y6:Xs8)Qks7%Q],on*S+=/6T- +Z2ak&r;Zcqr;RW5q>/+)W1TWY[.""op&G$irVZTms8W)rqu?0b%fPs$+qth/(`aqdYP%Jbrr4_N +s8Vrlm2?l`(aVZAs82]ns6V'L*>KG6)BTt<+BFKEp&+jbs8Dlqqtp0gr;Z]orr2ourr;us!WW/t +rs8N#s8Vuprr;uss8W)us8W#srsJc'r;6ElrVZ]mr:0b6s/.@n*Z#V5*?Z7<()@o1+r_gL&fDi1 +*@'D6rr;do*ZYt4)-rr48:PTUha*$-";+3YqY^$^s8W)tq>^Ko!<)lq\,Us~> +YQ"_%q"Xa]ru1e"gm;JQ8OZTpYK"f'b/VHA`5]m?aN)9@aSX!Ja?\"r5SaqK(D7;m,*:-ha2,X7 +_oTd3b0120+r_UZbL=5;b14iS',qPr'+>B^$ku0MUs.3:b0eDPa25g6e'-&8_CWaIaiMTFb0%oM +dE0MO_SjL;`Q?9Gb0.rL`Pom>`l?-DaMu6=`m2WEai29ia9p(8%M]`k%1`mZ&H3>0(D7Di(D75s +,Sq$uYJA6*dm"Zi&JS9uf?2@`dEQhD&/Q#l"pY\U-Pm[62:':]aNDcCaj/.o#a$R'-oDSF]rVllrrqZZmrVHNorO2`V~> +Y5\_*r;6Bhrr2lr&,uV,s8V`Bh^]s` +(]4.1s8DfhqXaF\rr<#kj6c:'jR)6en,<7grVl`krVlotr;HKnr;O#%J,~> +Z2Xk'rql]rrr;usrr3H)rq=a6SYMmSVTJ<,q>L,`h9br;$Bj +qu?>:,Sq%-*jP\Arr;`i\/Z;.*M@9t,T.aI(`atMD6,Tdm=*ZlOI*?l\8KoaTe*#02- +,K'HZs7hQq(E=>Do^r1`r;$^E_rr +U&Pr'oA-BZ;c$%]=+d]t_TBj@`l5s<`Q64!aT'9NaDf;Ja_qe2)%mc$((1e#bfn>RcbmWGb[qh5 +)&L>AoP/N&eboh$CAcT +bg1;F(DmZ"fZqsi`Pg'5"VV=Q$9*" +YQ"h+r;$-`qu6Km!ri#prr32kiT9Cjj5Tk6#5nK#r;?QnrVuEes8PR\dsrbg+rMaO+W_kZchIJ1 +s8W$C*?ZUS./!W=s8W)kF<2_RFo(t-_hq23-R0cY.46L&q#0scqRaDjkkOoMpAb'js82]n$2OT" +q>^?lrVc`nrVuj#qZ$Tmr;Zcq#5\8qs8N&unbt`PqBR4-,oA$a8SO +Z2ak'q>^Hm)?0[9rVuorjhRRYSYE'kmJ-YXrVZWorr)iqs6K[as&S^:H6=+F&g&)5)BaOTo`+I] +rq[ZN(E4D>o)J^hs8DJ*(EOW:p\46oL.N:,*?,tC+X)[6r:g0d\[g/Mp\+LWs8)coq>^Hmrr;um +rr;foqu?Wnrqu^"rr;ips82`orr*,ur;?Tos8VWg.0'&`)&F5(+tQ/oNNgaqq"OL]p%3bS*>fog +q>U?mf,Z"N*$)Qfr;$?l')#-N=/b>2q>]llTpqXDR&Q^fhYdBMqY^?qrVZWnWrIS~> +TDo;mkeE!Y8OuT[Dlp_P_Zn&ua2Z'=bkoK]`pq,]b0A/;C(q3m$lg-&&J8]\dFZ:cdb,*C*$?15 +e'Z.Ub0e^F&Ju-cf[S6>CGcG2%1np@eHos*t~> +YQ"h+r;$0cqu6Ek$i9eps8UI-k3hV +,paZ\+IW3-s8Musq'md2,.77Hs82ion"t=R.j#rX*GbKNq=cZk+sn[1D1\CdcKkE)p%JC[rr2p4 +rr<#qq#CBnr;?Nns8Dlqrr)lsrV6Bl"TAAts7u3a6iZj/+=&$ZU\"^9fr;OD"o_&7Ys8Vq2+L3bqu6Kms7-'hr;HTo% +fZM.rr;rRjQuO/m-WEPr;Zfrs7u`oq>UHorqlcqZN#F~> +VuHktr;?QnrttY5p\sf\WLTZQUo`VMp%\C]rr;urr;Zf`r_NRhs8W&mhNfB2(`OG;(*+K2Y5\.c +Q6.+`*ZC=@rVuors7IW\'-4CRs8VurqWstu*@2RB(`$`Xs7u@B+WV^M7VI4=YKH&(p[e%Up\t0l +(&n75qtL-jrqu]ms8W&qs8Muss8D`lrri<#qu?K^rX/\t,T%I9-(j`&p\st-s8Duos8Vb^)AO,4 +FSc%9s8,>%,8_A=q"t*jrr3bKo(DVRpAb*cAf2O()f,'Fp&G'fs8Drs#l=Puq#(-gs8VZhs8W&s +'`@k+s7ZEIXeMAWR@:"FYPS;!r;QQm!ri/srr0&"J,~> +Z2Xh&qu?ZorVlopqu6U4o'b+MC/Ii&=(Ir4\@fVo`5]g;`lQ6Db3m>U`k'(5eCVN`%209i*[DL; +'317Pe'WRW)AjG(I+?K^`lZfc()mVgPK_4qajee]KO"p"%2BTd:sRG*`X`=^%Lt0jB7uSSb1b@i +bKn5QcH=ARc-FGOe'H7\aSs9ma2Z6Ba3)TG_TU'Ga3MZG_stfDc-$Y5+;l&ObKS8[d`p%YcGmuN +c@ZZA'+e$`a2H9U2[gN3#ZT6pb.bU+b)XQfb0n;ZeCIM.(_dK\c-^Knq=s^\rV6BsrVQHfq"jrus*t~> +Z2ah&rqufqp\t^HlrVlisnc&Rg;>g:js8)>b:`p\t+C9mrr)iq!W)fls8N#&s*t~> +VuQbp*<-!>[qY^<_s7Z<#9HtGt,4bd3oc5+r)]9h;*$H^O+Wj +X8`;!qYL0hs8VuprtkS"g:(j':KLS#Ejrj&_na42ai;ECb0'.nE5oi7`lQQVc,t`!&JH$%)ANl$ +09G#u&Jc&m%b]7Q`5TaDW=fdZ'u\P=`PBR<_Um>qTfa>4)%Od6aN">o(DRGr%1j0k%Lre"9i>ha +T?kQuahZ3HccXPYc-4>SaiDQBa32KAbKn)Iahl$8ccbk":W1IQ*ZQ"-Us[N4c-4;M_TBj:bgNX3 +)As2Ccd'GHd!-02%gilscGdl;]#)e3cHsn`bgFq%%Mfcg1"=Ll^<+7=ai2W@bJMBFc-FAHbONXs +`5fs?a2Z6A[(1ci;b9AK>@hK +ZMt%+r;?Qgs8W)mrs7iGhX9Uiir&fQs8W#qrr<#grZ(b6s8Dusp](0`\n3B7+WDIH-6F?W,T\*X +JGJp;s#Tk9,p"..qYU +X8i1u!r`,trVmT0qtg9krr)]\\YGXkT;&IJo_n^ar;Z`ps8DKe*;KR4qu?]ks8;Gu@jN-9(DRf0 +)&aV<(E+NGp\+Rc3qeRU()Kd?qZ$KnqZ$ToqZ$?.(_e&9p\k-K,8q+6+!;pP(`"23*u>k>,oA/o +s8Dutp@n@Up\Y!jrr*K-s82irq#(0brr2Wks8DimnbtiSnpD>i)]>1?rVZ]qrVufnrqcT\V&U +Y5\_'q"FLXqu-?js8EK+qX`dlMe?$n:f1Yp\,O5G`llL"b43Pk_TpBJcc3W=aN9oJ)%mMi()dts +$5+'c&eeX!`6QWI`5$4#',3[acH3uH`luoTbgY"=$k=!\bK%l8%hoa$'+G`f$4%:T'+56]'a5Dp +d`9SZ`5g$Aaii#Tb0%fGb/MNG_T'a5aN20CbK%TAn]4ML`+B]$*XdJ@ai_lQa2Pj:bf%WCN#<`Z +'be[/_o^H@*"NMd$_>tobe_-8`QlrR`Qc_m?lBXh&dphOb0RQ/`6H`Yc-+#?_8=+2ccF)qa:ub? +bJqH9]<7W2;cud`7Sd +ZMt%+r;?Qhrr`8ur;QWo!;ZQm#3"D(l/U:]p](9ms8;lrs8Mros8MrrDZ0M5r;HZnr;Zcfc@@/b +-6"-Q,U"9T,U;[Ss8Vlos7fhF+!jOVl1b5Tr;QTls7lM\-mBp=qYg?=,9n:DpW^sYRr;de,Ut;b +,q:&9rquckC+:T8n+Zk^rVc`qs82iqrVuN*S"-8>r;ZNknc&Re9UdIQ+t.R1s8Domq"sjZe>S48 ++^Emq#C6kqu?]prVlfr +pAY*i!<2lq$N9JOnaQ#:lf?mlr;Qiqrr2iq"oS/kqu$Hhs8W)*s*t~> +X8`;$rVc`mrtkY3rVc`ks8DiefW(@5St`12o`"^arVlcos8N&ur;QWos8MuqDu]_2s8Drsrr)ls +o?Db0+Wh=9)]]h7*$-0cr;Zfls8Vjs*u>qcU#u%Hq>1'erVuWgQQd@i<;HLjc5mo>?h2=\TU'>! +-6FN\(a(+Dq>L9kph2$#=RGh]s8Doqs8W#srr)lg^R:OblMU\Vs7$"^r0JTC)'X%qrquZgpA4OS +dAD\-)]BS0*$t@Zr;ZTg7i< +YQ"e)qY'XXqYgBhrtPJ4q>^9Ygp(s'<_ZJ#O0l^<_8aRlb4`pSb&>YLaj%c@_S*e/e^:R1#7MI` +'b_5n',D2daO&5S_T0U53Y<)G3/bc$eBlUhaiVoMdd*BbTb/q`BaiMTO_i\nXFLoQ:_9MMk4iPWo)AsM1Z"'e:/YMeh!b1@"T%oepAFmh!W2ins8Mu%s*t~> +Z2ak'pAb-krVm!!r;?Qmrs.iCj5oCcmIg>U"TJH"q"k!i#QFYsq=sd_r;6Njrr;ors$QS]j,k]; +,U"BU+!E%]rVQWls8Mu],TmsM,9J=)P.pG_rV6^HkrVZWnpAYR#r;?Qns8Duss8;cn +r;R)ii9'RuoCV8(n+-MVri,pJ~> +WW3"tqu?Zpr;RK1qYKWlT:hdHUpnYCqtp(KqYp?gs7B56(`J>1r;3B6)BWeir;6UEorVu]nrq'eG+=#;4s8Muer]gG^as@c=*E2[thT_:2A0E$;+WMI@ +(E489Fn>Y5q>^JM*$H"A,k_07q>0jGX\p2^)&aM1*Z?7DF8bn6s8;iqr;Q]orVZ]os8Mus"9/5u +rr2p2rr;`kqt\40TqIgCT:DOehu*HOrVl`p!<2forVl`p!<0D+J,~> +Y5\Y'qtp?jnGa:!mF.2/>#7jlD2Gd;`5g-HaiM`Ob/sP#s2b2^r65/_s2\rp`Pod8cHjVZZtTpa +',29"'G;$ce]c@[bf\2G%20Br((Cm3J?7GYd`BV]d5VgM$?"/1c%HK>*FRCBcd:.gcHOA>SUYQM +>0=k&aO*g!&e,&>c-+>Mbg"5FaMZuONe6qgHdN4eBHqY^Bnr;lfor;QcqW;hA~> +U&Y/lrr3*"r;?EirsSh[ipH$kiTgFBs8;lr"9/,iqu6Trr;6Hg!W2lns8)^Xs8;`nrVZ]ir2<76 +,9e6W,lI]BqYpElqm.Ih,oRpR*@)^S.W26KqY'(q,9SP_q#C,Y-QsS+qYpKlrVc`q-M[K8s8DNg +rVlfmBI"]F,U]/_p&G'cs7QElqu?M),U4Yar;Q]onbt6?rS8YD,9S=11*n@o,q'r[,p+3h"-d1J,~> +RK"3(rqH0^e#&k3S=cdti;!?Drr<#trr<#trVlZns8N&s!W;olrb)9/qZ$Nls7Z8a7NNNg)'C't +rr;ior;QW#*uc=;*[;RH)BpMEWTa-KiuB$V-d28apR!-C(nLI$rqlWkrr<#or;?Tmnc/Ugs7g%B +(E4G@RfE$[s7ZKes8VurpL,'^+OBrbrr)Bds8>(6*??%8+&+@2,9.^I)]'J1)BKb;*[)WXrVuZm +s7bUs)BB_9_"@QfV-G2`+WhR>)BBqC,&Yd'r;$Bhr;Z`p!WE#rrVl`pr;ciprtkY-s82`gs82cd +cFTgES=5n>StsHtr;N&_J,~> +T)Sljqu-Kn(&I=TWGPj67o!B#%LP6V^ZtT%33&QiDR~> +RK!u,glPXrr+Xe9W)^64E+=&@U[Jg($rr3#rr;-Ejr;HKnr;QWo#QFVlqZ$9hrr)j(mG7$mlLOQ6ip$B) +s*t~> +T`=rhs8N`2qu-KeqWkeoSYDaIW7189s82fq!WE&trq$0drabp+rVuoprr;cko>55f/n*Z6qYpNm +s8Vk6*$#u?LfYiH+<)%;+=B`i9-"ud..I90rH9+u+JAE$qXsmbqY:*gs8Vups8)]os7p.E()\)2 +)K,BDrVufqs7Z?dqILTa+3scPrr2p\n0Snd)\jP:)AX;4&fr23*ZZ1?,Y*jis8Vfms7lTa:Db#e +)K1O3*[MUI(EO;1)BL,?Z24@nrr<#rrVucop\t6lrqm$"rr2ros8Voort5/(k.[RcTUhdJT;&pV +q>C3jQiDR~> +TDo&kqY9pcrVmT,kM=+5@7sHm:0ij]^V7=sb/hNDrlbJeaMu3p_Z@`rqT*3db/_WI`Q6EIe'Opj% +M_CBbf7WC^rXdI<=KQP@qme$#8%RW&-i\*<^@H<$5Cb0^X#mf&f?VP_T9^Fbf[rJ_oKpAcd^1Z` +Q$(s)&X>,%h)XoaihlEa3)'3aOElq&e(tgn&Rc6a3VmA(EXn<'F4pL'GLZ['abK_$OR@pDV!Fe_ +T^0;bfVgP'b_*aFup'I$Ps0`#nIFS&6G1Pe^2[hbJV9aNDNIdDErCb +eCZ`G#h[?77KX=A<+dsmdg7As*t~> +R/[0aqu7B"gYh2_i90"ps8Vlgrr;upq>:*hqu6]rr;QQnr;-Btqu?Zks8W&orVoLgoCDkXs8Vop +s8)Ze.N]lYY5%bWYAZ!?*[`'O+WqaD.!5Ccs7U(L+!Mn&Ck8RidGY$!s8Dorp\Y!hrr;h.,9J'P ++sS70i;!^3kq>:0irrrE!rV?*arVm5sf@o`] +mI9<%hY$jI!<&5`J,~> +TE"rjs8Drr(B+74q#('aaJl#1W0jHbg@bLGrVuorrVufpq>^^KnqYgFhqsa+Pqu?]n +s8Vuop*Ue$*j#25mBCIX,TA$N(E+/+'I%MmrVuM"*#KV7883OMXj5f$p](3js7ZP[Drr;fnrs&(*)]BgDqX=DJs8;oo<#?Df*#'>8+W;IL,9g-1QF,*4pA+FZqYgHms8VbK +,oR^B)C$1H(E+22*[<.RZMXIopAb!hrVQQnrr)cop](9ls82orrr2otq>UC+r:JLaJ,~> +T`5&kqYp6iqu-O7rUK7:esC2[<)uCf@["%2]Y2;*`QZTNb/hTA_tq1M_oDPoAAug7_o^'A`5g!G +f%&$fd`]kY]ZA"*b1%+9'Fg8RaLm7*(DR8e#n7R^%h9@VeB?7_7Lg%E%P("QKoE(Be&TnYaj%iL +dE0JLa\*6])&F,-&idJGbfIf>aN2]M7h$"'ZI@rmUnl +,fn*I_o^3DCD7I"(_IPp)%7)f%h/sY +U&P,lqYpcurqlTms8Drs#N=Osn*'&rn,<7hqu$6ar;6KprqlZh!VuZirW3&trr51\rr;lqqY'je +s8DuopAapcs8:%g)'C:#s8)NhqX;Ul;C*n>,9eH^c2I\>pa742+=/'g]r;Q]prr`8qs8)]o +$L?j;jmD^/l/q@/rr3)sp\FfTs*t~> +T)SunrVcZmqu$I*q#(!L[A9:fS><+%iq`WSr;HX!rquZkr;QNlqYgNqrVlg\rVliqs82Nes8W&t +qtU3frr;l;,SV4CpAb-is826,P>WYR*??+B,0Kf_qXl$N*>on>*>f_:+f\9',_Q&,I7:Gs8DusqYXnE*$EQ(rr<#hrr +U&Y/k!;c]i!rMrorVmN-o(24iL1EnJ6r.-=U:nRa_T2Yus2Y8]`PqenrPeTRB?J9:bfRoHb.ba/ +_TUBSaiD0,^q7A'bH_uq',&sE_njIBc`VIG"r@j^$kNiJda-(a$kaHl(`4&%',2&f#cuFubL+VY +b08)La[QdR(`X52(CUb8eBZF]a1oF66jsV9YKb/.`q%2@`l,g>@Mg4.*uG7l9kAgVYgU\AcI(1` +f$2Lcd)a8F_Saa0%Ls*i(CqAl%2KTp@@b +UAk;oqtp6i#5e>qpAFpbrr38ss5E5.l/1FprVlrpqu6Km!W;cmp]C9gr;-Bus7cQnrquWhqu6UW +rr)fqrVHQns8MonNZBJk1-es7lHis8W$= +r;Z]op](9mnb?rJ+Wh[H,U4[k^ZYXos82irqZ$Hkrr_fhs8Drrq>UNqr;?Ki!;ucp!;c]p$0C70 +melP3lKRs?rs&Duq#C6^rg3Y8~> +T)Tc/rVZTls82irqZ$ThqtKj.bFbK#TUi(.o)&@ars&K#qtg3frV?KirWrPus8W)rqYU6jrrrE# +rVulprVnSLqhuC:*`D_1s8Duss8;fdm]1FP-7-+qrVu`g,o7I>)]ft@*$H:D,h;YhrV6-err!0& +q-tH`*1n/h)ZCfhL\^ZDrqHHeA/u[5cMRV@nc&Rg')hWl*#9D2?h3^Xr:]sdq>^6drr<#s"T8;t +s7lTn(A.E<+rhL;*$HFNKYHUKqZ$Hms8)cmrVlujrVuiqrW)onrqQNlr>5M.qYp&sWh,ZWTp;4E +\(UZUs8Vlos7_iZJ,~> +T`>&jrql]n(]474rVuons750CNDiPE;,_.l\%ol&`p1WXb/)3FaMu08^;\7:aN;KC_S*t*`Poa@ +FUfB)5Ldln]u\FOeC;OWN`uSl#aNiccd(/U&Jl,n(`=2*(CgfZZHgnA_SO=6cd0bW8.Z:GQPCJW +(D.$kf[%sd]>qrX%1s&Sc,doDo#O>@aMc>M'H%r/9\%J;gXFEp`Qc9>bK\MZbK.oI`kTX9`P'Ys +()@Sr&J>TcD5,,)b/q]Jd)O;KaihlL\\uV1bfn5PaN2C"`W*sXa99N#_oBdraqr7:_o&d&?qrs\ +9LMcbJ?nD0rVuTks8A8`J,~> +UAkAoq"O[br;R#uq>C6dr;Zcprs8DZj66($jQQI7rrE&sr:^*ms82chqYgFSrqlTmrr)lsrU^'h +rql\%-6Fh*r;ZfrrV-'drVuZlp&4a^p&Fmes48qE+=d*BeYT$ZA1f5'r;HTos8F)>rqU1Q+skP, +@3Qa5-7;sopAb*kq.h3!-.;_jrr)Bd&bl8(_CZoV+(kHKs8Dfnr;ZZnrrN&irr3#pqu6U!r;$Bm +nlYl=&kdhoo_JOer;Q`ls7QEis8;omrr3#orr2fqrq??orqH*_qYprtr9<;-oChA>m+pe%rr`,p +q>?KWJ,~> +Sc9W-rVc`qqYUUC;rqH0drVu]lo_eOZo`+abs3iG4)'nb,d@m4L@4W\tqu-Kn+9)69"Fp+!=PXoDedhph1Ze+3sc_s7-($s7lTn^F'p?).NI>s8;]lr;Z]orrN)jrr3#pqu6U7rVHQo +mo(AQ,"@$so(W.`r;Zfns7ZKks8Duorr3,srr;utrr2ios82rsr;QZp!<)op&cV[]d]fC6St2"< +Unt]kr;?Qms8Vusrg3Y8~> +RK"Z5q"Xmhr;Zfqs7Z$)UMbK.`A_o9gA +a2l<<\B)h6ajWKb$Q"0BccF#B_o9pCaM?'?bfS&LfZVRk\/Geg'\gF1KRli_"ougEb9G!KaNr5X +c:el_&$sq^&.K$c(-pX$e&T\T7h61BZd6_4`U_)>`kKF@Sei"S$UrOjf$MUa`lPs8aiVK8bfS)H +`Q?0A_nOIIcohsQ%kqLcbg+S^aMu?;aLoR2a2>s6aN_oDaND`Lb/h[%`WaH+b08#IrkfMkb08)N +^6XR`:J=MV4AK!nPM,R'r;6Kn!WN%`s*t~> +UAkDpq"OR\rr2p"rVuosrr3&ts8Dlq#MSA*m-WfalMLS]rr2fqrqcZkr[IgFs8Dutp](3lrr<#t +qu-Nos8;iqqu4Hs9.Jp!s8)]orr<#qs8Duorr*f8qYpKjdip(^@f-*$qY^9dpA=^ds82irqYpL5 +rqU1Q,::b6q0je?*?c[UdJNt?q.Lrr-.2YYrrUEkqu?WBdd6i0q>^Bhs8Drls82irrr2rsrqu]ns8Dlmr;?Qfs8Vfnr;-F"k2PdpqX3e +ScA`h!r`,sr;RW5qYpBjqu$0CW2#lOT:_dnn+lkXr;HWorr)cm!<)`m&,lM-rVuols8Duss8W)q +rVlisr=K#*rP4Oc-JnY"qYpNos8W#rs$$;Zs8N&orVcN;*$-)+q"jm`qtp-\qYL6lqu?]ns8N#r +pL50a+jBcUH6j[K)''pGq#C0aA/lO1c27M>s7-*gs"X8o+;l+<,l%?7qZ$?jr;ZfmrVuoqrVHQo +rr;ips8;`lqT[=Lp\agdr;6Nns7u]mqZ$ToqZ$Tprr)lprVHTnrr4#)OK +kPP5Trr2rtr;HQkrg3Y8~> +RK*6_!<)lr(&n75p>N;o>Y\$o=^?HX]"Z#"aNW!/d0.e?bf\*(aCiQ7bf@iJ_9'a>b0/&Pa2c3A +a2H*Eb0cYs.LX#Ad) +`l>p=f%I:6bLG(bdDj&D_Sa(0^rQGn#KOg'`5K[;ao0B^aSs3Za9B`1c-=JPrl+oY'ZRtsQ=j#h +6r-9M>?>RVkkb>Zrr)ir!r_uoQiDR~> +UAkDrq=sd_r;?Qis8W)rrs.fIk2Pdiipm$J"oeJrpA4aas5O"_rV?-[q>L +SH&Wgqu6Zqrr)fq)Z9C&e[;9MS>DdN_!Umor;Zfpqtg9fr:p3gnG`Cbrr2osrr2oq#l4,cq#(-i +rr2oq#6+Z&rr2rtrr*`4s7Wc@*["kbrqu`ps8Dors8)cos8Durr>PBC)&aaEr;ZDq,U!m@(*]RL +rUj\C(`pius6osdr!`EH)&XD=q#C?nqu?Kis7lTlrs/Q%rVZTlrVl?er;QTnrr*u=qtp?irVZQl +s8Mokq!R1TXJ)A^TU_IAa2@<@qtpBm"TJAurr/2_J,~> +U&P,kq>Vf?qYL*fs8W)sqtg*Yl.iCg>#%I^;-SLO\%fc%c-4M[eBQ:X`l@Sj!QrXbblZ,3aSs1Y +aND`Oc,mrCair&Sai_iPccsVO`Q6->`Q63Gc-ae%$P3b5cHs_WcHaVVcHF5La3)<=_o^*HdomCp +$DGVic'/bW',M,kMpg2-:)=NUZ-g\7`UV"[`lQBR$4..J!mJs2c,IoArl+oWprNER%EcrCe'l^h +b/V?8_8F1f`VmgJa +U&P8pr;QWnr;6Qoqu6ZqrqlcprVm/PeE$)dn_3'urVllsq#B@Q#64Z!qu6WqnGY?Bs.1M[,,,&6 +s8W&qrr)Wjs8;ois8Mrrrr;gn+sJDbqYpKmgES-l,:+UWr:aeJ*[f\@rr)?crr3E#:*;&/-d;Ac +q=t!idJit>"o.ros8;fjrrhrLjQc45klTl,eF`bBrqub^s*t~> +Sc8]hqZ$Tp!rW#qr;R<*q>9]^T;/0LSsHP'oDSUdrs&Juq>1-jr:0darVlfqs8;lrrri8srr<#t +rr2lorr2rsr\s]QRNNOiSc8Kcs8DlprV6?kr;ZKjs8Duss7f;-*$`u0rr)`H*[;UC*Zo@so3`LQ ++kHVkrVuEerr3>t8K&il,Kfc\q=ssho`"dgqu6KmnG`7`*rGp9s8;`mrqufop$gtVStD[RTV8*K +VPr\Nr;6Hlrr<#s!W;n\s*t~> +UAk;nqYU*g-2[Q9qu?]qrV6*]q>'XIcZ3/e:J"G[BSW_$]Z&%=c,n,MbK%Tma9]r5cd0k\bf\$+ +``1%%b08#I^r+.6cHF;Obg"JYbfIlJb/VE?aNDZHdX;N5$@paNbg"8Nb/qZHe&]\Fahts8b0A@! +'bC_L`6-?Q[gEog(_dBWg=f@?',A.,aN)_84%/kf=gbaN`)Sb0J8Na32K;X+!i45=In4;G_%Pa6**nrql]ks8)fpPQ-.~> +SGrfmr;6Bhr;QZp!WN&rrrW3"rr2p'e)KicmI0&kq>UBur;HQmqYg:3e +BIFlD,.@ILrrDc;rXA`%q>'g^q>'g\qu6NlrsJDThs^+)mc*9\f(/hBr;6J[s*t~> +PlLd_!WE#os8W$-qraTCSXZ7LTr-*&rqZHhrrN)unG`Idrr2Eeq#1Borr2rrrXAi!J0GgKOR`/F +q>L'es!RX=s8N&qs8N&trq7f\)^+bLs8VrjqGn[V()S2kej^Pp-KkC.rr;Nf$MjT!p1#6[(`]jY +rr3#ns7$$cs8W)rrrE&trUTs\ru:q:s82Zgp#a2hSYr0RT9uCLWoisPrqlTkrql]o!r`,tPlH7~> +UAkAnp@e@]qZ$TorVmrO`r3mS +`X9Z%`Q$$A`l6$?b5TTgb08,SaN"2"2pK?P&eG\+eBQ+SahuL`5T^:cPdN1%*H]8 +cH+)U3>3)8$4T&94<#%Qb0\8Ob43Ob`Q?TU:Djl_%[Y\md`]>Cb09h,!6kA`r5]Dg`P][6aN2B@ +`Poj>dF$5^V..UKO@YU8H(se>A/H(hXUC;s8W&lqYL*fP5g%~> +S,`Eas8N#ts8Mus"TJ>rrVlfr'&W!AiToa`hY[3Ms7uB_q>1!dir/rVrr2lpnGY?>BcS<@.8Xc) +T<6Z#p%/4ZpAb$cqZ$Nlrq7HZ+"$pcq"Oggq=oF`.3Tca*[2gO/GT5Err;Nfs8NQ'rgY2T+sNBJ +p](3ks3^iGrsJc'qt^$]pA4^`q>C7#mbQ^^m-+$#mH*$krr3,trr<#sqYpZsr;?P\s*t~> +U&P2nrVlNj!<2`m&cVJ!pYDO>Tp24ESZ1#or;Q]ms6]gZrrE&ts8Drrs7uWqs8N#ss#0O^(E"/9 +94rI>X4,kqnc/@UrqcHfs8MusoGS\d+o;66p](9hp3I]')]C%>)B'D=p&4pis7-*grt"l%QQ-bY +)j9jes8Dutrr)Eequ?Zps8N3#rVZTmrUp-ks8N#lruV%:s8D`R`2TB'Tph[@USas7nbrLcrr;up +r;QZorfR52~> +UAkDop@S.VrU^%0rVH#Ra`<)-_QQ*[s3_8jgGc-#Y!!6Y;b!m8U(p;R$Nrl##Y +`Q#p=rlY5a"3AL'aSs1;`CC.H(`55';0R\p[EQhIdEU+^`PTg:_oBk,((^u*d`02Ib/;J7%M]?V +((D'#(`:iKb/h`qa:ZeCa45eV)]TH;dE9eU`Q--Gr65)]r5]&]_nj1,`r='Z`WjT3e^`!jc2>fa +b5TK^`[\sI`lQ6Db/_ZH`4j(,^9sS\?;sm#85DWU@s"[(nbDqXs8W)ss8DilrK@22~> +RfE3_s82lrqu6Zlqu76#hWO7emH +U&Y,jo)J[fs8N?#rr)Zeq=Vo0U^WW_SYWI?jSo2Zqu?Q]rq-6jrr;uurqHHmrr2rtrr +UAkGrqY9p`qu,m](&d^efpu\[>YnEu6b05e_'-.i[eCMdYahc.!bl#W[a:QM8_nj1,aNVlNaMuBIe^`"Ebl#W]a +T'6]`Q#pra;r7;^q[XsYEsWC:fUFd8m#)$F/\!bq"jsdqtg3gr;QcqP5g%~> +PlCmcr;?QnqYpQpqYq&nhr*Y^m,Hg[r;?Tos8V'Wrr;uss8VWgs84aAH"/s82fnqtp'E9-YE++<_jQqY^BlrUKjts8DrodNfq[,ZOO:qu?Wndf04F +!;uin!;u`o$Lcm/jQ>UimHNQcrVm9(s8Dlns7lNlrql]nquH_\s*t~> +UAt2kr;Z]or;Z`p)?9^8qu-Kkp&4gZ^S[ZoSY2RM[GC!Dp&G'\rql`nrr2rtrW)utrq$0hr]'rV +r0DJ3,UsfX)&=>7(_n)--6"$Wch.8;rr;O:*#9dms7lWls8DlloA)nX(*aV4(a&MMs8DodrXJo+ +s81+a)&s_qpAOmgmJd(a"9/8trr2p!rr)fcrW<&trqcX0rVH'DbH[b7TV/$TTq%t0mJ6VSrr2os +"o%oos82fns8N"as*t~> +TDo)nqtg0drU'UurU][Db):1J>?+Qo:LK0Q]XlA3n&YOKrl"lWr5_dU`Q$3Kc-",KaiVQA`P][6 +`l?!8_oBjCb/V9;D-0FH(((op&/Gle#7q(Q"Tet,`6ZHBbK1P9%MRCAaNhZ?_8FF<]IXBq*>fe3 +$e38ef](uao]YT%qu$Hni;W`Smf#'?s8Mfjp@mFn +WL\'G.k2hk.4-&_hu3TSqu?=<+!E!,q>^ +U&P,lqYp]trVc`prr<#tr;RZ6rVHQms8Vlop\X0gV4sERT9u@Nbh_sfrUBgbs8N#srV6?ls7cNl +rrE&trAFTPs8McfoCgteV3u47-RKrY,U"!Lh#%-Nqu?74(E+Ikq#C3hs7cQmrr;V$+VYk4*?b+U +rr;Nf&,Q2's7ddLEgjcCq>^Kjs8N#ks8W'!rVlcqrquirr;ZZn"98B#rr2rnrZ2%X2=0!q#(0hq>^Elrr2urq>^HnQiDR~> +Sc8ljqY9parVZZqrV6Emq\Ar(rUp$OjN)[6-@9d_8XLAdEThLa3)TUd)r]#ML88o$k3OP&IedG]@>6Pa3MpE'G:o'aOA)Gbe_TCaO\g5 +&Iod"(CJO3a32Zra:H;0a3;[,:L&1/cbIKF_or&#p;RZbb0A/M_o9X?ccsVM^V7J%qoAlZaMu=# +`r4!Y`rF-[arAFA^q6nAH=9oR;bKbX92TVjb3&0fqtBRTpA+I_s8DupQN)I~> +UAk8nr;QQor;QNls8N#t%K?;&r;HZqqu?Kep\4[crsJGWkjA!9ki:Xorqucrrr)cprr)llrW)ln +rW)utqucotrr)co!;uTj"985ps8Musq^qaCq"a^Vm*W/0L1gP_rVufqq'-n--2@N=rr;lqqu$Ki +qYuO$+W_mTp\t0lnG`Fe%/9f"pA4^eq#CBgs8Dior;?Ejq>C9lq>^Emrqu]np\tWij5B%cm-X-( +k2u=6rs\i$rr2forqZQmr;HNlrfR52~> +RK!EhrVc`prr<#tr;Zfr"985trr)j2rr)TLa.f2pS=l:CX30>rr;HTnrr)lqrr;rrrr2rrrr2lq +rql]rrr)co!rr9!rr2utrr!-%s82`or;?QkrqcZh.JE;rcEEUeAGu<$s8;ok*Z$"DpAY$is8;oo +rVuZfreMX7(EOamrr<#frr2p,q#C6_p\Y!ds8VinrVlHhs8N&srVulrr;ZZns8W,urr;uss8W)t +s8=/>qY9d>^oa9#T:MI@S=QOmiqiTLs8W)us8N&uqZ$TorVQQn!ri6!Q2c@~> +Sc8]grqZZmrVccrrVucqrVQTtqt9g\rr2p3qXNISQ=jAr9i4M\@=k#\^VRn/aSj9[aSs?^aSs0\ +aNDa*c2Yugb/aM##0+^+aiqoMrl@CJaMYp8b0SJ]b/h?8cHOMO`QZ`TbKeGWaKLbTAOY>#d*KeY +cj0pg#1(TaSj-X`V[X[aNDcP +aMu6@rlkVh_nWq#_u.LR`qd^S`ZW@B`l5d.\!qbV<`)^h;,U:oAr!kOmIL5UqYU'Zq"t!grrW/p +rVc`urVQKjQiDR~> +U&Y&io)J^gr;ZfrrquZn$LH[.kj.F"o&99@rr3/tqXsX[r;HWtrr;uqrr!3%rquZkr;Q]qs8;im +q>:dX!<)oo%K-2(rqu`i.junur;HWorr`9!qu?Wm$+290+>*Bfs82iTrr2rtrW)loqu6Nn +rr;orqu?Klp]C9gr;$?mrVlftqtg +R/d0bmJeL2s82Tgpt`TYT:hjHU8FU(i;3?Mq>U?mrr;uts8Dfor;6Ekrql`qrr;rcs82fqs7QBj +r;ccpq@3?#rr2iopF.F<.Js&Brr<#t&,cJ*qtg,o-QsK\p\t3is6oses8W)urVulss8)`gs8Drl +ruV1UWVS_BgJcGZJJ,~> +SH&Qdnc/Rdr;S8Do'PGINbVct9h.lT:3r;9]u7h3b0.uNbKS5Ub0J,J`5T[6a2Z-?b0'_-!6G)X +s2b)Ws2G#Xs2YVkbf\#H`lQ6Db/hZHr652c!RK'jbl>j/bf\#MaT;GE!mf*7bK7lI`P]j@c-t7- +$3gJ6bKS2Nam[=N`WsT/c-=JR`l@krpr<Uc-+5K +`P]g=`kf +JcGcLqYpomgu7VbmdfDlkP+rT!W;oqquH`mrrW,pqYpEmrr],jkK%ursAVtq>:*hs8W)tLAuc~> +JcG`Ls8^Blp\tHsrVZQiq>UBn#QF]"rVuosr;Q^1 +rVQNdjNOs'St)=DT:MOHTXrqOrdk+Hs*t~> +JcG`L/H5P?mG>jKC0FY.5Y4dSEfdTBbKS,Pb/hWEbg+GUbKS)J_o'I4`l?*@b0'P$q8VX>s2Y/Z +,0.dHd)=>Ub.ts$c-4DSbK7cDaihcNc-O_?G]n2RbK%cKh8oE3rlG#[q8iTY.*TiM_oBa=b0.rN +c-=AM`lQ6?_ns!\LhTa`8kVrV:JY)'L9fCoo_nagrr%NMJ,~> +Jc>`Mrr)rrqu$I$f[A^>k3;-oi9gL@s8W$*r;Q`prVZQhqYU9kr;Zfro`*kKs8N +JcG]K(&[n)qtg*AWLKWWTUqjPU:Jb?pAFpgrrN-!rqlcqrVuoss8Duss8N)ur;HTlrr(dSs8N +K)ZtlqY9sdr;?Tnp?]SE@TcDr92APfDMtU*_8jdFbK@oJrl4rX$HgT6aMu6=`P][9p<*BY!6X?C +s2bJ_`lZHNc--(0!m8^-rl,Gl_TC9Qf%.sgaiqlIaN)cN!QrLZ`rF-[b5KO1bKS8Wc-+8O`5Ta8 +a2lEDbIaO$@T#ol:.RoL;HdXQ[F+(&p&"^frr%KLJ,~> +Jc>uQq>1!cqYC-grsJJRg$.V]lg*Ejo(r@krr<#trVc`prVuosrquU?gqu$Hms8Dcn%->mkkNM:)nF#W(ip?RB +rqlcqJcG`LJ,~> +Jc>cNrr)lsr"o2(p\F7%XeDPWR@g:IZH2\2p\Y!jrr)irs8Dus"98>urqucsrVZWmqu$Km!W;oX +rW)utrX&W%qu-Hms8)Zlrr2os#l4N!qu6Khp\t0l"9&8trS@JQs8;lorVlfqrVl]qrVl]o!rVon +rr)ruqu6L1rVlflm_bluVOj +K)YuPq"OU_r;S/An`7f[C0+P4:/OteAq%"n]Yhb0`PfsA`lH-Bb0.rMaMu6=_o9^pb59E^blQ&2 +k/[PErl>Mo`Q-*Ccd^+]bKS,Mrl,Jabf@]Fai_ZLda$%VbJV9Ia90T+`l7nrr5eiZ--Xc`cHab[ +b/_B6^qRY'`4`=$>Zars7nQBK +K)YuQqt^!]rqQQlqYpokg$/%ikihHtj73$Hs8;rsr;Qitqt^3c!;ucps8;ln!W;rps5X(arV?Kn +qZ$Bgs7cKprVulprr30"q#C9js5 +JcGQG+TD?;qtg3Vbb:l2R[KV?UT25lq>L0fs8N#rr;HWnrVlZn"TA8rrr2iqs8E0"r;6Ejj8K>_ +q>^Kks7uQlr;QWo"9/?"r;Q^#r:pm4 +s8;Q`qXW=UW1Tc[U7@dGTqA=$iq`HJq>:0js8W)urVl`pr;chOs*t~> +JcGKE(&dgkjNXKtQ]=l2__un!!b/sG$qoJf[rQP8c!R/^Ha9]i(aj%iPa2uU* +bS84@`l?!;`l6'@`m2rTaMQ0>`Q-!WaT'9WaSEsZaN"2"rlY8^s2P)X,0%dKbg+MXbKJAW_7mXe +P'0r&:fC+Y77^9[E0\2pjR)R9qYpZpqYL/Cs*t~> +K)Z2Wqt^'_p\Oa^rVHBj$iB,Fm-3j%khk.VoCi1crqlNjp]:3grVlotqu-UBop\=^hs8)Zlrs8H#r;ZfqpAb'Mrr;luqu$BkpAb*jqu?]q!;uin!Vu]nrqcX(oAe`h +me-)5iT94Xm.UAWs8E&rp\ssgqtg +JcG`Ls8Dut%K?D(rr2]lrV#^&YG.onSI2$]Upnb6p&4acrr2crrVulns8MusrqcWsrqu]ml2C\] +rVlfp!rN#nrr2umr;QWo!W2iors8K$rVuosp](3Orqufrrr;rqr;HTmrqlWorqudIrr<#trVlis +pA=UFaK_V7S=H1>R@pIS]$BO9r;-0_s8W)us8Mrqrqu`nre(6$~> +JcG]K*W?!:qYp?krV$$]k0KZIB44Y18kVcUC5JXh^;%Sb_un$$b/jG%rPnfWrQ>,`!6XQI!6>&Z +rl5\kcGRcLdDa>Rb0%fF`l5p>_SjRq`sBN*`5g$>^C2gShsL(/qYC-oqtg*arIb-#~> +Jc>fIrVl]o!<2cn%/&W5jlu$un*/]cmf*.as82oprr)iurqu]mrr;oqqu?Qorr)lXrr2j"s82ip +r;$?lqYh$'s8W#lr;Zfpqu?ZpqZ$HPrr;luqu$Bkq#CBns8W,us8;cks82lrrVuoqrVmB'lf.!l +mHsW8n+5\pjRi?L#Q4JsqYC$drqcWsqt^'eL];l~> +Jc>cIrqcZprW)usrYYP2pX?RFTq@dFUSFN^^Y.c>qu6NjrVliqrpp*hrW)oWrr2j"s8;orr;$?l +rr2lr$2so(rV?Els8DlprrW)tqr7VQs8W)urVuforV?Heru(e8rqlTlqXN^r\"oXhSXH"2R&$IO +]\3&Vrr<#ts8N-!rVccprdk*"~> +Jc>`Jr;Qs!qY9d[qu-O3mGlj$LM:-s92&,V;-eC2XLlBi`59I3`r='Y`r*gK`oP5>`u`.?`Q#g? +bKJ&NaMu6=`Pfm?`4s40a2Gj9`Q#d<`Sno<`r4!Qb5]Q_b5]]bblc24aMn.r*6-.C_o'='Xdt/] +=&N$t:f'SR=^,BlY1;LtoD8Cb!<2ut!WDlop]:6iKE$H~> +JcGWIs8E6$s8W#srV?HlrVm8ohra4imHWcliR[8brrr>tqu$HmqZ#^W!<;op$30r&rVulsr;Zfp +rrS(rs\l(qY^6dq>C9mr;-Eirri8qq"XiDs*t~> +K)biLrquiprr)ls"TAAuq>UBn'DhL\^n[ToS=Z=CTVnX%i:QmCr;Q]orVulos8)`os69L_s8)^& +s8Duss8N&rs8W)tr;R9*r;Q`rqZ$Tprr)irqZ#ORrr;usqu$Nor;Qcrp&>I"r;?Eer:o3jWMcJ_ +rga"Xs.9Rk\)@,Zs8W)trr30#rr<#tr.4nFs*t~> +JcGcK!<2ut"oJ)fpA"C\rttY'n)rN=P\jf.:JXe_<*j'dU:%YI^r+(c`W*p[`Q#m:pr2L=!6P)Y +(rsS7`Q?3EaNMcJaMu6=a2uBA`QQ<;`lA"r"3&O'al1>@`r4!RaplG3`lQVbf\#HrP]\q +_nNdiQZlG.9hJ&R;,^V(@:t;&gZJ,'q>L9l%/p)%qt^*cqY9j^qu)0IJ,~> +JcGTH"9/5rrqucur;6BhrVmArm,mHrmd90%i8`_cs82cp!<)lr"8V]bqYL3qrr)ipqu!)cqu?]p +s83K)q"FU_r;$0gs8;iqrVZ]pqu$I(o]kArl/q6slg!j!gZ/&)rri5oq"ap^rrrE"qt^-gL];l~> +K)Z&Sr;6EirVlZn!ri,sr;S/Cp[Q/.Un"$LSslOKVPh;chYR0Ks8;ioq>L?nrr)lrq>(!eqt^0g +s5O%Vs7uZms8Drms5!\Ss8W)prVc`rrr2rtr;Zd@r;HZor;Zfps8DNJgVg@kTqS'LTq7gHTqf*E +l1OoNr;HWls8W(Ls7lVE~> +K)YrOqY9scrri;sq"jmes"F?Jqtg*Wj40ZPC0Oe?;bU1e`Pfs?`l6'@ +`50@3a2R#YrPnZSrPniZ!m&C$rPefV!6G/^iQ2&=s2b,\s2ch7aiMN?_o0O3`QQNKbKe5Nb/V?> +`jhh1G[O<@9hJ&R9M8&[BS`b5i9^(3qu6iuqY9j^qYL'hrIY'"~> +JcGWI"TJ>rr;QWo!<2um!VuZkrs\DVhraCilL=!!j5'2"rri5qqt^6err`2oq#$ibqu6]rqu6Nq +qt^*fr!*-"s8Dlqr;$?sp#G#ik3Va>m0)Y4hWF%rrr`2rqu$ +K)YiMrqccprVlZn!ri/tqu7Q4q>0U4\tbacUR@^NT;/?a`:ETtqu6Wjrr2p%r;6Bfrq?6cs5O%V +s7uZns82fms4mSRs8N#sr;uuqrVHNprVl`p,5_<9rVcQcpYEusVOa6IURe'RUnXT_[cQuRrr)cm +qY^ +K)YrOqtp?hrrE#squ?Trs8Drqs!dg7lIE2!D-U4G7n?KO<*Wg\YHk^P`lc6?aNV`E`lH-C`5]sB +a2Z*;iQ1u;q8iQT#ft04b0%fF`l7qs"j"j/bf\)faT'9[aSj6la2uNHaMu9A`P][:bfRrLrl#eo +_nNdqT8%)a8ju*>85<5h>$PZd][>g/q#1'h#Q=AgpA"L]rV6EmrJ(?&~> +JcGZJ!<2rps8Moq!WN&srW3&urVm?+khkLil/q6kjmM6rq#:9prVu`lrsJ]$s8;Zequ$?fr1a2h +s8Dp%s8Mrnr;6?frr3-"qY'XYqu72ujQPdjlL=91l0INggZA"krrE&tr;ZbIs*t~> +K)YuQrVZTloD\gir;RW1rVZQ\e@;L?nrqu]rrr)ips8;lmrr`9! +rr.ZPJ,~> +JcGBB#6"GrrVc`prVn8@p?gnbWeY7i;GB\T84crcBS;h^^V@n.b0.oNbK.`Lb/VKEbK@rcaSX!O +a90T/b0'_)!64uYs2kDeb0&_bs2P)[rQ5PnbfIcC`Pf[gSo(;YPrqud"rVH +JcGcLs8Vckqu6fur;6 +JcG`KqYpQpqu?]q!r`,trr3r:qYgBjn`@X"V4sfYSXGt=U8PTIhtm0HqY0sfrrE&srrW/us5EtS +s1eR4s8W)ts!%:UEorr2llrr<#qrr2rsrWE,s +r;DBMJ,~> +JcGZJ!<)co#6"DprVuioqu7u@i2HZe+F/q"t!c +qY^?krrrAuqYL*fo`#$lqYL/Gs*t~> +K)Z#Rq>'pcrql]urquZhqtg +JcGWI"oeJur;HWms8W$#r;HTnrqQL*p=I@s8W&np\XpbrVZE`p?LAFX.lDbUS=9MStDIGWOfk$me6JTrV?Hks8N#t!<2ors8E-!s8N&t +rr2rrrW<#rreCH'~> +JcGBB!r_ohrr3-"qtp?krVm<)q"4%?gpiu3DIQUCr_*u(='0*gTAK%\^=_Q9o_7tRqu-KnrVcTg +qu,s_"9&,orJ1E'~> +K)Z#Rq>'pcrql`qrr2cprqcWsrVZQirqQTlpAP"%q!Hu'jQ>Uflg!WkgtC][p&Ccc!rr9!r;?Ys~> +JcGWIs8<#srVcZo#6+T"rr)iqqu7''s8Vurqt]L#\"KSsSeI`kTV&!SUpJD.n+Q_Zs8N#trqtaS +rVuQirr;`lrr:jSqYq];r;Q`opAagGfZL\"S=l=@T:D@?TV.pNWP6sMp\+Oarr30"s8)TirV6Bo +rr)ips8Drqs8N"Os*t~> +JcGBB!r`#nrr<#s"8i&qrql^5\bhqdYq>L?mr;Zfq +rr)iurquWlqu?Wlrs/Gtq"FFVqYPjD!<7Q~> +JcGWIrVlZn#6+PtqYL-hp&>$kqu79-i8Ek`mHNcun*B3'jl,.[q=ajgrqu]WrW)lprr<#Wrqu]g +rq-4(mGQUKjlksnm-X93lL*ruhqI/\q>Up%rVZThqYC$ar;?QnrVlfnrr`8ur;QQm#6+Ptqt^-g +L];l~> +JcGBB!ri/sq#CBns8;lp.K'&?rr2rtrquHYc_mG2StV^CSYD[FUS4Na\'ja@pA4X_r;?Nmrr;uq +s8W&us6fjds8Muts82fms82fns760es7HSY)=BTV%jIX2ON$ +q#('hqu?Qmqu6Zqp&>$kJcGBBJ,~> +K)Z;YqYL*fs8W&rqtg0drV$6pqtg*`r;Q]q-iX/Gr;--Tkh!tNE+3-R$YZ[O06"# +^;%M#_o9U7`qd[U`pUnJ`q[UZ`l5j7`Q#prb5]Nc`l5j5`o"i^`l5d/^::_ZTo+)4@9HH%8kDNE +9h8/`>%(r`Qe:Nio_87\r;Qisrr)`o!<2inrVlrtqtU-`!r2ZkJcC6~> +JcG3=r;Q?gs8Mio(&%%Mio9%^kj%Etlg*cpjm2=-s8W)srs/K#rqcEcr;?Ek!ri/tr;HWms8N&u +s8E0!qu$Bkr;ZfrrqlltrVlfqrrrE%rVZQirr2oqs8EW/rr2inqtg3dqY^?kr;ZfrrqHF,qXES+ +k2kXblgF-,nF,]/l/(.Uq"4U]rq-6jrqQNkreCH'~> +JcFj3s8Mcm$NC#%r;,g6a/,N(rh'4]&>#MfTUqmWZ,G/Mh=pX@s82Zms8E6&rr2rsrVlTl"9/?# +rqcZmrqud#rr)cmrVc`os8W)ts8N#tr;cimrsAZ(s8Dlqs8Dorrqmi7p[7(rf>=kjU84QXTV%mK +SXuIET;/*V\C9g=qYgBl!WW.Ms5!^*~> +JcG`Jr;Z`op&G!hp]!&JqtTaKki:+'TPn@L>$"Tr8OuEH:/FnqBRPu5R^]fA_SX@:aiDKC`l?!< +`l?'=`PojpaTfi/aN2BA`V[[T`W*jS`W*sXb5TQibf\#G`lH*<`W!mS`W*pfaN;THb/q`Gb/_NB +aMl-t`tHJ5]s"&mMfiN0;H?dt;c-:_8H)3k;-dXNO1*[)nFl_Tqu-KTs8W&rqu?VGrrE(L~> +JcF^/q>LEprqZR!pugMjiofUorU:*]m,d +JcFC&$i^)(rr2lmpuKW+Vu<>#TqJ'MSt2FFVP^?0cIh7Srq[-&s8MoqrV? +JcF^/s8Dfo1&UkDq"F@FftF)4De!!O:eaSU8k_lQ;d!@4HAIl]\@fMg_8F.+a2Pm2`Q6*!rl5&Y`;[UZ`lH*=a2c`Q$!=a2Q* +JcFR+s8MTh(&[:Oh;@/PlL+**l0@?mm-EcunFZPCs8W)trr`9!qYgEkrVlrur;6Hg!W2lprri;u +r;-EirrMrmr;Qcro`#d'lJq$kkN1jilKdZumI0H,lL!]oiSWeeJcEsoJ,~> +JcF@%s8FSJs8N#qrVZQ^g:s\bTU_OETUq[IUR[jIT:;[Z[DL>MmI^,Fq>L +JcF^/s8Dfo0`CnEp\+=QoCMG7e[L`eC0ah8:/4AP9i4MU;H$CqAoN6\Trtl:]YVS+_Sa@6`Pqeq +$-103c-4>Qa2c3ub6,l,a2\%rs2G&[rlkDa4ibO\`lQBIbfS)P`5Kg@c-"2Ka2c3<_SX$qZa-j: +S;DK'=B&0p:Jk"g:/+JZ8k)6E=(H,lOfm!nmIU&Mp]:*eJcF@%J,~> +JcFR+s8N&u!<)co!rVrpqYqN*jPSnSj5K4gmIK`9p@7\AlK%$klg=3 +JcFF'5lL`_rr2lorVuoss8Dlhn`JB9XeheeTq%aIS=Q%6S=6"BTqeTn]?8X[io9%fq=j^^r;6Be +p\F[_r;HWps8;lps8E&trqZTor +JcF^/s8Dip48o3Xqtg'\q#C?kqXa(3eAA8HF_5)g=&2Xg92.uL:/+\j>[M,aH]"#XUS=Wi]Y(to +_ns7)_8aO8a8X-\b/sY+s3(MdaSX!WaSs<]`ra5u`W!t8aN)6;_og$:^V%:r^V.1_Un4'AN-T8L +=]/*s:ImlB7Rp*G:f^Y">?b9;B8WIrdH'cjr;QotqY'UZJcF@%J,~> +JcFC&!<2lqs8;rsp\u9-k2G=amH!^$na>i7nEoE"kNUs]gtpuMlL+B@rQY?Sr:p'Wk2PL_hWNq[ +kiqF!l0836$1@ +JcFC&"9/8urql`prr;mMqtg$Ujjh;XVPL,YU7@jFS"6.BR[ThCU8"E\X0B1PbL,&(mIU/Mp@\+P +p%@tMr;HWorrW/urr2rtrr;p\r;HTns8Mrlp\+CYq=sINp@n+>g![gS\?2[-VOs`YTV8'SURn*N +TUq^HT:MUJVR""dkOn]Lr;HTlqYg>Cs3L^q~> +JcF^/s8Dfos8GIbqtg0ap\4LZqY9dUn*K)eag@[sC0tCH=&Dmj9i4ee;H$_&UQ]tCqf\[oGfaihuVd*^7ec2,W_c2YucaT0:'h"8r&nrIP"#s*t~> +JcF7"!ri5tr;Qcrp&?6/fA5-?gu78Skj@d(lLF6,lf[g,oC)#- +jl,(Ng"Y?ElfmTrlg*d$kiqF!m-Nm6j9=N#iS`Pjq#:BorVQU!r;-9eq=sr?s4@:$~> +JcF@%s8<'!rVQKjrr`5tqYU3g1B%+Gk0h)?VP0oYTUq^GTq@mFTq@mJT:DOLT;&*XWN<8+]YDG/ +db*C6o(;SJp%J(Or:U-brq6Edo_&1T1[O5[f@%pb_n!4\WhlMdU7n6OS=Q=GSY)CASt)@BR\6IP +TqA$QTuYaLq"agarVccpr;6HmquH_Is3q!u~> +JcF^/s8Dcns8E)tq=ss_55P0Us8N&urVQ<[n*8cDUQ95/A8#.O=&i7$`N.l_'E+r`b=BJNt9hS&M9he5U +92&)T:f'ng?!UW<@:sACY0,YcmI^2Kqt^*er;Qfsqu6Nor.4n!s*t~> +JcFF'!WE#irrW2urq?@9rq>U +JcFX-rVlis!WE#ps8W&tquH]prW)onrs\i%r:]mNi6K +JcF^/s8DZkrr)ln!<2fo0)PG8naGi/khb.=\YGC@D.-UJ;bfhM7nQBC852lV;,C.g<**+%$+m+;Gg=j;c6UprDW_q!)EMhs%sY3;,gS!>?=s4@r?m^ +U9r,!k3MR/o^_PEqY^@#rVH?`qYL*dqYL,@s474#~> +JcF=$!ri/tqYpTqr;QTnquQcqqu6Zqq>UZmmdKo;j5g1&!p8b4rp0dTlg!d$rp9[N&*iEElKdg* +n*]Q/lg*p(mf)Z!md'0$l0e$/mdBH-lfm^"lg*j$l0.9kkN:gaj5/e^nF?AMrri?!qtg3hrri>t +q>1$_rrE%Ls474#~> +JcFX-rVl`p%0$5)s8Muqr;Q]qs8Mio)ZK[7s8Muss8Mc\jk%Sd[C3$(SYDjOSt)@CrL`tY!2'7^ +#+qQ]T:_dLrgs.^qORe[StDYPT)YE,S=Q:FT:VUESt;RJTqJ*STV\m%\\cbJlLarMqY^?ls8W)s +rrE&trr`6!rql]n!rDioJcF4!J,~> +JcF^/s8D]l#6"Q$s8Doqq#<5Jq=sa^q>:$^naGc&e&A\fN.#hjAQi;D>Zb!';,C%a9heAZ:ej\W +7n,s=84cBC779O68cDB_8H;9Z74Uo$91hW?77Tj>91qlM:/=_`:JXni='Jp7@:a"dH@gm6U9D\k +j65h"q#(-k"TJAsqY^6j$2j\sqY0d^qu-JEs474#~> +JcF4!!<2or#6+Puqu$BklMh=in`o9"lJUX^lg=$)nG_hUn,Dh`n*]W0n*]T6n*^,?,4=pfnaYr5 +kiV*so'u5?n*TT2n+#o7m-j?%h;dhglg=EFoDejip&+dfJcF'rJ,~> +JcFX-qu6$`s8N#rpAPs0rVlfpnE8QO`4WUhV4jNTT:DCAS=H.@SGo)ZSd1g[St)LGStGnOs.(=+ +S"cIGTU_UES=Q4@St)CFT:DC@TqA$W[(*W^bhD.Jq>U6or;HTnrp'O]rdk+#s*t~> +JcF^/s8DQhs82ipp](9ls82ip+TME=qtTgRm-!BdhUK`_Y+Ll7Jo,"&>#e?l:Jak_91f+Qs%*Gd +9LhH@77TlH8MEY'6:41.9M/#Q7Rfm;8kVcN9i"V_9h\;_?=e)'KSbqh[`-hVk3D:$o_/(TqYU5B +s1SG_~> +JcF4!!<2rss8N&r!rMonn,ELgqtp?brs8A`iS`_UjQ5V)l2U#Kk5OZKn)s-,rTkEin+,u +JcFX-qu6Ek!<2`ms8E9%r;HWps8N#srVlfnrt>>/qYBp]pZUMab.FaMTVA-QT`1S`TE_*\T:VUF +Qhm9XSXuIHS"lVTTH0c"T;&$OU8"?RStW3r`RNW'o(VkQqt9d`rr;usjT#8Z!r`,tJcF@%J,~> +JcF^/s8DNgq#0[]-2dW8q=s[TmHNZefYb+nQA'Bn@qB1Z?!:9.;cQdn;,0bX6:jcI9*n0[7Rfm; +:et(krDXY<>?kTG@q&kYE. +JcF:#rr2lrs8N#q"8i#orr)j!qt^-eq#:EprVc'^s8E?$r:p-crVZ0OmeuMPmeuMXq"OX\q>:*g +l2Ue^!rW&srr;ioq>^ +JcFL)rVl]os8;rspAY-lr;Zfrs8;rqrr!!!rVlfprr*o9r;6?hqtg6ep\4LSn*/leeBc=X`4W^l +\$Vs&qORYU*M9"/ZaREV^r4=BfA#9Kme-AOqYU3equ-NnrVQQls8W)js8MutrVc`jrrE&tr;chJ +s4@:$~> +JcEpn!<)oorr)9b9)SP^q"F=Lmd9?(kiLg^iRcJu]s4E'P)P0EG]I_9<_Q1^:/F\Z91MKG:h4Bb +H[^X+P+JVV]>r:Qi8j%bm- +%%EndData +showpage +%%Trailer +end +%%EOF Index: gnupg/doc/gnupg-badge-openpgp.jpg <> Index: gnupg/doc/gnupg.texi diff -u gnupg/doc/gnupg.texi:1.1.2.6 gnupg/doc/gnupg.texi:1.1.2.7 --- gnupg/doc/gnupg.texi:1.1.2.6 Thu Sep 30 10:38:32 2004 +++ gnupg/doc/gnupg.texi Tue Dec 21 20:05:15 2004 @@ -82,8 +82,16 @@ @title Using the GNU Privacy Guard @subtitle Version @value{VERSION} @subtitle @value{UPDATED} + +@sp 6 + +@image{gnupg-badge-openpgp,8cm,,The GnuPG Logo} + +@sp 6 + @author Werner Koch @code{(wk@@gnupg.org)} + @page @vskip 0pt plus 1filll @copyrightnotice{} @@ -111,6 +119,7 @@ Developer information * Assuan:: Description of the Assuan protocol. +* System Notes:: Notes pertaining to certain OSes. Miscellaneous @@ -133,6 +142,7 @@ @include scdaemon.texi @include assuan.texi +@include sysnotes.texi @include tools.texi @include debugging.texi Index: gnupg/doc/gpg-agent.texi diff -u gnupg/doc/gpg-agent.texi:1.1.2.13 gnupg/doc/gpg-agent.texi:1.1.2.14 --- gnupg/doc/gpg-agent.texi:1.1.2.13 Mon Dec 20 17:17:24 2004 +++ gnupg/doc/gpg-agent.texi Tue Dec 21 20:05:15 2004 @@ -135,7 +135,7 @@ Set the name of the home directory to @var{dir}. If his option is not used, the home directory defaults to @file{~/.gnupg}. It is only recognized when given on the command line. It also overrides any home -directory stated through the environment variable @var{GNUPGHOME} or +directory stated through the environment variable @env{GNUPGHOME} or (on W32 systems) by means on the Registry entry @var{HKCU\Software\GNU\GnuPG:HomeDir}. Index: gnupg/doc/gpgsm.texi diff -u gnupg/doc/gpgsm.texi:1.1.2.19 gnupg/doc/gpgsm.texi:1.1.2.20 --- gnupg/doc/gpgsm.texi:1.1.2.19 Mon Dec 20 17:17:24 2004 +++ gnupg/doc/gpgsm.texi Tue Dec 21 20:05:15 2004 @@ -241,7 +241,7 @@ Set the name of the home directory to @var{dir}. If his option is not used, the home directory defaults to @file{~/.gnupg}. It is only recognized when given on the command line. It also overrides any home -directory stated through the environment variable @var{GNUPGHOME} or +directory stated through the environment variable @env{GNUPGHOME} or (on W32 systems) by means on the Registry entry @var{HKCU\Software\GNU\GnuPG:HomeDir}. Index: gnupg/doc/scdaemon.texi diff -u gnupg/doc/scdaemon.texi:1.1.2.11 gnupg/doc/scdaemon.texi:1.1.2.12 --- gnupg/doc/scdaemon.texi:1.1.2.11 Mon Dec 20 17:17:24 2004 +++ gnupg/doc/scdaemon.texi Tue Dec 21 20:05:15 2004 @@ -86,7 +86,7 @@ Set the name of the home directory to @var{dir}. If his option is not used, the home directory defaults to @file{~/.gnupg}. It is only recognized when given on the command line. It also overrides any home -directory stated through the environment variable @var{GNUPGHOME} or +directory stated through the environment variable @env{GNUPGHOME} or (on W32 systems) by means on the Registry entry @var{HKCU\Software\GNU\GnuPG:HomeDir}. Index: gnupg/doc/sysnotes.texi diff -u /dev/null gnupg/doc/sysnotes.texi:1.1.2.1 --- /dev/null Tue Dec 21 20:05:16 2004 +++ gnupg/doc/sysnotes.texi Tue Dec 21 20:05:15 2004 @@ -0,0 +1,107 @@ +@c Copyright (C) 2004 Free Software Foundation, Inc. +@c This is part of the GnuPG manual. +@c For copying conditions, see the file gnupg.texi. + +@node System Notes +@chapter Notes pertaining to certain OSes. + +GnuPG has been developed on GNU/Linux systems and is know to work on +almost all Free OSes. All modern POSIX systems should be supproted +right now, however there are probably a lot of smaller glitches we need +to fix first. The major problem areas are: + +@itemize +@item +For logging to sockets and other internal operations the +@code{fopencookie} function (@code{funopen} under *BSD) is used. This +is a very convient function which makes it possible to create outputs in +a structures and easy maintainable way. The drawback however is that +most proprietary OSes don't support this function. At g10@tie{}Code we +have looked into several ways on how to overcome this limitation but no +sufficiently easy and maintainable way has been found. Porting +@emph{glibc} to a general POSIX system is of course an option and would +make writing portable software much easier; this it has not yet been +done and the system administrator wouldneed to cope with the GNU +specific admin things in addition to the generic ones of his system. + +We have now settled to use explicit stdio wrappers with a functionality +similar to funopen. Although the code for this has already been written +(@emph{libestream}), we have not yet changed GnuPG to use it. + +This means that on systems not supporting either @code{funopen} or +@code{fopencookie}, logging to a socket won't work, prompts are not +formatted as pretty as theyshould be and @command{gpgsm}'s +@code{LISTKEYS} Assuan command does not work. + +@item +We are planning to use file descriptor passing for interprocess +communication. This will allow us save a lot of resources and improve +performance of certain operations a lot. Systems not supporting this +won't gain these benefits but we try to keep them working the satndard +way as it is done today. + +@item +We require more or less full POSIX compatibility. This has been +arround for 15 years now and thus we don't believe it makes sense to +support non POSIX systems anymore. Well, we of course the usual +workarounds for near POSIX systems well be applied. + +There is one exception of this rule: Systems based the Microsoft Windows +API (called here @emph{W32}) will be supported to some extend. + +@end itemize + + +@menu +* W32 Notes:: Microsoft Windows Notes +@end menu + + +@node W32 Notes +@section Microsoft Windows Notes + +The port to Microsoft Windows based OSes is pretty new and has some +limitations we might remove over time. Note, that we have not yet done +any security audit and you should not use any valuable private key. In +particular, @strong{using it on a box with more than one user, might +lead to a key compromise}. + +@noindent +Current limitations are: + +@itemize +@item +The @code{LISTKEYS} Assuan command of @command{gpgsm} is not supported. +Using the command line options @option{--list-keys} or +@option{--list-secret-keys} does however work. + +@item +No support for CRL checks. By default the option +@option{--disable-crl-checks} has been turned on and the log will show +an appropriate warning message. The reason for this is that the +separate CRL checking daemin (@command{dirmngr}) has not been ported to +W32. + +@item +@command{gpgconf} does not create backup files, so in case of trouble +your configuration file might get lost. + +@item +@command{watchgnupg} is not available. Logging to sockets is not +possible. + +@item +The periodical smartcard status checking done by @command{scdaemon} is +not yet supported. + +@item +Detached running of the gpg-agent is not directly supported. It needs +to be started in a console and left alone then. + +@end itemize + + + + + + Index: gnupg/doc/tools.texi diff -u gnupg/doc/tools.texi:1.1.2.4 gnupg/doc/tools.texi:1.1.2.5 --- gnupg/doc/tools.texi:1.1.2.4 Fri Oct 22 14:30:34 2004 +++ gnupg/doc/tools.texi Tue Dec 21 20:05:15 2004 @@ -12,10 +12,11 @@ * addgnupghome:: Create .gnupg home directories. * gpgconf:: Modify .gnupg home directories. * gpgsm-gencert.sh:: Generate an X.509 certificate request. +* gpg-preset-passphrase:: Put a passphrase into the cache. @end menu @c -@c WATHCGNUPG +@c WATCHGNUPG @c @node watchgnupg @section Read logs from a socket @@ -593,3 +594,504 @@ +@c +@c GPG-PRESET-PASSPHRASE +@c +@node gpg-preset-passphrase +@section Put a passphrase into the cache. + +XXXX +The @command{gpgconf} is a utility to automatically and reasonable +safely query and modify configuration files in the @file{.gnupg} home +directory. It is designed not to be invoked manually by the user, but +automatically by graphical user interfaces (GUI).@footnote{Please note +that currently no locking is done, so concurrent access should be +avoided. There are some precautions to avoid corruption with +concurrent usage, but results may be inconsistent and some changes may +get lost. The stateless design makes it difficult to provide more +guarantees.} + +@command{gpgconf} provides access to the configuration of one or more +components of the GnuPG system. These components correspond more or +less to the programs that exist in the GnuPG framework, like GnuPG, +GPGSM, DirMngr, etc. But this is not a strict one-to-one +relationship. Not all configuration options are available through +@command{gpgconf}. @command{gpgconf} provides a generic and abstract +method to access the most important configuration options that can +feasibly be controlled via such a mechanism. + +@command{gpgconf} can be used to gather and change the options +available in each component, and can also provide their default +values. @command{gpgconf} will give detailed type information that +can be used to restrict the user's input without making an attempt to +commit the changes. + +@command{gpgconf} provides the backend of a configuration editor. The +configuration editor would usually be a graphical user interface +program, that allows to display the current options, their default +values, and allows the user to make changes to the options. These +changes can then be made active with @command{gpgconf} again. Such a +program that uses @command{gpgconf} in this way will be called GUI +throughout this section. + +@menu +* Invoking gpgconf:: List of all commands and options. +* Format conventions:: Formatting conventions relevant for all commands. +* Listing components:: List all gpgconf components. +* Listing options:: List all options of a component. +* Changing options:: Changing options of a component. +@end menu + + +@node Invoking gpgconf +@subsection Invoking gpgconf + +One of the following commands must be given: + +@table @gnupgtabopt +@item --list-components +List all components. This is the default command used if none is +specified. + +@item --list-options @var{component} +List all options of the component @var{component}. + +@item --change-options @var{component} +Change the options of the component @var{component}. +@end table + +The following options may be used: + +@table @gnupgtabopt +@c FIXME: Not yet supported. +@c @item -o @var{file} +@c @itemx --output @var{file} +@c Use @var{file} as output file. + +@item -v +@itemx --verbose +Outputs additional information while running. Specifically, this +extends numerical field values by human-readable descriptions. + +@c FIXME: Not yet supported. +@c @item -n +@c @itemx --dry-run +@c Do not actually change anything. Useful together with +@c @code{--change-options} for testing purposes. + +@item -r +@itemx --runtime +Only used together with @code{--change-options}. If one of the +modified options can be changed in a running daemon process, signal +the running daemon to ask it to reparse its configuration file after +changing. + +This means that the changes will take effect at run-time, as far as +this is possible. Otherwise, they will take effect at the next start +of the respective backend programs. +@end table + + +@node Format conventions +@subsection Format conventions + +Some lines in the output of @command{gpgconf} contain a list of +colon-separated fields. The following conventions apply: + +@itemize @bullet +@item +The GUI program is required to strip off trailing newline and/or +carriage return characters from the output. + +@item +@command{gpgconf} will never leave out fields. If a certain version +provides a certain field, this field will always be present in all +@command{gpgconf} versions from that time on. + +@item +Future versions of @command{gpgconf} might append fields to the list. +New fields will always be separated from the previously last field by +a colon separator. The GUI should be prepared to parse the last field +it knows about up until a colon or end of line. + +@item +Not all fields are defined under all conditions. You are required to +ignore the content of undefined fields. +@end itemize + +There are several standard types for the content of a field: + +@table @asis +@item verbatim +Some fields contain strings that are not escaped in any way. Such +fields are described to be used @emph{verbatim}. These fields will +never contain a colon character (for obvious reasons). No de-escaping +or other formatting is required to use the field content. This is for +easy parsing of the output, when it is known that the content can +never contain any special characters. + +@item percent-escaped +Some fields contain strings that are described to be +@emph{percent-escaped}. Such strings need to be de-escaped before +their content can be presented to the user. A percent-escaped string +is de-escaped by replacing all occurences of @code{%XY} by the byte +that has the hexadecimal value @code{XY}. @code{X} and @code{Y} are +from the set @code{0-9a-f}. + +@item localised +Some fields contain strings that are described to be @emph{localised}. +Such strings are translated to the active language and formatted in +the active character set. + +@item @w{unsigned number} +Some fields contain an @emph{unsigned number}. This number will +always fit into a 32-bit unsigned integer variable. The number may be +followed by a space, followed by a human readable description of that +value (if the verbose option is used). You should ignore everything +in the field that follows the number. + +@item @w{signed number} +Some fields contain a @emph{signed number}. This number will always +fit into a 32-bit signed integer variable. The number may be followed +by a space, followed by a human readable description of that value (if +the verbose option is used). You should ignore everything in the +field that follows the number. + +@item option +Some fields contain an @emph{option} argument. The format of an +option argument depends on the type of the option and on some flags: + +@table @asis +@item no argument +The simplest case is that the option does not take an argument at all +(@var{type} @code{0}). Then the option argument is an unsigned number +that specifies how often the option occurs. If the @code{list} flag +is not set, then the only valid number is @code{1}. Options that do +not take an argument never have the @code{default} or @code{optional +arg} flag set. + +@item number +If the option takes a number argument (@var{alt-type} is @code{2} or +@code{3}), and it can only occur once (@code{list} flag is not set), +then the option argument is either empty (only allowed if the argument +is optional), or it is a number. A number is a string that begins +with an optional minus character, followed by one or more digits. The +number must fit into an integer variable (unsigned or signed, +depending on @var{alt-type}). + +@item number list +If the option takes a number argument and it can occur more than once, +then the option argument is either empty, or it is a comma-separated +list of numbers as described above. + +@item string +If the option takes a string argument (@var{alt-type} is 1), and it +can only occur once (@code{list} flag is not set) then the option +argument is either empty (only allowed if the argument is optional), +or it starts with a double quote character (@code{"}) followed by a +percent-escaped string that is the argument value. Note that there is +only a leading double quote character, no trailing one. The double +quote character is only needed to be able to differentiate between no +value and the empty string as value. + +@item string list +If the option takes a number argument and it can occur more than once, +then the option argument is either empty, or it is a comma-separated +list of string arguments as described above. +@end table +@end table + +The active language and character set are currently determined from +the locale environment of the @command{gpgconf} program. + +@c FIXME: Document the active language and active character set. Allow +@c to change it via the command line? + + +@node Listing components +@subsection Listing components + +The command @code{--list-components} will list all components that can +be configured with @command{gpgconf}. Usually, one component will +correspond to one GnuPG-related program and contain the options of +that programs configuration file that can be modified using +@command{gpgconf}. However, this is not necessarily the case. A +component might also be a group of selected options from several +programs, or contain entirely virtual options that have a special +effect rather than changing exactly one option in one configuration +file. + +A component is a set of configuration options that semantically belong +together. Furthermore, several changes to a component can be made in +an atomic way with a single operation. The GUI could for example +provide a menu with one entry for each component, or a window with one +tabulator sheet per component. + +The command argument @code{--list-components} lists all available +components, one per line. The format of each line is: + +@code{@var{name}:@var{description}} + +@table @var +@item name +This field contains a name tag of the component. The name tag is used +to specify the component in all communication with @command{gpgconf}. +The name tag is to be used @emph{verbatim}. It is thus not in any +escaped format. + +@item description +The @emph{string} in this field contains a human-readable description +of the component. It can be displayed to the user of the GUI for +informational purposes. It is @emph{percent-escaped} and +@emph{localized}. +@end table + +Example: +@example +$ gpgconf --list-components +gpg:GPG for OpenPGP +gpg-agent:GPG Agent +scdaemon:Smartcard Daemon +gpgsm:GPG for S/MIME +dirmngr:Directory Manager +@end example + + +@node Listing options +@subsection Listing options + +Every component contains one or more options. Options may be gathered +into option groups to allow the GUI to give visual hints to the user +about which options are related. + +The command argument @code{@w{--list-options @var{component}}} lists +all options (and the groups they belong to) in the component +@var{component}, one per line. @var{component} must be the string in +the field @var{name} in the output of the @code{--list-components} +command. + +There is one line for each option and each group. First come all +options that are not in any group. Then comes a line describing a +group. Then come all options that belong into each group. Then comes +the next group and so on. There does not need to be any group (and in +this case the output will stop after the last non-grouped option). + +The format of each line is: + +@code{@var{name}:@var{flags}:@var{level}:@var{description}:@var{type}:@var{alt-type}:@var{argname}:@var{default}:@var{argdef}:@var{value}} + +@table @var +@item name +This field contains a name tag for the group or option. The name tag +is used to specify the group or option in all communication with +@command{gpgconf}. The name tag is to be used @emph{verbatim}. It is +thus not in any escaped format. + +@item flags +The flags field contains an @emph{unsigned number}. Its value is the +OR-wise combination of the following flag values: + +@table @code +@item group (1) +If this flag is set, this is a line describing a group and not an +option. +@end table + +The following flag values are only defined for options (that is, if +the @code{group} flag is not used). + +@table @code +@item optional arg (2) +If this flag is set, the argument is optional. This is never set for +@var{type} @code{0} (none) options. + +@item list (4) +If this flag is set, the option can be given multiple times. + +@item runtime (8) +If this flag is set, the option can be changed at runtime. + +@item default (16) +If this flag is set, a default value is available. + +@item default desc (32) +If this flag is set, a (runtime) default is available. This and the +@code{default} flag are mutually exclusive. + +@item no arg desc (64) +If this flag is set, and the @code{optional arg} flag is set, then the +option has a special meaning if no argument is given. +@end table + +@item level +This field is defined for options and for groups. It contains an +@emph{unsigned number} that specifies the expert level under which +this group or option should be displayed. The following expert levels +are defined for options (they have analogous meaning for groups): + +@table @code +@item basic (0) +This option should always be offered to the user. + +@item advanced (1) +This option may be offered to advanced users. + +@item expert (2) +This option should only be offered to expert users. + +@item invisible (3) +This option should normally never be displayed, not even to expert +users. + +@item internal (4) +This option is for internal use only. Ignore it. +@end table + +The level of a group will always be the lowest level of all options it +contains. + +@item description +This field is defined for options and groups. The @emph{string} in +this field contains a human-readable description of the option or +group. It can be displayed to the user of the GUI for informational +purposes. It is @emph{percent-escaped} and @emph{localized}. + +@item type +This field is only defined for options. It contains an @emph{unsigned +number} that specifies the type of the option's argument, if any. The +following types are defined: + +Basic types: + +@table @code +@item none (0) +No argument allowed. + +@item string (1) +An @emph{unformatted string}. + +@item int32 (2) +A @emph{signed number}. + +@item uint32 (3) +An @emph{unsigned number}. +@end table + +Complex types: + +@table @code +@item pathname (32) +A @emph{string} that describes the pathname of a file. The file does +not necessarily need to exist. + +@item ldap server (33) +A @emph{string} that describes an LDAP server in the format: + +@code{@var{hostname}:@var{port}:@var{username}:@var{password}:@var{base_dn}} +@end table + +More types will be added in the future. Please see the @var{alt-type} +field for information on how to cope with unknown types. + +@item alt-type +This field is identical to @var{type}, except that only the types +@code{0} to @code{31} are allowed. The GUI is expected to present the +user the option in the format specified by @var{type}. But if the +argument type @var{type} is not supported by the GUI, it can still +display the option in the more generic basic type @var{alt-type}. The +GUI must support all the defined basic types to be able to display all +options. More basic types may be added in future versions. If the +GUI encounters a basic type it doesn't support, it should report an +error and abort the operation. + +@item argname +This field is only defined for options with an argument type +@var{type} that is not @code{0}. In this case it may contain a +@emph{percent-escaped} and @emph{localised string} that gives a short +name for the argument. The field may also be empty, though, in which +case a short name is not known. + +@item default +This field is defined only for options. Its format is that of an +@emph{option argument} (@xref{Format conventions}, for details). If +the default value is empty, then no default is known. Otherwise, the +value specifies the default value for this option. Note that this +field is also meaningful if the option itself does not take a real +argument. + +@item argdef +This field is defined only for options for which the @code{optional +arg} flag is set. If the @code{no arg desc} flag is not set, its +format is that of an @emph{option argument} (@xref{Format +conventions}, for details). If the default value is empty, then no +default is known. Otherwise, the value specifies the default value +for this option. If the @code{no arg desc} flag is set, the field is +either empty or contains a description of the effect of this option if +no argument is given. Note that this field is also meaningful if the +option itself does not take a real argument. + +@item value +This field is defined only for options. Its format is that of an +@emph{option argument}. If it is empty, then the option is not +explicitely set in the current configuration, and the default applies +(if any). Otherwise, it contains the current value of the option. +Note that this field is also meaningful if the option itself does not +take a real argument. +@end table + + +@node Changing options +@subsection Changing options + +The command @w{@code{--change-options @var{component}}} will attempt +to change the options of the component @var{component} to the +specified values. @var{component} must be the string in the field +@var{name} in the output of the @code{--list-components} command. You +have to provide the options that shall be changed in the following +format on standard input: + +@code{@var{name}:@var{flags}:@var{new-value}} + +@table @var +@item name +This is the name of the option to change. @var{name} must be the +string in the field @var{name} in the output of the +@code{--list-options} command. + +@item flags +The flags field contains an @emph{unsigned number}. Its value is the +OR-wise combination of the following flag values: + +@table @code +@item default (16) +If this flag is set, the option is deleted and the default value is +used instead (if applicable). +@end table + +@item new-value +The new value for the option. This field is only defined if the +@code{default} flag is not set. The format is that of an @emph{option +argument}. If it is empty (or the field is omitted), the default +argument is used (only allowed if the argument is optional for this +option). Otherwise, the option will be set to the specified value. +@end table + +Examples: + +To set the force option, which is of basic type @code{none (0)}: + +@example +$ echo 'force:0:1' | gpgconf --change-options dirmngr +@end example + +To delete the force option: + +@example +$ echo 'force:16:' | gpgconf --change-options dirmngr +@end example + +The @code{--runtime} option can influence when the changes take +effect. + + + Index: gnupg/jnlib/w32-afunix.c diff -u gnupg/jnlib/w32-afunix.c:1.1.2.1 gnupg/jnlib/w32-afunix.c:1.1.2.2 --- gnupg/jnlib/w32-afunix.c:1.1.2.1 Tue Nov 30 10:48:37 2004 +++ gnupg/jnlib/w32-afunix.c Tue Dec 21 20:05:15 2004 @@ -49,17 +49,18 @@ struct sockaddr_in myaddr; struct sockaddr_un * unaddr; FILE * fp; - int port = 0; + int port; unaddr = (struct sockaddr_un *)addr; fp = fopen (unaddr->sun_path, "rb"); if (!fp) - return -1; + return -1; fscanf (fp, "%d", &port); fclose (fp); + /* XXX: set errno in this case */ if (port < 0 || port > 65535) - return -1; + return -1; myaddr.sin_family = AF_INET; myaddr.sin_port = port; Index: gnupg/sm/ChangeLog diff -u gnupg/sm/ChangeLog:1.101.2.85 gnupg/sm/ChangeLog:1.101.2.86 --- gnupg/sm/ChangeLog:1.101.2.85 Tue Dec 21 11:02:59 2004 +++ gnupg/sm/ChangeLog Tue Dec 21 20:05:14 2004 @@ -1,6 +1,7 @@ 2004-12-21 Werner Koch * gpgsm.c (main): Use default_homedir(). + (main) [W32]: Default to disabled CRL checks. 2004-12-20 Werner Koch Index: gnupg/sm/gpgsm.c diff -u gnupg/sm/gpgsm.c:1.67.2.36 gnupg/sm/gpgsm.c:1.67.2.37 --- gnupg/sm/gpgsm.c:1.67.2.36 Tue Dec 21 11:02:59 2004 +++ gnupg/sm/gpgsm.c Tue Dec 21 20:05:14 2004 @@ -757,6 +757,9 @@ opt.def_cipher_algoid = "1.2.840.113549.3.7"; /*des-EDE3-CBC*/ opt.homedir = default_homedir (); +#ifdef HAVE_W32_SYSTEM + opt.no_crl_checks = 1; +#endif /* First check whether we have a config file on the commandline */ orig_argc = argc; Index: gnupg/tools/ChangeLog diff -u gnupg/tools/ChangeLog:1.25.2.60 gnupg/tools/ChangeLog:1.25.2.61 --- gnupg/tools/ChangeLog:1.25.2.60 Wed Dec 15 15:15:08 2004 +++ gnupg/tools/ChangeLog Tue Dec 21 20:05:14 2004 @@ -1,3 +1,8 @@ +2004-12-21 Werner Koch + + * gpgconf-comp.c (get_config_pathname) [DOSISH]: Detect absolute + pathnames with a drive letter. + 2004-12-15 Werner Koch * Makefile.am (bin_PROGRAMS) [W32]: Do not build watchgnupg. Index: gnupg/tools/gpgconf-comp.c diff -u gnupg/tools/gpgconf-comp.c:1.1.2.48 gnupg/tools/gpgconf-comp.c:1.1.2.49 --- gnupg/tools/gpgconf-comp.c:1.1.2.48 Wed Dec 15 15:15:08 2004 +++ gnupg/tools/gpgconf-comp.c Tue Dec 21 20:05:14 2004 @@ -1272,7 +1272,13 @@ else pathname = ""; +#ifdef HAVE_DOSISH_SYSTEM + if (!(pathname[0] + && pathname[1] == ':' + && (pathname[2] == '/' || pathname[2] == '\\'))) +#else if (pathname[0] != '/') +#endif gc_error (1, 0, "Option %s, needed by backend %s, is not absolute", gc_backend[backend].option_config_filename, gc_backend[backend].name); From cvs at cvs.gnupg.org Mon Dec 27 18:22:01 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Jan 28 12:17:13 2005 Subject: STABLE-BRANCH-1-2 gnupg (40 files) Message-ID: Date: Monday, December 27, 2004 @ 18:27:11 Author: wk Path: /cvs/gnupg/gnupg Tag: STABLE-BRANCH-1-2 Modified: ChangeLog INSTALL Makefile.am NEWS README configure.ac m4/Makefile.in po/ChangeLog po/be.po po/ca.po po/cs.po po/da.po po/de.po po/el.po po/eo.po po/es.po po/et.po po/fi.po po/fr.po po/gl.po po/hu.po po/id.po po/it.po po/ja.po po/nl.po po/pl.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sv.po po/tr.po po/zh_CN.po po/zh_TW.po scripts/config.guess scripts/depcomp scripts/install-sh scripts/missing scripts/mkinstalldirs * Makefile.am (AUTOMAKE_OPTIONS): New. * configure.ac (AC_CANONICAL_TARGET): Replaced by AC_CANONICAL_HOST. Changed all reference to TARGET to HOST. Made sure that i586-mingw32msvc gets detected as mingw32. * ro.po: Updated. * sv.po: Updated. -----------------------+ ChangeLog | 11 INSTALL | 70 +- Makefile.am | 8 NEWS | 8 README | 6 configure.ac | 29 - m4/Makefile.in | 94 ++- po/ChangeLog | 6 po/be.po | 56 +- po/ca.po | 56 +- po/cs.po | 56 +- po/da.po | 56 +- po/de.po | 56 +- po/el.po | 56 +- po/eo.po | 56 +- po/es.po | 56 +- po/et.po | 56 +- po/fi.po | 56 +- po/fr.po | 58 +- po/gl.po | 56 +- po/hu.po | 56 +- po/id.po | 56 +- po/it.po | 56 +- po/ja.po | 56 +- po/nl.po | 56 +- po/pl.po | 56 +- po/pt.po | 56 +- po/pt_BR.po | 56 +- po/ro.po | 193 ++++--- po/ru.po | 56 +- po/sk.po | 56 +- po/sv.po | 1234 +++++++++++++++++++++++------------------------- po/tr.po | 56 +- po/zh_CN.po | 56 +- po/zh_TW.po | 56 +- scripts/config.guess | 18 scripts/depcomp | 362 ++++++++------ scripts/install-sh | 490 ++++++++++--------- scripts/missing | 139 +++-- scripts/mkinstalldirs | 69 ++ 40 files changed, 2218 insertions(+), 1921 deletions(-) Index: gnupg/ChangeLog diff -u gnupg/ChangeLog:1.118.2.86 gnupg/ChangeLog:1.118.2.87 --- gnupg/ChangeLog:1.118.2.86 Thu Dec 23 04:03:10 2004 +++ gnupg/ChangeLog Mon Dec 27 18:27:11 2004 @@ -1,3 +1,14 @@ +2004-12-27 Werner Koch + + Released 1.2.7. + + * Makefile.am (AUTOMAKE_OPTIONS): New. + * configure.ac (AC_CANONICAL_TARGET): Replaced by + AC_CANONICAL_HOST. Changed all reference to TARGET to HOST. Made + sure that i586-mingw32msvc gets detected as mingw32. + + Updated to automake 1.9. + 2004-12-22 David Shaw * NEWS: Note pgpgroup-to-gpggroup. Index: gnupg/INSTALL diff -u gnupg/INSTALL:1.26 gnupg/INSTALL:1.26.2.1 --- gnupg/INSTALL:1.26 Sat Jun 29 22:47:08 2002 +++ gnupg/INSTALL Mon Dec 27 18:27:11 2004 @@ -1,13 +1,16 @@ -Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation, -Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,12 +70,13 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for variables by setting -them in the environment. You can do that on the command line like this: +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix @@ -81,7 +85,7 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -98,19 +102,19 @@ Installation Names ================== - By default, `make install' will install the package's files in +By default, `make install' will install the package's files in `/usr/local/bin', `/usr/local/man', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -121,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -136,10 +140,11 @@ Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it cannot guess the host type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -151,27 +156,23 @@ See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't -need to know the host type. +need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should use the `--target=TYPE' option to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the host -platform (i.e., that on which the generated programs will eventually be -run) with `--host=TYPE'. In this case, you should also specify the -build platform with `--build=TYPE', because, in this case, it may not -be possible to guess the build platform (it sometimes involves -compiling and running simple test programs, and this can't be done if -the compiler is a cross compiler). +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -180,7 +181,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -194,8 +195,7 @@ `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' Index: gnupg/Makefile.am diff -u gnupg/Makefile.am:1.46.2.3 gnupg/Makefile.am:1.46.2.4 --- gnupg/Makefile.am:1.46.2.3 Mon Aug 9 21:47:08 2004 +++ gnupg/Makefile.am Mon Dec 27 18:27:11 2004 @@ -18,6 +18,8 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ## Process this file with automake to produce Makefile.in +ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99 if CROSS_COMPILING checks = @@ -49,9 +51,3 @@ echo "$(VERSION)" > $(distdir)/VERSION - - - - - -ACLOCAL_AMFLAGS = -I m4 Index: gnupg/NEWS diff -u gnupg/NEWS:1.158.2.49 gnupg/NEWS:1.158.2.50 --- gnupg/NEWS:1.158.2.49 Thu Dec 23 04:03:10 2004 +++ gnupg/NEWS Mon Dec 27 18:27:11 2004 @@ -1,9 +1,15 @@ -Noteworthy changes in version 1.2.7 +Noteworthy changes in version 1.2.7 (2004-12-27) ------------------------------------------------ + Please note that the 1.2.x series will enter end of life status on + January 1, 2005, after which it will only be updated for security + critical bugs. + * New "pgpgroup-to-gpggroup" script (in the tools directory) to convert from PGP 6 group syntax to GnuPG group syntax. + * Translation update and minor bug fixes. + Noteworthy changes in version 1.2.6 (2004-08-25) ------------------------------------------------ Index: gnupg/README diff -u gnupg/README:1.71.2.16 gnupg/README:1.71.2.17 --- gnupg/README:1.71.2.16 Tue Aug 10 21:39:02 2004 +++ gnupg/README Mon Dec 27 18:27:11 2004 @@ -1,7 +1,7 @@ GnuPG - The GNU Privacy Guard ------------------------------- - Version 1.2.6 + Version 1.2.7 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. @@ -15,6 +15,10 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Please note that the 1.2.x series will enter end of life status on + January 1, 2005, after which it will only be updated for security + critical bugs. + Intro ----- Index: gnupg/configure.ac diff -u gnupg/configure.ac:1.25.2.62 gnupg/configure.ac:1.25.2.63 --- gnupg/configure.ac:1.25.2.62 Wed Aug 25 18:11:06 2004 +++ gnupg/configure.ac Mon Dec 27 18:27:11 2004 @@ -19,13 +19,14 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA dnl dnl (Process this file with autoconf to produce a configure script.) -dnlAC_REVISION($Revision: 1.25.2.62 $)dnl +dnlAC_REVISION($Revision: 1.25.2.63 $)dnl -AC_PREREQ(2.52) +AC_PREREQ(2.59) +min_automake_version="1.9.3" # Remember to change the version number immediately *after* a release # and remove the "-cvs" or "rc" suffix immediately *before* a release. -AC_INIT(gnupg, 1.2.7-cvs, bug-gnupg@gnu.org) +AC_INIT(gnupg, 1.2.7, bug-gnupg@gnu.org) # Set development_version to yes if the minor number is odd or you # feel that the default check for a development version is not # sufficient. @@ -33,8 +34,8 @@ AC_CONFIG_AUX_DIR(scripts) AC_CONFIG_SRCDIR(g10/g10.c) -AC_CANONICAL_TARGET() -AM_INIT_AUTOMAKE +AC_CANONICAL_HOST +AM_INIT_AUTOMAKE() AM_CONFIG_HEADER(config.h) AC_GNU_SOURCE @@ -314,7 +315,7 @@ try_gettext=yes have_dosish_system=no -case "${target}" in +case "${host}" in *-*-mingw32*) # special stuff for Windoze NT ac_cv_have_dev_random=no @@ -472,8 +473,8 @@ AC_SUBST(GPGKEYS_MAILTO) AC_SUBST(GPGKEYS_HKP) -case "${target}" in - *-*-mingw32*) +case "${host}" in + *-mingw32*) PRINTABLE_OS_NAME="MingW32" ;; *-*-cygwin*) @@ -503,7 +504,7 @@ # NAME_OF_DEV_RANDOM="/dev/random" NAME_OF_DEV_URANDOM="/dev/urandom" -case "${target}" in +case "${host}" in *-openbsd*) NAME_OF_DEV_RANDOM="/dev/srandom" NAME_OF_DEV_URANDOM="/dev/urandom" @@ -749,8 +750,8 @@ if test "$ac_cv_have_dev_random" = yes; then random_modules="rndlinux" else - case "${target}" in - *-*-mingw32*|*-*-cygwin*) + case "${host}" in + *-mingw32*|*-*-cygwin*) random_modules="rndw32" ;; i?86-emx-os2|i?86-*-os2*emx) @@ -917,8 +918,8 @@ # add some extra libs here so that previous tests don't fail for # mysterious reasons - the final link step should bail out. -case "${target}" in - *-*-mingw32*) +case "${host}" in + *-mingw32*) dnl NETLIBS="$NETLIBS -lwsock32" W32LIBS="-lwsock32" ;; @@ -1035,7 +1036,7 @@ # Give some feedback echo -echo " Configured for: $PRINTABLE_OS_NAME ($target)" +echo " Configured for: $PRINTABLE_OS_NAME ($host)" if test -n "$show_extraasm"; then echo " Extra cpu specific functions:$show_extraasm" fi Index: gnupg/m4/Makefile.in diff -u gnupg/m4/Makefile.in:1.5.2.1 gnupg/m4/Makefile.in:1.5.2.2 --- gnupg/m4/Makefile.in:1.5.2.1 Tue Aug 10 20:17:49 2004 +++ gnupg/m4/Makefile.in Mon Dec 27 18:27:11 2004 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.3 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,7 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -21,7 +20,6 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -35,7 +33,34 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ host_triplet = @host@ +subdir = m4 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ + $(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ + $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ + $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ + $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -156,6 +181,8 @@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -176,33 +203,47 @@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 -subdir = m4 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu m4/Makefile -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -210,10 +251,6 @@ ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -227,7 +264,7 @@ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -245,7 +282,6 @@ check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -266,7 +302,7 @@ clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -283,6 +319,8 @@ dvi-am: +html: html-am + info: info-am info-am: @@ -316,8 +354,8 @@ uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ Index: gnupg/po/ChangeLog diff -u gnupg/po/ChangeLog:1.48.2.18 gnupg/po/ChangeLog:1.48.2.19 --- gnupg/po/ChangeLog:1.48.2.18 Mon Aug 9 21:46:31 2004 +++ gnupg/po/ChangeLog Mon Dec 27 18:27:11 2004 @@ -1,3 +1,9 @@ +2004-12-27 Werner Koch + + * ro.po: Updated. + + * sv.po: Updated. + 2004-08-09 Werner Koch * ca.po: Updated. Index: gnupg/po/be.po diff -u gnupg/po/be.po:1.1.2.7 gnupg/po/be.po:1.1.2.8 --- gnupg/po/be.po:1.1.2.7 Fri Aug 13 19:03:15 2004 +++ gnupg/po/be.po Mon Dec 27 18:27:11 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -2006,26 +2006,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -3682,7 +3682,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "" @@ -3691,11 +3691,11 @@ msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "" @@ -3727,16 +3727,16 @@ msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "ÑкаÑавана карыÑтальнікам\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3746,20 +3746,20 @@ "Вам неабходна ўвеÑьці пароль, каб адчыніць ÑакрÑтны ключ длÑ\n" "карыÑтальніка: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-бітавы %s ключ, ID %08lX, Ñтвораны %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "УвÑдзіце пароль: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Паўтарыце пароль: " @@ -3825,41 +3825,41 @@ msgid "NOTE: key has been revoked" msgstr "" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "" @@ -4370,7 +4370,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA патрабуе выкарыÑÑ‚Ð°Ð½ÑŒÐ½Ñ 160-Ñ– бітавага Ñ…Ñш-альгарытму\n" @@ -4659,17 +4659,17 @@ msgid "No help available for `%s'" msgstr "Ð”Ð»Ñ \"%s\" даведка адÑутнічае" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "" Index: gnupg/po/ca.po diff -u gnupg/po/ca.po:1.3.2.19 gnupg/po/ca.po:1.3.2.20 --- gnupg/po/ca.po:1.3.2.19 Fri Aug 13 19:03:12 2004 +++ gnupg/po/ca.po Mon Dec 27 18:27:05 2004 @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-12-05 19:15+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -2176,28 +2176,28 @@ msgstr "" "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[No s'ha trobat l'id d'usuari]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n" @@ -3960,7 +3960,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versió %d del protocol de gpg-agent no està suportada\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no s'ha pogut connectar amb «%s»: %s\n" @@ -3969,11 +3969,11 @@ msgid "communication problem with gpg-agent\n" msgstr "hi ha un problema de comunicació amb el gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID de la clau principal %08lX)" @@ -4016,16 +4016,16 @@ msgid "invalid response from agent\n" msgstr "la resposta de l'agent és invàlida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "s'ha cancel·lat per l'usuari\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4035,20 +4035,20 @@ "Necessiteu la contrasenya per desblocar la clau secreta de\n" "l'usuari: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "no es pot demanar la contrasenya en mode desatès\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Introduïu la contrasenya: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repetiu la contrasenya: " @@ -4118,41 +4118,41 @@ msgid "NOTE: key has been revoked" msgstr "NOTA: aquesta clau ha estat revocada!" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "s'està sol·licitant la clau %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "no s'ha pogut obtenir del servidor la clau: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "error mentre s'enviava a «%s»: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "l'enviament a «%s» ha tingut èxit (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "l'enviament a «%s» ha fallat: status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "aquest servidor de claus no suporta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "s'està cercant «%s» al servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "no es pot cercar el servidor de claus: %s\n" @@ -4723,7 +4723,7 @@ "no s'ha pogut evitar una clau feble per a xifratge simètric;\n" "hi ha hagut %d intents!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n" @@ -5137,17 +5137,17 @@ msgid "No help available for `%s'" msgstr "No hi ha ajuda disponible per a `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "error en crear l'anell «%s»: %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "s'ha creat l'anell «%s»\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n" Index: gnupg/po/cs.po diff -u gnupg/po/cs.po:1.6.2.18 gnupg/po/cs.po:1.6.2.19 --- gnupg/po/cs.po:1.6.2.18 Fri Aug 13 19:03:09 2004 +++ gnupg/po/cs.po Mon Dec 27 18:27:05 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.3\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-12-07 16:20+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -2121,28 +2121,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pøíli¹ mnoho polo¾ek v bufferu veøejných klíèù - vypnuto\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[User ID not found]" # c-format -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Neplatný klíè %08lX zmìnìn na platný pomocí --always-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "neexistuje tajný podklíè pro veøejný klíè %08lX - ignorováno\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "pou¾ívám sekundární klíè %08lX místo primárního klíèe %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "klíè %08lX: tajný klíè bez klíèe veøejného - pøeskoèeno\n" @@ -3861,7 +3861,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verze %d není podporován\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemohu se pøipojit k `%s': %s\n" @@ -3870,11 +3870,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problém v komunikaci s gpg-agentem\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentem - pou¾ívání agenta vypnuto\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hlavní ID klíèe %08lX)" @@ -3906,16 +3906,16 @@ msgid "invalid response from agent\n" msgstr "neplatná reakce od agenta\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "zru¹eno u¾ivatelem\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentem: agent vrací 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3925,20 +3925,20 @@ "Musíte znát heslo, abyste odemknul(a) tajný klíè pro\n" "u¾ivatele: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "délka %u bitù, typ %s, klíè %08lX, vytvoøený %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "v dávkovém re¾imu se nemohu ptát na heslo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -4006,41 +4006,41 @@ msgid "NOTE: key has been revoked" msgstr "POZNÁMKA: klíè byl revokován" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "po¾aduji klíè %08lX z %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nemohu dostat klíè ze serveru klíèù: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "chyba pøi posílání na `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "úspì¹né odeslání na `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "chyba odeslání na `%s': (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "tento keyserver nepodporuje --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "vyhledávám \"%s\" na HKP serveru %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nemohu prohledávat server klíèù: %s\n" @@ -4580,7 +4580,7 @@ "nemohu se vyvarovat slabého klíèe pro symetrickou ¹ifru; operaci jsem zkusil " "%d krát!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA po¾aduje pou¾ití 160-ti bitového hashovacího algoritmu\n" @@ -4980,17 +4980,17 @@ msgid "No help available for `%s'" msgstr "Pomoc není dostupná pro '%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "chyba pøi vytváøení souboru klíèù (keyring)`%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "soubor klíèù (keyring) `%s' vytvoøen\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "selhalo obnovení vyrovnávací pamìti klíèù: %s\n" Index: gnupg/po/da.po diff -u gnupg/po/da.po:1.11.2.18 gnupg/po/da.po:1.11.2.19 --- gnupg/po/da.po:1.11.2.18 Fri Aug 13 19:03:06 2004 +++ gnupg/po/da.po Mon Dec 27 18:27:04 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -2070,27 +2070,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 #, fuzzy msgid "[User id not found]" msgstr "[bruger ikke fundet]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -3788,7 +3788,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "valgte cifferalgoritme %d er ugyldig\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "kan ikke åbne '%s': %s\n" @@ -3797,11 +3797,11 @@ msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hovednøgle-ID %08lX)" @@ -3832,36 +3832,36 @@ msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" "user: \"" msgstr "" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Indtast kodesætning: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Gentag kodesætning: " @@ -3928,41 +3928,41 @@ msgid "NOTE: key has been revoked" msgstr "nøgle %08lX: nøgle er blevet annulleret!\n" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, fuzzy, c-format msgid "requesting key %08lX from %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, fuzzy, c-format msgid "can't get key from keyserver: %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, fuzzy, c-format msgid "error sending to `%s': %s\n" msgstr "fejl ved læsning af '%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, fuzzy, c-format msgid "can't search keyserver: %s\n" msgstr "importér nøgler fra en nøgleserver: %s\n" @@ -4477,7 +4477,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" @@ -4768,17 +4768,17 @@ msgid "No help available for `%s'" msgstr "Ingen hjælp tilgængelig for `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, fuzzy, c-format msgid "error creating keyring `%s': %s\n" msgstr "fejl ved skrivning af nøglering `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, fuzzy, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "ingen standard offentlig nøglering\n" Index: gnupg/po/de.po diff -u gnupg/po/de.po:1.82.2.20 gnupg/po/de.po:1.82.2.21 --- gnupg/po/de.po:1.82.2.20 Fri Aug 13 19:03:02 2004 +++ gnupg/po/de.po Mon Dec 27 18:27:04 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-07-20 16:01+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -2134,29 +2134,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "zu viele Einträge im pk-Cache - abgeschaltet\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[User-ID nicht gefunden]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Ungültiger Schlüssel %08lX, gültig gemacht per --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "Kein privater Schlüssel zum öffentlichen Schlüssel %08lX - übergangen\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -3903,7 +3903,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterstützt\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n" @@ -3912,12 +3912,12 @@ msgid "communication problem with gpg-agent\n" msgstr "Kommunikationsproblem mit GPG-Agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (Hauptschlüssel-ID %08lX)" @@ -3949,16 +3949,16 @@ msgid "invalid response from agent\n" msgstr "Falsche Antwort des Agenten\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "Abbruch durch Benutzer\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3968,20 +3968,20 @@ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n" "Benutzer: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-Bit %s Schlüssel, ID %08lX, erzeugt %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Geben Sie die Passphrase ein: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Geben Sie die Passphrase nochmal ein: " @@ -4048,41 +4048,41 @@ msgid "NOTE: key has been revoked" msgstr "Hinweis: Schlüssel wurde widerrufen" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "Schlüssel %08lX wird von %s angefordert\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "Schlüssel ist beim Schlüsselserver nicht erhältlich: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "Fehler beim Senden an `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "Senden an `%s' erfolgreich (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "Senden an `%s' erfolglos (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "Dieser Schlüsselserver unterstützt --search-keys nicht\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "suche nach \"%s\" auf HKP-Server %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "kann Schlüsselserver nicht durchsuchen: %s\n" @@ -4649,7 +4649,7 @@ "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schlüssels für " "sym.Verschlüsselung nicht vermieden werden!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n" @@ -5079,17 +5079,17 @@ msgid "No help available for `%s'" msgstr "Keine Hilfe für '%s' vorhanden." -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "Schlüsselbund `%s' erstellt\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n" Index: gnupg/po/el.po diff -u gnupg/po/el.po:1.6.2.18 gnupg/po/el.po:1.6.2.19 --- gnupg/po/el.po:1.6.2.18 Fri Aug 13 19:03:00 2004 +++ gnupg/po/el.po Mon Dec 27 18:27:03 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -2127,27 +2127,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "ðÜñá ðïëëÝò êáôá÷ùñÞóåéò óôç pk cache - áðåíåñãïðïéÞèçêå\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[User id äåí âñÝèçêå]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Ìç Ýãêõñï êëåéäß %08lX Ýãéíå Ýãêõñï áðü ôï --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "êáíÝíá ìõóôéêü õðïêëåéäß ãéá ôï äçìüóéï õðïêëåéäß %08lX - áãíüçóç\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "÷ñÞóç ôïõ äåõôåñåýïíôïò êëåéäéïý %08lX áíôß ôïõ ðñùôåýïíôïò %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "êëåéäß %08lX: ìõóôéêü êëåéäß ÷ùñßò äçìüóéï - ðáñáëåßöèçêå\n" @@ -3873,7 +3873,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "äåí õðïóôçñßæåôáé ç Ýêäïóç ðñùôïêüëëïõ %d ôïõ gpg-agent\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "áäõíáìßá óýíäåóçò óôï `%s': %s\n" @@ -3882,11 +3882,11 @@ msgid "communication problem with gpg-agent\n" msgstr "ðñüâëçìá åðéêïéíùíßáò ìå ôï gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "ðñüâëçìá ìå ôïí agent - áðåíåñãïðïéÞóç ôçò ÷ñÞóçò ôïõ agent\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (êýñéï êëåéäß, ID %08lX)" @@ -3919,16 +3919,16 @@ msgid "invalid response from agent\n" msgstr "ìç Ýãêõñç áðÜíôçóç áðü ôïí agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "áêõñþèçêå áðü ôï ÷ñÞóôç\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "ðñüâëçìá ìå ôïí agent: agent åðéóôñÝöåé 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3938,20 +3938,20 @@ "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\n" "ãéá ôï ÷ñÞóôç: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit %s êëåéäß, ID %08lX, äçìéïõñãßá %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "áäõíáìßá åñþôçóçò ôçò ëÝîçò êëåéäß óå êáôÜóôáóç äÝóìçò\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "ÐëçêôñïëïãÞóôå ôç öñÜóç êëåéäß: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "ÅðáíáëÜâåôå ôç öñÜóç êëåéäß: " @@ -4017,41 +4017,41 @@ msgid "NOTE: key has been revoked" msgstr "ÓÇÌÅÉÙÓÇ: ôï êëåéäß Ý÷åé áíáêëçèåß" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "áßôçóç êëåéäéïý %08lX áðü ôï %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "áäõíáìßá ëÞøçò ôïõ êëåéäéïý áðü ôï äéáêïìéóôÞ: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "óöÜëìá óôç áðïóôïëÞ ðñïò ôï `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "åðéôõ÷ßá ôçò áðïóôïëÞò óôï `%s' (êáôÜóôáóç=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "áðïôõ÷ßá óôçí áðïóôïëÞ ðñïò ôï `%s': êáôÜóôáóç=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "áõôüò ï keyserver äåí õðïóôçñßæåé --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "áíáæÞôçóç ôïõ \"%s\" áðü ôï HKP äéáêïìéóôÞ %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "áäõíáìßá áíáæÞôçóçò äéáêïìéóôÞ: %s\n" @@ -4604,7 +4604,7 @@ "áäõíáìßá áðïöõãÞò áäýíáìïõ êëåéäéïý ãéá óõììåôñéêü êñõðôáëãüñéèìï, äïêéìÞ " "ãéá %d öïñÝò!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "ï DSA áðáéôåß ôç ÷ñÞóç åíüò 160 bit áëãüñéèìïõ hash\n" @@ -5012,17 +5012,17 @@ msgid "No help available for `%s'" msgstr "Äåí õðÜñ÷åé äéáèÝóéìç âïÞèåéá ãéá `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "áäõíáìßá äçìéïõñãßáò ôçò êëåéäïèÞêçò `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "êëåéäïèÞêç `%s' äçìéïõñãÞèçêå\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "áðïôõ÷ßá åðáíáäüìçóçò ôçò cache êëåéäïèÞêçò: %s\n" Index: gnupg/po/eo.po diff -u gnupg/po/eo.po:1.10.2.18 gnupg/po/eo.po:1.10.2.19 --- gnupg/po/eo.po:1.10.2.18 Fri Aug 13 19:02:58 2004 +++ gnupg/po/eo.po Mon Dec 27 18:27:03 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -2101,26 +2101,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "tro da registroj en pk-staplo - malþaltas\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Uzantidentigilo ne trovita]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, fuzzy, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Nevalida þlosilo %08lX validigita per --always-trust\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "estas sekreta þlosilo por la publika þlosilo \"%s\"!\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uzas flankan þlosilon %08lX anstataý la æefa þlosilo %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "þlosilo %08lX: sekreta þlosilo sen publika þlosilo - ignorita\n" @@ -3862,7 +3862,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokolversio %d de gpg-agent ne estas uzebla\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ne povas konektiøi al '%s': %s\n" @@ -3871,11 +3871,11 @@ msgid "communication problem with gpg-agent\n" msgstr "komunikproblemo kun gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problemo kun agento - malþaltas uzadon de agento\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (æefþlosilo %08lX)" @@ -3907,16 +3907,16 @@ msgid "invalid response from agent\n" msgstr "nevalida respondo de agento\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "nuligita de uzanto\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemo kun agento: agento redonas 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3926,20 +3926,20 @@ "Vi bezonas pasfrazon por malþlosi la sekretan þlosilon\n" "por la uzanto: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bita %s-þlosilo, %08lX, kreita je %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "ne povas kontroli pasvorton en neinteraga reøimo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Donu pasfrazon: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ripetu pasfrazon: " @@ -4006,41 +4006,41 @@ msgid "NOTE: key has been revoked" msgstr "þlosilo %08lX: þlosilo estas revokita!\n" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, fuzzy, c-format msgid "requesting key %08lX from %s\n" msgstr "petas la þlosilon %08lX de HKP-þlosilservilo %s ...\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "ne povas akiri þlosilon de þlosilservilo: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "eraro dum sendo al '%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "sukceso dum sendo al '%s' (statuso=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "malsukceso dum sendo al '%s': statuso=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "seræas pri \"%s\" æe HKP-servilo %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "ne povas seræi æe þlosilservilo: %s\n" @@ -4575,7 +4575,7 @@ msgstr "" "ne povas eviti malfortajn þlosilojn por simetria æifro; provis %d fojojn!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" @@ -4968,17 +4968,17 @@ msgid "No help available for `%s'" msgstr "Nenia helpo disponata por '%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "eraro dum kreado de þlosilaro '%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "þlosilaro '%s' kreita\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "malsukcesis rekonstrui þlosilaran staplon: %s\n" Index: gnupg/po/es.po diff -u gnupg/po/es.po:1.6.2.18 gnupg/po/es.po:1.6.2.19 --- gnupg/po/es.po:1.6.2.18 Fri Aug 13 19:02:55 2004 +++ gnupg/po/es.po Mon Dec 27 18:27:02 2004 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-18 22:40+0100\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" @@ -2158,26 +2158,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "demasiados registros en la cache pk - anulada\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Identificador de usuario no encontrado]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Clave %08lX inválida hecha mediante --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "no hay subclave secreta para la clave pública %08lX -ignorada\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clave %08lX: clave secreta sin clave pública - omitida\n" @@ -3891,7 +3891,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "el programa no permite usar el protocolo agente gpg versión %d\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "no se puede conectar con `%s': %s\n" @@ -3900,11 +3900,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con el agente gpg\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema con el agente - inhabilitando el uso del agente\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "(ID clave primaria %08lX)" @@ -3936,16 +3936,16 @@ msgid "invalid response from agent\n" msgstr "respuesta del agente inválida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "cancelado por el usuario\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con el agente: el agente devuelve 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3955,20 +3955,20 @@ "Necesita una frase contraseña para desbloquear la clave secreta\n" "del usuario: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "imposible pedir contraseña en modo de proceso por lotes\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Introduzca frase contraseña: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita frase contraseña: " @@ -4034,41 +4034,41 @@ msgid "NOTE: key has been revoked" msgstr "NOTA: la clave ha sido revocada" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "solicitando clave %08lX a %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "no puede obtenerse la clave en el servidor: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "error enviando a `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "envió correcto a `%s` (estado=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "falló el envio a `%s': status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "este servidor de clave no proporciona --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "buscando \"%s\" en el servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "no puede buscarse en el servidor: %s\n" @@ -4609,7 +4609,7 @@ "¡imposible evitar clave débil para cifrado simétrico después de %d " "intentos!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necesita un algoritmo de hash de 160 bits.\n" @@ -5007,17 +5007,17 @@ msgid "No help available for `%s'" msgstr "No hay ayuda disponible para `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "error escribiendo anillo `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "anillo `%s' creado\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "fallo reconstruyendo caché del anillo de claves: %s\n" Index: gnupg/po/et.po diff -u gnupg/po/et.po:1.6.2.18 gnupg/po/et.po:1.6.2.19 --- gnupg/po/et.po:1.6.2.18 Fri Aug 13 19:02:53 2004 +++ gnupg/po/et.po Mon Dec 27 18:27:02 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -2081,28 +2081,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "avalike võtmete puhvris on liiga palju võtmeid - blokeerin\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Kasutaja id puudub]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid " "kasutamisega\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "avalikul alamvõtmel %08lX puudub salajane alamvõti - ignoreerin\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "võti %08lX: salajane võti avaliku võtmeta - jätsin vahele\n" @@ -3806,7 +3806,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n" @@ -3815,11 +3815,11 @@ msgid "communication problem with gpg-agent\n" msgstr "probleem gpg-agent programmiga suhtlemisel\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "probleem agendiga - blokeerin agendi kasutamise\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (peamise võtme ID %08lX)" @@ -3851,16 +3851,16 @@ msgid "invalid response from agent\n" msgstr "vigane vastus agendilt\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "katkestatud kasutaja poolt\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem agendiga: agent tagastas 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3870,20 +3870,20 @@ "Te vajate kasutaja salajase võtme lahtilukustamiseks\n" "parooli: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bitine %s võti, ID %08lX, loodud %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "pakettmoodis ei saa parooli küsida\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Sisestage parool: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Korrake parooli: " @@ -3949,41 +3949,41 @@ msgid "NOTE: key has been revoked" msgstr "MÄRKUS: võti on tühistatud" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "küsin võtit %08lX võtmeserverist %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "võtmeserverist ei saa võtit: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "viga teate saatmisel serverile `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "teate saatmine serverile `%s' õnnestus (olek=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "teate saatmine serverile `%s' ebaõnnestus: olek=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "see võtmeserver ei toeta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "otsin \"%s\" HKP serverist %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "võtmeserverist ei saa otsida: %s\n" @@ -4513,7 +4513,7 @@ "sümmeetrilises ¨ifris ei õnnestu vältida nõrga võtme kasutamist; proovisin %" "d korda!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA nõuab 160 bitist räsialgoritmi kasutamist\n" @@ -4905,17 +4905,17 @@ msgid "No help available for `%s'" msgstr "`%s' kohta abiinfo puudub" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "viga võtmehoidla `%s' loomisel: %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "võtmehoidla `%s' on loodud\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n" Index: gnupg/po/fi.po diff -u gnupg/po/fi.po:1.1.2.15 gnupg/po/fi.po:1.1.2.16 --- gnupg/po/fi.po:1.1.2.15 Fri Aug 13 19:02:51 2004 +++ gnupg/po/fi.po Mon Dec 27 18:27:02 2004 @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -2115,28 +2115,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Käyttäjätunnusta ei löytynyt]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -3858,7 +3858,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n" @@ -3867,11 +3867,11 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agentin kanssa yhteysongelma\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (pääavaimen tunnus %08lX)" @@ -3903,16 +3903,16 @@ msgid "invalid response from agent\n" msgstr "agentin lähettämä vastaus ei kelpaa\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "käyttäjän peruma\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3921,20 +3921,20 @@ "\n" "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "salasanan kysyminen ei onnistu eräajossa\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Syötä salasana: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Toista salasana: " @@ -4001,41 +4001,41 @@ msgid "NOTE: key has been revoked" msgstr "HUOM: avain on mitätöity!" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "pyydetään avainta %08lX kohteesta %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "avainpalvelimelta ei saa avainta: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "kohteeseen \"%s\" lähettäminen onnistui (tila=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "virhe lähettäessä kohteeseen \"%s\": tila=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "tämä avainpalvelin ei tue valitsinta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "etsitään \"%s\" HKP-palvelimelta %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr " avainpalvelimelta ei pysty etsimään: %s\n" @@ -4590,7 +4590,7 @@ "heikon avaimen luomista symmetriselle salaimelle ei voitu välttää; \n" "yritettiin %d kertaa!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n" @@ -4995,17 +4995,17 @@ msgid "No help available for `%s'" msgstr "Ei ohjetta aiheesta \"%s\"" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "virhe luotaessa avainrengasta \"%s\": %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "avainrengas \"%s\" luotu\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n" Index: gnupg/po/fr.po diff -u gnupg/po/fr.po:1.60.2.19 gnupg/po/fr.po:1.60.2.20 --- gnupg/po/fr.po:1.60.2.19 Fri Aug 13 19:02:48 2004 +++ gnupg/po/fr.po Mon Dec 27 18:27:01 2004 @@ -5,13 +5,13 @@ # Thanks to Rémi Guyomarch and # for pointing me out some errors. # -# $Id: fr.po,v 1.60.2.19 2004/08/13 17:02:48 werner Exp $ +# $Id: fr.po,v 1.60.2.20 2004/12/27 17:27:01 wk Exp $ # msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-16 20:20+0200\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -2158,29 +2158,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "trop d'entrées dans le cache pk - désactivé\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Nom utilisateur introuvable]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "La clé invalide %08lX a été rendue valide par --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "pas de sous-clé secrète pour la clé publique %08lX - ignorée\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "utilisation de la clé secondaire %08lX à la place de la clé\n" "principale %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "clé %08lX: clé secrète sans clé publique - non prise en compte\n" @@ -3922,7 +3922,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "le protocole gpg-agent version %d n'est pas supporté\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossible de se connecter à `%s': %s\n" @@ -3931,11 +3931,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problème de communication avec ssh-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problème avec l'agent - arrêt d'utilisation de l'agent\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID clé principale %08lX)" @@ -3968,16 +3968,16 @@ msgid "invalid response from agent\n" msgstr "réponse de l'agent invalide\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "annulé par l'utilisateur\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problème avec l'agent : l'agent renvoie 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3987,20 +3987,20 @@ "Vous avez besoin d'un mot de passe pour déverrouiller la clé secrète pour\n" "l'utilisateur: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "clé de %u bits %s, ID %08lX, créée le %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "impossible de demander un mot de passe en mode automatique\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Entrez le mot de passe: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Répétez le mot de passe: " @@ -4070,41 +4070,41 @@ msgid "NOTE: key has been revoked" msgstr "NOTE: la clé a été révoquée" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "requête de la clé %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "impossible d'obtenir les clés du serveur: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "erreur pendant l'envoi de `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "l'envoi à `%s' s'est déroulé avec succès (résultat=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "l'envoi à `%s' a échoué: le résultat est %u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "ce serveur de clés ne supporte pas --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "recherche de \"%s\" du serveur HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "impossible de chercher une clé dans le serveur : %s\n" @@ -4676,7 +4676,7 @@ "impossible d'éviter une clé faible pour le chiffrement symétrique:\n" "%d essais ont eu lieu !\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA nécessite l'utilisation d'un algorithme de hachage de 160 bits\n" @@ -5073,17 +5073,17 @@ msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "erreur durant la création du porte-clés `%s' : %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "le porte-clés `%s` a été créé\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "la reconstruction du cache de porte-clés a échoué : %s\n" Index: gnupg/po/gl.po diff -u gnupg/po/gl.po:1.6.2.18 gnupg/po/gl.po:1.6.2.19 --- gnupg/po/gl.po:1.6.2.18 Fri Aug 13 19:02:46 2004 +++ gnupg/po/gl.po Mon Dec 27 18:27:00 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -2111,28 +2111,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "demasiadas entradas na caché de chaves públicas - desactivada\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Non se atopou o id de usuario]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "non hai unha sub-chave secreta para a sub-chave pública %08lX - ignórase\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sen chave pública - omitida\n" @@ -3860,7 +3860,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versión %d do protocolo de gpg-agent non está soportada\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "non se puido conectar a `%s': %s\n" @@ -3869,11 +3869,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problema de comunicación con gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema co axente - desactivando o emprego do axente\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -3905,16 +3905,16 @@ msgid "invalid response from agent\n" msgstr "resposta do axente non válida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "cancelado polo usuario\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3924,20 +3924,20 @@ "Necesita un contrasinal para desbloquea-la chave secreta para\n" "o usuario \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bits, chave %s, ID %08lX, creada %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Introduza o contrasinal: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita o contrasinal: " @@ -4003,41 +4003,41 @@ msgid "NOTE: key has been revoked" msgstr "NOTA: a chave está revocada" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "solicitando a chave %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "non se pode obte-la chave do servidor de chaves: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "erro ao enviar a `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "éxito ao enviar a `%s' (estado=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "fallo ao enviar a `%s': estado=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "este servidor de chaves non soporta --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "buscando \"%s\" no servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "non se pode buscar no servidor de chaves: %s\n" @@ -4591,7 +4591,7 @@ "non se pode evitar unha chave feble para o cifrado simétrico; tentouse %d " "veces\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n" @@ -4985,17 +4985,17 @@ msgid "No help available for `%s'" msgstr "Non hai axuda dispoñible para `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "erro ao crea-lo chaveiro `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "chaveiro `%s' creado\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n" Index: gnupg/po/hu.po diff -u gnupg/po/hu.po:1.1.2.13 gnupg/po/hu.po:1.1.2.14 --- gnupg/po/hu.po:1.1.2.13 Fri Aug 13 19:02:45 2004 +++ gnupg/po/hu.po Mon Dec 27 18:26:55 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Hungarian \n" @@ -2091,29 +2091,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "Túl sok bejegyzés van a nyilvánoskulcs-gyorsítótárban - letiltom.\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[ismeretlen kulcs]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "%08lX érvénytelen kulcsot érvényesítettük az\n" "--allow-non-selfsigned-uid opcióval.\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "Nincs titkos alkulcs a %08lX nyilvános alkulcshoz - figyelmen kívül hagyom.\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsõdleges helyett.\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "%08lX kulcs: titkos kulcs nyilvános kulcs nélkül - kihagytam.\n" @@ -3827,7 +3827,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "%d gpg-agent protokollverzió nem támogatott!\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n" @@ -3836,11 +3836,11 @@ msgid "communication problem with gpg-agent\n" msgstr "Kommunikációs probléma a gpg ügynökkel!\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "Probléma van az ügynökkel. Letiltom a használatát.\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "" @@ -3875,16 +3875,16 @@ msgid "invalid response from agent\n" msgstr "Érvénytelen válasz az ügynöktõl!\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "A felhasználó megszakította a mûveletet.\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3895,20 +3895,20 @@ "használatához:\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s." -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "Nem tudok jelszót bekérni kötegelt módban!\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Írja be a jelszót: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ismételje meg a jelszót: " @@ -3975,41 +3975,41 @@ msgid "NOTE: key has been revoked" msgstr "MEGJEGYZÉS: A kulcsot visszavonták." -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverrõl.\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "Nem tudom lehívni a kulcsot a %s kulcsszerverrõl.\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "Hiba %s-ra/-re küldéskor: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "Sikeresen felküldtem %s kulcsszerverre. (Státusz: %u.)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "Nem tudtam felküldeni %s kulcsszerverre. Státusz: %u.\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "Ez a kulcsszerver nem támogatja a --search-keys kapcsolót.\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "Nem tudok keresni a %s kulcsszerveren.\n" @@ -4555,7 +4555,7 @@ "Nem tudom elkerülni a gyenge kulcsot a szimmetrikus titkosítóhoz.\n" "%d alkalommal próbáltam!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "A DSA 160 bites hash (kivonatoló) algoritmust igényel.\n" @@ -4958,17 +4958,17 @@ msgid "No help available for `%s'" msgstr "Nem áll rendelkezésre segítség \"%s\" témához." -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "\"%s\" kulcskarikát létrehoztam.\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n" Index: gnupg/po/id.po diff -u gnupg/po/id.po:1.11.2.18 gnupg/po/id.po:1.11.2.19 --- gnupg/po/id.po:1.11.2.18 Fri Aug 13 19:02:43 2004 +++ gnupg/po/id.po Mon Dec 27 18:26:55 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -2102,26 +2102,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[User id tidak ditemukan]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n" @@ -3837,7 +3837,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "protokol gpg-agent versi %d tidak didukung\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "tidak dapat terkoneksi ke `%s': %s\n" @@ -3846,11 +3846,11 @@ msgid "communication problem with gpg-agent\n" msgstr "masalah komunikasi dengan gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "masalah dengan agen - tiadakan penggunaan agen\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID kunci utama %08lX)" @@ -3882,16 +3882,16 @@ msgid "invalid response from agent\n" msgstr "respon tidak valid dari agen\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "dibatalkan oleh user\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3901,20 +3901,20 @@ "Anda perlu passphrase untuk membuka kunci rahasia untuk\n" "pemakai: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit kunci %s, ID %08lX, tercipta %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "tidak dapat meminta password dalam mode batch\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Masukkan passphrase: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ulangi passphrase: " @@ -3980,41 +3980,41 @@ msgid "NOTE: key has been revoked" msgstr "CATATAN: kunci telah dibatalkan" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "meminta kunci %08lX dari %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "tidak dapat memperoleh kunci keyserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "kesalahan mengirim ke `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "success sending to `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "failed sending to `%s': status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "keyserver ini tidak mendukung --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "mencari \"%s\" dari server HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "tidak dapat mencari keyserver: %s\n" @@ -4554,7 +4554,7 @@ msgstr "" "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA butuh penggunaan algoritma hash 160 bit\n" @@ -4960,17 +4960,17 @@ msgid "No help available for `%s'" msgstr "Tidak tersedia bantuan untuk `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "kesalahan menulis keyring `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "%s: keyring tercipta\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "gagal membuat kembali cache keyring: %s\n" Index: gnupg/po/it.po diff -u gnupg/po/it.po:1.64.2.19 gnupg/po/it.po:1.64.2.20 --- gnupg/po/it.po:1.64.2.19 Fri Aug 13 19:02:41 2004 +++ gnupg/po/it.po Mon Dec 27 18:26:55 2004 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -2112,27 +2112,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "troppe voci nella pk cache - disabilitata\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[User ID non trovato]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" @@ -3855,7 +3855,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "la versione %d del protocollo di gpg-agent non è gestita\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossibile connettersi a `%s': %s\n" @@ -3864,11 +3864,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problema di comunicazione con gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema con l'agent - uso dell'agent disattivato\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (key ID principale %08lX)" @@ -3900,16 +3900,16 @@ msgid "invalid response from agent\n" msgstr "risposta non valida dall'agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "interrotto dall'utente\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema con l'agent: ha restituito 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3919,20 +3919,20 @@ "Ti serve una passphrase per sbloccare la chiave segreta\n" "dell'utente: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "impossibile chiedere la password in modo batch\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Inserisci la passphrase: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Ripeti la passphrase: " @@ -4000,41 +4000,41 @@ msgid "NOTE: key has been revoked" msgstr "NOTA: la chiave è stata revocata" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "richiedo la chiave %08lX a %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "impossibile scaricare la chiave dal keyserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "errore leggendo `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "inviata con successo a `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "invio a `%s' fallito: status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "questo keyserver non gestisce --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "cerco \"%s\" sul server HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "impossibile cercare sul keyserver: %s\n" @@ -4592,7 +4592,7 @@ "Impossibile evitare una chiave debole per il cifrario simmetrico;\n" "ho provato %d volte!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n" @@ -5003,17 +5003,17 @@ msgid "No help available for `%s'" msgstr "Non è disponibile un aiuto per `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "errore creando il portachiavi `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "portachiavi `%s' creato\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "rebuild della cache del portachiavi fallito: %s\n" Index: gnupg/po/ja.po diff -u gnupg/po/ja.po:1.11.2.18 gnupg/po/ja.po:1.11.2.19 --- gnupg/po/ja.po:1.11.2.18 Fri Aug 13 19:02:39 2004 +++ gnupg/po/ja.po Mon Dec 27 18:26:54 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-12-06 00:44+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -2124,26 +2124,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - »ÈÍѶػß\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[¥æ¡¼¥¶¡¼id¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid¤ÇÍ­¸ú¤Ë¤µ¤ì¤¿Ìµ¸ú¤Ê¸°%08lX¤Ç¤¹\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "¸ø³«Éû¸°%08lX¤Ë¤¿¤¤¤¹¤ëÈëÌ©Éû¸°¤¬¤¢¤ê¤Þ¤»¤ó - ̵»ë\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "Éû¸°%08lX¤ò¼ç¸°%08lX¤ËÂåÍѤ·¤Þ¤¹\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "¸°%08lX: ¸ø³«¸°¤Î¤Ê¤¤ÈëÌ©¸°¤Ç¤¹ - ¥¹¥­¥Ã¥×\n" @@ -3837,7 +3837,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent¥×¥í¥È¥³¥ë¡¦¥Ð¡¼¥¸¥ç¥ó%d¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "`%s'¤ØÀܳ¤Ç¤­¤Þ¤»¤ó: %s\n" @@ -3846,11 +3846,11 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agent¤È¤ÎÄÌ¿®¾ã³²\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥ÈÍøÍѶػß\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (¼ç¸°ID %08lX)" @@ -3882,16 +3882,16 @@ msgid "invalid response from agent\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤«¤é¤Î̵¸ú¤Ê±þÅú\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "¥æ¡¼¥¶¡¼¤Ë¤è¤ë¼è¾Ã¤·\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥¨¡¼¥¸¥§¥ó¥È¤Ë¾ã³²: ¥¨¡¼¥¸¥§¥ó¥È¤¬0x%lx¤òÊÖµÑ\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3901,20 +3901,20 @@ "¼¡¤Î¥æ¡¼¥¶¡¼¤ÎÈëÌ©¸°¤Î¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë¤Ë¤Ï\n" "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u¥Ó¥Ã¥È%s¸°, ID %08lXºîÀ®ÆüÉÕ¤Ï%s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "¥Ð¥Ã¥Á¥â¡¼¥É¤Ç¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÌä¹ç¤»¤¬¤Ç¤­¤Þ¤»¤ó\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: " @@ -3982,41 +3982,41 @@ msgid "NOTE: key has been revoked" msgstr "Ãí°Õ: ¸°¤Ï¼º¸úºÑ¤ß¤Ç¤¹" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "¸°%08lX¤ò%s¤ËÍ×µá\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤á¤Þ¤»¤ó: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "`%s'¤Ø¤ÎÁ÷¿®¥¨¥é¡¼: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "`%s'¤Ø¤ÎÁ÷¿®¤ËÀ®¸ù (¾õÂÖ=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "`%s'¤Ø¤ÎÁ÷¿®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: ¾õÂÖ=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "¤³¤Î¸°¥µ¡¼¥Ð¡¼¤Ï¡¢--search-keys¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤»¤ó\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "¡Ö%s¡×¤òHKP¥µ¡¼¥Ð¡¼%s¤«¤é¸¡º÷\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "¸°¥µ¡¼¥Ð¡¼¤ò¸¡º÷¤Ç¤­¤Þ¤»¤ó: %s\n" @@ -4537,7 +4537,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "ÂоΰŹæË¡¤Î¼å¤¤¸°¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£%d²ó»î¤ß¤Þ¤·¤¿!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA¤Ç¤Ï160¥Ó¥Ã¥È¤Î¥Ï¥Ã¥·¥å¡¦¥¢¥ë¥´¥ê¥º¥à¤Î»ÈÍѤ¬É¬ÍפǤ¹\n" @@ -4926,17 +4926,17 @@ msgid "No help available for `%s'" msgstr "¡Ö%s¡×¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "¸°ÎØ¡Ö%s¡×¤ÎºîÀ®¥¨¥é¡¼: %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "¸°ÎØ¡Ö%s¡×¤¬¤Ç¤­¤Þ¤·¤¿\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "¸°ÎØ¥­¥ã¥Ã¥·¥å¤ÎºÆ¹½Ãۤ˼ºÇÔ¤·¤Þ¤·¤¿: %s\n" Index: gnupg/po/nl.po diff -u gnupg/po/nl.po:1.11.2.18 gnupg/po/nl.po:1.11.2.19 --- gnupg/po/nl.po:1.11.2.18 Fri Aug 13 19:02:36 2004 +++ gnupg/po/nl.po Mon Dec 27 18:26:54 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-05-10 19:23+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" @@ -2118,29 +2118,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "teveel ingangen in pk buffer - uit gezet\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Gebruikerscode niet gevonden]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Ongeldige sleutel %08lX geldig gemaakt met --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "geen geheime deelsleutel voor openbare deelsleutel %08lX - genegeerd\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "de secundaire sleutel %08lX wordt gebruikt in plaats van primaire sleutel %" "08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "" @@ -3876,7 +3876,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protocol versie %d wordt niet ondersteund\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan niet verbinden met `%s': %s\n" @@ -3885,11 +3885,11 @@ msgid "communication problem with gpg-agent\n" msgstr "communicatieprobleem met gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "probleem met de agent - gebruik van agent uit gezet\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hoofdsleutel ID %08lX)" @@ -3922,16 +3922,16 @@ msgid "invalid response from agent\n" msgstr "ongeldig antwoord van agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "geannuleerd door gebruiker\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "probleem met agent: agent geeft 0x%lx terug\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3941,20 +3941,20 @@ "U heeft een wachtwoord nodig om de geheime sleutel\n" "voor de gebruiker te ontgrendelen: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "kan niet vragen om wachtwoord in batch-modus\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Geef wachtwoord: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Herhaal wachtwoord: " @@ -4022,41 +4022,41 @@ msgid "NOTE: key has been revoked" msgstr "LET OP: sleutel is herroepen" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "bezig met opvragen sleutel %08lX van %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "kan sleutel niet ontvangen van sleutelserver: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "fout bij verzenden aan `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "succes bij zenden aan `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "verzenden aan `%s' mislukt: status=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "bezig met zoeken naar \"%s\" bij HKP-server %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "kan niet zoeken op sleutelserver: %s\n" @@ -4607,7 +4607,7 @@ "kan zwakke sleutel voor symmetrische codering niet vermijden; %d keer " "geprobeerd!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA vereist het gebruik van een 160-bits hash-algoritme\n" @@ -5026,17 +5026,17 @@ msgid "No help available for `%s'" msgstr "Geen hulp beschikbaar voor `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "fout bij aanmaken sleutelbos `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "sleutelbos `%s' aangemaakt\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "opnieuw opbouwen sleutelbos buffer mislukt: %s\n" Index: gnupg/po/pl.po diff -u gnupg/po/pl.po:1.41.2.20 gnupg/po/pl.po:1.41.2.21 --- gnupg/po/pl.po:1.41.2.20 Fri Aug 13 19:02:34 2004 +++ gnupg/po/pl.po Mon Dec 27 18:26:54 2004 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -2130,27 +2130,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "zbyt wiele wpisów w buforze kluczy publicznych - wy³±czony\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[brak identyfikatora u¿ytkownika]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Opcja --allow-non-selfsigned-uid wymusi³a uznanie za poprawny klucza %08lX.\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pominiêty\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pominiêty\n" @@ -3868,7 +3868,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "wersja %d protoko³u agenta nie jest obs³ugiwana\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nie mo¿na siê po³±czyæ z ,,%s'': %s\n" @@ -3877,11 +3877,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problem z porozumiewaniem siê z agentem\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problem z agentem - zostaje wy³±czony\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (podklucz %08lX)" @@ -3913,16 +3913,16 @@ msgid "invalid response from agent\n" msgstr "b³êdna odpowied¼ agenta\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "anulowano przez u¿ytkownika\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem agenta: zwróci³ 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3932,20 +3932,20 @@ "Musisz podaæ has³o aby odbezpieczyæ klucz prywatny u¿ytkownika:\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "d³ugo¶æ %u bitów, typ %s, numer %08lX, stworzony %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "pytanie o has³o nie dzia³a w trybie wsadowym\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Podaj has³o: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Powtórz has³o: " @@ -4012,41 +4012,41 @@ msgid "NOTE: key has been revoked" msgstr "UWAGA: klucz zosta³ uniewa¿niony" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "zapytanie o klucz %08lX w %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nie mo¿na pobraæ klucza z serwera: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "b³±d przy wysy³aniu do ,,%s'': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "wysy³anie do ,,%s'' powiod³o siê (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "wysy³anie do ,,%s'' nie powiod³o siê (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "ten serwer kluczy nie umo¿liwia przeszukiwania\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nie mo¿na przeszukaæ serwera: %s\n" @@ -4593,7 +4593,7 @@ "brak mo¿liwo¶ci generacji dobrego klucza dla szyfru symetrycznego;\n" "operacja by³a powtarzana %d razy!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" "Algorytm DSA wymaga u¿ycia algorytmu skrótu daj±cego 160-bitowy wynik.\n" @@ -4995,17 +4995,17 @@ msgid "No help available for `%s'" msgstr "Brak pomocy o ,,%s''" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "b³±d tworzenia zbioru kluczy `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "zbiór kluczy ,,%s'' zosta³ utworzony\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "nie powiod³a siê odbudowa bufora bazy: %s\n" Index: gnupg/po/pt.po diff -u gnupg/po/pt.po:1.6.2.18 gnupg/po/pt.po:1.6.2.19 --- gnupg/po/pt.po:1.6.2.18 Fri Aug 13 19:02:32 2004 +++ gnupg/po/pt.po Mon Dec 27 18:26:53 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -2121,26 +2121,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desactivado\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Utilizador não encontrado]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "há uma chave secreta para a chave pública \"%s\"!\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -3860,7 +3860,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "a versão %d do protocolo gpg-agent não é suportada\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível ligar a `%s': %s\n" @@ -3869,11 +3869,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problemas na comunicação com o gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problema com o agente - a desactivar a utilização deste\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -3907,16 +3907,16 @@ msgid "invalid response from agent\n" msgstr "resposta do agente inválida\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "cancelado pelo utilizador\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problema com o agente: o agente returnou 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3926,20 +3926,20 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "utilizador: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "impossível pedir senha em modo não-interactivo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -4005,41 +4005,41 @@ msgid "NOTE: key has been revoked" msgstr "NOTA: a chave foi revogada" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "a pedir a chave %08lX de %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "não consigo obter chave do servidor: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "erro ao enviar para `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "sucesso ao enviar para `%s' (estado=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "erro ao enviar para `%s': estado=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "a procurar por \"%s\" no servidor HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "não consigo procurar no servidor de chaves: %s\n" @@ -4586,7 +4586,7 @@ "impossível evitar chave fraca para criptografia simétrica;\n" "tentei %d vezes!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necessita de utilização de uma algoritmo de dispersão de 160 bit\n" @@ -4987,17 +4987,17 @@ msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponível para `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "erro ao criar porta-chaves `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "porta-chaves `%s' criado\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "falha ao criar 'cache' do porta-chaves: %s\n" Index: gnupg/po/pt_BR.po diff -u gnupg/po/pt_BR.po:1.43.2.18 gnupg/po/pt_BR.po:1.43.2.19 --- gnupg/po/pt_BR.po:1.43.2.18 Fri Aug 13 19:02:30 2004 +++ gnupg/po/pt_BR.po Mon Dec 27 18:26:53 2004 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -2182,27 +2182,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "entradas demais no cache pk - desativado\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 #, fuzzy msgid "[User id not found]" msgstr "[usuário não encontrado]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, fuzzy, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "há uma chave secreta para esta chave pública!\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" @@ -3931,7 +3931,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "algoritmo de proteção %d não é suportado\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, fuzzy, c-format msgid "can't connect to `%s': %s\n" msgstr "impossível abrir `%s': %s\n" @@ -3940,11 +3940,11 @@ msgid "communication problem with gpg-agent\n" msgstr "" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID principal da chave %08lX)" @@ -3980,16 +3980,16 @@ msgid "invalid response from agent\n" msgstr "" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3999,20 +3999,20 @@ "Você precisa de uma frase secreta para desbloquear a chave secreta do\n" "usuário: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "chave de %u-bit/%s, ID %08lX, criada em %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "impossível pedir senha em modo não-interativo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Digite a frase secreta: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repita a frase secreta: " @@ -4080,41 +4080,41 @@ msgid "NOTE: key has been revoked" msgstr "chave %08lX: a chave foi revogada!\n" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, fuzzy, c-format msgid "requesting key %08lX from %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, fuzzy, c-format msgid "can't get key from keyserver: %s\n" msgstr "impossível escrever para o chaveiro: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, fuzzy, c-format msgid "error sending to `%s': %s\n" msgstr "erro na leitura de `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, fuzzy, c-format msgid "can't search keyserver: %s\n" msgstr "impossível escrever para o chaveiro: %s\n" @@ -4652,7 +4652,7 @@ "impossível evitar chave fraca para criptografia simétrica;\n" "%d tentativas!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" @@ -4996,17 +4996,17 @@ msgid "No help available for `%s'" msgstr "Nenhuma ajuda disponível para `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, fuzzy, c-format msgid "error creating keyring `%s': %s\n" msgstr "erro na escrita do chaveiro `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, fuzzy, c-format msgid "keyring `%s' created\n" msgstr "%s: chaveiro criado\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, fuzzy, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "%s: falha ao criar tabela de \"hash\": %s\n" Index: gnupg/po/ro.po diff -u gnupg/po/ro.po:1.1.2.13 gnupg/po/ro.po:1.1.2.14 --- gnupg/po/ro.po:1.1.2.13 Fri Aug 13 19:02:28 2004 +++ gnupg/po/ro.po Mon Dec 27 18:26:53 2004 @@ -1,7 +1,7 @@ # Mesajele în limba românã pentru gnupg. # Copyright (C) 2003 Free Software Foundation, Inc. # Acest fiºier este distribuit sub aceeaºi licenþã ca ºi pachetul gnupg. -# Laurentiu Buzdugan , 2003. +# Laurentiu Buzdugan , 2003. # # # @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" -"PO-Revision-Date: 2004-06-17 12:00-0500\n" -"Last-Translator: Laurentiu Buzdugan \n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" +"PO-Revision-Date: 2003-05-11 12:00-0500\n" +"Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" @@ -77,7 +77,7 @@ #: util/errors.c:58 msgid "unknown digest algorithm" -msgstr "algoritm rezumat necunoscut" +msgstr "algoritm rezumat (digest) necunoscut" #: util/errors.c:59 msgid "bad public key" @@ -365,14 +365,14 @@ #: cipher/md.c:140 #, c-format msgid "digest algorithm `%s' is read-only in this release\n" -msgstr "algoritm rezumat `%s' este numai-citire în acestã ediþie\n" +msgstr "algoritm rezumat (digest) `%s' este numai-citire în acestã ediþie\n" #: cipher/md.c:147 #, c-format msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" msgstr "" -"AVERTISMENT: rezumatul `%s' nu este parte din OpenPGP. Folosiþi-l pe riscul " -"dvs.!\n" +"AVERTISMENT: rezumatul (digest) `%s' nu este parte din OpenPGP. Folosiþi-l " +"pe riscul dvs.!\n" #: cipher/rndegd.c:204 msgid "" @@ -550,7 +550,7 @@ #: g10/g10.c:381 msgid "|algo [files]|print message digests" -msgstr "|algo [fiºiere]|afiºeazã rezumate mesaje" +msgstr "|algo [fiºiere]|afiºeazã rezumate (digest) mesaje" #: g10/g10.c:385 g10/gpgv.c:64 msgid "" @@ -705,13 +705,13 @@ #: g10/g10.c:472 msgid "set all packet, cipher and digest options to OpenPGP behavior" msgstr "" -"seteazã toate opþiunile pentru pachete, cifru ºi rezumat ca pentru " +"seteazã toate opþiunile pentru pachete, cifru ºi rezumat (digest) ca pentru " "comportamentul OpenPGP" #: g10/g10.c:473 msgid "set all packet, cipher and digest options to PGP 2.x behavior" msgstr "" -"seteazã toate opþiunile pentru pachete, cifru ºi rezumat ca pentru " +"seteazã toate opþiunile pentru pachete, cifru ºi rezumat (digest) ca pentru " "comportamentul PGP 2.x" #: g10/g10.c:477 @@ -720,7 +720,8 @@ #: g10/g10.c:479 msgid "|NAME|use message digest algorithm NAME for passphrases" -msgstr "|NUME|foloseºte algoritm rezumat mesaj NUME pentru fraza-parolã" +msgstr "" +"|NUME|foloseºte algoritm rezumat (digest) mesaj NUME pentru fraza-parolã" #: g10/g10.c:481 msgid "|NAME|use cipher algorithm NAME for passphrases" @@ -732,7 +733,7 @@ #: g10/g10.c:484 msgid "|NAME|use message digest algorithm NAME" -msgstr "|NUME|foloseºte algoritm rezumat mesaj NUME" +msgstr "|NUME|foloseºte algoritm rezumat (digest) mesaj NUME" #: g10/g10.c:486 msgid "|N|use compress algorithm N" @@ -864,7 +865,7 @@ #: g10/g10.c:1224 #, c-format msgid "unknown configuration item \"%s\"\n" -msgstr "articol configurare necunoscut \"%s\"\n" +msgstr "articol de configurare necunoscut \"%s\"\n" #: g10/g10.c:1445 #, c-format @@ -976,11 +977,11 @@ #: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" -msgstr "algoritm rezumat selectat este invalid\n" +msgstr "algoritm rezumat (digest) selectat este invalid\n" #: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" -msgstr "algoritm rezumat certificare selectat este invalid\n" +msgstr "algoritm rezumat (digest) certificare selectat este invalid\n" #: g10/g10.c:2197 #, c-format @@ -1010,7 +1011,7 @@ #: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" -msgstr "min-cert-level invalid; trebuie sã fie 0, 1, 2 sau 3\n" +msgstr "min-cert-level invalid; trebuie sã fie 1, 2 sau 3\n" #: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" @@ -1030,7 +1031,7 @@ #: g10/g10.c:2238 msgid "invalid personal digest preferences\n" -msgstr "preferinþe rezumat personale invalide\n" +msgstr "preferinþe rezumat (digest) personale invalide\n" #: g10/g10.c:2242 msgid "invalid personal compress preferences\n" @@ -1039,7 +1040,7 @@ #: g10/g10.c:2272 #, c-format msgid "%s does not yet work with %s\n" -msgstr "%s nu merge încã cu %s!\n" +msgstr "%s nu merge încã cu %s\n" #: g10/g10.c:2316 #, c-format @@ -1049,7 +1050,8 @@ #: g10/g10.c:2321 #, c-format msgid "you may not use digest algorithm \"%s\" while in %s mode\n" -msgstr "nu puteþi folosi algorimul de rezumat \"%s\" câtã vreme în modul %s\n" +msgstr "" +"nu puteþi folosi algoritmul rezumat (digest) \"%s\" câtã vreme în modul %s\n" #: g10/g10.c:2326 #, c-format @@ -1132,27 +1134,27 @@ #: g10/g10.c:2683 #, c-format msgid "keyserver send failed: %s\n" -msgstr "trimitere server de chei eºuatã: %s\n" +msgstr "trimiterea la serverul de chei a eºuat: %s\n" #: g10/g10.c:2685 #, c-format msgid "keyserver receive failed: %s\n" -msgstr "recepþie server de chei eºuatã: %s\n" +msgstr "receptionarea de la serverul de chei a eºuat: %s\n" #: g10/g10.c:2687 #, c-format msgid "key export failed: %s\n" -msgstr "export cheie eºuat: %s\n" +msgstr "exportul cheii a eºuat: %s\n" #: g10/g10.c:2698 #, c-format msgid "keyserver search failed: %s\n" -msgstr "cãutare server de chei eºuatã: %s\n" +msgstr "cãutarea pe serverul de chei a eºuat: %s\n" #: g10/g10.c:2708 #, c-format msgid "keyserver refresh failed: %s\n" -msgstr "actualizare server de chei eºuatã: %s\n" +msgstr "actualizarea serverului de chei a eºuat: %s\n" #: g10/g10.c:2749 #, c-format @@ -1175,7 +1177,7 @@ #: g10/g10.c:2942 msgid "Go ahead and type your message ...\n" -msgstr "Daþi-i drumul ºi scrieþi mesajul ...\n" +msgstr "Daþi-i drumul ºi scriþi mesajul ...\n" #: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 @@ -1481,12 +1483,14 @@ #: g10/pkclist.c:602 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "" -"AVERTISMENT: aceastã cheie poate fi revocatã (cheia de revocare nu este " +"AVERTISMENT: aceastã cheie ar putea fi revocatã (cheia de revocare nu este " "prezentã)\n" #: g10/pkclist.c:611 msgid "WARNING: This key has been revoked by its designated revoker!\n" -msgstr "AVERTISMENT: Aceastã cheie a fost revocatã revocatorul desemnat!\n" +msgstr "" +"AVERTISMENT: Aceastã cheie a fost revocatã de cel desemnat cu aceastã " +"capacitate!\n" #: g10/pkclist.c:614 msgid "WARNING: This key has been revoked by its owner!\n" @@ -2036,7 +2040,7 @@ #: g10/encode.c:223 #, c-format msgid "using cipher %s\n" -msgstr "folosesc cifrul %s\n" +msgstr "este folosit cifrul %s\n" #: g10/encode.c:233 g10/encode.c:494 #, c-format @@ -2123,26 +2127,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "prea multe intrãri în cache-ul pk - deactivat\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[ID utilizator nu a fost gãsit]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Cheia invalidã %08lX fãcutã validã de --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "nici o subcheie secretã pentru subcheia publicã %08lX - ignoratã\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "folosim cheia secundarã %08lX în loc de cheia primarã %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "cheia %08lX: cheie secretã fãrã cheie publicã - sãritã\n" @@ -2684,7 +2688,7 @@ #: g10/keyedit.c:668 msgid "Your selection? (enter '?' for more information): " -msgstr "Selecþia dvs.? (introduceþi '?' pentru informaþii suplimentare): " +msgstr "Selecþia dvs.? (apasaþi '?' pentru informaþii suplimentare): " #: g10/keyedit.c:688 msgid "" @@ -3229,7 +3233,7 @@ #: g10/keyedit.c:1611 msgid "Digest: " -msgstr "Rezumat: " +msgstr "Rezumat (digest): " #: g10/keyedit.c:1663 msgid "Features: " @@ -3298,9 +3302,9 @@ "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" -"AVERTISMENT: nici un ID utilizator nu a fost marcat ca primar.\n" -" Aceastã comandã poate cauza ca un alt ID utilizator\n" -" sã devinã ID-ul utilizator primar presupus.\n" +"AVERTISMENT: nici un ID utilizator nu a fost desemnat ca primar. Aceastã\n" +" comandã poate face ca un alt ID utilizator sã devinã cel " +"primar.\n" #: g10/keyedit.c:2181 msgid "" @@ -3582,12 +3586,12 @@ #: g10/mainproc.c:262 #, c-format msgid "bad passphrase or unknown cipher algorithm (%d)\n" -msgstr "frazã=parolã greºitã sau algoritm cifrare necunoscut (%d)\n" +msgstr "fraza-parolã incorectã sau algoritm de cifrare necunoscut (%d)\n" #: g10/mainproc.c:299 #, c-format msgid "%s encrypted session key\n" -msgstr "%s cheie de sesiune cifratã\n" +msgstr "cheie de sesiune cifratã %s\n" #: g10/mainproc.c:301 g10/encr-data.c:66 #, c-format @@ -3600,9 +3604,9 @@ msgstr "cifrat cu un algoritm necunoscut %d\n" #: g10/mainproc.c:309 -#, fuzzy, c-format +#, c-format msgid "passphrase generated with unknown digest algorithm %d\n" -msgstr "cifrat cu un algoritm necunoscut %d\n" +msgstr "fraza-parolã generatã cu un algoritm rezumat (digest) necunoscut %d\n" #: g10/mainproc.c:358 #, c-format @@ -3631,11 +3635,11 @@ #: g10/mainproc.c:494 #, c-format msgid "encrypted with %lu passphrases\n" -msgstr "cifratã cu %lu fraze-parolã\n" +msgstr "cifrat(ã) cu %lu fraze-parolã\n" #: g10/mainproc.c:496 msgid "encrypted with 1 passphrase\n" -msgstr "cifratã cu 1 frazã-parolã\n" +msgstr "cifrat(ã) cu 1 fraza-parolã\n" #: g10/mainproc.c:512 g10/mainproc.c:531 #, c-format @@ -3696,7 +3700,7 @@ #: g10/mainproc.c:1352 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "Semnãturã fãcutã %.*s folosind cheia %s cu ID %08lX\n" +msgstr "Semnãtura a fãcut %.*s folosind cheia %s ID %08lX\n" #: g10/mainproc.c:1381 msgid "Key available at: " @@ -3731,7 +3735,7 @@ #: g10/mainproc.c:1574 #, c-format msgid "%s signature, digest algorithm %s\n" -msgstr "semnãturã %s, algoritm rezumat %s\n" +msgstr "semnãturã %s, algoritm rezumat (digest) %s\n" #: g10/mainproc.c:1575 msgid "binary" @@ -3815,7 +3819,7 @@ #: g10/misc.c:551 msgid "Uncompressed" -msgstr "Necompresat" +msgstr "Necompresat(ã)" #: g10/misc.c:629 #, c-format @@ -3830,7 +3834,7 @@ #: g10/parse-packet.c:688 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -"AVERTISMENT: cheie de sesiune cifratã simetric potenþial nesigurã " +"AVERTISMENT: cheie de sesiune cifratã simetric potential nesigurã " "(insecure)\n" #: g10/parse-packet.c:1106 @@ -3863,7 +3867,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent versiune protocol %d nu este suportat\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nu mã pot conecta la `%s': %s\n" @@ -3872,11 +3876,11 @@ msgid "communication problem with gpg-agent\n" msgstr "probleme de comunicare cu gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problemã cu agentul - deactivez folosirea agentului\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (ID cheie principalã %08lX)" @@ -3909,16 +3913,16 @@ msgid "invalid response from agent\n" msgstr "rãspuns invalid de la agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "anulatã de utilizator\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problemã cu agentul: agentul returneazã 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3928,20 +3932,20 @@ "Aveþi nevoie de o frazã-parolã pentru a descuia cheia\n" "secretã pentru utilizator: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "cheia %2$s de %1$u-biþi, ID %3$08lX, creatã %4$s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "nu pot cere parola în modul batch\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Introduceþi fraza-parolã: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Repetaþi fraza-parolã: " @@ -4008,41 +4012,41 @@ msgid "NOTE: key has been revoked" msgstr "NOTÃ: cheia a fost revocatã" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "cer cheia %08lX de la %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nu pot obþine cheia de la serverul de chei: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "eroare trimitere la `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "succes trimitere la `%s' (stare=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "a eºuat trimiterea la `%s': stare=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" -msgstr "acest sercer de chei nu suportã --search-keys\n" +msgstr "acest server de chei nu suportã --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "caut pentru \"%s\" de pe serverul HKP %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nu pot cãuta serverul de chei: %s\n" @@ -4057,9 +4061,9 @@ msgstr "algoritm de protecþie %d%s nu este suportat\n" #: g10/seckey-cert.c:70 -#, fuzzy, c-format +#, c-format msgid "protection digest %d is not supported\n" -msgstr "algoritm de protecþie %d%s nu este suportat\n" +msgstr "algoritm de rezumat (digest) %d nu este suportat\n" #: g10/seckey-cert.c:239 msgid "Invalid passphrase; please try again" @@ -4082,7 +4086,9 @@ #: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" -msgstr "AVERTISMENT: conflict pentru rezumat semnãturã în mesaj\n" +msgstr "" +"AVERTISMENT: conflict pentru rezumatul semnãturii (signature digest) în " +"mesaj\n" #: g10/sig-check.c:93 #, c-format @@ -4095,8 +4101,8 @@ #, c-format msgid "WARNING: signing subkey %08lX has an invalid cross-certification\n" msgstr "" -"AVERTISMENT: subcheia de semnare %08lX are un certificare-reciprocã invalidã " -"(invalid cross-certification)\n" +"AVERTISMENT: subcheia de semnare %08lX are o certificare recipricã (cross-" +"certification) invalidã\n" #: g10/sig-check.c:233 #, c-format @@ -4155,7 +4161,7 @@ #: g10/sig-check.c:640 #, c-format msgid "key %08lX: no subkey for subkey binding signature\n" -msgstr "cheia %08lX: nici o subcheie pentru semnare legatã de cheie\n" +msgstr "cheia %08lX: nici o subcheie pentru legarea semnãturii de subcheie\n" #: g10/sign.c:84 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" @@ -4216,7 +4222,8 @@ #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "" -"forþarea algoritmului rezumat %s (%d) violeazã preferinþele destinatarului\n" +"forþarea algoritmului rezumat (digest) %s (%d) violeazã preferinþele " +"destinatarului\n" #: g10/sign.c:804 msgid "signing:" @@ -4444,12 +4451,12 @@ #: g10/trustdb.c:1203 #, c-format msgid "signature from Elgamal signing key %08lX to %08lX skipped\n" -msgstr "semnãturã de la cheia de semnare Elgamal %08lX la %08lX sãritã\n" +msgstr "semnãturã de la cheie de semnare Elgamal %08lX pentru %08lX sãritã\n" #: g10/trustdb.c:1211 #, c-format msgid "signature from %08lX to Elgamal signing key %08lX skipped\n" -msgstr "semnãturã de la %08lX la cheia de semnare Elgamal %08lX sãritã\n" +msgstr "semnãturã de la %08lX pentru cheia de semnare Elgamal %08lX sãritã\n" #: g10/trustdb.c:1608 #, c-format @@ -4579,7 +4586,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "nu pot evita cheie slabã pentru cifru simetric; am încercat %d ori!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necesitã folosirea unui algoritm cu hash de 160 biþi\n" @@ -4987,17 +4994,17 @@ msgid "No help available for `%s'" msgstr "Nici un disponibil disponibil pentru `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "eroare la crearea inelului de chei `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "inelul de chei `%s' creat\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "am eºuat sã reconstruiesc cache-ul inelului de chei: %s\n" @@ -5300,3 +5307,27 @@ #, c-format msgid "read error: %s\n" msgstr "eroare citire: %s\n" + +#~ msgid " (%d) ElGamal (sign and encrypt)\n" +#~ msgstr " (%d) ElGamal (semnãturã ºi cifrare)\n" + +#~ msgid "" +#~ "The use of this algorithm is only supported by GnuPG. You will not be\n" +#~ "able to use this key to communicate with PGP users. This algorithm is " +#~ "also\n" +#~ "very slow, and may not be as secure as the other choices.\n" +#~ msgstr "" +#~ "Folosirea acestui algoritm este suportatã numai de GnuPG. Nu veþi putea\n" +#~ "folosi aceastã cheie pentru a comunica cu alþi utilizatori PGP. Mai " +#~ "mult,\n" +#~ "acest algoritm este foarte lent ºi ar putea fi mai puþin sigur decât\n" +#~ "celelalte opþiuni.\n" + +#~ msgid "Create anyway? " +#~ msgstr "Creaþi oricum? " + +#~ msgid "invalid symkey algorithm detected (%d)\n" +#~ msgstr "am detectat un algoritm symkey invalid (%d)\n" + +#~ msgid "this keyserver is not fully HKP compatible\n" +#~ msgstr "acest server de chei nu este în totalitate compatibil cu HKP\n" Index: gnupg/po/ru.po diff -u gnupg/po/ru.po:1.44.2.7 gnupg/po/ru.po:1.44.2.8 --- gnupg/po/ru.po:1.44.2.7 Fri Aug 13 19:02:27 2004 +++ gnupg/po/ru.po Mon Dec 27 18:26:53 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: GnuPG 1.2.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-12-23 19:24+0100\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -2095,27 +2095,27 @@ msgid "too many entries in pk cache - disabled\n" msgstr "Ñлишком много входов в pk кÑше - отключено\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[User ID Ðе найден]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "ÐедейÑтвительный ключ %08lX разрешен параметром --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "нет Ñекретного подключа Ð´Ð»Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ подключа %08lX - игнорирую\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "иÑпользуетÑÑ Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‡Ð½Ñ‹Ð¹ ключ %08lX вмеÑто главного %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "ключ %08lX: Ñекретный ключ без открытого - пропущен\n" @@ -3816,7 +3816,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "протокол gpg-agent верÑии %d не поддерживаетÑÑ\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "не могу подключитьÑÑ Ðº `%s': %s\n" @@ -3825,11 +3825,11 @@ msgid "communication problem with gpg-agent\n" msgstr "коммуникационный проблемы Ñ gpg-agent\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼ - иÑпользование агента отключено\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (главный идентификатор ключа %08lX)" @@ -3861,16 +3861,16 @@ msgid "invalid response from agent\n" msgstr "неверный ответ от агента\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "прервано пользователем\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "проблема Ñ Ð°Ð³ÐµÐ½Ñ‚Ð¾Ð¼: агент вернул 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3880,20 +3880,20 @@ "Ðеобходим пароль Ð´Ð»Ñ Ð´Ð¾Ñтупа к Ñекретному ключу пользователÑ:\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u-бит %s ключ, ID %08lX, Ñоздан %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "не могу получить пароль в пакетном режиме\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Введите пароль: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Повторите пароль: " @@ -3959,41 +3959,41 @@ msgid "NOTE: key has been revoked" msgstr "ЗÐМЕТЬТЕ: ключ был отозван" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ñ ÐºÐ»ÑŽÑ‡Ð° %08lX Ñ %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "не могу получить ключ Ñ Ñервера ключей: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "ошибка отправки на `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "уÑпешно отправлено на `%s' (ÑтатуÑ=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "Ñбой отправки на `%s': ÑтатуÑ=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "Данный Ñервер ключей не поддерживает --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "поиÑк \"%s\" на HKP Ñервере %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "не могу найти Ñервер ключей: %s\n" @@ -4524,7 +4524,7 @@ msgstr "" "невозможно избежать Ñлабого ключа Ð´Ð»Ñ Ñимметричного шифра; %d попыток!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA требует иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ 160 битной Ñ…Ñш-функции\n" @@ -4913,17 +4913,17 @@ msgid "No help available for `%s'" msgstr "Ðет Ñправки Ð´Ð»Ñ `%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ‹ ключей `%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "Ñоздана таблица ключей `%s'\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "Ñбой переÑтройки кÑша таблицы ключей: %s\n" Index: gnupg/po/sk.po diff -u gnupg/po/sk.po:1.1.2.15 gnupg/po/sk.po:1.1.2.16 --- gnupg/po/sk.po:1.1.2.15 Fri Aug 13 19:02:25 2004 +++ gnupg/po/sk.po Mon Dec 27 18:26:52 2004 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -2124,28 +2124,28 @@ msgid "too many entries in pk cache - disabled\n" msgstr "príli¹ veµa polo¾iek v bufferi verejných kµúèov - vypnuté\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[User id not found]" # c-format -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Neplatný kµúè %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "existuje tajný kµúè pre tento verejný kµúè %08lX!\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "pou¾ívam sekundárny kµúè %08lX namiesto primárneho kµúèa %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "kµúè %08lX: tajný kµúè bez verejného kµúèa - preskoèené\n" @@ -3865,7 +3865,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokol verzie %d nie je podporovaný\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "nemô¾em sa pripoji» k `%s': %s\n" @@ -3874,11 +3874,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problém v komunikácii s gpg-agentom\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "problém s agentom - pou¾ívanie agenta vypnuté\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (hlavné ID kµúèa %08lX)" @@ -3910,16 +3910,16 @@ msgid "invalid response from agent\n" msgstr "neplatná reakcia od agenta\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "zru¹ené u¾ívateµom\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problém s agentom: agent vracia 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3929,20 +3929,20 @@ "Musíte pozna» heslo, aby ste odomkli tajný kµúè pre\n" "u¾ívateµa: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "då¾ka %u bitov, typ %s, ID %08lX, vytvorený %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "v dávkovom re¾ime sa nemô¾em pýta» na heslo\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Vlo¾te heslo: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Opakujte heslo: " @@ -4008,41 +4008,41 @@ msgid "NOTE: key has been revoked" msgstr "POZNÁMKA: kµúè bol revokovaný" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "po¾adujem kµúè %08lX z %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "nemô¾em dosta» kµúè zo servera kµúèov: %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "chyba pri posielaní na `%s': %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "úspe¹né odoslanie na `%s' (status=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "zlyhalo posielanie na `%s': (status=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "tento server kµúèov nepodporuje --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "vyhµadávam \"%s\" na HKP serveri %s\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "nemô¾em prehµadáva» server kµúèov: %s\n" @@ -4582,7 +4582,7 @@ "nemô¾em sa vyvarova» slabého kµúèa pre symetrickú ¹ifru; operáciu som skúsil " "%d krát!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA po¾aduje pou¾itie 160 bitového hashovacieho algoritmu\n" @@ -4982,17 +4982,17 @@ msgid "No help available for `%s'" msgstr "Pomoc nie je dostupná pre '%s'" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "chyba pri vytváraní súboru kµúèov (keyring)`%s': %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "súbor kµúèov (keyring) `%s' vytvorený\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "zlyhalo obnovenie vyrovnávacej pamäti kµúèov: %s\n" Index: gnupg/po/sv.po diff -u gnupg/po/sv.po:1.11.2.19 gnupg/po/sv.po:1.11.2.20 --- gnupg/po/sv.po:1.11.2.19 Fri Oct 15 10:16:42 2004 +++ gnupg/po/sv.po Mon Dec 27 18:26:50 2004 @@ -1,5 +1,5 @@ # Swedish messages for gnupg -# Copyright (C) 1999 Free Software Foundation, Inc. +# Copyright (C) 1999, 2004 Free Software Foundation, Inc. # # Per Tunedal , 2004 # @@ -10,24 +10,22 @@ # where corrected. The translations were checked for # consistency and some expressions where given new # translations. -# -# 2004, September 20: First Preliminary new translation. -# This translation will be revised and corrected -# during October 2004. +# 2004/12/01 Per Tunedal # =================================================== # # First translator Daniel Resare , 1999-2002, # who sends his thanks to André Dahlqvist # and to his wife Olivia . # -# $Id: sv.po,v 1.11.2.19 2004/10/15 08:16:42 werner Exp $ +# $Id: sv.po,v 1.11.2.20 2004/12/27 17:26:50 wk Exp $ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.2.1\n" -"POT-Creation-Date: 2004-08-25 16:59+0200\n" -"PO-Revision-Date: 2004-09-20 22:12+0100\n" -"Last-Translator: Per Tunedal \n" +"Project-Id-Version: gnupg 1.2.6\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" +"PO-Revision-Date: 2004-12-01 17:49+0100\n" +"Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -49,28 +47,23 @@ msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha använt fel program för denna uppgift)\n" -#: util/miscutil.c:307 -#: util/miscutil.c:344 +#: util/miscutil.c:307 util/miscutil.c:344 msgid "yes" msgstr "ja" -#: util/miscutil.c:308 -#: util/miscutil.c:349 +#: util/miscutil.c:308 util/miscutil.c:349 msgid "yY" msgstr "jJ" -#: util/miscutil.c:310 -#: util/miscutil.c:346 +#: util/miscutil.c:310 util/miscutil.c:346 msgid "no" msgstr "nej" -#: util/miscutil.c:311 -#: util/miscutil.c:350 +#: util/miscutil.c:311 util/miscutil.c:350 msgid "nN" msgstr "nN" -#: util/miscutil.c:348 -#: g10/keyedit.c:996 +#: util/miscutil.c:348 g10/keyedit.c:996 msgid "quit" msgstr "avsluta" @@ -180,7 +173,7 @@ #: util/errors.c:79 msgid "invalid passphrase" -msgstr "felaktig lösenmening" +msgstr "fel lösenmening" #: util/errors.c:80 msgid "unimplemented pubkey algorithm" @@ -301,9 +294,7 @@ msgid "no entropy gathering module detected\n" msgstr "ingen demon för entropisamling hittad\n" -#: cipher/random.c:387 -#: g10/keygen.c:1931 -#: g10/import.c:163 +#: cipher/random.c:387 g10/keygen.c:1931 g10/import.c:163 #, c-format msgid "can't open `%s': %s\n" msgstr "kan inte öppna \"%s\": %s\n" @@ -320,11 +311,11 @@ #: cipher/random.c:401 msgid "note: random_seed file is empty\n" -msgstr "notera: filen random_seed är tom\n" +msgstr "Obs: filen random_seed är tom\n" #: cipher/random.c:407 msgid "WARNING: invalid size of random_seed file - not used\n" -msgstr "varning: slumpkärnan har en felaktig storlek och används därför inte\n" +msgstr "VARNING: slumpkärnan har en felaktig storlek och används därför inte\n" #: cipher/random.c:415 #, c-format @@ -333,10 +324,9 @@ #: cipher/random.c:453 msgid "note: random_seed file not updated\n" -msgstr "notera: random_seed uppdaterades inte\n" +msgstr "Obs: random_seed uppdaterades inte\n" -#: cipher/random.c:473 -#: g10/exec.c:481 +#: cipher/random.c:473 g10/exec.c:481 #, c-format msgid "can't create `%s': %s\n" msgstr "kan inte skapa \"%s\": %s\n" @@ -390,7 +380,8 @@ #: cipher/md.c:147 #, c-format msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n" -msgstr "VARNING: sammandraget `%s' ingÃ¥r inte i OpenPGP. Användes pÃ¥ din egen risk!\n" +msgstr "" +"VARNING: sammandraget `%s' ingÃ¥r inte i OpenPGP. Användes pÃ¥ din egen risk!\n" #: cipher/rndegd.c:204 msgid "" @@ -405,7 +396,7 @@ #: cipher/primegen.c:310 #, c-format msgid "can't generate a prime with less than %d bits\n" -msgstr "kan inte skapa ett primtal med mindre än %d bits\n" +msgstr "kan inte skapa ett primtal med mindre än %d bitar\n" #: g10/g10.c:322 msgid "" @@ -425,7 +416,7 @@ #: g10/g10.c:326 msgid "make a detached signature" -msgstr "skapa en signatur i en separat fil" +msgstr "skapa signatur i en separat fil" #: g10/g10.c:327 msgid "encrypt data" @@ -437,15 +428,16 @@ #: g10/g10.c:330 msgid "encryption only with symmetric cipher" -msgstr "endast symetrisk kryptering" +msgstr "endast symmetrisk kryptering" #: g10/g10.c:331 msgid "store only" msgstr "endast lagring" +# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas. #: g10/g10.c:332 msgid "decrypt data (default)" -msgstr "dekryptera data (normalläge)" +msgstr "dekryptera data (standard)" #: g10/g10.c:333 msgid "|[files]|decrypt files" @@ -457,11 +449,11 @@ #: g10/g10.c:336 msgid "list keys" -msgstr "räkna upp nycklar" +msgstr "visa en lista pÃ¥ nycklar" #: g10/g10.c:338 msgid "list keys and signatures" -msgstr "räkna upp nycklar och signaturer" +msgstr "visa en lista pÃ¥ nycklar och signaturer" #: g10/g10.c:339 msgid "check key signatures" @@ -469,11 +461,11 @@ #: g10/g10.c:340 msgid "list keys and fingerprints" -msgstr "räkna upp nycklar och fingeravtryck" +msgstr "visa en lista pÃ¥ nycklar och fingeravtryck" #: g10/g10.c:341 msgid "list secret keys" -msgstr "räkna upp hemliga nycklar" +msgstr "visa en lista pÃ¥ hemliga nycklar" #: g10/g10.c:342 msgid "generate a new key pair" @@ -537,7 +529,7 @@ #: g10/g10.c:367 msgid "list only the sequence of packets" -msgstr "skriv endast ut paketsekvensen" +msgstr "visa endast paketsekvensen" #: g10/g10.c:369 msgid "export the ownertrust values" @@ -571,8 +563,8 @@ msgid "|algo [files]|print message digests" msgstr "|algo [filer]|skriv ut kontrollsummor" -#: g10/g10.c:385 -#: g10/gpgv.c:64 +# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil. +#: g10/g10.c:385 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -592,11 +584,11 @@ #: g10/g10.c:392 msgid "|NAME|use NAME as default recipient" -msgstr "|NAMN|använd NAMN som standardvärdet för mottagare" +msgstr "|NAMN|använd NAMN som förvald mottagare" #: g10/g10.c:394 msgid "use the default key as default recipient" -msgstr "använd standardnyckeln som standardmottagare" +msgstr "använd standardnyckeln som förvald mottagare" #: g10/g10.c:400 msgid "use this user-id to sign or decrypt" @@ -604,7 +596,7 @@ #: g10/g10.c:401 msgid "|N|set compress level N (0 disables)" -msgstr "|N|sätt kompressionsnivÃ¥n till N (0 för att slÃ¥ av kompression)" +msgstr "|N|sätt kompressionsnivÃ¥n till N (0 för att stänga av kompression)" #: g10/g10.c:404 msgid "use canonical text mode" @@ -614,13 +606,11 @@ msgid "use as output file" msgstr "använd som fil för utdata" -#: g10/g10.c:416 -#: g10/gpgv.c:66 +#: g10/g10.c:416 g10/gpgv.c:66 msgid "verbose" msgstr "utförlig" -#: g10/g10.c:417 -#: g10/gpgv.c:67 +#: g10/g10.c:417 g10/gpgv.c:67 msgid "be somewhat more quiet" msgstr "var nÃ¥got tystare" @@ -628,29 +618,35 @@ msgid "don't use the terminal at all" msgstr "använd inte terminalen alls" +# AlltsÃ¥ även för V4-nycklar. För att vara PGP-kompatibel. #: g10/g10.c:419 msgid "force v3 signatures" -msgstr "använd v3-signaturer" +msgstr "använd alltid v3-signaturer" +# motsatsen översatt med: +# använd alltid v3-signaturer #: g10/g10.c:420 msgid "do not force v3 signatures" -msgstr "använd inte v3-signaturer" +msgstr "genomdriv inte användning av v3-signaturer" #: g10/g10.c:421 msgid "force v4 key signatures" -msgstr "använd v4-nyckelsignaturer" +msgstr "använd alltid v4-nyckelsignaturer" #: g10/g10.c:422 msgid "do not force v4 key signatures" -msgstr "använd inte v4-nyckelsignaturer" +msgstr "genomdriv inte användning av v4-nyckelsignaturer" +# Framtvingar användning av mdc även vid äldre chiffer. Ej kompatibelt med pgp. +# Cast-5 används som standard vid symmetrisk kryptering. Detta kommando integritetskyddar dÃ¥ den krypterade filen. Onödigt om nyare chiffer angivits med --personal-cipher-preferences #: g10/g10.c:423 msgid "always use a MDC for encryption" -msgstr "använd alltid en MDC för kryptering" +msgstr "använd alltid en MDC vid kryptering" +# mdc är standard för de nyare algoritmerna AES, TWOFISH #: g10/g10.c:425 msgid "never use a MDC for encryption" -msgstr "använd aldrig en MDC för kryptering" +msgstr "använd aldrig en MDC vid kryptering" #: g10/g10.c:427 msgid "do not make any changes" @@ -679,7 +675,7 @@ #: g10/g10.c:435 msgid "add this keyring to the list of keyrings" -msgstr "lägg till denna nyckelring till listan av nyckelringar" +msgstr "lägg till denna nyckelring till listan över nyckelringar" #: g10/g10.c:436 msgid "add this secret keyring to the list" @@ -703,10 +699,9 @@ #: g10/g10.c:445 msgid "read options from file" -msgstr "läs flaggor frÃ¥n fil" +msgstr "läs inställningar frÃ¥n fil" -#: g10/g10.c:449 -#: g10/gpgv.c:71 +#: g10/g10.c:449 g10/gpgv.c:71 msgid "|FD|write status info to this FD" msgstr "|FD|skriv statusinformation till denna FD" @@ -728,11 +723,15 @@ #: g10/g10.c:472 msgid "set all packet, cipher and digest options to OpenPGP behavior" -msgstr "ändra inställningarna för paket, kryptering och kontrollsumma sÃ¥ att gpg följer OpenPGP-standarden" +msgstr "" +"ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma sÃ¥ " +"att gpg följer OpenPGP-standarden" #: g10/g10.c:473 msgid "set all packet, cipher and digest options to PGP 2.x behavior" -msgstr "ändra inställningarna för paket, kryptering och kontrollsumma sÃ¥ att gpg härmar PGP 2.x-beteende" +msgstr "" +"ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma sÃ¥ " +"att gpg härmar PGP 2.x-beteende" #: g10/g10.c:477 msgid "|N|use passphrase mode N" @@ -764,16 +763,19 @@ #: g10/g10.c:489 msgid "Show Photo IDs" -msgstr "Visa fotoidentifikation" +msgstr "Visa foto-ID:n" #: g10/g10.c:490 msgid "Don't show Photo IDs" -msgstr "Visa inte fotoidentifikation" +msgstr "Visa inte foto-ID:n" +# Här anges alltsÃ¥ med vilket program som ska visa foto-ID:n #: g10/g10.c:491 msgid "Set command line to view Photo IDs" -msgstr "Sätt komandoraden för att visa fotoientifikation" +msgstr "Ange kommandoraden för att visa foto-ID:n" +# inställningar istället för flaggor? +# Nej, här är det bruksanvisningen för kommandoraden. #: g10/g10.c:498 msgid "" "@\n" @@ -798,12 +800,11 @@ "\n" "-se -r Bo [fil] signera och kryptera för användaren Bo\n" "--clearsign [fil] skapa en klartextsignatur\n" -"--detach-sign [fil] skapa en signatur i en separat fil\n" +"--detach-sign [fil] skapa signatur i en separat fil\n" "--list-keys [namn] visa nycklar\n" "--fingerprint [namn] visa fingeravtryck\n" -#: g10/g10.c:667 -#: g10/gpgv.c:95 +#: g10/g10.c:667 g10/gpgv.c:95 msgid "Please report bugs to .\n" msgstr "" "Rapportera gärna fel till .\n" @@ -813,6 +814,7 @@ msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)" +# Om inget kommando anges (decrypt/encrypt etc) väljs Ã¥tgärd efter indata. #: g10/g10.c:687 msgid "" "Syntax: gpg [options] [files]\n" @@ -833,21 +835,19 @@ #: g10/g10.c:701 msgid "Pubkey: " -msgstr "öppen nyckel:" +msgstr "öppen nyckel: " -#: g10/g10.c:707 -#: g10/keyedit.c:1588 +#: g10/g10.c:707 g10/keyedit.c:1588 msgid "Cipher: " -msgstr "Chiffer" +msgstr "Chiffer: " #: g10/g10.c:713 msgid "Hash: " msgstr "Kontrollsumma: " -#: g10/g10.c:719 -#: g10/keyedit.c:1634 +#: g10/g10.c:719 g10/keyedit.c:1634 msgid "Compression: " -msgstr "Komprimering:" +msgstr "Komprimering: " #: g10/g10.c:802 msgid "usage: gpg [options] " @@ -891,7 +891,7 @@ #: g10/g10.c:1445 #, c-format msgid "NOTE: old default options file `%s' ignored\n" -msgstr "OBS: inställningsfilen \"%s\" används inte\n" +msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n" #: g10/g10.c:1481 #, c-format @@ -906,7 +906,7 @@ #: g10/g10.c:1492 #, c-format msgid "reading options from `%s'\n" -msgstr "läser flaggor frÃ¥n \"%s\"\n" +msgstr "läser inställningar frÃ¥n \"%s\"\n" #: g10/g10.c:1701 #, c-format @@ -925,26 +925,27 @@ #: g10/g10.c:1863 #, c-format msgid "%s:%d: invalid import options\n" -msgstr "%s: felaktiga importalternativ %d\n" +msgstr "%s: felaktiga importinställningar %d\n" #: g10/g10.c:1866 msgid "invalid import options\n" -msgstr "felaktiga importalternativ\n" +msgstr "felaktiga importinställningar\n" #: g10/g10.c:1873 #, c-format msgid "%s:%d: invalid export options\n" -msgstr "%s: felaktiga exportalternativ %d\n" +msgstr "%s: felaktiga exportinställningar %d\n" #: g10/g10.c:1876 msgid "invalid export options\n" -msgstr "felaktiga exportalternativ\n" +msgstr "felaktiga exportinställningar\n" #: g10/g10.c:1882 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunde inte sätta exec-sökvägen till %s\n" +# Programmet skapar en avbildning (image) av minnet för att lättare kunna spÃ¥ra fel. #: g10/g10.c:2040 msgid "WARNING: program may create a core file!\n" msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n" @@ -954,8 +955,7 @@ msgid "WARNING: %s overrides %s\n" msgstr "VARNING: %s gäller istället för %s\n" -#: g10/g10.c:2051 -#: g10/g10.c:2062 +#: g10/g10.c:2051 g10/g10.c:2062 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "OBS: %s är inte för normal användning!\n" @@ -978,29 +978,29 @@ #: g10/g10.c:2083 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" -msgstr "du kan inte bÃ¥de signera och kryptera samtidigt tillsammans med --pgp2\n" +msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n" #: g10/g10.c:2089 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" -msgstr "du mÃ¥ste använda filer (och inte rör) tillsammans med --pgp2\n" +msgstr "du mÃ¥ste använda filer (och inte rör) i --pgp2-läge\n" +# IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard. #: g10/g10.c:2102 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" -msgstr "för att kryptera meddelanden med --pgp2 krävs IDEA-insticksprogrammet\n" +msgstr "" +"för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n" -#: g10/g10.c:2169 -#: g10/g10.c:2187 +#: g10/g10.c:2169 g10/g10.c:2187 msgid "selected cipher algorithm is invalid\n" -msgstr "den valda krypteringsalgoritmen är ogiltig\n" +msgstr "den valda krypteringsalgoritmen är felaktig\n" -#: g10/g10.c:2175 -#: g10/g10.c:2193 +#: g10/g10.c:2175 g10/g10.c:2193 msgid "selected digest algorithm is invalid\n" -msgstr "den valda kontrollsummealgoritmen är ogiltig\n" +msgstr "den valda kontrollsummealgoritmen är felaktig\n" #: g10/g10.c:2181 msgid "selected certification digest algorithm is invalid\n" -msgstr "den valda kontrollsummealgoritmen är ogiltig\n" +msgstr "den valda kontrollsummealgoritmen är felaktig\n" #: g10/g10.c:2197 #, c-format @@ -1012,60 +1012,58 @@ msgid "compress algorithm must be in range %d..%d\n" msgstr "kompressionsalgoritmen mÃ¥ste vara i intervallet %d..%d\n" -# jag bedömer att detta och de följande är interna felmeddelanden -# som det är i princip omöjligt att översätta pÃ¥ pÃ¥ ett bra sätt. -# Sannolikheten för att användaren drabbas av felmeddelandet -# är ändÃ¥ litet. Eventuellt borde meddelandena inte alls -# översättas för att göra eventuell felsökning lättare -# för internationella felsökare +# antalet betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. #: g10/g10.c:2203 msgid "completes-needed must be greater than 0\n" msgstr "variabeln \"completes-needed\" mÃ¥ste ha ett värde som är större än 0\n" +# antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita pÃ¥ en nyckel du inte själv verifierat. #: g10/g10.c:2205 msgid "marginals-needed must be greater than 1\n" msgstr "variabeln \"marginals-needed\" mÃ¥ste vara större än 1\n" +# Hur djupt GnuPG ska leta i Web-of-trust. #: g10/g10.c:2207 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "variabeln \"max-cert-depth\" mÃ¥ste ha ett värde mellan 1 och 255\n" -# cert-level? Vad är det? -# inte testnivÃ¥ i alla fall! -# Kanske är det nivÃ¥n för hur lÃ¥ng förtroendekedjan fÃ¥r vara? +# Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. #: g10/g10.c:2209 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" -msgstr "ogiltigt standardvärde för certifikatnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" +msgstr "" +"felaktigt standardvärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" -# testnivÃ¥!? Vad är detta??? -# längd pÃ¥ förtroendekedjan? +# Det är nivÃ¥n för hurväl du har kontrollerat att nyckeln tillhör innehavaren. #: g10/g10.c:2211 msgid "invalid min-cert-level; must be 1, 2, or 3\n" -msgstr "ogiltigt minimivärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" +msgstr "" +"felaktigt minimivärde för certifieringsnivÃ¥n; mÃ¥ste vara 0, 1, 2 eller 3\n" +# S2K har med krypteringen av hemliga nyckeln att göra #: g10/g10.c:2214 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n" #: g10/g10.c:2218 msgid "invalid S2K mode; must be 0, 1 or 3\n" -msgstr "ogiltigt S2K-läge; mÃ¥ste vara 0, 1 eller 3\n" +msgstr "felaktigt S2K-läge; mÃ¥ste vara 0, 1 eller 3\n" #: g10/g10.c:2225 msgid "invalid default preferences\n" -msgstr "ogiltiga standardinställningar\n" +msgstr "felaktiga standardinställningar\n" +# Du kan ange de algoritmer du föredrar i prioritetsordning. DÃ¥ avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel). #: g10/g10.c:2234 msgid "invalid personal cipher preferences\n" -msgstr "felaktiga inställningar av krypteringsalgoritm\n" +msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n" #: g10/g10.c:2238 msgid "invalid personal digest preferences\n" -msgstr "felaktiga inställningar av checksummealgoritm\n" +msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n" #: g10/g10.c:2242 msgid "invalid personal compress preferences\n" -msgstr "felaktiga inställningar av kompressionsalgoritm\n" +msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n" #: g10/g10.c:2272 #, c-format @@ -1085,7 +1083,8 @@ #: g10/g10.c:2326 #, c-format msgid "you may not use compression algorithm \"%s\" while in %s mode\n" -msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n" +msgstr "" +"du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n" #: g10/g10.c:2418 #, c-format @@ -1094,7 +1093,8 @@ #: g10/g10.c:2429 msgid "WARNING: recipients (-r) given without using public key encryption\n" -msgstr "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n" +msgstr "" +"VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n" #: g10/g10.c:2440 msgid "--store [filename]" @@ -1150,9 +1150,7 @@ # Filnamn bÃ¥de med och utan fnuttar finns. lite ologiskt. Vill nÃ¥gon # fixa en patch? -#: g10/g10.c:2631 -#: g10/encode.c:423 -#: g10/sign.c:809 +#: g10/g10.c:2631 g10/encode.c:423 g10/sign.c:809 #, c-format msgid "can't open %s: %s\n" msgstr "kan inte öppna %s: %s\n" @@ -1189,12 +1187,12 @@ #: g10/g10.c:2749 #, c-format msgid "dearmoring failed: %s\n" -msgstr "misslyckades med att ta bort skalet: %s\n" +msgstr "misslyckades med att ta bort ASCII-skalet: %s\n" #: g10/g10.c:2757 #, c-format msgid "enarmoring failed: %s\n" -msgstr "misslyckades med att skapa skal: %s\n" +msgstr "misslyckades med att skapa ASCII-skal: %s\n" #: g10/g10.c:2844 #, c-format @@ -1210,25 +1208,26 @@ msgstr "Skriv ditt meddelande här ...\n" # se förra kommentaren -#: g10/g10.c:2945 -#: g10/decrypt.c:62 -#: g10/decrypt.c:145 -#: g10/verify.c:95 +#: g10/g10.c:2945 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "kan inte öppna \"%s\"\n" #: g10/g10.c:3218 -msgid "a notation name must have only printable characters or spaces, and end with an '='\n" +msgid "" +"a notation name must have only printable characters or spaces, and end with " +"an '='\n" msgstr "" "ett notationsnamn kan bara innehÃ¥lla bokstäver, siffror, punkter eller\n" "understrykningstecken och sluta med ett likhetstecken\n" -# user notation namme?? +# user notation name?? +# Werner: +# That is an OpenPGP notation name not registered with IANA. #: g10/g10.c:3227 msgid "a user notation name must contain the '@' character\n" -msgstr "ett användarnoteringsnamn mÃ¥ste innehÃ¥lla '@'-tecknetr\n" +msgstr "ett användarnoteringsnamn mÃ¥ste innehÃ¥lla '@'-tecknet\n" #: g10/g10.c:3237 msgid "a notation value must not use any control characters\n" @@ -1236,20 +1235,22 @@ #: g10/g10.c:3272 msgid "the given certification policy URL is invalid\n" -msgstr "den angivna URL som beskriver certifikationspolicy är ogiltig\n" +msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n" #: g10/g10.c:3274 msgid "the given signature policy URL is invalid\n" -msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n" +msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n" #: g10/gpgv.c:68 msgid "take the keys from this keyring" msgstr "ta nycklarna frÃ¥n denna nyckelring " -# vad menas? +# Med detta kommando ger gnupg enbart en varning när ett meddelande är tidsstämplat i framtiden. Annars avslutas gnupg med ett felmeddelande. +# Kommandot är avsett att användas i "near online system". +# Krav frÃ¥n RIPE. #: g10/gpgv.c:70 msgid "make timestamp conflicts only a warning" -msgstr "konflikter vid utförande av tidsstämpling enbart en varning" +msgstr "utfärda enbart en varning när tidsstämpeln är orimlig" #: g10/gpgv.c:99 msgid "Usage: gpgv [options] [files] (-h for help)" @@ -1266,15 +1267,15 @@ #: g10/armor.c:321 #, c-format msgid "armor: %s\n" -msgstr "skal: %s\n" +msgstr "ASCII-skal: %s\n" #: g10/armor.c:350 msgid "invalid armor header: " -msgstr "felaktig rubrikrad i skalet: " +msgstr "felaktig rubrikrad i ASCII-skalet: " #: g10/armor.c:357 msgid "armor header: " -msgstr "rad i skalet: " +msgstr "rad i ASCII-skalet: " #: g10/armor.c:368 msgid "invalid clearsig header\n" @@ -1284,21 +1285,22 @@ msgid "nested clear text signatures\n" msgstr "flera klartextsignaturer gÃ¥r in i varandra\n" +# rader i klartexten som inleds med bindestreck fÃ¥r ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..." #: g10/armor.c:544 msgid "invalid dash escaped line: " -msgstr "felaktig bindestreck-kodad rad: " +msgstr "felaktig rad som börjar med bindestreck: " #: g10/armor.c:556 msgid "unexpected armor:" -msgstr "oväntat skal:" +msgstr "oväntat ASCII-skal:" # överhoppad eller hoppades över? -#: g10/armor.c:682 -#: g10/armor.c:1258 +#: g10/armor.c:682 g10/armor.c:1258 #, c-format msgid "invalid radix64 character %02x skipped\n" -msgstr "hoppade över ogiltigt radix64-tecken %02x \n" +msgstr "hoppade över felaktigt radix64-tecken %02x \n" +# CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten. #: g10/armor.c:725 msgid "premature eof (no CRC)\n" msgstr "för tidigt filslut (ingen CRC-summa)\n" @@ -1311,8 +1313,7 @@ msgid "malformed CRC\n" msgstr "felformaterad CRC-summa\n" -#: g10/armor.c:767 -#: g10/armor.c:1295 +#: g10/armor.c:767 g10/armor.c:1295 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "CRC-fel; %06lx - %06lx\n" @@ -1332,48 +1333,45 @@ #: g10/armor.c:1078 #, c-format msgid "invalid armor: line longer than %d characters\n" -msgstr "felaktigt asciiI-skal: raden är längre än %d tecken\n" +msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n" #: g10/armor.c:1082 -msgid "quoted printable character in armor - probably a buggy MTA has been used\n" +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" "tecken kodade enligt \"quoted printable\"-standarden funna i skalet - detta\n" -"beror sannolikt pÃ¥ att en felaktig epostserver eller epostklient har använts\n" +"beror sannolikt pÃ¥ att en felaktig e-postserver eller e-postklient har " +"använts\n" -#: g10/pkclist.c:63 -#: g10/revoke.c:603 +#: g10/pkclist.c:63 g10/revoke.c:603 msgid "No reason specified" msgstr "Ingen anledning har angivits" # tveksam översättning. funderar pÃ¥ "ersatt av nÃ¥got bättre" men det -# känns inte heller bra -#: g10/pkclist.c:65 -#: g10/revoke.c:605 +# känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla. +#: g10/pkclist.c:65 g10/revoke.c:605 msgid "Key is superseded" msgstr "Nyckeln är ersatt" -#: g10/pkclist.c:67 -#: g10/revoke.c:604 +#: g10/pkclist.c:67 g10/revoke.c:604 msgid "Key has been compromised" msgstr "Nyckeln har tappat sin säkerhet" -#: g10/pkclist.c:69 -#: g10/revoke.c:606 +#: g10/pkclist.c:69 g10/revoke.c:606 msgid "Key is no longer used" msgstr "Nyckeln används inte längre" -#: g10/pkclist.c:71 -#: g10/revoke.c:607 +#: g10/pkclist.c:71 g10/revoke.c:607 msgid "User ID is no longer valid" msgstr "Användaridentiteten är inte längre giltig" #: g10/pkclist.c:75 msgid "reason for revocation: " -msgstr "Anledning till spärren: " +msgstr "anledning till spärren: " #: g10/pkclist.c:92 msgid "revocation comment: " -msgstr "Spärrkommentar: " +msgstr "spärrkommentar: " # ej kristallklart vad förkortningarna stÃ¥r för #: g10/pkclist.c:254 @@ -1389,8 +1387,7 @@ "Inget tillitsvärde tilldelat till:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:290 -#: g10/mainproc.c:1503 +#: g10/pkclist.c:290 g10/mainproc.c:1503 msgid " aka \"" msgstr " även känd som \"" @@ -1420,7 +1417,7 @@ #: g10/pkclist.c:307 #, c-format msgid " %d = I trust marginally\n" -msgstr " %d = Jag litar maginellt pÃ¥ denna användare\n" +msgstr " %d = Jag litar marginellt pÃ¥ denna användare\n" #: g10/pkclist.c:308 #, c-format @@ -1444,13 +1441,11 @@ msgid " s = skip this key\n" msgstr " s = hoppa över denna nyckel\n" -# q skall bytas ut mot a sÃ¥fort det kollas upp sÃ¥ att q ocksÃ¥ funkar. #: g10/pkclist.c:320 msgid " q = quit\n" -msgstr " q = avsluta\n" +msgstr "a = avsluta\n" -#: g10/pkclist.c:327 -#: g10/revoke.c:632 +#: g10/pkclist.c:327 g10/revoke.c:632 msgid "Your decision? " msgstr "Vad väljer du? " @@ -1467,9 +1462,7 @@ msgid "key %08lX: key has been revoked!\n" msgstr "nyckeln %08lX: nyckeln har spärrats!\n" -#: g10/pkclist.c:444 -#: g10/pkclist.c:456 -#: g10/pkclist.c:556 +#: g10/pkclist.c:444 g10/pkclist.c:456 g10/pkclist.c:556 msgid "Use this key anyway? " msgstr "Vill du använda nyckeln trots det? " @@ -1481,12 +1474,15 @@ #: g10/pkclist.c:470 #, c-format msgid "%08lX: key has expired\n" -msgstr "%08lX: nyckeln har blivit för gammal\n" +msgstr "%08lX:giltighetstiden har gÃ¥tt ut för nyckeln\n" #: g10/pkclist.c:480 #, c-format -msgid "%08lX: There is no indication that this key really belongs to the owner\n" -msgstr "%08lX: Det finns inget som indikerar att signaturen verkligen tillhör ägaren.\n" +msgid "" +"%08lX: There is no indication that this key really belongs to the owner\n" +msgstr "" +"%08lX: Det finns inget som tyder pÃ¥ att signaturen verkligen tillhör " +"ägaren.\n" #: g10/pkclist.c:486 #, c-format @@ -1521,8 +1517,7 @@ "*verkligen* vet vad du gör, kan du svara ja pÃ¥ nästa frÃ¥ga\n" "\n" -#: g10/pkclist.c:565 -#: g10/pkclist.c:595 +#: g10/pkclist.c:565 g10/pkclist.c:595 msgid "WARNING: Using untrusted key!\n" msgstr "VARNING: Använder en nyckel som inte är betrodd!\n" @@ -1532,7 +1527,7 @@ #: g10/pkclist.c:611 msgid "WARNING: This key has been revoked by its designated revoker!\n" -msgstr "VARNING: Denna nyckel har spärrats av sin spärrnyckel!\n" +msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n" #: g10/pkclist.c:614 msgid "WARNING: This key has been revoked by its owner!\n" @@ -1548,19 +1543,21 @@ #: g10/pkclist.c:626 msgid "Note: This key has been disabled.\n" -msgstr "Notera: Denna nyckel har deaktiverats.\n" +msgstr "Obs: Denna nyckel har stängts av.\n" #: g10/pkclist.c:631 msgid "Note: This key has expired!\n" -msgstr "Notera: Denna nyckel har gÃ¥tt ut!\n" +msgstr "Obs: Giltighetstiden för denna nyckel har gÃ¥tt ut!\n" #: g10/pkclist.c:642 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "VARNING: Denna nyckel är inte certifierad med en pÃ¥litlig signatur!\n" #: g10/pkclist.c:644 -msgid " There is no indication that the signature belongs to the owner.\n" -msgstr " Det finns inget som indikerar att signaturen tillhör ägaren.\n" +msgid "" +" There is no indication that the signature belongs to the owner.\n" +msgstr "" +" Det finns inget som indikerar att signaturen tillhör ägaren.\n" #: g10/pkclist.c:652 msgid "WARNING: We do NOT trust this key!\n" @@ -1571,7 +1568,8 @@ msgstr " Signaturen är sannolikt en FÖRFALSKNING.\n" #: g10/pkclist.c:661 -msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n" +msgid "" +"WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "" "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n" "tillräckligt högt tillitsvärde!\n" @@ -1580,24 +1578,21 @@ msgid " It is not certain that the signature belongs to the owner.\n" msgstr " Det är inte säkert att signaturen tillhör ägaren.\n" -#: g10/pkclist.c:817 -#: g10/pkclist.c:841 -#: g10/pkclist.c:999 -#: g10/pkclist.c:1059 +#: g10/pkclist.c:817 g10/pkclist.c:841 g10/pkclist.c:999 g10/pkclist.c:1059 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: hoppade över: %s\n" # överhoppad? -#: g10/pkclist.c:827 -#: g10/pkclist.c:1031 +#: g10/pkclist.c:827 g10/pkclist.c:1031 #, c-format msgid "%s: skipped: public key already present\n" msgstr "hoppade över %s: öppen nyckel finns redan\n" #: g10/pkclist.c:858 msgid "You did not specify a user ID. (you may use \"-r\")\n" -msgstr "Du specificerade ingen användaridentitet. (du kan använda \"-r\") för detta\n" +msgstr "" +"Du specificerade ingen användaridentitet. (du kan använda \"-r\") för detta\n" #: g10/pkclist.c:871 msgid "" @@ -1611,14 +1606,13 @@ msgid "No such user ID.\n" msgstr "Hittade inte användaridentiteten.\n" -#: g10/pkclist.c:892 -#: g10/pkclist.c:974 +#: g10/pkclist.c:892 g10/pkclist.c:974 msgid "skipped: public key already set as default recipient\n" msgstr "hoppade över: den öppna nyckeln är redan satt som förvald mottagare\n" #: g10/pkclist.c:910 msgid "Public key is disabled.\n" -msgstr "Den öppna nyckeln är deaktiverad\n" +msgstr "Den öppna nyckeln är avstängd.\n" #: g10/pkclist.c:917 msgid "skipped: public key already set\n" @@ -1632,11 +1626,14 @@ #: g10/pkclist.c:1011 #, c-format msgid "%s: skipped: public key is disabled\n" -msgstr "hoppade över %s: den öppna nyckeln är deaktiverad\n" +msgstr "hoppade över %s: den öppna nyckeln är avstängd\n" +# plural av adressee +# dvs. den som meddelandet är adresserat till. +# Ã…tskillnad görs mellan adressee och receiver. #: g10/pkclist.c:1066 msgid "no valid addressees\n" -msgstr "inga giltiga adresser\n" +msgstr "inga giltiga adressater\n" #: g10/keygen.c:198 #, c-format @@ -1646,7 +1643,7 @@ #: g10/keygen.c:205 #, c-format msgid "preference %c%lu duplicated\n" -msgstr "inställningen %c%lu är dubblerad\n" +msgstr "inställningen %c%lu förekommer flera gÃ¥nger\n" #: g10/keygen.c:210 #, c-format @@ -1655,7 +1652,7 @@ #: g10/keygen.c:280 msgid "invalid character in preference string\n" -msgstr "Ogiltigt tecken i inställningssträngen\n" +msgstr "felaktigt tecken i inställningssträngen\n" #: g10/keygen.c:638 msgid "writing direct signature\n" @@ -1669,16 +1666,12 @@ msgid "writing key binding signature\n" msgstr "skriver signatur knuten till nyckeln\n" -#: g10/keygen.c:785 -#: g10/keygen.c:869 -#: g10/keygen.c:960 +#: g10/keygen.c:785 g10/keygen.c:869 g10/keygen.c:960 #, c-format msgid "keysize invalid; using %u bits\n" -msgstr "ogiltig nyckelstorlek; använder %u bitar\n" +msgstr "felaktig nyckelstorlek; använder %u bitar\n" -#: g10/keygen.c:790 -#: g10/keygen.c:874 -#: g10/keygen.c:965 +#: g10/keygen.c:790 g10/keygen.c:874 g10/keygen.c:965 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "nyckelstorleken avrundad uppÃ¥t till %u bitar\n" @@ -1721,9 +1714,7 @@ msgid "Your selection? " msgstr "Vad väljer du? " -#: g10/keygen.c:1112 -#: g10/keyedit.c:682 -#: g10/revoke.c:665 +#: g10/keygen.c:1112 g10/keyedit.c:682 g10/revoke.c:665 msgid "Invalid selection.\n" msgstr "Felaktigt val.\n" @@ -1750,7 +1741,8 @@ #: g10/keygen.c:1141 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" -msgstr "nyckelstorleken är för liten; 1024 är det minsta tillÃ¥tna värdet för RSA.\n" +msgstr "" +"nyckelstorleken är för liten; 1024 är det minsta tillÃ¥tna värdet för RSA.\n" #: g10/keygen.c:1144 msgid "keysize too small; 768 is smallest value allowed.\n" @@ -1774,7 +1766,9 @@ msgstr "Är du säker pÃ¥ att du vill ha denna nyckelstorlek? " #: g10/keygen.c:1164 -msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n" +msgid "" +"Okay, but keep in mind that your monitor and keyboard radiation is also very " +"vulnerable to attacks!\n" msgstr "" "Ok, men kom ihÃ¥g att din bildskärm och ditt tangentbord ocksÃ¥ sänder\n" "avslöjande strÃ¥lning som kan avlyssnas!\n" @@ -1784,8 +1778,7 @@ msgid "Requested keysize is %u bits\n" msgstr "Den efterfrÃ¥gade nyckelstorleken är %u bitar\n" -#: g10/keygen.c:1176 -#: g10/keygen.c:1180 +#: g10/keygen.c:1176 g10/keygen.c:1180 #, c-format msgid "rounded up to %u bits\n" msgstr "avrundade uppÃ¥t till %u bitar\n" @@ -1834,7 +1827,7 @@ #: g10/keygen.c:1269 msgid "invalid value\n" -msgstr "ogiltigt värde\n" +msgstr "felaktigt värde\n" #: g10/keygen.c:1274 #, c-format @@ -1861,14 +1854,15 @@ #: g10/keygen.c:1335 msgid "" "\n" -"You need a User-ID to identify your key; the software constructs the user id\n" +"You need a User-ID to identify your key; the software constructs the user " +"id\n" "from Real Name, Comment and Email Address in this form:\n" " \"Heinrich Heine (Der Dichter) \"\n" "\n" msgstr "" "\n" "Du behöver en användaridentitet för att identifiera din nyckel; mjukvaran\n" -"konstruerar en användaridentitet frÃ¥n namn, kommentar och epostadress\n" +"konstruerar en användaridentitet frÃ¥n namn, kommentar och e-postadress\n" "enligt följande form: \n" " \"Gustav Vasa (Brutal kung) \"\n" "\n" @@ -1879,7 +1873,7 @@ #: g10/keygen.c:1355 msgid "Invalid character in name\n" -msgstr "Ogiltigt tecken i namnet\n" +msgstr "Felaktigt tecken i namnet\n" #: g10/keygen.c:1357 msgid "Name may not start with a digit\n" @@ -1891,11 +1885,11 @@ #: g10/keygen.c:1367 msgid "Email address: " -msgstr "Epostadress: " +msgstr "E-postadress: " #: g10/keygen.c:1378 msgid "Not a valid email address\n" -msgstr "Epostadressen är ogiltig\n" +msgstr "E-postadressen är ogiltig\n" #: g10/keygen.c:1386 msgid "Comment: " @@ -1903,7 +1897,7 @@ #: g10/keygen.c:1392 msgid "Invalid character in comment\n" -msgstr "Ogiltigt tecken i kommentaren\n" +msgstr "Felaktigt tecken i kommentaren\n" #: g10/keygen.c:1415 #, c-format @@ -1923,7 +1917,7 @@ #: g10/keygen.c:1427 msgid "Please don't put the email address into the real name or the comment\n" -msgstr "Ange inte epostadressen som namn eller kommentar\n" +msgstr "Ange inte e-postadressen som namn eller kommentar\n" # Ej solklart vad förkortningarna stÃ¥r för #: g10/keygen.c:1432 @@ -1951,8 +1945,7 @@ "Du behöver en lösenmening för att skydda din hemliga nyckel\n" "\n" -#: g10/keygen.c:1510 -#: g10/keyedit.c:880 +#: g10/keygen.c:1510 g10/keyedit.c:880 msgid "passphrase not correctly repeated; try again" msgstr "lösenmeningen upprepades inte korrekt; försök igen." @@ -1992,14 +1985,12 @@ msgid "Key generation canceled.\n" msgstr "Skapandet av nycklar avbröts.\n" -#: g10/keygen.c:2293 -#: g10/keygen.c:2381 +#: g10/keygen.c:2293 g10/keygen.c:2381 #, c-format msgid "writing public key to `%s'\n" msgstr "skriver den öppna nyckeln till \"%s\"\n" -#: g10/keygen.c:2294 -#: g10/keygen.c:2383 +#: g10/keygen.c:2294 g10/keygen.c:2383 #, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemlig nyckel till \"%s\"\n" @@ -2012,7 +2003,7 @@ #: g10/keygen.c:2376 #, c-format msgid "no writable secret keyring found: %s\n" -msgstr "hittade ingen nyckelring som gick att skriva till: %s\n" +msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n" #: g10/keygen.c:2390 #, c-format @@ -2037,85 +2028,79 @@ "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" -"Notera att denna nyckel inte kan användas för kryptering. Du kommer\n" +"Observera att denna nyckel inte kan användas för kryptering. Du kommer\n" "kanske att vilja använda kommandot \"--edit-key\" för att skapa en\n" "undernyckel för detta syfte.\n" -#: g10/keygen.c:2441 -#: g10/keygen.c:2563 +#: g10/keygen.c:2441 g10/keygen.c:2563 #, c-format msgid "Key generation failed: %s\n" msgstr "Nyckelgenereringen misslyckades: %s\n" # c-format behövs inte i singularis -#: g10/keygen.c:2491 -#: g10/sign.c:261 +#: g10/keygen.c:2491 g10/sign.c:261 #, c-format -msgid "key has been created %lu second in future (time warp or clock problem)\n" +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" msgstr "" "nyckeln är skapad %lu sekund in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" -#: g10/keygen.c:2493 -#: g10/sign.c:263 +#: g10/keygen.c:2493 g10/sign.c:263 #, c-format -msgid "key has been created %lu seconds in future (time warp or clock problem)\n" +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "" "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" #: g10/keygen.c:2502 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" -msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n" +msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n" #: g10/keygen.c:2530 msgid "Really create? " msgstr "Vill du verkligen skapa? " -#: g10/decrypt.c:98 -#: g10/encode.c:771 +#: g10/decrypt.c:98 g10/encode.c:771 msgid "--output doesn't work for this command\n" msgstr "--output kan inte användas för detta kommando\n" -#: g10/encode.c:176 -#: g10/tdbio.c:508 -#: g10/tdbio.c:569 -#: g10/openfile.c:180 +#: g10/encode.c:176 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180 #: g10/openfile.c:316 #, c-format msgid "%s: can't open: %s\n" msgstr "%s: kan inte öppna: %s\n" -#: g10/encode.c:207 -#: g10/sign.c:1063 +#: g10/encode.c:207 g10/sign.c:1063 #, c-format msgid "error creating passphrase: %s\n" msgstr "fel vid skapandet av lösenmening: %s\n" #: g10/encode.c:212 msgid "can't use a symmetric ESK packet due to the S2K mode\n" -msgstr "kan inte använda symetriska ESK-paket pga S2K-läge\n" +msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n" #: g10/encode.c:223 #, c-format msgid "using cipher %s\n" msgstr "använderchiffer %s\n" -#: g10/encode.c:233 -#: g10/encode.c:494 +#: g10/encode.c:233 g10/encode.c:494 #, c-format msgid "`%s' already compressed\n" msgstr "`%s' är redan komprimerad\n" -#: g10/encode.c:302 -#: g10/encode.c:531 +#: g10/encode.c:302 g10/encode.c:531 #, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: VARNING: tom fil\n" #: g10/encode.c:414 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" -msgstr "du kan endast krypterar till RSA nycklar som är högst 2048 bitar lÃ¥nga i --pgp2-läge\n" +msgstr "" +"du kan endast kryptera till RSA nycklar som är högst 2048 bitar lÃ¥nga i --" +"pgp2-läge\n" #: g10/encode.c:429 #, c-format @@ -2123,20 +2108,23 @@ msgstr "läser frÃ¥n \"%s\"\n" #: g10/encode.c:465 -msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" +msgid "" +"unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "kan inte använda IDEA-kryptering för alla nycklar du krypterar till.\n" -#: g10/encode.c:475 -#: g10/encode.c:658 +#: g10/encode.c:475 g10/encode.c:658 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "att kräva symetrisk kryptering med %s (%d) strider mot mottagarnas inställningar\n" +msgstr "" +"att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas " +"inställningar\n" -#: g10/encode.c:573 -#: g10/sign.c:781 +#: g10/encode.c:573 g10/sign.c:781 #, c-format msgid "forcing compression algorithm %s (%d) violates recipient preferences\n" -msgstr "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inställningar\n" +msgstr "" +"att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens " +"inställningar\n" #: g10/encode.c:717 #, c-format @@ -2148,31 +2136,25 @@ msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s krypterad för: \"%s\"\n" -#: g10/export.c:157 -#: g10/keyedit.c:2501 -#: g10/delkey.c:74 -#: g10/revoke.c:224 +#: g10/export.c:157 g10/keyedit.c:2501 g10/delkey.c:74 g10/revoke.c:224 #, c-format msgid "key `%s' not found: %s\n" msgstr "hittade inte nyckeln `%s': %s\n" -#: g10/export.c:180 -#: g10/delkey.c:82 -#: g10/revoke.c:230 -#: g10/revoke.c:454 +#: g10/export.c:180 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:454 #, c-format msgid "error reading keyblock: %s\n" -msgstr "fel vid läsninga av nyckelblock: %s\n" +msgstr "fel vid läsning av nyckelblock: %s\n" #: g10/export.c:189 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "hoppade över nyckeln %08lX - följer inte standarden RFC2440\n" +msgstr "hoppade över nyckeln %08lX - den följer inte standarden RFC2440\n" #: g10/export.c:205 #, c-format msgid "key %08lX: not protected - skipped\n" -msgstr "nyckeln %08lX är inte skyddad - överhoppade över den\n" +msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n" #: g10/export.c:213 #, c-format @@ -2182,7 +2164,7 @@ #: g10/export.c:284 #, c-format msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK kontrollsumma\n" +msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n" #: g10/export.c:310 msgid "WARNING: nothing exported\n" @@ -2190,29 +2172,30 @@ #: g10/getkey.c:150 msgid "too many entries in pk cache - disabled\n" -msgstr "för mÃ¥nga poster i pk-cachen - inaktiverad\n" +msgstr "för mÃ¥nga poster i pk-cachen - avstängd\n" -#: g10/getkey.c:186 -#: g10/getkey.c:2670 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Hittade inte användaridentiteten]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "Ogiltig nyckel %08lX tvingat giltig med --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX - hoppar över\n" +msgstr "" +"det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX " +"- hoppar över\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n" @@ -2298,27 +2281,27 @@ msgstr " inte importerade: %lu\n" #: g10/import.c:551 -msgid "NOTE: Elgamal primary key detected - this may take some time to import\n" +msgid "" +"NOTE: Elgamal primary key detected - this may take some time to import\n" msgstr "OBS: Elgamal-huvdnyckel upptäckt- denna kan ta tid att importera\n" -#: g10/import.c:565 -#: g10/import.c:832 +#: g10/import.c:565 g10/import.c:832 #, c-format msgid "key %08lX: no user ID\n" msgstr "nyckel %08lX: ingen användaridentitet\n" -# eller är det en skadad HKP-nyckel som reparerats? -# Jag tror att undernyckeln är skadad pÃ¥ HKP-servern. Vanligt fel vid mÃ¥nga undernycklar. +# Undernyckeln är skadad pÃ¥ HKP-servern. Vanligt fel vid mÃ¥nga undernycklar. #: g10/import.c:587 #, c-format msgid "key %08lX: HKP subkey corruption repaired\n" -msgstr "nyckeln %08lX: HKP skadad undernyckel har reparerats!\n" +msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n" # vad innebär fnutten i slutet? #: g10/import.c:602 #, c-format msgid "key %08lX: accepted non self-signed user ID '%s'\n" -msgstr "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n" +msgstr "" +"nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n" #: g10/import.c:608 #, c-format @@ -2329,8 +2312,7 @@ msgid "this may be caused by a missing self-signature\n" msgstr "detta kan bero pÃ¥ att det saknas en egensignatur\n" -#: g10/import.c:619 -#: g10/import.c:912 +#: g10/import.c:619 g10/import.c:912 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n" @@ -2345,18 +2327,12 @@ msgid "no writable keyring found: %s\n" msgstr "hittade ingen nyckelring som gick att skriva till: %s\n" -#: g10/import.c:639 -#: g10/sign.c:688 -#: g10/sign.c:924 -#: g10/openfile.c:254 +#: g10/import.c:639 g10/sign.c:688 g10/sign.c:924 g10/openfile.c:254 #, c-format msgid "writing to `%s'\n" msgstr "skriver till \"%s\"\n" -#: g10/import.c:645 -#: g10/import.c:730 -#: g10/import.c:859 -#: g10/import.c:972 +#: g10/import.c:645 g10/import.c:730 g10/import.c:859 g10/import.c:972 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n" @@ -2365,21 +2341,19 @@ #: g10/import.c:662 #, c-format msgid "key %08lX: public key \"%s\" imported\n" -msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n" +msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n" #: g10/import.c:684 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "nyckel %08lX: matchar inte vÃ¥r lokala kopia\n" -#: g10/import.c:701 -#: g10/import.c:929 +#: g10/import.c:701 g10/import.c:929 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n" -#: g10/import.c:708 -#: g10/import.c:935 +#: g10/import.c:708 g10/import.c:935 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n" @@ -2422,12 +2396,14 @@ #: g10/import.c:838 #, c-format msgid "key %08lX: secret key with invalid cipher %d - skipped\n" -msgstr "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade över den\n" +msgstr "" +"nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade " +"över den\n" #: g10/import.c:853 #, c-format msgid "no default secret keyring: %s\n" -msgstr "inga standardnyckelringar: %s\n" +msgstr "ingen hemlig nyckelring angiven som standard: %s\n" #: g10/import.c:864 #, c-format @@ -2447,7 +2423,9 @@ #: g10/import.c:906 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" -msgstr "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med spärrcertifikatet\n" +msgstr "" +"nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med " +"spärrcertifikatet\n" #: g10/import.c:946 #, c-format @@ -2468,7 +2446,9 @@ #: g10/import.c:1056 #, c-format msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" -msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID \"%s\"\n" +msgstr "" +"nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID \"%s" +"\"\n" #: g10/import.c:1058 #, c-format @@ -2480,8 +2460,7 @@ msgid "key %08lX: no subkey for key binding\n" msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n" -#: g10/import.c:1084 -#: g10/import.c:1128 +#: g10/import.c:1084 g10/import.c:1128 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n" @@ -2509,7 +2488,7 @@ #: g10/import.c:1142 #, c-format msgid "key %08lX: removed multiple subkey revocation\n" -msgstr "nyckel %08lX: tog bort ogiltig spärr av undernyckel\n" +msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n" #: g10/import.c:1179 #, c-format @@ -2524,36 +2503,40 @@ #: g10/import.c:1229 #, c-format msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n" +msgstr "" +"nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n" -# Vad skippades? nyckeln eller spärrcertifikatet?? #: g10/import.c:1238 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" -msgstr "nyckel %08lX: spärrcertifikat pÃ¥ fel plats - hoppade över\n" +msgstr "" +"nyckel %08lX: spärrcertifikat pÃ¥ fel plats - hoppade över certifikatet\n" # nyckeln eller certifikatet?? #: g10/import.c:1255 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "nyckel %08lX: felaktigt sp?rrcertifikat (revocation certificate): %s - hoppade ?ver\n" +msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n" -# signaturen? #: g10/import.c:1268 #, c-format msgid "key %08lX: subkey signature in wrong place - skipped\n" -msgstr "nyckel %08lX: signatur pÃ¥ undernyckel pÃ¥ fel plats - hoppade över den\n" +msgstr "" +"nyckel %08lX: signatur pÃ¥ undernyckel pÃ¥ fel plats - hoppade över " +"signaturen\n" # nyckeln eller klassen? #: g10/import.c:1276 #, c-format msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" -msgstr "nyckel %08lX: oväntad signaturklass (0x%02X) - överhoppad\n" +msgstr "" +"nyckel %08lX: oväntad signaturklass (0x%02X) - hoppade över signaturen\n" #: g10/import.c:1375 #, c-format msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "nyckel %08lX: användaridentitet hittades tvÃ¥ gÃ¥nger - slog ihop\n" +msgstr "" +"nyckel %08lX: användaridentitet hittades flera gÃ¥nger - slog ihop till en\n" #: g10/import.c:1434 #, c-format @@ -2573,7 +2556,7 @@ #: g10/import.c:1539 #, c-format msgid "key %08lX: direct key signature added\n" -msgstr "nyckel %08lX: lagt till direkt nyckelignatur\n" +msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n" #: g10/keyedit.c:149 msgid "[revocation]" @@ -2583,35 +2566,29 @@ msgid "[self-signature]" msgstr "[egensignatur]" -#: g10/keyedit.c:221 -#: g10/keylist.c:169 +#: g10/keyedit.c:221 g10/keylist.c:169 msgid "1 bad signature\n" msgstr "1 felaktig signatur\n" -#: g10/keyedit.c:223 -#: g10/keylist.c:171 +#: g10/keyedit.c:223 g10/keylist.c:171 #, c-format msgid "%d bad signatures\n" msgstr "%d felaktiga signaturer\n" -#: g10/keyedit.c:225 -#: g10/keylist.c:173 +#: g10/keyedit.c:225 g10/keylist.c:173 msgid "1 signature not checked due to a missing key\n" msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n" -#: g10/keyedit.c:227 -#: g10/keylist.c:175 +#: g10/keyedit.c:227 g10/keylist.c:175 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n" -#: g10/keyedit.c:229 -#: g10/keylist.c:177 +#: g10/keyedit.c:229 g10/keylist.c:177 msgid "1 signature not checked due to an error\n" msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n" -#: g10/keyedit.c:231 -#: g10/keylist.c:179 +#: g10/keyedit.c:231 g10/keylist.c:179 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signaturer verifierades inte eftersom fel uppstod\n" @@ -2630,19 +2607,12 @@ msgid "User ID \"%s\" is revoked." msgstr "Användar-ID \"%s\" är spärrat." -#: g10/keyedit.c:371 -#: g10/keyedit.c:397 -#: g10/keyedit.c:422 -#: g10/keyedit.c:576 -#: g10/keyedit.c:634 -#: g10/keyedit.c:1237 +#: g10/keyedit.c:371 g10/keyedit.c:397 g10/keyedit.c:422 g10/keyedit.c:576 +#: g10/keyedit.c:634 g10/keyedit.c:1237 msgid "Are you sure you still want to sign it? (y/N) " msgstr "Vill du verkligen fortfarande signera den? (j/N)" -#: g10/keyedit.c:383 -#: g10/keyedit.c:409 -#: g10/keyedit.c:434 -#: g10/keyedit.c:582 +#: g10/keyedit.c:383 g10/keyedit.c:409 g10/keyedit.c:434 g10/keyedit.c:582 #: g10/keyedit.c:1243 msgid " Unable to sign.\n" msgstr " Kan inte signera.\n" @@ -2681,7 +2651,9 @@ #: g10/keyedit.c:480 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " -msgstr "Vill du skapa en ny signatur som ersätter den vars giltighetstid gÃ¥tt ut? (J/n) " +msgstr "" +"Vill du skapa en ny signatur som ersätter den vars giltighetstid gÃ¥tt ut? (J/" +"n) " #: g10/keyedit.c:501 #, c-format @@ -2717,7 +2689,7 @@ #: g10/keyedit.c:570 msgid "This key has expired!" -msgstr "Notera: Giltighetstiden för denna nyckel har gÃ¥tt ut!" +msgstr "Giltighetstiden för denna nyckel har gÃ¥tt ut!" #: g10/keyedit.c:590 #, c-format @@ -2726,11 +2698,16 @@ #: g10/keyedit.c:594 msgid "Do you want your signature to expire at the same time? (Y/n) " -msgstr "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) " +msgstr "" +"Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) " #: g10/keyedit.c:627 -msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n" -msgstr "Du kan inte göra en OpenPGP-signatur pÃ¥ en PGP 2.x-nyckel när du är i --pgp2-läge\n" +msgid "" +"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " +"mode.\n" +msgstr "" +"Du kan inte göra en OpenPGP-signatur pÃ¥ en PGP 2.x-nyckel när du är i --pgp2-" +"läge\n" #: g10/keyedit.c:629 msgid "This would make the key unusable in PGP 2.x.\n" @@ -2738,7 +2715,8 @@ #: g10/keyedit.c:652 msgid "" -"How carefully have you verified the key you are about to sign actually belongs\n" +"How carefully have you verified the key you are about to sign actually " +"belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n" @@ -2747,12 +2725,10 @@ #: g10/keyedit.c:656 #, c-format msgid " (0) I will not answer.%s\n" -msgstr " (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n" +msgstr "" +" (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n" -#: g10/keyedit.c:657 -#: g10/keyedit.c:659 -#: g10/keyedit.c:661 -#: g10/keyedit.c:663 +#: g10/keyedit.c:657 g10/keyedit.c:659 g10/keyedit.c:661 g10/keyedit.c:663 msgid " (default)" msgstr " (standard)" @@ -2797,7 +2773,7 @@ "WARNING: the signature will not be marked as non-exportable.\n" msgstr "" "\n" -"VARNING: Signaturen kommer att markeras som icke exporterbar.\n" +"VARNING: signaturen kommer att markeras som exporterbar.\n" "\n" #: g10/keyedit.c:706 @@ -2806,7 +2782,7 @@ "WARNING: the signature will not be marked as non-revocable.\n" msgstr "" "\n" -"VARNING: Signaturen kommer att markeras som icke möjlig att Ã¥terkalla.\n" +"VARNING: Signaturen kommer att markeras som möjlig att spärra.\n" "\n" #: g10/keyedit.c:713 @@ -2855,10 +2831,7 @@ msgid "Really sign? " msgstr "Vill du verkligen signera? " -#: g10/keyedit.c:781 -#: g10/keyedit.c:3289 -#: g10/keyedit.c:3380 -#: g10/keyedit.c:3453 +#: g10/keyedit.c:781 g10/keyedit.c:3289 g10/keyedit.c:3380 g10/keyedit.c:3453 #: g10/sign.c:318 #, c-format msgid "signing failed: %s\n" @@ -2894,7 +2867,7 @@ "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" msgstr "" -"Du vill inte ha nÃ¥gon lösenmening - detta är sannolikt en dÃ¥lig idé!\n" +"Du vill inte ha nÃ¥gon lösenmening - detta är sannolikt en *dÃ¥lig* idé!\n" "\n" #: g10/keyedit.c:888 @@ -2940,11 +2913,11 @@ #: g10/keyedit.c:1002 msgid "list" -msgstr "list" +msgstr "visa en lista" #: g10/keyedit.c:1002 msgid "list key and user IDs" -msgstr "räkna upp nycklar och användaridentiteter" +msgstr "visa en lista pÃ¥ nycklar och användaridentiteter" # ??? #: g10/keyedit.c:1003 @@ -2973,7 +2946,7 @@ #: g10/keyedit.c:1006 msgid "list signatures" -msgstr "räkna upp signaturer" +msgstr "visa en lista pÃ¥ signaturer" #: g10/keyedit.c:1007 msgid "c" @@ -3017,7 +2990,7 @@ #: g10/keyedit.c:1013 msgid "debug" -msgstr "debug" +msgstr "avlusa" #: g10/keyedit.c:1014 msgid "adduid" @@ -3029,11 +3002,11 @@ #: g10/keyedit.c:1015 msgid "addphoto" -msgstr "lägg till bild" +msgstr "addphoto" #: g10/keyedit.c:1015 msgid "add a photo ID" -msgstr "lägg till en användaridentitet med foto" +msgstr "lägg till ett foto som användaridentitet" #: g10/keyedit.c:1016 msgid "deluid" @@ -3045,7 +3018,7 @@ #: g10/keyedit.c:1018 msgid "delphoto" -msgstr "ta bort bild" +msgstr "delphoto" #: g10/keyedit.c:1019 msgid "addkey" @@ -3065,7 +3038,7 @@ #: g10/keyedit.c:1021 msgid "addrevoker" -msgstr "Ange spärrnyckel" +msgstr "addrevoker" #: g10/keyedit.c:1021 msgid "add a revocation key" @@ -3089,7 +3062,7 @@ #: g10/keyedit.c:1024 msgid "primary" -msgstr "huvud" +msgstr "primary" #: g10/keyedit.c:1024 msgid "flag user ID as primary" @@ -3101,7 +3074,7 @@ #: g10/keyedit.c:1025 msgid "toggle between secret and public key listing" -msgstr "hoppa mellan utskrift av hemliga och öppna nycklar" +msgstr "hoppa mellan att visa en lista pÃ¥ hemliga eller öppna nycklar" #: g10/keyedit.c:1027 msgid "t" @@ -3113,7 +3086,7 @@ #: g10/keyedit.c:1028 msgid "list preferences (expert)" -msgstr "skriv ut inställningar (expertläge)" +msgstr "visa en lista pÃ¥ inställningar (expertläge)" #: g10/keyedit.c:1029 msgid "showpref" @@ -3121,7 +3094,7 @@ #: g10/keyedit.c:1029 msgid "list preferences (verbose)" -msgstr "skriv ut inställningar (utförligt)" +msgstr "visa en lista pÃ¥ inställningar (utförligt)" #: g10/keyedit.c:1030 msgid "setpref" @@ -3187,7 +3160,7 @@ #: g10/keyedit.c:1037 msgid "disable a key" -msgstr "deaktivera en nyckel" +msgstr "stäng av en nyckel" #: g10/keyedit.c:1038 msgid "enable" @@ -3199,21 +3172,20 @@ #: g10/keyedit.c:1039 msgid "showphoto" -msgstr "visa bild" +msgstr "showphoto" #: g10/keyedit.c:1039 msgid "show photo ID" -msgstr "visa bild-ID" +msgstr "visa foto-ID" -#: g10/keyedit.c:1059 -#: g10/delkey.c:120 +#: g10/keyedit.c:1059 g10/delkey.c:120 msgid "can't do that in batchmode\n" msgstr "kan inte göra detta i batch-läge\n" #: g10/keyedit.c:1097 #, c-format msgid "error reading secret keyblock `%s': %s\n" -msgstr "fel vid läsning av hemlig nyckel\"%s\": %s\n" +msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n" #: g10/keyedit.c:1115 msgid "Secret key is available.\n" @@ -3241,16 +3213,14 @@ #: g10/keyedit.c:1251 msgid "Hint: Select the user IDs to sign\n" -msgstr "Tips: Välj det användarid du vill signera\n" +msgstr "Tips: Välj de användarID:n du vill signera\n" #: g10/keyedit.c:1276 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "Detta kommando är inte tillÃ¥tet när du är i %s-läge.\n" -#: g10/keyedit.c:1298 -#: g10/keyedit.c:1319 -#: g10/keyedit.c:1379 +#: g10/keyedit.c:1298 g10/keyedit.c:1319 g10/keyedit.c:1379 msgid "You must select at least one user ID.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en användaridentitet.\n" @@ -3266,8 +3236,7 @@ msgid "Really remove this user ID? " msgstr "Vill du verkligen ta bort denna användaridentitet? " -#: g10/keyedit.c:1342 -#: g10/keyedit.c:1398 +#: g10/keyedit.c:1342 g10/keyedit.c:1398 msgid "You must select at least one key.\n" msgstr "Du mÃ¥ste välja Ã¥tminstone en nyckel.\n" @@ -3297,7 +3266,8 @@ #: g10/keyedit.c:1472 msgid "Really update the preferences for the selected user IDs? " -msgstr "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? " +msgstr "" +"Vill du verkligen ändra inställningarna för de valda användaridentiteterna? " #: g10/keyedit.c:1474 msgid "Really update the preferences? " @@ -3327,15 +3297,15 @@ #: g10/keyedit.c:1552 msgid "Invalid command (try \"help\")\n" -msgstr "Ogiltigt kommando (försök med \"help\")\n" +msgstr "Felaktigt kommando (försök med \"help\")\n" #: g10/keyedit.c:1611 msgid "Digest: " -msgstr "Sammandrag:" +msgstr "Sammandrag: " #: g10/keyedit.c:1663 msgid "Features: " -msgstr "Funktioner:" +msgstr "Funktioner: " #: g10/keyedit.c:1897 #, c-format @@ -3346,10 +3316,7 @@ msgid " (sensitive)" msgstr " (känsligt)" -#: g10/keyedit.c:1907 -#: g10/keyedit.c:1933 -#: g10/keyedit.c:2018 -#: g10/keyedit.c:2033 +#: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033 #, c-format msgid "%s%c %4u%c/%08lX created: %s expires: %s" msgstr "%s%c %4u%c/%08lX skapad: %s gÃ¥r ut: %s" @@ -3361,12 +3328,12 @@ #: g10/keyedit.c:1920 msgid "This key has been disabled" -msgstr "Denna nyckel har deaktiverats" +msgstr "Denna nyckel har stängts av" #: g10/keyedit.c:1949 #, c-format msgid "rev! subkey has been revoked: %s\n" -msgstr "revoked! en undernyckel har spärrats: %s\n" +msgstr "rev! undernyckeln har spärrats: %s\n" #: g10/keyedit.c:1952 msgid "rev- faked revocation found\n" @@ -3378,22 +3345,19 @@ msgid "rev? problem checking revocation: %s\n" msgstr "rev? problem vid kontroll av spärren: %s\n" -#: g10/keyedit.c:1974 -#: g10/keyedit.c:2057 -#: g10/keylist.c:492 -#: g10/keylist.c:532 +#: g10/keyedit.c:1974 g10/keyedit.c:2057 g10/keylist.c:492 g10/keylist.c:532 #: g10/mainproc.c:946 msgid "[revoked] " msgstr "[spärrad]" -#: g10/keyedit.c:1976 -#: g10/keyedit.c:2059 +#: g10/keyedit.c:1976 g10/keyedit.c:2059 msgid "[expired] " -msgstr "[Giltighetstiden har upphört]" +msgstr "[Giltighetstiden har gÃ¥tt ut]" #: g10/keyedit.c:1984 msgid "There are no preferences on a PGP 2.x-style user ID.\n" -msgstr "Du kan inte ange nÃ¥gra inställningar för ett användar-ID av PGP 2.x-typ.\n" +msgstr "" +"Du kan inte ange nÃ¥gra inställningar för ett användar-ID av PGP 2.x-typ.\n" #: g10/keyedit.c:1992 msgid "" @@ -3401,7 +3365,7 @@ "unless you restart the program.\n" msgstr "" "Obs! Den visade nyckelgiltigheten kan vara felaktig\n" -"om du inte startar om programmet.\n" +"om du inte startar om programmet.\n" #: g10/keyedit.c:2121 msgid "" @@ -3414,20 +3378,21 @@ #: g10/keyedit.c:2181 msgid "" -"WARNING: This is a PGP2-style key. Adding a photo ID may cause some versions\n" +"WARNING: This is a PGP2-style key. Adding a photo ID may cause some " +"versions\n" " of PGP to reject this key.\n" msgstr "" -"VARNING: Detta är en nyckel av PGP2-typ. Om du lägger till ett foto- ID kan vissa versioner\n" +"VARNING: Detta är en nyckel av PGP2-typ. Om du lägger till ett foto- ID kan " +"vissa versioner\n" " av PGP avvisa denna nyckel.\n" -#: g10/keyedit.c:2186 -#: g10/keyedit.c:2459 +#: g10/keyedit.c:2186 g10/keyedit.c:2459 msgid "Are you sure you still want to add it? (y/N) " msgstr "Vill du verkligen fortfarande lägga till den? (j/N) " #: g10/keyedit.c:2192 msgid "You may not add a photo ID to a PGP2-style key.\n" -msgstr "Du kan inte lägga till ett bild-ID till en nyckel av PGP 2-typ.\n" +msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n" #: g10/keyedit.c:2327 msgid "Delete this good signature? (y/N/q)" @@ -3462,9 +3427,12 @@ #: g10/keyedit.c:2454 msgid "" -"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may cause\n" +"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " +"cause\n" " some versions of PGP to reject this key.\n" -msgstr "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna nyckel inte användas i vissa versioner av PGP.\n" +msgstr "" +"VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna " +"nyckel inte användas i vissa versioner av PGP.\n" #: g10/keyedit.c:2465 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" @@ -3472,11 +3440,11 @@ #: g10/keyedit.c:2488 msgid "Enter the user ID of the designated revoker: " -msgstr "Ange användar-ID för spärrnyckeln:" +msgstr "Ange användar-ID för spärrnyckeln: " #: g10/keyedit.c:2511 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" -msgstr "Det gÃ¥r inte att använda en PGP 2-nyckel som spärrnyckel\n" +msgstr "det gÃ¥r inte att använda en PGP 2-nyckel som spärrnyckel\n" #: g10/keyedit.c:2521 msgid "you cannot appoint a key as its own designated revoker\n" @@ -3488,8 +3456,11 @@ # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad) #: g10/keyedit.c:2546 -msgid "Are you sure you want to appoint this key as a designated revoker? (y/N): " -msgstr "Är du verkligen säker pÃ¥ att du vill utse denna nyckel till spärrnyckel? (j/N): " +msgid "" +"Are you sure you want to appoint this key as a designated revoker? (y/N): " +msgstr "" +"Är du verkligen säker pÃ¥ att du vill utse denna nyckel till spärrnyckel? (j/" +"N): " #: g10/keyedit.c:2611 msgid "Please remove selections from the secret keys.\n" @@ -3519,8 +3490,7 @@ msgid "Please select exactly one user ID.\n" msgstr "Du mÃ¥ste välja bara en användaridentitet.\n" -#: g10/keyedit.c:2805 -#: g10/keyedit.c:2915 +#: g10/keyedit.c:2805 g10/keyedit.c:2915 #, c-format msgid "skipping v3 self-signature on user id \"%s\"\n" msgstr "hoppar över v3 egensignatur pÃ¥ användar-id \"%s\"\n" @@ -3614,7 +3584,9 @@ #: g10/keyedit.c:3364 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" -msgstr "VARNING: en signatur pÃ¥ ett användar-ID är daterad %d sekunder in i framtiden\n" +msgstr "" +"VARNING: en signatur pÃ¥ ett användar-ID är daterad %d sekunder in i " +"framtiden\n" #: g10/keyedit.c:3537 #, c-format @@ -3624,29 +3596,26 @@ #: g10/keylist.c:112 #, c-format msgid "Critical signature policy: " -msgstr "FELAKTIG signatur fr?n \"" +msgstr "Viktig signaturpolicy: " #: g10/keylist.c:114 #, c-format msgid "Signature policy: " -msgstr "Signatur-policy: " +msgstr "Signaturpolicy: " -#: g10/keylist.c:139 -#: g10/keylist.c:162 -#: g10/mainproc.c:811 -#: g10/mainproc.c:820 +#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:811 g10/mainproc.c:820 msgid "WARNING: invalid notation data found\n" -msgstr "VARNING: ogiltig notationsdata hittades\n" +msgstr "VARNING: ogiltig noteringsdata hittades\n" #: g10/keylist.c:148 #, c-format msgid "Critical signature notation: " -msgstr "FELAKTIG signatur fr?n \"" +msgstr "Viktig signaturnotation: " #: g10/keylist.c:150 #, c-format msgid "Signature notation: " -msgstr "Signatur-notering:" +msgstr "Signaturnotering: " #: g10/keylist.c:157 msgid "not human readable" @@ -3656,8 +3625,7 @@ msgid "Keyring" msgstr "Nyckelring" -#: g10/keylist.c:534 -#: g10/mainproc.c:948 +#: g10/keylist.c:534 g10/mainproc.c:948 #, c-format msgid " [expires: %s]" msgstr "[gÃ¥r ut: %s]" @@ -3668,7 +3636,7 @@ #: g10/keylist.c:1048 msgid " Subkey fingerprint:" -msgstr " Undernyckelns fingeravtryck:" +msgstr " Undernyckelns fingeravtryck:" #: g10/keylist.c:1055 msgid " Primary key fingerprint:" @@ -3676,10 +3644,9 @@ #: g10/keylist.c:1057 msgid " Subkey fingerprint:" -msgstr " Undernyckelns fingeravtryck:" +msgstr " Undernyckelns fingeravtryck:" -#: g10/keylist.c:1061 -#: g10/keylist.c:1065 +#: g10/keylist.c:1061 g10/keylist.c:1065 msgid " Key fingerprint =" msgstr "Nyckelns fingeravtryck =" @@ -3698,14 +3665,12 @@ msgid "%s encrypted session key\n" msgstr "%s krypterad sessionsnyckel\n" -#: g10/mainproc.c:301 -#: g10/encr-data.c:66 +#: g10/mainproc.c:301 g10/encr-data.c:66 #, c-format msgid "%s encrypted data\n" msgstr "%s krypterad data\n" -#: g10/mainproc.c:305 -#: g10/encr-data.c:68 +#: g10/mainproc.c:305 g10/encr-data.c:68 #, c-format msgid "encrypted with unknown algorithm %d\n" msgstr "krypterad med en okänd algoritm %d\n" @@ -3720,16 +3685,10 @@ msgid "public key is %08lX\n" msgstr "den öppna nyckeln är %08lX\n" -# DEK betyder Data Encryption Key, Meddelandet är förvirrande -# men efter att ha kikat i koden har jag kommit fram till att -# meddelandet bara visas om verbose-flaggan är satt, och dÃ¥ -# markerar meddelandet att get_session_key lyckades hitta -# rätt publik nyckel att kryptera datat med. Jag tycker -# inte att svenska översättningen är mycket obskyrare än engelska -# originalet iallafall. +# Men jag ändrade sÃ¥ det blev närmare originalet. Per #: g10/mainproc.c:404 msgid "public key encrypted data: good DEK\n" -msgstr "data krypterad med öppen nyckel: korrekt krypteringsnyckel\n" +msgstr "Data krypterat till öppen nyckel: Giltig DEK\n" #: g10/mainproc.c:456 #, c-format @@ -3756,8 +3715,7 @@ msgid "encrypted with 1 passphrase\n" msgstr "krypterad med with 1 lösenmening\n" -#: g10/mainproc.c:512 -#: g10/mainproc.c:531 +#: g10/mainproc.c:512 g10/mainproc.c:531 #, c-format msgid "assuming %s encrypted data\n" msgstr "antar att %s krypterade data\n" @@ -3765,16 +3723,20 @@ #: g10/mainproc.c:519 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" -msgstr "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s istället\n" +msgstr "" +"IDEA-kryptering inte installerad. Optimistiskt försök att använda %s " +"istället\n" #: g10/mainproc.c:549 msgid "decryption okay\n" msgstr "dekrypteringen lyckades\n" +# Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH. #: g10/mainproc.c:553 msgid "WARNING: message was not integrity protected\n" msgstr "VARNING: detta meddelande var inte integritetsskyddat\n" +# Meddelandet innebär alltsÃ¥ att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut. #: g10/mainproc.c:556 msgid "WARNING: encrypted message has been manipulated!\n" msgstr "VARNING: det krypterade meddelandet har ändrats!\n" @@ -3786,7 +3748,7 @@ #: g10/mainproc.c:581 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" -msgstr "OBS: avsändaren efterfrÃ¥gade \"endast-för-dina-ögon\"\n" +msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n" #: g10/mainproc.c:583 #, c-format @@ -3801,7 +3763,7 @@ #: g10/mainproc.c:823 msgid "Notation: " -msgstr "Notation: " +msgstr "Notering: " # finns det nÃ¥gon bra svensk översättning av policy? #: g10/mainproc.c:835 @@ -3812,8 +3774,7 @@ msgid "signature verification suppressed\n" msgstr "signaturen verifierades inte\n" -#: g10/mainproc.c:1333 -#: g10/mainproc.c:1343 +#: g10/mainproc.c:1333 g10/mainproc.c:1343 msgid "can't handle these multiple signatures\n" msgstr "kan inte hantera dessa multipla signaturer\n" @@ -3826,21 +3787,20 @@ msgid "Key available at: " msgstr "Nyckeln tillgänglig hos: " -#: g10/mainproc.c:1430 -#: g10/mainproc.c:1463 +#: g10/mainproc.c:1430 g10/mainproc.c:1463 msgid "BAD signature from \"" msgstr "FELAKTIG signatur frÃ¥n \"" -#: g10/mainproc.c:1431 -#: g10/mainproc.c:1464 +#: g10/mainproc.c:1431 g10/mainproc.c:1464 msgid "Expired signature from \"" msgstr "Giltighetstiden har upphört för signatur frÃ¥n \"" -#: g10/mainproc.c:1432 -#: g10/mainproc.c:1465 +#: g10/mainproc.c:1432 g10/mainproc.c:1465 msgid "Good signature from \"" msgstr "Korrekt signatur frÃ¥n \"" +# Visas vid ogiltig signatur: +# Eftersom signaturen är ogiltig kan man inte vara säker pÃ¥ att angivet namn och nyckel-id är riktigt. #: g10/mainproc.c:1467 msgid "[uncertain]" msgstr "[osäkert]" @@ -3877,15 +3837,16 @@ msgid "Can't check signature: %s\n" msgstr "Kan inte verifiera signaturen: %s\n" -#: g10/mainproc.c:1664 -#: g10/mainproc.c:1680 -#: g10/mainproc.c:1766 +#: g10/mainproc.c:1664 g10/mainproc.c:1680 g10/mainproc.c:1766 msgid "not a detached signature\n" msgstr "detta är inte nÃ¥gon signatur i en separat fil\n" #: g10/mainproc.c:1707 -msgid "WARNING: multiple signatures detected. Only the first will be checked.\n" -msgstr "VARNING: multipla signaturerer upptäckta. Endast den första kommer att kontrolleras.\n" +msgid "" +"WARNING: multiple signatures detected. Only the first will be checked.\n" +msgstr "" +"VARNING: multipla signaturer upptäckta. Endast den första kommer att " +"kontrolleras.\n" #: g10/mainproc.c:1715 #, c-format @@ -3903,7 +3864,7 @@ #: g10/misc.c:99 #, c-format msgid "can't disable core dumps: %s\n" -msgstr "kan inte deaktivera minnesutskrifter: %s\n" +msgstr "kan inte stänga av minnesutskrifter: %s\n" #: g10/misc.c:163 msgid "Experimental algorithms should not be used!\n" @@ -3911,14 +3872,17 @@ #: g10/misc.c:193 msgid "this cipher algorithm is deprecated; please use a more standard one!\n" -msgstr "denna krypteringsalgoritm är förÃ¥ldrad, använd istället en mer normal algoritm!\n" +msgstr "" +"denna krypteringsalgoritm är förÃ¥ldrad, använd istället en mer normal " +"algoritm!\n" #: g10/misc.c:301 msgid "the IDEA cipher plugin is not present\n" msgstr "Insticksprogram för IDEA-kryptering är inte installerat\n" #: g10/misc.c:302 -msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n" +msgid "" +"please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "Mer information finns pÃ¥: http://www.gnupg.org/why-not-idea.html\n" #: g10/misc.c:534 @@ -3959,8 +3923,7 @@ msgid "subpacket of type %d has critical bit set\n" msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n" -#: g10/passphrase.c:459 -#: g10/passphrase.c:506 +#: g10/passphrase.c:459 g10/passphrase.c:506 msgid "gpg-agent is not available in this session\n" msgstr "kunde inte fÃ¥ tillgÃ¥ng till GPG-Agent i denna session\n" @@ -3987,8 +3950,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "GPG-Agent protokoll version %d stöds inte\n" -#: g10/passphrase.c:549 -#: g10/hkp.c:156 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "kan inte ansluta till \"%s\": %s\n" @@ -3997,14 +3959,11 @@ msgid "communication problem with gpg-agent\n" msgstr "problem vid kommunikation med GPG-Agent\n" -#: g10/passphrase.c:578 -#: g10/passphrase.c:885 -#: g10/passphrase.c:998 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" -msgstr "problem med GPG-Agent, inaktiverar den\n" +msgstr "problem med GPG-Agent, stänger av den\n" -#: g10/passphrase.c:680 -#: g10/passphrase.c:1104 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (huvudnyckelns identitet %08lX)" @@ -4036,13 +3995,11 @@ msgid "invalid response from agent\n" msgstr "felaktigt svar frÃ¥n GPG-Agent\n" -#: g10/passphrase.c:780 -#: g10/passphrase.c:879 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "avbruten av användaren\n" -#: g10/passphrase.c:785 -#: g10/passphrase.c:969 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n" @@ -4099,7 +4056,12 @@ msgid "no signed data\n" msgstr "ingen signerad data\n" +# se förra kommentaren #: g10/plaintext.c:472 +#, fuzzy, c-format +msgid "can't open signed data `%s'\n" +msgstr "kan inte öppna \"%s\"\n" + #: g10/pubkey-enc.c:101 #, c-format msgid "anonymous recipient; trying secret key %08lX ...\n" @@ -4169,7 +4131,7 @@ #: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" -msgstr "kan inte h?mta nyckeln fr?n en nyckelserver: %s\n" +msgstr "kan inte söka pÃ¥ nyckelservern: %s\n" #: g10/seckey-cert.c:53 msgid "secret key parts are not available\n" @@ -4196,14 +4158,16 @@ msgid "%s ...\n" msgstr "%s ...\n" -# är det nyckeln som är svag, konstigt +# För vissa krypteringsalgoritmer är det känt att vissa svaga nycklar kan förekomma. Dessa ska aldrig användas. GnuPG vill pÃ¥ detta sätt hindra dig frÃ¥n att skapa en sÃ¥dan nyckel. #: g10/seckey-cert.c:297 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "VARNING: Upptäckte en svag nyckel - byt lösenmening igen.\n" #: g10/seckey-cert.c:335 msgid "generating the deprecated 16-bit checksum for secret key protection\n" -msgstr "skapar den förÃ¥ldrade 16-bit kontrollsumman för skydd av den hemliga nyckeln\n" +msgstr "" +"skapar den förÃ¥ldrade 16-bit kontrollsumman för skydd av den hemliga " +"nyckeln\n" #: g10/sig-check.c:70 msgid "WARNING: signature digest conflict in message\n" @@ -4219,11 +4183,14 @@ #: g10/sig-check.c:96 #, c-format msgid "WARNING: signing subkey %08lX has an invalid cross-certification\n" -msgstr "WARNING signeringsundernyckel %08lX har en ogiltig korscertiifiering\n" +msgstr "" +"VARNING signeringsundernyckel %08lX har en ogiltig korscertiifiering\n" #: g10/sig-check.c:233 #, c-format -msgid "key %08lX: this is a PGP generated ElGamal key which is NOT secure for signatures!\n" +msgid "" +"key %08lX: this is a PGP generated ElGamal key which is NOT secure for " +"signatures!\n" msgstr "" "nyckel %08lX:: detta är en nyckel av ElGamal-typ genererad av PGP\n" "som inte är säker för signaturer!\n" @@ -4242,14 +4209,18 @@ # c-format behövs inte i singularis #: g10/sig-check.c:252 #, c-format -msgid "key %08lX has been created %lu second in future (time warp or clock problem)\n" +msgid "" +"key %08lX has been created %lu second in future (time warp or clock " +"problem)\n" msgstr "" "nyckel %08lX är skapad %lu sekund in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" #: g10/sig-check.c:254 #, c-format -msgid "key %08lX has been created %lu seconds in future (time warp or clock problem)\n" +msgid "" +"key %08lX has been created %lu seconds in future (time warp or clock " +"problem)\n" msgstr "" "nyckel %08lX är skapad %lu sekunder in i framtiden (problemet är\n" "relaterat till tidsresande eller en felställd klocka)\n" @@ -4262,17 +4233,20 @@ #: g10/sig-check.c:370 #, c-format msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" -msgstr "antar att signaturen gjord med nyckel %08lX är felaktig eftersom en okänd kritisk bit är satt\n" +msgstr "" +"antar att signaturen gjord med nyckel %08lX är felaktig eftersom en okänd " +"kritisk bit är satt\n" #: g10/sig-check.c:614 #, c-format msgid "key %08lX: no subkey for subkey revocation packet\n" -msgstr "nyckel %08lX: ingen undernyckel för spärr av undernyckel\n" +msgstr "nyckel %08lX: ingen undernyckel till paket för spärr av undernyckel\n" #: g10/sig-check.c:640 #, c-format msgid "key %08lX: no subkey for subkey binding signature\n" -msgstr "nyckel %08lX: ingen anv?ndaridentitet f?r signaturen\n" +msgstr "" +"nyckel %08lX: ingen undernyckel till signatur för bindning av undernyckel\n" # notation data? #: g10/sign.c:84 @@ -4283,12 +4257,16 @@ #: g10/sign.c:92 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -msgstr "kan inte lägga till noteringar i nyckelsignaturer signaturer gjorda med en v3-nyckel (PGP 2.x-typ)\n" +msgstr "" +"kan inte lägga till noteringar i nyckelsignaturer signaturer gjorda med en " +"v3-nyckel (PGP 2.x-typ)\n" #: g10/sign.c:111 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" -msgstr "VARNING: kan inte %%-expandera anteckning (för stor). Använder den utan expansion.\n" +msgstr "" +"VARNING: kan inte %%-expandera anteckning (för stor). Använder den utan " +"expansion.\n" #: g10/sign.c:137 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" @@ -4296,12 +4274,17 @@ #: g10/sign.c:145 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -msgstr "kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP 2.x-typ)\n" +msgstr "" +"kan inte lägga till en policy-URL i signaturer gjorda med en v3-nyckel (PGP " +"2.x-typ)\n" #: g10/sign.c:158 #, c-format -msgid "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" -msgstr "VARNING: kan inte %%-expandera policy-url (för stor). Använder den utan expansion.\n" +msgid "" +"WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n" +msgstr "" +"VARNING: kan inte %%-expandera policy-url (för stor). Använder den utan " +"expansion.\n" #: g10/sign.c:313 #, c-format @@ -4322,10 +4305,9 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n" -" i --pgp2-läge\n" +"när du är i --pgp2-läge\n" -#: g10/sign.c:683 -#: g10/sign.c:919 +#: g10/sign.c:683 g10/sign.c:919 #, c-format msgid "can't create %s: %s\n" msgstr "kan inte skapa %s: %s\n" @@ -4333,7 +4315,9 @@ #: g10/sign.c:712 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" -msgstr "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?llningar\n" +msgstr "" +"att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?" +"llningar\n" #: g10/sign.c:804 msgid "signing:" @@ -4341,7 +4325,9 @@ #: g10/sign.c:903 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" -msgstr "du kan endast krypterar till RSA nycklar som ?r h?gst 2048 bitar l?nga i --pgp2-l?ge\n" +msgstr "" +"du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n" +"när du är i --pgp2-läge\n" #: g10/sign.c:1057 #, c-format @@ -4358,14 +4344,12 @@ msgid "input line longer than %d characters\n" msgstr "indataraden är längre än %d tecken\n" -#: g10/tdbio.c:128 -#: g10/tdbio.c:1410 +#: g10/tdbio.c:128 g10/tdbio.c:1410 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n" -#: g10/tdbio.c:134 -#: g10/tdbio.c:1417 +#: g10/tdbio.c:134 g10/tdbio.c:1417 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n" @@ -4384,23 +4368,17 @@ msgid "%s: directory does not exist!\n" msgstr "%s: katalogen finns inte!\n" -#: g10/tdbio.c:496 -#: g10/tdbio.c:514 -#: g10/tdbio.c:557 +#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557 #, c-format msgid "%s: can't create lock\n" msgstr "%s: kan inte skapa lÃ¥s\n" -#: g10/tdbio.c:498 -#: g10/tdbio.c:560 +#: g10/tdbio.c:498 g10/tdbio.c:560 #, c-format msgid "%s: can't make lock\n" -msgstr "%s: kan inte skapa l?s\n" +msgstr "%s: kan inte skapa lÃ¥s\n" -#: g10/tdbio.c:504 -#: g10/openfile.c:250 -#: g10/openfile.c:325 -#: g10/keyring.c:1460 +#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: kan inte skapa: %s\n" @@ -4413,7 +4391,7 @@ #: g10/tdbio.c:523 #, c-format msgid "%s: invalid trustdb created\n" -msgstr "%s: felaktig tillitsdatabas skapad\n" +msgstr "%s: ogiltig tillitsdatabas skapad\n" #: g10/tdbio.c:526 #, c-format @@ -4427,7 +4405,7 @@ #: g10/tdbio.c:582 #, c-format msgid "%s: invalid trustdb\n" -msgstr "%s: felaktig tillitsdatabas\n" +msgstr "%s: ogiltig tillitsdatabas\n" #: g10/tdbio.c:614 #, c-format @@ -4439,18 +4417,13 @@ msgid "%s: error updating version record: %s\n" msgstr "%s: fel vid uppdatering av versionspost: %s\n" -#: g10/tdbio.c:638 -#: g10/tdbio.c:674 -#: g10/tdbio.c:688 -#: g10/tdbio.c:724 -#: g10/tdbio.c:1343 -#: g10/tdbio.c:1370 +#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724 +#: g10/tdbio.c:1343 g10/tdbio.c:1370 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s: fel vid läsning av versionspost: %s\n" -#: g10/tdbio.c:651 -#: g10/tdbio.c:703 +#: g10/tdbio.c:651 g10/tdbio.c:703 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s: fel vid skrivning av versionspost: %s\n" @@ -4524,7 +4497,7 @@ #: g10/trustdb.c:289 #, c-format msgid "key %08lX: no public key for trusted key - skipped\n" -msgstr "nyckel %08lX: hittade ingen motsvarande offentlig (publik) nyckel - ?verhoppad\n" +msgstr "nyckel %08lX: hittade ingen motsvarande öppen nyckel - överhoppad\n" # är det en bekräftelse av en förändring eller ett konstaterande? # Jfr nyckeln %08lX är förbehÃ¥llslöst betrodd\n @@ -4533,26 +4506,24 @@ msgid "key %08lX marked as ultimately trusted\n" msgstr "nyckeln %08lX är markerad som förbehÃ¥llslöst betrodd\n" -# req är nog felstavat i originalet dÃ¥ det syftar pÃ¥ record och inte -# request +# req stÃ¥r för request +# kollat med Werner. Per #: g10/trustdb.c:324 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "tillitspost %lu, posttyp %d: kunde inte läsa: %s\n" +msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n" #: g10/trustdb.c:330 #, c-format msgid "trust record %lu is not of requested type %d\n" msgstr "tillitsvärdet %lu är inte av begärd typ %d\n" -#: g10/trustdb.c:345 -#: g10/tdbdump.c:59 +#: g10/trustdb.c:345 g10/tdbdump.c:59 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n" -#: g10/trustdb.c:360 -#: g10/tdbdump.c:217 +#: g10/trustdb.c:360 g10/tdbdump.c:217 #, c-format msgid "trustdb: sync failed: %s\n" msgstr "tillitsdatabas: synkronisering misslyckades: %s\n" @@ -4561,8 +4532,7 @@ msgid "no need for a trustdb check\n" msgstr "det behövs ingen kontroll av tillitsdatabasen\n" -#: g10/trustdb.c:465 -#: g10/trustdb.c:1814 +#: g10/trustdb.c:465 g10/trustdb.c:1814 #, c-format msgid "next trustdb check due at %s\n" msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n" @@ -4605,12 +4575,15 @@ #: g10/trustdb.c:1680 #, c-format msgid "public key of ultimately trusted key %08lX not found\n" -msgstr "Hittar inte den öppna nyckeln tillhörande den förbehÃ¥llslöst betrodda nyckeln %08lX \n" +msgstr "" +"Hittar inte den öppna nyckeln tillhörande den förbehÃ¥llslöst betrodda " +"nyckeln %08lX \n" #: g10/trustdb.c:1755 #, c-format msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" -msgstr "kontrollerar vid djupet %d signerad=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" +msgstr "" +"kontrollerar vid djupet %d signerad=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n" #: g10/verify.c:110 msgid "" @@ -4628,19 +4601,18 @@ msgstr "raden %u är för lÃ¥ng, eller saknar nyradstecken\n" # Slumptalsgenerator: Random Number Generator -#: g10/skclist.c:129 -#: g10/skclist.c:185 +#: g10/skclist.c:129 g10/skclist.c:185 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" -msgstr "nyckeln är inte markerad som osäker - det gÃ¥r inte att använda den med fejkad slumptalsgenerator!\n" +msgstr "" +"nyckeln är inte markerad som osäker - det gÃ¥r inte att använda den med " +"fejkad slumptalsgenerator!\n" -# bubblerad? #: g10/skclist.c:157 #, c-format msgid "skipped `%s': duplicated\n" -msgstr "hoppade över \"%s\": kopia\n" +msgstr "hoppade över \"%s\": förekommer flera gÃ¥nger\n" -#: g10/skclist.c:164 -#: g10/skclist.c:172 +#: g10/skclist.c:164 g10/skclist.c:172 #, c-format msgid "skipped `%s': %s\n" msgstr "hoppade över `%s': %s\n" @@ -4651,7 +4623,9 @@ #: g10/skclist.c:179 #, c-format -msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n" +msgid "" +"skipped `%s': this is a PGP generated ElGamal key which is not secure for " +"signatures!\n" msgstr "" "hoppade över `%s': detta är en nyckel av ElGamal-typ genererad av PGP\n" "som inte är säker för signaturer!\n" @@ -4691,7 +4665,8 @@ #: g10/openfile.c:354 #, c-format msgid "WARNING: options in `%s' are not yet active during this run\n" -msgstr "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n" +msgstr "" +"VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n" #: g10/openfile.c:383 #, c-format @@ -4703,11 +4678,13 @@ msgid "%s: directory created\n" msgstr "%s: katalog skapad\n" +# I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas. #: g10/encr-data.c:91 -msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" +msgid "" +"WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" -"VARNING: meddelandet krypterades med en svag nyckel i den symmetriska\n" -"krypteringen.\n" +"VARNING: meddelandet krypterades med en svag nyckel\n" +"i den symmetriska krypteringen.\n" #: g10/encr-data.c:98 msgid "problem handling encrypted packet\n" @@ -4728,8 +4705,7 @@ msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n" -#: g10/delkey.c:121 -#: g10/delkey.c:128 +#: g10/delkey.c:121 g10/delkey.c:128 msgid "(unless you specify the key by fingerprint)\n" msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n" @@ -4795,10 +4771,12 @@ msgstr "Om du vill använda denna otillförlitliga nyckel ändÃ¥, svara \"ja\"." #: g10/helptext.c:68 -msgid "Enter the user ID of the addressee to whom you want to send the message." +msgid "" +"Enter the user ID of the addressee to whom you want to send the message." msgstr "Ange användaridentiteten till vilken du vill skicka meddelandet." -# Ska inte avsnittet om ElGAmal -signaturer utgÃ¥! +# Ska inte avsnittet om ElGAmal -signaturer utgÃ¥! SÃ¥dana signaturer knäcktes 2004. +# Jo, enligt Werner ska avsnittet bort till nästa version. #: g10/helptext.c:72 msgid "" "Select the algorithm to use.\n" @@ -4808,7 +4786,8 @@ "DSA signatures are much faster than those of ElGamal.\n" "\n" "ElGamal is an algorithm which can be used for signatures and encryption.\n" -"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n" +"OpenPGP distinguishs between two flavors of this algorithms: an encrypt " +"only\n" "and a sign+encrypt; actually it is the same, but some parameters must be\n" "selected in a special way to create a safe key for signatures: this program\n" "does this but other OpenPGP implementations are not required to understand\n" @@ -4829,11 +4808,13 @@ "OpenPGP-standarden skiljer pÃ¥ tvÃ¥ varianter av denna algoritm: en som bara\n" "kan användas för kryptering och en som bÃ¥de kan signera och kryptera.\n" "Egentligen är det samma algoritm, men vissa parametrar mÃ¥ste väljas pÃ¥\n" -"ett speciellt sätt för att skapa en säker nyckel för signaturer: detta program\n" +"ett speciellt sätt för att skapa en säker nyckel för signaturer: detta " +"program\n" "gör detta men andra OpenPGP-implementationer behöver inte förstÃ¥\n" "signatur+kryptering varianten.\n" "\n" -"Den första nyckeln (huvudnyckeln) mÃ¥ste alltid vara en nyckel som kan användas\n" +"Den första nyckeln (huvudnyckeln) mÃ¥ste alltid vara en nyckel som kan " +"användas\n" "för att skapa signaturer. Detta är anledningen till att den ElGamal-variant\n" "som bara krypterar inte är tillgänglig i denna meny" @@ -4861,13 +4842,8 @@ msgid "Enter the size of the key" msgstr "Ange storleken pÃ¥ nyckeln" -#: g10/helptext.c:109 -#: g10/helptext.c:114 -#: g10/helptext.c:126 -#: g10/helptext.c:158 -#: g10/helptext.c:186 -#: g10/helptext.c:191 -#: g10/helptext.c:196 +#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158 +#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196 msgid "Answer \"yes\" or \"no\"" msgstr "Svara \"ja\" eller \"nej\"" @@ -4889,11 +4865,11 @@ #: g10/helptext.c:136 msgid "please enter an optional but highly suggested email address" -msgstr "ange en epostadress. Detta är valfritt men rekommenderas varmt" +msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt" #: g10/helptext.c:140 msgid "Please enter an optional comment" -msgstr "Ange en valfri kommentar" +msgstr "Ange en kommentar (frivilligt)" #: g10/helptext.c:145 msgid "" @@ -4905,7 +4881,7 @@ msgstr "" "N för att ändra namnet.\n" "C för att ändra kommentaren.\n" -"E för att ändra epostadressen.\n" +"E för att ändra e-postadressen.\n" "O för att fortsätta med nyckelgenerering.\n" "Q för att avsluta nyckelgenereringen." @@ -4919,51 +4895,74 @@ "belongs to the person named in the user ID. It is useful for others to\n" "know how carefully you verified this.\n" "\n" -"\"0\" means you make no particular claim as to how carefully you verified the\n" +"\"0\" means you make no particular claim as to how carefully you verified " +"the\n" " key.\n" "\n" "\"1\" means you believe the key is owned by the person who claims to own it\n" -" but you could not, or did not verify the key at all. This is useful for\n" -" a \"persona\" verification, where you sign the key of a pseudonymous user.\n" -"\n" -"\"2\" means you did casual verification of the key. For example, this could\n" -" mean that you verified the key fingerprint and checked the user ID on the\n" +" but you could not, or did not verify the key at all. This is useful " +"for\n" +" a \"persona\" verification, where you sign the key of a pseudonymous " +"user.\n" +"\n" +"\"2\" means you did casual verification of the key. For example, this " +"could\n" +" mean that you verified the key fingerprint and checked the user ID on " +"the\n" " key against a photo ID.\n" "\n" -"\"3\" means you did extensive verification of the key. For example, this could\n" +"\"3\" means you did extensive verification of the key. For example, this " +"could\n" " mean that you verified the key fingerprint with the owner of the key in\n" -" person, and that you checked, by means of a hard to forge document with a\n" -" photo ID (such as a passport) that the name of the key owner matches the\n" -" name in the user ID on the key, and finally that you verified (by exchange\n" +" person, and that you checked, by means of a hard to forge document with " +"a\n" +" photo ID (such as a passport) that the name of the key owner matches " +"the\n" +" name in the user ID on the key, and finally that you verified (by " +"exchange\n" " of email) that the email address on the key belongs to the key owner.\n" "\n" "Note that the examples given above for levels 2 and 3 are *only* examples.\n" -"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n" +"In the end, it is up to you to decide just what \"casual\" and \"extensive" +"\"\n" "mean to you when you sign other keys.\n" "\n" "If you don't know what the right answer is, answer \"0\"." msgstr "" -"När du signerar ett användar-ID pÃ¥ en nyckel, mÃ¥ste du först kontrollera att nyckeln\n" -"verkligen tillhör den person som nämns i användar-ID:t. Det är viktigt för andra att\n" +"När du signerar ett användar-ID pÃ¥ en nyckel, mÃ¥ste du först kontrollera att " +"nyckeln\n" +"verkligen tillhör den person som nämns i användar-ID:t. Det är viktigt för " +"andra att\n" "fÃ¥ veta hur noga du har kontrollerat detta.\n" "\n" -"\"0\" betyder att du inte pÃ¥stÃ¥r nÃ¥gonting om hur noga du kontrolleratnyckeln.\n" -"\n" -"\"1\" betyder att du tror att nyckeln tillhör den person som pÃ¥stÃ¥r sig göra det\n" -" men du kunde inte, eller ville inte kontrollera nyckeln alls. Detta är användbartför\n" -" en \"persona\" kontroll, där du signerar nyckeln för en användare med pseudonym.\n" +"\"0\" betyder att du inte pÃ¥stÃ¥r nÃ¥gonting om hur noga du " +"kontrolleratnyckeln.\n" "\n" -"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda att\n" -" du kontrollerade fingeravtrycket och kontrollerade användar-ID:t för nyckeln\n" +"\"1\" betyder att du tror att nyckeln tillhör den person som pÃ¥stÃ¥r sig göra " +"det\n" +" men du kunde inte, eller ville inte kontrollera nyckeln alls. Detta är " +"användbartför\n" +" en \"persona\" kontroll, där du signerar nyckeln för en användare med " +"pseudonym.\n" +"\n" +"\"2\" betyder att du gjorde viss kontroll av nyckeln. Det kan t.ex. betyda " +"att\n" +" du kontrollerade fingeravtrycket och kontrollerade användar-ID:t för " +"nyckeln\n" " mot en fotolegitimation.\n" "\n" -"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln. Detta kan t.ex.\n" -" betyda att du kontrollerade nyckelns fingeravtryck direkt med nyckelinnehavaren\n" -" och att du kontrollerade, med hjälp av svÃ¥rförfalskade identitetsdokument\n" +"\"3\" betyder att du gjorde en noggrann och uttömmande kontroll av nyckeln. " +"Detta kan t.ex.\n" +" betyda att du kontrollerade nyckelns fingeravtryck direkt med " +"nyckelinnehavaren\n" +" och att du kontrollerade, med hjälp av svÃ¥rförfalskade " +"identitetsdokument\n" "a\n" " med foto (tex ett körkort) att namnet pÃ¥ innehavaren stämmer med\n" -" namnet i användar-ID:t pÃ¥ nyckeln, och slutligen att du kontrollerade att(genom att utväxla\n" -" e-postmeddelanden) att e-postadressen pÃ¥ nyckeln tillhör nyckelinnehavaren.\n" +" namnet i användar-ID:t pÃ¥ nyckeln, och slutligen att du kontrollerade att" +"(genom att utväxla\n" +" e-postmeddelanden) att e-postadressen pÃ¥ nyckeln tillhör " +"nyckelinnehavaren.\n" "\n" "Obs! OvanstÃ¥ende exempel för nivÃ¥erna 2 och 3 är bara förslag.\n" "Slutligen är det bara du själv som avgör vad \"viss\" and \"noggrann\"\n" @@ -5040,8 +5039,10 @@ "to the current list of preferences. The timestamp of all affected\n" "self-signatures will be advanced by one second.\n" msgstr "" -"Ändra dina inställningar för alla användar-ID:n (eller enbart för en av de valda)\n" -"till den aktuella listan pÃ¥ inställningar. Tidsstämplingen för alla pÃ¥verkade\n" +"Ändra dina inställningar för alla användar-ID:n (eller enbart för en av de " +"valda)\n" +"till den aktuella listan pÃ¥ inställningar. Tidsstämplingen för alla " +"pÃ¥verkade\n" "egensignaturer kommer att flyttas fram en sekund.\n" #: g10/helptext.c:244 @@ -5084,10 +5085,11 @@ " Use this to state that the user ID should not longer be used;\n" " this is normally used to mark an email address invalid.\n" msgstr "" -"Du borde ange en anledning till certifikationen. Beroende pÃ¥ sammanhanget\n" -"har du möjligheten att välja frÃ¥n följande lista:\n" +"Du borde ange en anledning till spärren. Beroende pÃ¥ sammanhanget\n" +"har du möjlighet att välja frÃ¥n följande lista:\n" " \"Nyckeln har tappat sin säkerhet\"\n" -" Använd denna om du har anledning att tro att icke auktoriserade personer\n" +" Använd denna om du har anledning att tro att icke auktoriserade " +"personer\n" " har fÃ¥tt tillgÃ¥ng till din hemliga nyckel.\n" " \"Nyckeln har ersatts\"\n" " Använd denna om du har ersatt denna nyckel med en nyare.\n" @@ -5095,7 +5097,7 @@ " Använd denna om du har pensionerat denna nyckel.\n" " \"Användaridentiteten är inte längre giltig\"\n" " Använd denna för att visa att denna användaridentitet inte längre\n" -" skall användas. Detta används normalt för att visa att en epostadress\n" +" skall användas. Detta används normalt för att visa att en e-postadress\n" " är ogiltig.\n" #: g10/helptext.c:286 @@ -5105,7 +5107,8 @@ "An empty line ends the text.\n" msgstr "" "Om du vill kan du ange en text som beskriver varför du utfärdar\n" -"detta spärrcertifikat (revocation certificate). Försök att hÃ¥lla texten kort och koncis.\n" +"detta spärrcertifikat (revocation certificate). Försök att hÃ¥lla texten kort " +"och koncis.\n" "En tom rad avslutar texten.\n" #: g10/helptext.c:301 @@ -5117,22 +5120,22 @@ msgid "No help available for `%s'" msgstr "Det finns ingen hjälp tillgänglig för \"%s\"" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "fel vid skapande av nyckelringen \"%s\": %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "%s: nyckelring skapad\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "misslyckades med att Ã¥terskapa nyckelringscache: %s\n" -# märkligt felmeddelande, kolla upp +# Enligt Werner uppstÃ¥r detta om nÃ¥got gÃ¥r snett när den hemliga nyckeln uppdateras. #: g10/keyring.c:1226 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "VARNING: det finns 2 filer med konfidentiell information.\n" @@ -5195,9 +5198,10 @@ msgid "Unable to open photo \"%s\": %s\n" msgstr "Kan inte öppna fotot \"%s\": %s\n" +# Obs! Syftar pÃ¥ bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil. #: g10/photoid.c:97 msgid "Are you sure you want to use it (y/N)? " -msgstr "Vill du verkligen sp?rra denna nyckel? " +msgstr "Vill du verkligen använda det (j/N)?" #: g10/photoid.c:112 #, c-format @@ -5223,9 +5227,10 @@ # Behörighet att komma Ã¥t inställningarna, tror jag. Inte behörigheter i inställningsfilen. #: g10/exec.c:325 -msgid "external program calls are disabled due to unsafe options file permissions\n" +msgid "" +"external program calls are disabled due to unsafe options file permissions\n" msgstr "" -"anrop av externa program är inaktiverat pga osäkra behörigheter för\n" +"anrop av externa program är avstängt pga osäkra behörigheter för\n" "inställningsfilen\n" #: g10/exec.c:355 @@ -5242,8 +5247,7 @@ msgid "system error while calling external program: %s\n" msgstr "systemfel när externa program anropades: %s\n" -#: g10/exec.c:524 -#: g10/exec.c:583 +#: g10/exec.c:524 g10/exec.c:583 msgid "unnatural exit of external program\n" msgstr "externa program avslutades felaktigt\n" @@ -5256,8 +5260,7 @@ msgid "unable to read external program response: %s\n" msgstr "kan inte läsa svaret frÃ¥n det externa programmet: %s\n" -#: g10/exec.c:594 -#: g10/exec.c:601 +#: g10/exec.c:594 g10/exec.c:601 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n" @@ -5267,9 +5270,7 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n" -#: g10/keyid.c:317 -#: g10/keyid.c:329 -#: g10/keyid.c:341 +#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341 msgid "never " msgstr "aldrig" @@ -5278,12 +5279,8 @@ msgstr "ofullständing nyckel\n" # Vad? -#: g10/revoke.c:102 -#: g10/revoke.c:116 -#: g10/revoke.c:128 -#: g10/revoke.c:174 -#: g10/revoke.c:186 -#: g10/revoke.c:568 +#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 +#: g10/revoke.c:186 g10/revoke.c:568 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet misslyckades: %s\n" @@ -5293,8 +5290,7 @@ msgid "key %08lX incomplete\n" msgstr "nyckel %08lX är inte komplett\n" -#: g10/revoke.c:214 -#: g10/revoke.c:433 +#: g10/revoke.c:214 g10/revoke.c:433 msgid "sorry, can't do this in batch mode\n" msgstr "kan inte göra detta i batch-läge\n" @@ -5306,19 +5302,21 @@ msgid "(This is a sensitive revocation key)\n" msgstr "(Detta är en känslig spärrnyckel)\n" -#: g10/revoke.c:297 -#: g10/revoke.c:503 +#: g10/revoke.c:297 g10/revoke.c:503 msgid "Create a revocation certificate for this key? " msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?" -#: g10/revoke.c:310 -#: g10/revoke.c:534 +# --force översatt med: +# genomdriv (använd alltid?) +# -do-not-force översatt med: +# genomdriv inte +# I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gÃ¥ att skriva ut. +#: g10/revoke.c:310 g10/revoke.c:534 msgid "ASCII armored output forced.\n" -msgstr "utdata med ett ascii-skal valt.\n" +msgstr "utdata med ett ascii-skal genomdrivet.\n" # Vad menas??? -#: g10/revoke.c:324 -#: g10/revoke.c:548 +#: g10/revoke.c:324 g10/revoke.c:548 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet misslyckades: %s\n" @@ -5369,8 +5367,8 @@ "Var vänlig flytta det till ett media du kan gömma; om Mallory fÃ¥r\n" "fÃ¥r tillgÃ¥ng till detta certificate kan han göra din nyckel oanvändbar.\n" "Det är klokt att skriva ut detta certifikat och gömma det, ifall ditt\n" -"media blir oläsligt. But have some caution: The print system of\n" -"your machine might store the data and make it available to others!\n" +"media blir oläsligt. Men se upp: Utskriftsfunktionen pÃ¥\n" +"din dator kan spara data sÃ¥ att det blir Ã¥tkomligt för andra!\n" #: g10/revoke.c:615 msgid "Please select the reason for the revocation:\n" @@ -5387,7 +5385,7 @@ #: g10/revoke.c:668 msgid "Enter an optional description; end it with an empty line:\n" -msgstr "Skriv en frivillig beskrivning; avsluta med en tom rad:\n" +msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n" #: g10/revoke.c:696 #, c-format @@ -5416,15 +5414,16 @@ #: g10/tdbdump.c:140 #, c-format msgid "can't open file: %s\n" -msgstr "Kan inte öppna fil %s\n" +msgstr "Kan inte öppna fil: %s\n" #: g10/tdbdump.c:151 msgid "line too long\n" msgstr "raden är för lÃ¥ng\n" +# Det ska vara ett kolon pÃ¥ denna plats, men det saknas! #: g10/tdbdump.c:159 msgid "error: missing colon\n" -msgstr "fel: saknar kolon\n" +msgstr "fel: kolonet saknas\n" #: g10/tdbdump.c:164 msgid "error: invalid fingerprint\n" @@ -5442,5 +5441,4 @@ #: g10/tdbdump.c:208 #, c-format msgid "read error: %s\n" -msgstr "Läsfel: %s\n" - +msgstr "läsfel: %s\n" Index: gnupg/po/tr.po diff -u gnupg/po/tr.po:1.6.2.18 gnupg/po/tr.po:1.6.2.19 --- gnupg/po/tr.po:1.6.2.18 Fri Aug 13 19:02:17 2004 +++ gnupg/po/tr.po Mon Dec 27 18:26:49 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-07-08 08:10+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -2105,29 +2105,29 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk belleÄŸinde çok fazla girdi - iptal edildi\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[Kullanıcı kimliÄŸi bulunamadı]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "" "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli " "oldu\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "" "yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n" @@ -3866,7 +3866,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "\"%s\" sunucusuna baÄŸlanılamadı: %s\n" @@ -3875,11 +3875,11 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ile haberleÅŸme problemi\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (asıl anahtar kimliÄŸi %08lX)" @@ -3911,16 +3911,16 @@ msgid "invalid response from agent\n" msgstr "yanıt geçersiz\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "kullanıcı tarafından durduruldu\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3930,22 +3930,22 @@ "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n" "Anahtarın sahibi: \"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "" "%u bitlik %s anahtarı, %08lX kimliÄŸi ile\n" "%s tarihinde üretilmiÅŸ" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "önceden tanımlanmış iÅŸlemler kipinde (batchmode) parola sorgulanamaz\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "Anahtar parolasını girin: " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "Tekrar: " @@ -4011,41 +4011,41 @@ msgid "NOTE: key has been revoked" msgstr "BÄ°LGÄ°: anahtar yürürlükten kaldırılmıştı" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "%08lX anahtarı %s adresinden isteniyor\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "anahtar sunucusunun %s adresinden anahtar alınamadı\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "\"%s\" adresine gönderme hatası: %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "\"%s\" adresine gönderme iÅŸlemi baÅŸarılı (durum=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "\"%s\" adresine gönderme iÅŸlemi baÅŸarısız (durum=%u)\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "bu anahtar sunucusu --search-keys seçeneÄŸini desteklemiyor\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "HKP sunucusunun %2$s adresinde \"%1$s\" aranıyor\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "anahtar sunucusu aranamıyor: %s\n" @@ -4589,7 +4589,7 @@ "simetrik ÅŸifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere " "denendi!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n" @@ -4979,17 +4979,17 @@ msgid "No help available for `%s'" msgstr "\"%s\" için yardım mevcut deÄŸil" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "`%s' anahtar zinciri oluÅŸturulurken hata: %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "`%s' anahtar zinciri oluÅŸturuldu\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "anahtar zinciri belleÄŸi yeniden oluÅŸturulurken hata: %s\n" Index: gnupg/po/zh_CN.po diff -u gnupg/po/zh_CN.po:1.1.2.5 gnupg/po/zh_CN.po:1.1.2.6 --- gnupg/po/zh_CN.po:1.1.2.5 Fri Aug 13 19:02:17 2004 +++ gnupg/po/zh_CN.po Mon Dec 27 18:26:49 2004 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2004-07-20 15:50+0200\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" @@ -2067,26 +2067,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk »º´æÀïÏîÄ¿Ì«¶à¡ª¡ªÒѽûÓÃ\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[ÕÒ²»µ½Óû§±êʶ]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid ÄÜÈÃÎÞЧµÄÃÜÔ¿ %08lX ÉúЧ\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "¹«Ô¿ %08lX ûÓÐÏà¶ÔÓ¦µÄ˽Կ¡ª¡ªÕýÔÚºöÂÔ\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "ʹÓÃ×ÓÔ¿ %08lX ¶ø·ÇÖ÷Ô¿ %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "ÃÜÔ¿ %08lX£ºÖ»ÓÐ˽Կ¶øûÓй«Ô¿¡ª¡ªÒÑÌø¹ý\n" @@ -3788,7 +3788,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "²»Ö§³Ö gpg-agent ЭÒé°æ±¾ %d\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "ÎÞ·¨Á¬½ÓÖÁ¡®%s¡¯£º%s\n" @@ -3797,11 +3797,11 @@ msgid "communication problem with gpg-agent\n" msgstr "Óë gpg-agent ͨѶÓÐÎÊÌâ\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "´úÀí³ÌÐòµÄÎÊÌ⡪¡ªÕýÔÚÍ£ÓôúÀí³ÌÐò\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr "(Ö÷Ô¿³×ºÅ %08lX)" @@ -3833,16 +3833,16 @@ msgid "invalid response from agent\n" msgstr "´úÀí³ÌÐòÏìÓ¦ÎÞЧ\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "Óû§È¡Ïû\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "´úÀí³ÌÐòµÄÎÊÌ⣺´úÀí³ÌÐò·µ»Ø 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3852,20 +3852,20 @@ "ÄúÐèÒªÏÂÁÐʹÓÃÕßµÄÃÜÂ룬²ÅÄܽ⿪˽Կ£º\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u ×Ö½ÚµÄ %s ÃÜÔ¿£¬Ô¿³×ºÅ %08lX£¬½¨Á¢ÓÚ %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "ÔÚÅú´¦ÀíģʽÖÐÎÞ·¨Ñ¯ÎÊÃÜÂë\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "ÇëÊäÈëÃÜÂ룺" -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "ÇëÔÙÊäÈëÒ»´ÎÃÜÂ룺" @@ -3931,41 +3931,41 @@ msgid "NOTE: key has been revoked" msgstr "×¢Ò⣺ÃÜÔ¿Òѱ»µõÏú" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "ÕýÔÚ²éѯÃÜÔ¿ %08lX£¬À´×Ô %s\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "ÎÞ·¨´Ó¹«Ô¿·þÎñÆ÷È¡µÃÃÜÔ¿£º %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "ÉÏ´«µ½¡®%s¡¯µÄʱºò·¢Éú´íÎó£º%s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "³É¹¦ÉÏ´«ÖÁ¡®%s¡¯(״̬ = %u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "ÉÏ´«µ½¡®%s¡¯Ê§°Ü£º×´Ì¬ = %u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "´Ë¹«Ô¿·þÎñÆ÷²»Ö§³Ö --search-keys\n" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "ÕýÔÚËÑÑ°¡°%s¡±£¬ÔÚ HKP ·þÎñÆ÷ %s ÉÏ\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "ÎÞ·¨ËÑÑ°¹«Ô¿·þÎñÆ÷£º%s\n" @@ -4480,7 +4480,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "¶Ô³Æ¼ÓÃÜÎÞ·¨±ÜÃâÉú³ÉÈõÃÜÔ¿£»ÒѾ­³¢ÊÔ %d ´Î£¡\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA ÒªÇóʹÓà 160 ×Ö½ÚµÄÉ¢ÁÐËã·¨\n" @@ -4861,17 +4861,17 @@ msgid "No help available for `%s'" msgstr "¡®%s¡¯Ã»ÓпÉÓõİïÖú" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "½¨Á¢Ô¿³×»·¡®%s¡¯Ê±·¢Éú´íÎó£º%s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "Ô¿³×»·¡®%s¡¯Òѽ¨Á¢\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "ÖØн¨Á¢Ô¿³×»·»º´æʧ°Ü£º %s\n" Index: gnupg/po/zh_TW.po diff -u gnupg/po/zh_TW.po:1.1.2.15 gnupg/po/zh_TW.po:1.1.2.16 --- gnupg/po/zh_TW.po:1.1.2.15 Fri Aug 13 19:02:16 2004 +++ gnupg/po/zh_TW.po Mon Dec 27 18:26:49 2004 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2004-08-13 18:54+0200\n" +"POT-Creation-Date: 2004-12-27 17:50+0100\n" "PO-Revision-Date: 2003-05-13 15:48+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -2072,26 +2072,26 @@ msgid "too many entries in pk cache - disabled\n" msgstr "pk §Ö¨ú¸Ì¦³¤Ó¦h¶µ¥Ø ¢w ¤w¸T¥Î\n" -#: g10/getkey.c:186 g10/getkey.c:2672 +#: g10/getkey.c:186 g10/getkey.c:2689 msgid "[User id not found]" msgstr "[§ä¤£¨ì¨Ï¥ÎªÌ ID]" -#: g10/getkey.c:1607 +#: g10/getkey.c:1630 #, c-format msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid ¯àÅýµL®Äªºª÷Æ_ %08lX ¥Í®Ä\n" -#: g10/getkey.c:2160 +#: g10/getkey.c:2179 #, c-format msgid "no secret subkey for public subkey %08lX - ignoring\n" msgstr "¤½Æ_ %08lX ¨S¦³¬Û¹ïÀ³ªº¨pÆ_ ¢w ¥¿¦b©¿²¤\n" -#: g10/getkey.c:2388 +#: g10/getkey.c:2407 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "¥¿¦b¨Ï¥Î¦¸Æ_ %08lX ¨Ó´À´«¥DÆ_ %08lX\n" -#: g10/getkey.c:2435 +#: g10/getkey.c:2454 #, c-format msgid "key %08lX: secret key without public key - skipped\n" msgstr "ª÷Æ_ %08lX: ¬é¦³¨pÆ_¦Ó¨S¦³¤½Æ_ ¢w ¤w¸õ¹L\n" @@ -3785,7 +3785,7 @@ msgid "gpg-agent protocol version %d is not supported\n" msgstr "gpg-agent ¨ó©wª©¥» %d ¥¼³Q¤ä´©\n" -#: g10/passphrase.c:549 g10/hkp.c:155 +#: g10/passphrase.c:549 g10/hkp.c:156 #, c-format msgid "can't connect to `%s': %s\n" msgstr "µLªk³s±µ¦Ü `%s' ¡G %s\n" @@ -3794,11 +3794,11 @@ msgid "communication problem with gpg-agent\n" msgstr "gpg-agent ªº³q°T°ÝÃD\n" -#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992 +#: g10/passphrase.c:578 g10/passphrase.c:885 g10/passphrase.c:998 msgid "problem with the agent - disabling agent use\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD ¢w ¥¿¦b°±¥Î¥N²zµ{¦¡\n" -#: g10/passphrase.c:680 g10/passphrase.c:1098 +#: g10/passphrase.c:680 g10/passphrase.c:1104 #, c-format msgid " (main key ID %08lX)" msgstr " (¥D­nª÷Æ_ ID %08lX)" @@ -3830,16 +3830,16 @@ msgid "invalid response from agent\n" msgstr "¥N²zµ{¦¡¶Ç¦^µL®Äªº¦^À³\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:780 g10/passphrase.c:879 msgid "cancelled by user\n" msgstr "¥Ñ¨Ï¥ÎªÌ¨ú®ø¤F\n" -#: g10/passphrase.c:785 g10/passphrase.c:963 +#: g10/passphrase.c:785 g10/passphrase.c:969 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "¥N²zµ{¦¡ªº°ÝÃD¡G¥N²zµ{¦¡¶Ç¦^ 0x%lx\n" -#: g10/passphrase.c:1084 +#: g10/passphrase.c:1090 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -3849,20 +3849,20 @@ "©p»Ý­n¤U¦C¨Ï¥ÎªÌªº±K½X¦ê¡AÅׯà¸Ñ¶}¨pÆ_¡G\n" "\"" -#: g10/passphrase.c:1093 +#: g10/passphrase.c:1099 #, c-format msgid "%u-bit %s key, ID %08lX, created %s" msgstr "%u ¦ì¤¸ %s ID %08lX ªºª÷Æ_¡A«Ø¥ß©ó %s" -#: g10/passphrase.c:1145 +#: g10/passphrase.c:1151 msgid "can't query password in batchmode\n" msgstr "¦b§å¦¸¼Ò¦¡¤¤µLªk¸ß°Ý±K½X\n" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1155 msgid "Enter passphrase: " msgstr "½Ð¿é¤J±K½X¦ê¡G " -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1159 msgid "Repeat passphrase: " msgstr "½Ð¦A¿é¤J¤@¦¸±K½X¦ê¡G " @@ -3928,41 +3928,41 @@ msgid "NOTE: key has been revoked" msgstr "½Ðª`·N¡Gª÷Æ_¤w¸g³QºM¾P¤F" -#: g10/hkp.c:71 +#: g10/hkp.c:72 #, c-format msgid "requesting key %08lX from %s\n" msgstr "ª÷Æ_ %08lX ¥¿¦V %s ­n¨D¤¤\n" -#: g10/hkp.c:98 +#: g10/hkp.c:99 #, c-format msgid "can't get key from keyserver: %s\n" msgstr "µLªk±qª÷Æ_¦øªA¾¹¨ú±oª÷Æ_¡G %s\n" -#: g10/hkp.c:183 +#: g10/hkp.c:184 #, c-format msgid "error sending to `%s': %s\n" msgstr "¶Ç°e¨ì `%s' ªº®É­Ôµo¥Í¿ù»~¡G %s\n" -#: g10/hkp.c:198 +#: g10/hkp.c:199 #, c-format msgid "success sending to `%s' (status=%u)\n" msgstr "¦¨¥\¦a¶Ç°e¨ì `%s' (ª¬ºA=%u)\n" -#: g10/hkp.c:201 +#: g10/hkp.c:202 #, c-format msgid "failed sending to `%s': status=%u\n" msgstr "¶Ç°e¨ì `%s' ªº®É­Ô¥¢±Ñ¤F¡Gª¬ºA=%u\n" -#: g10/hkp.c:373 +#: g10/hkp.c:384 msgid "this keyserver does not support --search-keys\n" msgstr "" -#: g10/hkp.c:523 +#: g10/hkp.c:534 #, c-format msgid "searching for \"%s\" from HKP server %s\n" msgstr "¥¿¦b·j´M \"%s\" ©ó HKP ¦øªA¾¹ %s ¤W\n" -#: g10/hkp.c:575 +#: g10/hkp.c:586 #, c-format msgid "can't search keyserver: %s\n" msgstr "µLªk·j´Mª÷Æ_¦øªA¾¹¡G %s\n" @@ -4478,7 +4478,7 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "µLªkÁקK¹ïºÙ¦¡½s±Kªkªº®zª÷Æ_¡F¤w¸g¸Õ¤F %d ¦¸¤F¡I\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA ­n¨D¨Ï¥Î 160 ¦ì¤¸ªºÂø´êºtºâªk\n" @@ -4859,17 +4859,17 @@ msgid "No help available for `%s'" msgstr "`%s' ¨S¦³¥i¥Îªº»¡©ú" -#: g10/keydb.c:156 +#: g10/keydb.c:160 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "«Ø¥ßÆ_°Í°é `%s' ®Éµo¥Í¿ù»~¡G %s\n" -#: g10/keydb.c:163 +#: g10/keydb.c:167 #, c-format msgid "keyring `%s' created\n" msgstr "Æ_°Í°é `%s' ¤w«Ø¥ß\n" -#: g10/keydb.c:639 +#: g10/keydb.c:646 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "­«·s«Ø¥ßÆ_°Í°é§Ö¨ú¥¢±Ñ¡G %s\n" Index: gnupg/scripts/config.guess diff -u gnupg/scripts/config.guess:1.9.2.2 gnupg/scripts/config.guess:1.9.2.3 --- gnupg/scripts/config.guess:1.9.2.2 Fri Aug 13 19:00:47 2004 +++ gnupg/scripts/config.guess Mon Dec 27 18:26:49 2004 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-07-19' +timestamp='2004-08-13' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -203,9 +203,6 @@ amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; cats:OpenBSD:*:*) echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -230,18 +227,12 @@ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -1179,9 +1170,10 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; Index: gnupg/scripts/depcomp diff -u gnupg/scripts/depcomp:1.1 gnupg/scripts/depcomp:1.1.2.1 --- gnupg/scripts/depcomp:1.1 Fri Aug 23 10:02:08 2002 +++ gnupg/scripts/depcomp Mon Dec 27 18:26:49 2004 @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. + +scriptversion=2004-05-31.23 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,22 +27,45 @@ # Originally written by Alexandre Oliva . +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -172,19 +197,25 @@ aix) # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" - outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi - stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else rm -f "$tmpdepfile" @@ -192,6 +223,7 @@ fi if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. @@ -206,38 +238,89 @@ rm -f "$tmpdepfile" ;; +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put # dependencies in `foo.d' instead, so we check for that too. # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - base=`echo "$object" | sed -e 's/\.o$//' -e 's/\.lo$//'` - tmpdepfile1="$base.o.d" - tmpdepfile2="$base.d" if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. + tmpdepfile1="$dir.libs/$base.lo.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else + tmpdepfile1="$dir$base.o.d" + tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" - else + elif test -f "$tmpdepfile2"; then tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -250,34 +333,42 @@ dashmstdout) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - test -z "$dashmflag" && dashmflag=-M - ( IFS=" " - case " $* " in - *" --mode=compile "*) # this is libtool, let us make it quiet - for arg - do # cycle over the arguments - case "$arg" in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg ;; esac - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" tr ' ' ' @@ -295,33 +386,37 @@ ;; makedepend) - # X makedepend - ( - shift - cleared=no - for arg in "$@"; do - case $cleared in no) - set ""; shift - cleared=yes - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift;; - esac + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + shift + fi + # X makedepend + shift + cleared=no + for arg in "$@"; do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix="`echo $object | sed 's/^.*\././'`" + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' @@ -334,35 +429,39 @@ cpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test $1 != '--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg ;; esac - "$@" -E | + done + + "$@" -E | sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -372,49 +471,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, + # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + "$@" || exit $? + IFS=" " + for arg + do + case "$arg" in + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift shift ;; - *) + *) set fnord "$@" "$arg" shift shift ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi + esac + done + "$@" -E | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" @@ -434,3 +511,12 @@ esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gnupg/scripts/install-sh diff -u gnupg/scripts/install-sh:1.3 gnupg/scripts/install-sh:1.3.2.1 --- gnupg/scripts/install-sh:1.3 Sat Jun 29 15:37:55 2002 +++ gnupg/scripts/install-sh Mon Dec 27 18:26:49 2004 @@ -1,19 +1,38 @@ #!/bin/sh -# # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). + +scriptversion=2004-10-22.00 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# Copyright 1991 by the Massachusetts Institute of Technology +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -23,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -41,211 +58,266 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - : - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' + -t) dstarg=$2 + shift + shift + continue;; -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + -T) no_target_directory=true shift + continue;; - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - : - fi + --version) echo "$0 $scriptversion"; exit 0;; - pathcomp="${pathcomp}/" + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - : - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi -fi && +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } +done -exit 0 +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gnupg/scripts/missing diff -u gnupg/scripts/missing:1.2 gnupg/scripts/missing:1.2.2.1 --- gnupg/scripts/missing:1.2 Sat Jun 29 15:37:55 2002 +++ gnupg/scripts/missing Mon Dec 27 18:26:49 2004 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + +scriptversion=2004-09-07.08 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -38,18 +42,24 @@ configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit 0 ;; -*) @@ -87,14 +101,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,16 +185,11 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. - You can get \`$1Help2man' as part of \`Autoconf' from any GNU + You can get \`$1' as part of \`Autoconf' from any GNU archive site." file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` @@ -185,7 +209,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,13 +281,8 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -284,32 +298,28 @@ tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error # messages. if (gnutar --version > /dev/null 2>&1); then - gnutar ${1+"$@"} && exit 0 + gnutar "$@" && exit 0 fi if (gtar --version > /dev/null 2>&1); then - gtar ${1+"$@"} && exit 0 + gtar "$@" && exit 0 fi firstarg="$1" if shift; then case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" ${1+"$@"} && exit 0 + tar "$firstarg" "$@" && exit 0 ;; esac fi @@ -323,10 +333,10 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -334,3 +344,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gnupg/scripts/mkinstalldirs diff -u gnupg/scripts/mkinstalldirs:1.5.2.1 gnupg/scripts/mkinstalldirs:1.5.2.2 --- gnupg/scripts/mkinstalldirs:1.5.2.1 Tue Aug 10 19:23:10 2004 +++ gnupg/scripts/mkinstalldirs Mon Dec 27 18:26:49 2004 @@ -1,20 +1,32 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2004-02-15.20 + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" 1>&2 + echo "$usage" exit 0 ;; -m) # -m PERM arg @@ -23,6 +35,10 @@ dirmode=$1 shift ;; + --version) + echo "$0 $scriptversion" + exit 0 + ;; --) # stop option processing shift break @@ -50,17 +66,37 @@ 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') - if mkdir -p -- . 2>/dev/null; then + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; esac @@ -84,17 +120,17 @@ mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi @@ -107,5 +143,8 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here From cvs at cvs.gnupg.org Mon Dec 27 19:01:32 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Jan 28 12:17:18 2005 Subject: STABLE-BRANCH-1-2 gnupg/doc (ChangeLog samplekeys.asc) Message-ID: Date: Monday, December 27, 2004 @ 19:06:50 Author: wk Path: /cvs/gnupg/gnupg/doc Tag: STABLE-BRANCH-1-2 Modified: ChangeLog samplekeys.asc Updated samplekeys ----------------+ ChangeLog | 4 samplekeys.asc | 3096 ++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 1930 insertions(+), 1170 deletions(-) Index: gnupg/doc/ChangeLog diff -u gnupg/doc/ChangeLog:1.19.2.64 gnupg/doc/ChangeLog:1.19.2.65 --- gnupg/doc/ChangeLog:1.19.2.64 Tue Aug 3 23:35:06 2004 +++ gnupg/doc/ChangeLog Mon Dec 27 19:06:50 2004 @@ -1,3 +1,7 @@ +2004-12-27 Werner Koch + + * samplekeys.asc: Replaced by version from 1.4.0. + 2004-08-03 David Shaw * gpg.sgml: Note that --throw-keyid is --throw-keyids. Index: gnupg/doc/samplekeys.asc diff -u gnupg/doc/samplekeys.asc:1.2.2.5 gnupg/doc/samplekeys.asc:1.2.2.6 --- gnupg/doc/samplekeys.asc:1.2.2.5 Wed Feb 4 02:20:45 2004 +++ gnupg/doc/samplekeys.asc Mon Dec 27 19:06:50 2004 @@ -1,1179 +1,1935 @@ - pub 1024D/5B0358A2 1999-03-15 Werner Koch - uid Werner Koch + pub 1024D/5B0358A2 1999-03-15 [expires: 2009-07-11] + uid Werner Koch + uid Werner Koch + uid Werner Koch + sub 1024D/010A57ED 2004-03-21 [expires: 2007-12-31] + sub 2048R/B604F148 2004-03-21 [expires: 2005-12-31] - pub 1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) + pub 1024D/57548DCD 1998-07-07 [expires: 2005-12-31] + uid Werner Koch (gnupg sig) - pub 1024D/621CC013 1998-07-07 Werner Koch - uid Werner Koch - uid Werner Koch - sub 1536g/ADF6A6E1 1999-02-20 [expires: 2002-11-01] - sub 1536G/B5A18FF4 1998-07-07 [expires: 2002-07-06] - sub 1536R/23D2A63D 2002-07-30 [expires: 2003-12-31] + pub 4096R/99242560 2002-01-28 + uid David M. Shaw + sub 2048g/1643B926 2002-01-28 [expires: 2012-01-26] + sub 1024D/49E1CBC9 2002-01-28 [expires: 2012-01-26] - pub 4096R/99242560 2002-01-28 David M. Shaw - sub 2048g/1643B926 2002-01-28 [expires: 2012-01-26] - sub 1024D/49E1CBC9 2002-01-28 [expires: 2012-01-26] + pub 2048R/CA57AD7C 2004-12-06 + uid PGP Global Directory Verification Key + uid [jpeg image of size 3400] - pub 1024D/B2D7795E 2001-01-04 Philip R. Zimmermann - uid Philip R. Zimmermann - uid [jpeg image of size 3369] - uid [jpeg image of size 3457] - sub 3072g/A8E92834 2001-01-04 + pub 1024D/B2D7795E 2001-01-04 + uid Philip R. Zimmermann + uid Philip R. Zimmermann + uid [jpeg image of size 3369] + uid [jpeg image of size 3457] + uid Philip R. Zimmermann + sub 3072g/A8E92834 2001-01-04 + + pub 1024R/37D92FFB 2003-11-17 [expires: 2009-12-31] + uid g10 Code (code signing key 1) -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.5-cvs (GNU/Linux) +Version: GnuPG v1.3.92 (GNU/Linux) -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 -7wAKCRCe3S/TMCo4dsE0AKCtLNULkuWeRKJgdrI06Hp5ME6HzgCggkMeIKIKyhko -tJhazNkesxAwTYyIRgQTEQIABgUCP2mmPQAKCRD7K/90Ou4UIZCeAJkBnd1b5IOi -p1JmMncNdp/sxUKB2QCgndXJNLk4WrMGhV+vGnzwaqFEopKIRgQTEQIABgUCP2oW -cgAKCRCMsYtH4EE5YX1CAJsEZkElql7bFhbaLXRe4y80LAoyewCcDi2RKFOF44yC -7zH1UIXYE9yuPcGIRgQTEQIABgUCP2pSOAAKCRD7AD7VxQYeqbLgAJ4wcQm6E4+o -38xOsbdATKbu6KBKqACdFCL0mSaydaYfF6uB4rYETtRBJEGIRgQTEQIABgUCP2qU -wAAKCRB999a6hsd8RHBCAJ4s9aoSE26ViV7hx/rjTCvXlq1JfACgimVNZ3Yxb1AM -Vs1CK+Q/lHQyPKaIRgQTEQIABgUCP2rtxwAKCRCJUnY0IJ3w08GNAJ9ZxCT3nTY5 -BbaYW+QTI3YYnCNkbQCfdbffn2C6vlofhGQekocCko4iqQCIRgQTEQIABgUCP2sD -1AAKCRD6z0HVcbkTHC1KAKCxrwjSB1sCF9InYGy4lu7ieXucRQCgkU0UzHW8PGV8 -lWjGlQuv4vlh8ZqIRgQTEQIABgUCP5TcRwAKCRB7Tl1hmnthcsvbAKCOFNmrraji -eQAxcHT1BRufTInNIQCdFEsyqVVjZziOpIhqDvvjFhYf476IlQQTEQIAVQUCPigi -sU4aaHR0cDovL3d3dy5wb2JveC5jb20vfnBrYWhsZS9wZ3AvcG9saWN5L0Q2ODVE -Mzk3NjlBMzhBREUtREI2OThENzE5OTI0MjU2MC5hc2MACgkQ1oXTl2mjit7dvQCe -LP1Jt4y98+pso+hNhmgg2o3zUs0An1gpEE/1rVpYxh8QPjnkoAdLl8w7iJkEExEC -AFkFAj4m6WxSGmh0dHA6Ly93d3cudm9sdGEuZHluZG5zLm9yZy9+bXdsL3BncC9w -b2xpY3kvQ0ZCMEEwNEMyMDIwRUVENS1EQjY5OEQ3MTk5MjQyNTYwLmFzYwAKCRDP -sKBMICDu1ZUcAJ9x4myZskZjkV7zIwVDkeaD5DcMUACguU9kordVZCyvfRrkblgz -wh1JBiqIRgQQEQIABgUCQBCPqQAKCRCnUhCQq7QRIFIkAKDyq/NaOZyN3PpplhUj -J+2W1QPt+gCfaizP0Xr96qfkSiWrwKtSb8EZ846IRgQSEQIABgUCQBx03QAKCRAe -T2ZJ6ikXhcm0AKC36fDkDOH7PbZ8BInj1DlsGJsHsgCgovuuhQuDma4tDvO+A6Aw -JN7oBrSIRgQTEQIABgUCQB1lLwAKCRBmUBI1GUYtR2YHAJ9PVg/LzFADzoEu6+gd -Gkdibeb+RwCg0TuUDn/9g+S9gPJCaUKk4aEXkZ2IRgQTEQIABgUCQB5gDgAKCRCV -2F1rp0KDn4HPAKCyj8wmX+bwfQGy/pCBEqDaktRJKQCdHxUBaQXOxGq3iistsm9K -Af8ogvO5Ag0EPFTLBBAIAO5SrjR8+omG/tqQGW8a46eQB1fOqW7VSUAVqRlpBixE -Rm+sNoWEy/GF6+yYLXgZstWv/peWWI52RUPOtN3mUQtYPv5K67lpn4icRPx7R1XF -Ug1MVzSYhOuw6UnRj3/InCMd3PdV5LovYn0t1TEo9Xs1i5ufzmBdbrU0OUIsK780 -7mgrPI1g1M8SO+xXM0GEBC7g5h3r3XuCnuujHlgiWm7PTkOoutb7qya49VkEPab1 -zs3G3aEBbQBf7xivNq569KeXA8nrN0uZQiguJyIb6JB6LQn+t2FFOmnxvTi6fwEp -XKdodtb5rQ6e8UoOg+yL5+XB7R5wbwoRur40PSDuYHcAAwUIAJzRe8+VXFdNC22E -MTdb1++4isCdWhGVUmDKyZ77YbSTzOWpQLDkEUXvOaYGbAX3dsYCmw2RbEGj3ovp -+fZzD08ZevGLK2DlmgXvSEZxCgWCB0lcAwBrBHccjioKYTTu3ECnKUVnXqovRUNd -XFlS2a0qgoZk/WermBiw2mysAIWJek6xENifTszOfOiwEWR2/JtjDnBq5Wvl2WWp -54xFX2nouaJ/CLoTi2pcf78e+Atai4vQdXyPycgrCZTELo5A66c/NIcCMmr7rSwf -U3UGZ/E7jai/5u3KVNWDGzSGv9TsNgoqO864a/xb01+CoDGhqurpMe6lgw2zBPeg -ReeyDLSJAiIEGAECAAwFAjxUywQFCRLMAwAACgkQ22mNcZkkJWDxrA/+NILMckL+ -DPARXz4JzxDmJUhAcKYm6/l0Xau6vfJ9xfWZV4yR6u+EYV+mqLS9dMKXjG+n3BSo -ZmjLvDYceD1D/foddSOxMJjHi59qaxv7Em7IAmOLbBFtPDWw83F3Y+vir3pKROpW -JjmuDkUExDg8fNXfUfA8XKlAmB2J/omDGxA5wWZh4D3OYZBrwTY9hfnRrOJ9Igb8 -RUgaE0sx2/V5LBt/3KvA3VufTHCcNf508jdpCyLxozaknlftj9qHoeTUSQB7PV+V -vmWq/rKr5Rw2tXtI6tkqzIVnTg9aoE19wcxcroVltyCS3XMhRKejbAvy9niXZFsH -JU9cYRL5vCxLAdtZ3RNlDaSIzlHHRbxJ2GvOA4vGaSLxL54BuqvbZuSteA12WEHM -7Dfq6zl4E2H8WxLgs6RQoNQ2WkUJlpF3MsM6OxdmFIMNZxXvU5SKyyYF2XI4PoaN -1DZqrla/qjVdSM2ApBOiO9Cf0N37lzn1XTNldCUE2lnwTlBaMMFTcsyOV0pfE08L -JbBjfK6BABgUd9ycIQcuk5XYRK50dabyDlbdJJBl2xKiCGDjb37HXdiyBWVH8noI -fKBQiTQ5ijmyp7lcmR+d0N24E59Og+U3QWgivbrFalHviWdSuFS8vttJEogami5H -pd+Ne6Pm6naS91LvIF8tW7DocqPZu/boPKK5AaIEPFTL2xEEAPWI56sUWj4Cq24U -0Kq8xjGAbj+EJW7EHhAwN8veI5TyvvnnX8lBlE56rlxwypj5y8LKrM2GQrAt+Z1T -/BTrINHgE2GAI+QPbjw1FxkJFtXjUBRqIeaeEsQUGSpVSQgCclYDMVw7VMA240PQ -pDjja79WJWow8/Yfch3xVI0KwuO7AKDl/CwcTCVXQKhjDkBnCNpU1k36tQQAmm2p -amd+e9fnj6ABLKksWXpYRwP0nuqMZX8VjUIpQxrIFEpud5e8niZ/vKmbokZuPcDJ -T2Z8ywOYrDAIdFMqE0pz7PJZ2Qy26OP7OB9ic9PjGoSUmLTbUikzYbib+xYf5EBl -ZbQGp4lEHnnKCSu2MYSm577Fys4O2BC9gyygwOAD/0Q3g0YSu3oV25HjjXibDj47 -43QE8UmuyKPhiFBQdQki4Gh3wuN2/I+0uaRImfDDlvpMJz9+RvPYdSvPZxaQuO17 -fMv+Qx+Gf7cN0nWhCK/E0i97v1DiuIGRHOblYQhgQF/wXSGBVnTtlFIxGjt6Md/J -YB9B3zbHKoDecwhBHOpZiQIiBBgBAgAMBQI8VMvbBQkSzAMAAAoJENtpjXGZJCVg -LYUP/0AkjdbBWnqhUBJIu34OhNJ/re5jvldZZTcpqexvD6t4kiNnffaIo1ZNgUJ6 -24XS8vsI5fS8ss3772kNOEMAFLyTUYCGjqcZGG989rXN9YaPXjmLEEZisVcxlsNY -otThJzAcpbAGhufBqRSP+TE37nCJSQb16BEpB0qIsqL9j3dXN4Sf+jrhWG5+Xb2K -ZQYtit6QKtdjgplrYnBbz0waVZb0xA9IfiNd96DtXtUcfffbtfz0IC3puan7s98C -7/a/KpF4MtQKnThATbL10qNPclmg0ymmVm+pO74jqupNmgzouJq/KoK3/KG7On6T -n4OlkMPg0S/0/SlBxdBFEj1RDJGzHNVdoh1EalwRpyLGuSQItXldXDK6fU9uQ11h -5RH10Zzz4800iciYdhZi/TZ0K7Jh3/H+w4ke7swoAPPkmakZq+qNo9BQD1K1eBJj -GAe8E2D8D0+xF15mLPJtKL2pl8BmyME9mfxBoTnN1HQEBdt9qNeeptPe7Ym+RzG0 -0/vAHI1902nlwyaYyN+Vsm3yfBdixFpibEMDwvTDAn8u0pVvAVKkwWnpT70mKCnS -0+hTsbZ6AFWJ9dFkSBeyxEskiahDbKUqb9wAif6tY2TenF2ChZbyi0eQXvzFrZ2d -gF6sB5kf12BrVyOhUZjXesa2/pj9kMJIoTHs1U/stkPxKIF0mQGiBDWiHh4RBAD+ -l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT43No/coPajDvhZTaD -M/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwWG2dx39ME7DN+SRvE -E1xUm4E9G2Nnd2UNtLgg82wgi/ZK4Ih9CYDyo0a9awCgisn3RvZ/MREJmQq1+SjJ -gDx+c2sEAOEnxGYisqIKcOTdPOTTie7o7x+nem2uac7uOW68N+wRWxhGPIxsOdue -MIa7U94Wg/Ydn4f2WngJpBvKNaHYmW8j1Q5zvZXXpIWRXSvyTR641BceGHNdYiR/ -PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxYurUIBACi7d1rUlHr -4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnqbAAW+EUUX2xpb54C -evAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9quf0yvby63kFCanQ -Kc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtvY2ggKGdudXBnIHNp -ZykgPGRkOWpuQGdudS5vcmc+iGIEExECACIFAj4HI6kCGwMFCQpPc4sECwcDAgMV -AgMDFgIBAh4BAheAAAoJEGi3q4lXVI3NjGwAnitvWvzrdrjf+Y8MNw+JH7zKDiVI -AKCIJyojVHeliciZ8DMU2Dxd0LaZYIhGBBARAgAGBQI1oic8AAoJEGx+4bhiHMAT -ftYAn1fOaKDUOt+dS38rB+CJ2Q+iElWJAKDRPpp8q5GylbM8DPlMpClWN3TYqYhG -BBARAgAGBQI27U5sAAoJEF3iSZZbA1iiarYAn35qU3ZOlVECELE/3V6q98Q30eAa -AKCtO+lacH0Qq1E6v4BP/9y6MoLIhohGBBARAgAGBQI26PrdAAoJEAcDKpaJBMji -EpgAoM3IisrN7XXdhnP9lmx0UJKE7SsFAJwMWIBnGK93ojuWXh9YgDRySZKZqIhG -BBARAgAGBQI5zA88AAoJEDLDW4BHupNX9vwAn1ZRUYyIWV5XoRUIq7Epz1id+hDV -AKDMZSo15h9vfGAjrytpxOs5clW+G5kBogQ1oiDzEQQAtg97Rc2w+PH6KdND4jPP -nbtkmehzoGFaKT/hrZtlgQ1I5BcAwpMNAy/aUt4jSLpx4H3rsw25uEd5V0145Zgc -VIzVQZF+GZkREhKGjdun7BVm9UbwYFXCnDfg8mOBhT/S0PCclonwHNfqPR5xNJON -A+dpQS10n+7+CYb2PTbXxPMAoOKF02gokRT0gpSJKN0aiZK56b9XBACsd9q5xKIO -Zjz7PJltUsucrpQkyq2wi/Uu8CDbTHBehSTZtjwfe1cvhRnxhyhJdijPAAurdwij -lRknSr05/vWYjxYsraIVJhWmWlNfRYwKUB2Qa3ceBVvvG06Ea3WYQp5FCM1nYu15 -RCtEMP0xND5fFy8Q3QikCPiQEl71tHofMAP+J5wKYbBKUdRlmuCpbO/vyjv1fEN1 -y4t2XiLZ8vuTAQ5/2OwN7uEazbvKt0kSYAb1AX1M4X0skWYTUKqSBb4SkrGxjTVa -ObQEUkHVHuI9RpS0VFnFip+BdquY+OqXaIGL5xWMvMa77gFKiNUA+A/+GFycijB/ -gzh50+IgIw/UZWO0Gldlcm5lciBLb2NoIDx3a0BnbnVwZy5vcmc+iGgEExECACAF -CwcKAwQDFQMCAxYCAQIXgAUJClEDhgUCPvGPUQIZAQASB2VHUEcAAQEJEGx+4bhi -HMATUd4AoK21FmNTJP5vAB8drSe4wb+gxNYgAKDaPjWO6v0Cy5AFfdVMtKKgyDMS -ZIhGBBARAgAGBQI515CqAAoJEF3iSZZbA1ii6mEAoMlgca31J1BPB7QU4OT/Vo4l -qnXdAJ0X9jzcq7luWTSXun0fxyJyD4k/JLQhV2VybmVyIEtvY2ggPHdlcm5lci5r -b2NoQGd1dWcuZGU+iGMEExECABsDCwoDAxUDAgMWAgECF4AFAj7wvogFCQpRA4YA -EgdlR1BHAAEBCRBsfuG4YhzAE4K/AKCHF663QX7B65V1p14kWLeIzbTBjACgnNDJ -80QtxXQ8Vfc1212lgRabePiJAHUDBRA1o3cUHRn0wQyYV6UBAT3zAv9HMaPuMWFQ -KZRTtJyGMo0ID+w/DtLn8z7CMBd5L2+2+RTTY36fgwITehtBziIJC9xrFrQnx+VB -2pYvprTRSCg6U7a/hf5T6WT9zj887C2UuIWE6pjLNTvwAqvGsSoAIpWIRgQQEQIA -BgUCNu1OCwAKCRBd4kmWWwNYonyaAKCxLBsteoVfwn5g5Lug9QgVCMV76QCfRgQK -XQv9zl4oO7Aa1Qljm9zEM3C0HFdlcm5lciBLb2NoIDx3a0BnMTBjb2RlLmNvbT6I -ZQQTEQIAHQULBwoDBAMVAwIDFgIBAheABQI+8L55BQkKUQOGABIHZUdQRwABAQkQ -bH7huGIcwBOmMQCdFcNmdDdygP1ERyssmXisa22kfhEAnA0fhVxaxufXclb9ghka -3kqUTBPpiEYEEBECAAYFAjrZjLoACgkQXeJJllsDWKIeugCgv/vK9GSiG/qMTGZr -oWkat9UXK/QAoLRmljpyVj5kZvY2eMscl2vMVjhItBpXZXJuZXIgS29jaCA8d2tA -b3Blbml0LmRlPohJBDARAgAJBQI+8cH4Ah0gAAoJEGx+4bhiHMAT7sEAni8ARnnl -Q4Qlekn8JC1cgaAt5xGZAJkBnOhzuvZOA+GLBzadVCSDHz5tUohRBDARAgAJBQI6 -Gk+UAh0gABIJEGx+4bhiHMATB2VHUEcAAQFJ3wCfd30iP3w5mgbWJbx2lH78Vtxm -OocAn2sXLgUg8EU7jhgiKVJeSkGAntoziGQEExECABwECwoEAwMVAwIDFgIBAheA -BQI+8L6IBQkKUQOGABIHZUdQRwABAQkQbH7huGIcwBNqdwCghPbaE/ctxLLX6eyY -Sgeii+68LuUAn02TXgzknaVvDdQxecLIq5P2ak8zuQGNBDbPBwgQBgD3NYQqbl5m -kwwFGyKkvQhR5IoTJ4pSMAFfi9g26uXjj7aHpjysefusbWX882Pf1QlcGQsWPWOT -xDfa/7cFAOO/C/xTl7+ROAaV/uEfdZJbfxGRnDXw5dgK+ehaRid4i4OPr8cfZtU1 -eZNpzTlGQFQ9S/jKGqVoWmRVyzAoa4Q1HG6O/9Ra9UX7/Y/y5JCCSYan9xvB8xOQ -LwkFUssFGsmGXW5qnYmNm5JWSVRQF7NV/c0kxqBXPHjsc+otWXjKvhsAAwYF/0+6 -OUfkjk5Se9mnP4NdtX9ZBV9XW0ZEKtqQiPeak3oadQMXUsBt7q9rJRQn4vGQzVKp -BVya7L+Zodcn6qu80uU+pRk+ZTlwg2WwDtsKjWWNVSnngnXLw9lTHofF8SX8vMtW -Sv4hNafKp6JGKQN5xR/iSLHa15OXHojd5ypPmg2plJFdbCc3hJuRe0B3utKASm1R -iFBeBIRqunWlcngniuCoVrj2MohIMmquf8SWW0d7kXHVul+QIhiViTjkKBr1s4hU -BBgRAgAMBQI2zwcIBQkG88kAABIJEGx+4bhiHMATB2VHUEcAAQF5FQCggakIOYzL -X3lNq2WWgcAkSNm7kpoAnA69b3z2E5vxyD3bhggVUDX7j8hruQGNBDWiITwUBgCR -CYCU5eLFvzCtrzesTWLssIQ0vOW8FlYoFc3g416VkCeeQ6bsipGMyG0pEk3vnOpX -IpRpTAMqOl/0nkra3vmZLEG2ds1Govdeh2Mcr3c5wBSTPdyLuK4L9vbgkjarhd5A -b+/hhHVWh0zTMRDUgLQkKrg+Xf1BnJcl1kKtQW8xxermu41KV3O0GpMUVSIVuTDU -W6D9nJcm97YVVxuxFcWsHsQS7L6KJT+Rn81WIqTQvhPopEdWwSKuI2UKKJtbX18A -AwUF/1Nu/rsoUwOsupBqf/ShJKh2MNAoMaq2iHspBggo9ep+pPxx533J3kwsXA8p -/e3sBYbW5xbbHXXwA1iQ9JTXbZROd0+xrHRxjheRofFo3Ck0UKi0ZDRRFKHEo2ly -pt1+/L7V3ymkRq+A7LGdXUk6QuNkkvArxuDEV1s9ZywkmeO64fc/DPzsLNOA5JhD -Ew+cjBBzHlu5khXk14Qsm1xtt3dFW5or8ZCG3xAmm5dKOLw2XUWKFgOMAJHxNpGU -CHnQaYhOBCgRAgAGBQI4K/uDABIJEGx+4bhiHMATB2VHUEcAAQHYUwCfXER7vu6t -oZMaRX56JOJkYrKHwk4AoM6D4zSLmIolevsCweaNdezDVj2QiFQEGBECAAwFAjWi -ITwFCQeEzgAAEgkQbH7huGIcwBMHZUdQRwABAQ31AKC7LUfHIOULR8EkN5xQjihE -RFBSMACgyA9yt4TPm+o1taPrTV/XZ42/mDG4ywQ9RsdvAQYA4c7Pmb5FdkDl8S+8 -tQhCIOJZV/UNXHp7X23ADQSPYrZdKaUlU7VSsZHbSYMOlq+qTssywKM2WHxY7kig -A56lKmQkBlFx7jxiDf3i9QY9K3Y4OEr5mbDpAeEd6gw2pQE/lredN6HYgkP4Sg4L -LAJPVg454p3eBMP+Fg1YXUVBHocJIzhEEwHAi4igX0pknKDfGTQHa/fFWylohOME -nOe0RokE72tNYtAEEFxG0jElvKu2DfTnMKL6j/CbUVXu+BntAAYpiE8EGBECAA8C -GwwFAj7wvr0FCQKsXU4ACgkQbH7huGIcwBP5wQCgrrPfdtdf0UgPZlCoJ9RM12hR -uEgAoI9gUzmWE8LsyB+a3ruEnGnXe8i6mQGiBDbtSOkRBACURhKnGIFyXIeX61GA -Y9hJA5FgG4UalV55ohdz4whBgDzDGLE3XYlO8HCn4ggKilll6MOwY0yZeg6PEU9Y -3SqTzpQSV6qj2M7MgcS8xOpi6bNCu0iyZUik0KklUXMdI8e/CVmBpQJT9CofbD1d -sP6z4dC6z3jil0+5Wbfw6yIXzwCgy/7Fagq5mN0H760/JEiiXILS1n0D/3H26lTa -xo1vGput9Td1FQN7Vn6YDP0/To5ipsOODROV3zyUwF5QleY+8zTFJA3qD5KxRfA7 -26WELOF1mB6Mw44UdkPniOoGdMH5oSx6qnNnlVZBBu3U+e1qfQwLQjHu0WX4Z2q0 -0DKpWLThGv7Loh5NKi6OfTbMhfHoevCAzQnmA/wKc6J8GqthENThKXxZaei3Ep0t -+PlBmbUzuAYCXZhI6/0KyD6emyQ7LYIaPv9qEfMkMLhxicG0v/AAwOCBRKS3bkqc -6wAYaO0bjUHJvem3HkWPux82t83+6YPyRnVjm/mwt0uEyKSvt7Md2DVrO3lEcKRk -RHiYuf0nonPhl5Rs5bQaV2VybmVyIEtvY2ggPHdrQGdudXBnLm9yZz6IYwQTEQIA -GwUCNxrPkAUJDMl8gAMLCgMDFQMCAxYCAQIXgAASCRBd4kmWWwNYogdlR1BHAAEB -XcIAnjv7ON5AiwzCLBwm9h9ywufXJQuVAJ9RMq6lpPqnDly6UCKz+kGt0EplyIhG -BBARAgAGBQI3GtE9AAoJEGx+4bhiHMAThfQAnjcDvBthtHotN89IP590GSKY287x -AJ0WhKl9j7gWwpVqCD+ofcq0ZQBG1IkAdQMFEDca0WMdGfTBDJhXpQEB0a4C/0Az -Sj1eSYFs4ss2x7xCn0yMPxML+hJdjGnVb0CPJGzzeKpD69pmVsD87nPa53gj0NXi -/ADnQvPmcsVs8dr7K5PxXFOXaJzDm72tnLeJKiTesZfMY7MQ0yYQUhUWogSY8YhG -BBARAgAGBQI3GtGjAAoJEGi3q4lXVI3NLfgAoISt+x9r02Hl14njSfGmZIjyUrXu -AJ9FhxTqLUHU1uDZmSSvlKpOcG1pYIhGBBARAgAGBQI3Tx9dAAoJEPbu3yAYS8TZ -Lb4Ani50OXjsQCc/gr5G+xZy/yqOqnOWAJ44VlluXNaN6J7yhB9iXtsEGvE+oohG -BBARAgAGBQI3pyb+AAoJEJg0ZdshQ5QifskAn0stcy37RHy7iB2bFB4rPVNDJaiz -AJ9hCH+0yNTOTisrEHLhS0QufAn3H4hFBBARAgAGBQI34UEzAAoJEDZnYPF9LteI -eecAn3eTmQldy/AIYuEFvyaF1FPmQdDNAJj3trsO1mAyzs7+PB++rZunMveeiEYE -EBECAAYFAjgqYg8ACgkQ4/JYVBKPDnkbHQCfRR7qUYmwTxtrf+Fw6hfsYjCy//AA -n1eRdkkdCExOJPwvrHEtZydSmVA1iEYEEBECAAYFAjg+hAUACgkQPLiSUC+jvC3t -pACfQIFhqwTuBllnuUOkgMa6rulX+/YAoKlktYF043aeqSrUw4iS/E2j4jwEiEYE -EBECAAYFAjjp0koACgkQTdZxWszFN4L6bwCgwpuua61qgAtpaSOYHX7fWt7H47kA -oKn8qLSkNxNkGYIN3eN31wTq7SqMiEYEEBECAAYFAjkqNrsACgkQgb3TxA4fm3ll -6QCfa40KVqCwh3fujwV6ytgjRLzH6A0An3cM5d0pHySOgPt+3SuzTimP2uUTiEYE -EBECAAYFAjkqcbcACgkQPiBPySqQhyxNbwCg1IeeK1RtmnBNTMQdLEL6d9lG8gYA -n1s8mpGiWhgi+wFlaI3kuiDcDjMfiEYEEBECAAYFAjkuMbwACgkQPYrxsgmsCmqo -TQCgvcENAwnf9lDDBCrcjipm+UY4VhwAnA0RAPIuxkYC3cYcl4GkkbADGb6/iD8D -BRA5LirQnrLk82kWyHMRAuBMAKCKWYTrqJFhNImeQlk+X5b1xc1oawCaAzpR/yyf -0SdhudOGUweAbHkTop+IRgQQEQIABgUCOSwoRgAKCRCz7YQ1nRvHyDszAJ9f/wdM -rzjb9+6Uu18SVxbRFb1rzACfXwxRrspMDv1roRUqupreo0u3a/WJARwEEAEBAAYF -Ajkq/oEACgkQBZx+4vCGy7UjPwf/cpeL9YTs57Ue7DaHQDUkbKX7Mojbemj5F6e5 -IoLU1fzbU1HKsg3VToIrPIF0wp6JZ3j9s1oP29AW3dIorgKCNGqzr3hNXW57Vzn6 -JjdO2NNJHa8DLEAJJyXpywibhMAle5IwNJ64TXvVCxdIlrkIRcFKcdM493kH7juE -Cv7QbXp+BYUf1YuNk0DyzckFk2Dr2FBIOJkLUUig/RK4FQmTjuGZmmMjM0YoZHFb -N8rza0CTd5LWyaer5XUu8MtYleQb9dUl5flKxPpbIgFxeyr14yT+3yYPJXETlJsI -W7tM0gwQvx/j1sRCTvvF/63/mfMM5jWID+rYfWWj/Sdxq6h8LIkBFQMFEDkumfUR -woHVACkrgQEBGq8H/02ToR2DbPmy0XJqDwKqU5yJVREZ1mkf+RH862VmQge9rh+A -X1yELYX/B3asx+gb8F6CXWO+3ho4BHYSr+oQIeWRZ4wgyvjJZUmqFiDtZP52KvYy -xk5xLkVGnMzJUO5q5j8qYFAoTsSDUnuZUj0KBFlO+SRC6wOHzmlSE6VrtvafhAsK -tuJwukL8wGUcTWd9zEMSJjHAD6slJOcuDzAj7uo5fp+qN3fNXcuAp30fAVnvCzwe -BqiDfkcmkgV96/9w6lwUw6XjZxDFkgjjnBxBPiMjfaXBKMA4xZgxsBRIgSMOzVJ+ -jCRy7Ry+1NlMOXLRS9MmND46MN7T6gk6h+uYq5+JAJUDBRA5RfikK3geLOOa8+kB -ATzqA/9h/nqpjpB7mcI5rV7Hvf9kw+84QuXvIpOiE9lHE9YezLrcV/8LILoDp09l -82JR1/Fg7gGyK0aHvq6dGZ4WN/9rDBaN86q/HrZtilYxvsThBC3Yp6w2OAr/I1pU -c8a2wprgTaBaj/6tZAeB+rXiKDHzD4o6jKpGFRk3TX0bIsw36okAlQMFEDkumgl7 -f3QZUtHKsQEBTGAD/R1ZGu/coFU0lce1iMOUcfXMGH7HuLxMjZoA8Q3ZvPfNYj1d -aKSc251WbvG2ynrWIwn/Fe+UPQlqzGGTz8kdE9rA07yRZHdR8piychHtYHGuU00G -JzcxMytQLJGzMuoYDZ3ycmodDkcE2SFPexkkXObQSyGbKmyY3ltuROq69NiJiEYE -EBECAAYFAjkxv8MACgkQvVi2kgKRLFOGyQCgq/dfbwyk9bT1SF+O5D2t7Ga5u5EA -n0Qku7aZSkzsF1cqLXQeYLS6Lib+iEwEEBECAAwFAjkufh8FAwlnUwAACgkQ14y8 -5WanSzHLCwCgu0KGRgV+RPZgkYaZ+tbbiitJKGsAn3sK9GUncLlUWWcwT+vd94Ca -/gOLiEYEEBECAAYFAjlKjdcACgkQXLe38qCqXB4KJwCg74PkIZVEki2jaffdpdhT -XK7GGIQAoL76QT7DKrkEBuLxhfQEBTF9Fe2aiQCVAwUQOWNdCO9tgkHwgRldAQHV -3QP+I0zA4bYwkyvOIyIiiRXpS9uCq0bcASW1vkTwIZNLfA7xxuqvH7Ii/dkoufcc -BHy+3kpGRB7urGL+EVoik+4xeTLzlOttfJka+JtjSyIcXKsB6b+M/8RVTTgGXn2c -tsFEXe9TqdA/wxGfq/j2nrqgO0AA81FByYWPP6xcYxl8UECIRgQQEQIABgUCOWoD -XwAKCRCH1qDd2koRFoYJAKC5zSV1Nkvv6PoC+WnlUhXUKf4MLQCgjo8GRaTCZ8V4 -1tY+BFnE65D65miIRgQQEQIABgUCOco7CgAKCRAru0Om8J6vClEEAJ0XWupTgymm -GZjcZa1qYj3JYoISzQCfbB4cHUtKX/GcB4r4t+yY6huDa8qIRgQQEQIABgUCOcv9 -8QAKCRAyw1uAR7qTV3OjAJ9C5fVUOKB40GwJzEq92Y9TnhDKHACgqrJyFiv+Esep -CB9VTawRNw5j9hOIRgQQEQIABgUCOcqdbwAKCRA19mF8UTrv2cMBAJwPbQYhIxdK -8y7V/3lLudmKkuZRsQCfcshNGObvD9ve6oCCaCMp4BCof06IRgQQEQIABgUCOcsy -JgAKCRBRrPatdb6Al6nyAKC9xO9CO0KOna88JD70u+uJaSCvJgCgtYn/WWGLqM8t -jo2Wbg1WsUb5bO+IRgQQEQIABgUCOczcRwAKCRDeeq9ulMCcf7EOAJ9TdXYGkr1U -Uwjx3Q/9FDuoM9TlrQCeIzEQkVXQXs7JIh7P5pcqUUsdggWIRgQQEQIABgUCOc8O -9QAKCRALYw/cIyO20gGoAJ9z0HnrZH71+Av49X5UaMBInM/zkwCfWslBVVVBIus/ -pJ0cdvG1s+vjUcaIRgQQEQIABgUCOc/KTAAKCRAT1C4a9op4vNtdAKCiS31KNDGH -u0g6D2gn4tyQ9Dq5rQCfRxsULGP7Vg+8xcQbZJvAx7teZ66IRgQQEQIABgUCOcqL -MwAKCRAXpkFt95SP2i3BAJ9TEj5VQk2zoPjbXp6aqfGG9ifc3gCgkVXbXi6ceY47 -4iJ5fjrcPu0wbSeJARUDBRA5yphYGk+GS77fSDEBASYpCACadO0OUmhMcglWkxHd -ZeXlqJGbL4U6VS+teOu1aFgz1hlL3W3hAiCcwHYCm0hNBgFxDgUnuNhFumTzOKDS -LQbJgOMPeWasTb5eCW6HE72pIAa5ew5RCy6rr99DRapucG1RBn8IlbQLJ2kV8TnH -y4DVMLzCsYJ89FyZ9Wtzx73dS0pLBZaCjjE6SIlBdPSzlX+JHT2lR25JxOmCMuNm -icDNHY0qiNrLY+GnbsYcE78dTpFvZkY5Vl8ix10WP0z1g3A7wv+qOdQ2/jyKADXL -FjHJs7+INor/ozQuMpZyQ84mFQjZsNTXaOl7uMC6Lb8XB1EEsJkr0vzoBwqKBR9J -IZeKiEYEEBECAAYFAjnMUKwACgkQIOZxsKxL2iiIGgCbB4Usk/JIloga/Zoyylds -+WmmXZoAn19oBvuhogItbbN2+qtpilGj7T0GiEYEEBECAAYFAjnQ39sACgkQbyOL -wk/aWgzEkwCdFeYir+l6RakjnDuEmD01TrJQKuAAnRfJ8uB3q/qcbJHBCnHoDNru -K4h8iEYEEBECAAYFAjnSCq8ACgkQv+EgZWshSJqimgCeMtHTR4uR3ZNZM2V5GhRj -qpBOBGwAoJCg1x0Flhi2x8X64YiOQ3C4NdCFiEYEEBECAAYFAjnOd1MACgkQ4V3Y -V7FcN9FYggCfYnHWrJrioflTqvx2uWEA+FcA6HcAn2LRZi72gZaMQByY3upW3Opq -Ygo6iEYEEBECAAYFAjnKODUACgkQ8L+clySSyY3d9wCfTuDmUwmjI7wOakObyhO5 -qw3lhkIAnRSetUtInDgYzvVEWREqLHMg5u6PiEYEEBECAAYFAjnUSlQACgkQKe9L -bRRkKPGb3ACfbjPLBSc5E80RCWeK81Ti6f3UFBYAni7t6PcpG05dHpB8pN43lljg -KbiViEYEEBECAAYFAjnUSloACgkQfourR+QKnXpKGgCeP2SiWvwQwIy60/u+S/wx -L/CyIfsAoLNsLgLX6KDJDQubcj0XIKXRVVvFiEYEEBECAAYFAjnUSlgACgkQ/PQg -U9f6RRJMtwCgga31FCSFWDPeURQDXOfkP1bRxi0An2LKKthcJfre01jdyoyDqBZA -DT5xiEYEEBECAAYFAjngZZEACgkQn87GPmUIgLTDggCeNWjS7/dYVvne/alXB60y -6CMf2p4Ani7VWy+BJRO2RL/yjr4HHuwOOzl2iEYEEBECAAYFAjnPp0oACgkQkVrM -Raj0wv2RzgCeJK0Wy1cmhCiWeigMgzMPNL4AOvcAoKQTi2rpaPF8tJXQwcgUu9eD -sh/ZiEYEEBECAAYFAjnaViIACgkQJjMhtkFplWud8QCg9I+Mnao02FpM3lvPaiZe -yx6G4OsAnjHczQexXe+DdgjrFOhODxtOK4EGiEYEEBECAAYFAjnO9SYACgkQcwpr -g2qF7t3ncwCgtDgy5GnZU33WU5yI3b+gimk/8/gAoMNLAm+nTgOaXRLj70P/FwHC -opVjiQCVAwUQOdD43bbjw8ZQaHktAQHDVwP/RdY8LQC8afnFCmMJQVJi+nHgS5Se -c4y6QoRierMWzbC0oI7w9tvcjIcnpUZR+1gJ6YwvU4vw1CDDoB2Iepab+UpeFt7W -9s77f4SgdsPIh2d7hEUria6VEFQXH/Ki/CSD3PkRYlWyvNL99S4CDmRf9z6F1G10 -OLxBhCM9IjAtauSIRgQQEQIABgUCOBQOCgAKCRBgB5CAc8fzT7duAJ9aX+GHT9lb -i7g4RbUq0g6JTs6OiwCdEiKy5l1LSG3nWN2OtshSruVFcOGIRgQQEQIABgUCOsEI -0gAKCRC3VqeMiCpsS+dIAJsHN7gGpQuKKYRwhQziWQSsKcOhzACfXy0mp2GhmDIP -QHSi4tt+AkImmUqIRgQQEQIABgUCOsHRIwAKCRDS8KJTn4hKyL9KAJ9qvtFP0k/D -9XUw7StETHZJ8NIh+gCg1yC2aktaBTeRt/zBvgARJAi7fTGJARUDBRA5LaLDAVW6 -4qCU2iUBAfU2CACM3DgKD/TP7oWoK/lv+ikjQTehzZnXCH6i8vqOwD2EqKrYyJDR -t13YaaOCKiNU0TnBhibUNiMCctVQyAq4w1AMJKekV7uOCEYclmCfJPcIbZfRN2I3 -UU0a3UxDDJ60hQf8pIgdY9/vQ4dC/D0FG+QdlrT1uT035ZOsPPKEq5mZssE3Y77A -LX07izrhuTf35KxlnyINS4w40KDwdMnYkXVpEfaLXClehalDpRedU9chaYDfU93O -wnqP+YOCeVVsfSsvbimj2QHeKDYgDXqsqswLwfmYqcz2W8DZUMGv/RZfssaWxxEo -P01eU2Ogvtr4JI7tPEucB2rf5iL6xAk8g2ujiQEZBBABAQAGBQI5LZPaAAoJEJVg -Yabdk0E58MAH4wbDMe/NXTNKgVJZ6+r2X6ms1TTIcp2/f0AA40e+jx78Cw1OW0+T -csqJd2QrGQaXp7tSQdrAmg6B37wMKZRK1W/dKt085Ki+qpx7ooL1R+yZss5/XybH -ts/k5il5OV4XV+8Ey8WFb2OuZMoWk7ba4tJymaipebPQnj906es+Y8/vWCLhjTgB -kTwNi2cBFVRJwRiJkKIs/TT5ChyO2QglEuE1Ngw1b3WgBbgpjPlLPXDHJzPJ9KrT -eYsEFqf2+vcb1YbNQJakEOJzjl2mhfaiyAiY+OdtF//JAnr4YpFPtSUxEUjmtZsr -clIFc4a+M1mUpBwbm4Dk4zzMSlbTFvCIRgQQEQIABgUCOvV5iQAKCRDsDq9xNneA -Jb4dAJ4zu5WMNM6kl6q7RncFV4oD1Xc4VwCdFlUwv5/5mYfm3H4FXVOBKVc4DZOI -RgQQEQIABgUCOvWa+AAKCRAsGKAqtMXzf9WoAJ4zQCKT5EQOBWyC7RzJH7ahfDzT -wQCgkzSiOPEiC1YVawIlSH+fIdCyV4mIRgQQEQIABgUCOyyn9QAKCRCVMMgfI9H3 -1LyhAJ90jOC8tO7gTaHmJnp5LO330BIU/gCeJ4cxbaZ26TLMm511OK7UgjU2Sw+J -ARUDBRA7QcJQ0iYpRM5qxsEBAUtnCACSAwL/GKayQ6Mv8LGCGB2RJaQMV2kSvddi -HNR0t6xaA3gAzbyYZlkoD2Vrt1ddGspiTGFfyakvgLdD0uetp8/5mfVzyZO40jFf -zqPuJkAiSyhngPZyw3w1IxhP2korqNk/Ug5yQIUEEjRb/IwZQa6UOK1aPhPAgCt/ -bFCRXvfMwpgkWFbmZKNYPH/8XXOuf7HUHSk2hlYI9DSAMt0S2dY7bH9qKhyqQSis -fA1+Ra6we8SbHgyRqtc8Nm4uq6YRY6lbq/jE6Xjj1n1q7fzgVJPrF/1zpCNeeBpJ -ABzdVzALoC5ONuaJDr4fpYbCOyzkbNE1GD8sPwu6popvXa2R+tmYiEYEEBECAAYF -AjtFbTQACgkQ53XjJNtBs4d0CwCbBezWYKjZIkv3XUSwo8Tv+yBknDgAnA73ogbj -gaH5eVCeyozQnYacPyqniEYEEBECAAYFAjtLFwcACgkQDqdWtRRIQ/U4JwCfcdyE -5wR64J4vMJiLVTsnCOwL2IQAoKh6VoL332CiFCc7/HnS+BSyyQYniEYEEBECAAYF -AjtF2P0ACgkQI/q1+wgWzBvKVACdHcRrbhKVegwltKcQ5qYVO56y74IAnRc4doOi -XWOceyzJf3Xsdnxtn3g2iEYEEBECAAYFAjtF8Q4ACgkQJ4bCRH+KQBfmygCfW0/z -FildJBM+tOtzBpcrebvCotkAn0bfKHrBqnLY1ksPlmB4Q/AOsaCCiEYEEBECAAYF -AjtJwZoACgkQUI/TY7yTaDmqpACePK3t/ENfuxqX+mmOSxqOoWU4KYEAoMeooLmH -dHSM1RH3lmHDBWvKcoUliEYEEBECAAYFAjtMF7UACgkQ1w1fWGA80HhzTACfT9LT -btUPrHtLYUEbKIPcY/gUL6IAnA21w8NvKK6CI2dINCdKZLFIFu5tiEYEEBECAAYF -AjtIJ1oACgkQ11ldN0tyliVaLwCdEuV11b+u54vPqKBRuMmrkBMBfWQAniX0SPgz -DdakBIOgRBLxI0ylqPUBiEYEEBECAAYFAjtKFU0ACgkQliSD4VZixzR0bgCdHHR3 -1OLXuM0Uwt6KAL8wKv5BK+IAn2RvYi4aHDVtSLUog0zyrZtBABqqiEYEEBECAAYF -AjtRuWEACgkQ5DsVPMtGficeuACfZ+QNXBmqNw2iU0Y0TkuN1uVs1cQAn1XLrW1n -+zQf+XuZk6KBut4kMiEZiEYEEBECAAYFAjtXQlsACgkQeRYvNvf2qtlusQCgoWOM -dQ+iY9S7WACe6TaqqbWncJkAoO0H8++oFvYLStWaZ+mDWleP+dTYiEYEEBECAAYF -AjtnOlAACgkQwAsNNiHlPr24EQCeNORrwEda6EoyY9bnY9AntyYn21QAn3MYioD/ -f+eTVlLSmDIt+co8m9FBiEYEEBECAAYFAjtJk7wACgkQeDPs8bVESBVRSQCffkV0 -QCmVd8XBr4Q0w9E1qDN0DwsAoIVNdsZ5KOKt2MzbV0U0hOiHxLs1iQCVAwUQPAav -cxc8cecT2Yc9AQG/rQP+Jm3Xe0Y9/c+q1kNCqoESPtOUe2qZFYnjWoROjmLHQIcL -DQ6wMXVjWTOPB9rHkW17j1gsZWVx9iGV0BD4PeqFrQxx4pA+1UWDStwGKPvZBwzO -dhdIO0RgPtMCU21wA8Kv9WMdAHOIE3p0CiTZO3yzO2x1zAl+T70sA0Ha9fapok2I -RgQQEQIABgUCPHDj4QAKCRAYzSWlIvOK85i4AJ4jJ+RO+NXFCdU/bUU5UqxxLef9 -DQCeL8rggWSLlSp73OTkxg3dMjyaPaOIRgQQEQIABgUCPCW8ZQAKCRAtvJI+Pdvd -6iGUAJ9e6LJNHDw5ts0sIsA9CsAkZWNyVACfbQy4ces2rvsfVKAHD9eft9p0orCI -RgQQEQIABgUCO1LEOAAKCRA79gnGi6/NvVJeAJ4grMdfC4M0ebPnolkClijZA4UV -SgCgsNBPsAVBP++VerUaQ76Eq3N65d+IRgQQEQIABgUCPCO1TgAKCRBEclP0Cv0M -qPL9AJ99IElboQkXt6pNp7gvEPzM963qIQCghYhESyHrOMRshOV9ZYaFZKuznJiJ -AJUDBRA7gdujUqzrLtOkLGEBAVMvA/9k4G20gO4wk9HFI2cm82hKWy1pjGofjb7f -de3DG9RqLYsJUgocLySBq9Kqfmmwr6P2xUuqJuc95srZA3xfCJ31kboUYXpzjpPV -JM6GuEnJhyPiVrtYGDWCB3vRDWA6f06bNa2ZgO7tWjFNiHAbnUgatqyAQ4XMmu9v -SFXlvMZzqIhGBBARAgAGBQI6iYHcAAoJEGKIBNsg/Gz2K/sAoJqickuLkDir3nYt -/UgBlJZu9pXrAKCmrUjD6BSSGCvZRf/t0qsED/aGx4hGBBARAgAGBQI8CBHPAAoJ -EGpYgt+EQEYCkRwAn1EgW/kA83PtnTF9daX99Uc+dTKsAJ9qZ14U9WscvXTUEguA -gU4RQ1sZfIhGBBARAgAGBQI8DpeaAAoJEIu6n3hgDL/nMRAAn1bTJqxEmW/oKUMl -98qIl9AzIVCWAJ4jXBHex1WKwqkdWlyUq6L7dwpIQIhGBBARAgAGBQI7mESOAAoJ -EJAtvZGMOKkKxOgAnRhikGl0KkC7GW+w4JWokUOFraaOAJ4hV/Qzh5EetlKPNQ09 -6BjRzfV84IhGBBARAgAGBQI8C6LbAAoJEKrPs4YhG27vC/4AnA4FPaMJO+DgOYIr -qJrcKH7hEDAiAKCEr02M2vP7KoJhHQEG0uasXBRwcYhGBBARAgAGBQI8B/tXAAoJ -ENrSsF1fPDGFBR0AoLMjqZGyZ7CCjEG0KIw7bLAMjRf9AKCokuxL3h7PCWUju69a -LHao7Wq3QIhGBBARAgAGBQI8Xas6AAoJEO7w2zSzISYDDLgAnjzDWQr1ufd5yWR3 -c8QnoO4cmwNPAJ40Srv1zBsQTNQZfWbJJ7hC4+qrA4hGBBARAgAGBQI8cUF6AAoJ -EDoapjWQmlQG4MQAnjBCr+ee/nYeekt5L9j+DTBynr7NAJ0fkNWOjNE6TjlrFM0O -Imsj6xOlnIhGBBARAgAGBQI8c3iBAAoJEKPgudJ6NPren9gAoJz13G46Oh6OM+O/ -j9skF8T0FvcAAJ4tL3UBggkJK9iFPsEj8Ww2mKZYTIkBHAQQAQEABgUCPIWvlgAK -CRASrXiOTwvquzDACACZig/2NuPjLPFmItHBpPS/V2LVnPmKnzrYRM2SvwlAa7QX -nv5pKUQKPcE+dz8D3cCcQe/DXZevJvVsBnGAo1K3kajBNMoKbTNS/Bj7odD5PtHd -Ug4bN+TNXzru23uk7ZCxL7jJjC+j2BUdzNX09IU54IaOZ7VDfKgSnX+vpW8fR+LU -mCRigoUvDRQG676C/Zd15dj0VZcoeb+7zyewFJzw8n4Hoje7T8TsHY+7b27xqljh -UK1jgFTCgAsEGNRgsXMSH/ElOLuo8Pk0tlBIWiDpndqO77QypiysGJClmlKJYGA+ -rFDDP8Nl1QfRj/Aw1TX2CyOSnLb4vq4ARBh9IhbQiEYEEBECAAYFAjy3OucACgkQ -Y0VdPmqAQL1huwCg9lxJiH5tp4T6jjrIOGEFXlbhXKcAoKIkBvLZ8eM3I4A2o6z4 -BsnfrqOFiEYEEBECAAYFAjx/dI0ACgkQbfJVn0GlZw9MIACg1EaZ0fhKlMpIYy7b -aYerk7kHg8wAn2ryX9N37zIvNBkolXsMIPajj4WsiEYEEBECAAYFAjyXNjUACgkQ -g2i7WWb7wYzPVQCfV7e+tJ/tvQccw7c2AcPhl/Ha9uIAnRuDdApPaxraPpEOxDZI -6OKs9m6diEYEEBECAAYFAjx+gfEACgkQjjtznt0rzJ2LGgCeMLyyMEY1v/RtyQw1 -6CtlSA0UFdcAmwecGJz4lgUnFflwAzR3dhUQzhgsiEYEEBECAAYFAjyXNDkACgkQ -oegCcNp0M5bUNACfc9vVVf37QIu044doBBffB5IFPZwAnj5NcSaY6lhgbOBPyldm -yMbLDjZ8iEYEEBECAAYFAjyAY74ACgkQ14NrbAzZIOeatQCfRa587QxA7/AqTQ8x -myDPeCrcaSMAoMYek7I6XRKvkvpTCa58keaxOO52iQCVAwUQPIIscuUVKCUzHNpd -AQE4KgP/V26oSd+wKMT7QHanMqH2Hf8g+Lh0hoKqUJOMNn+1ZTjFUaZox9TUjpNV -ENS08E631dbjF17D6e0k0d3wTuDZ9WNFLJBgvBkRD+MbaOOjB8ARQwnNBI+bYLoT -y4jG68PiA/g3f+aPiXVYenxp7EaFt5KoX0Fsdi7uuL3dPPdN0nSIRgQTEQIABgUC -PK9TiAAKCRDqnGbqufjW2W9wAKCM9FmZQsmdpV9qldqYzOg+G0UAiQCcC4iFow4o -GqyIbOlbGQCQJSHWon6IRgQQEQIABgUCPLE4LAAKCRAle3lOxmygPRScAJ48BHzB -YuRjxl0RXAnIc7O2eT3WgwCcDU5lseGYzA35tiOZrOf11g512+qIRgQQEQIABgUC -PLGOLAAKCRChxZJ8zl3ODrNoAJ9CTLYg3zBDJkAMYJnfzhiUGBHMMQCfUi/OaL+8 -FR+aUBSuT3V32rUSBTGIRgQQEQIABgUCPLGC2AAKCRB664rtRzpJyYFpAJ9n2iBT -fRmEMEHQlnOjt0kGqrWm7QCfZo1Uihn0oqMSIsP4dooyFrVDxs+IRgQQEQIABgUC -PLKHNwAKCRBWUTOkUNSruREgAKDcLyay45bh8NYzsxxEgVPkBj/TzgCgpRS+JgPr -B7NUGfg1Qg4ozEzoDLiIRgQQEQIABgUCPLPtrwAKCRAmW10ZyQeUTHhuAKDOiDky -/sslQNnOJIaC/6HPK+QJHQCeJzgV24F9aD/O7IGSA6FPxDPJSYKIRgQQEQIABgUC -OkzLOwAKCRDtRoHJvz35tHfOAKDhDhk+fE2PU42dG4lbhB2QxICGnwCeI3l/o3tf -ZZVJ4RIe+Oa2FL0oWoKIRgQQEQIABgUCPIzMIAAKCRCFuZB1wpEOQXwBAJwNGcmb -Dh1oZCm0sE/RlZBwxiC0owCffMo1ZpDUxLMDKyIglTNanoOX0gyIRQQQEQIABgUC -PIF3lAAKCRD/e9utmUPj3x/WAJ9pMWTNfVNSvFHB8hZuKBth2Xx0YgCYrJJhRywm -JmQz2DcIhulf4aRv0IhGBBIRAgAGBQI9BFvXAAoJEI/xGsXf6A+ylN4AnjDFKnhI -Yl6dHoVUU9DNodNHrcrAAJ9UGOZebNPGAn1BVxTM2CxD9oBvNohGBBMRAgAGBQI9 -BH+/AAoJECm+XSJo/VSfzvoAoISU5o+3aV5HuxK6pDdEJQTXJEyqAJ4iRDNrYQI+ -cbItvIyg6wm46hJinohMBBARAgAMBQI9ARP/BYMGtbFqAAoJEBQRON2j5F1ml9sA -n3IjOMmrHqVvVg2K/w2aJ5rH9xNcAKC9DqBPokcuvugw/qcJWC3BB8XRQ4hGBBMR -AgAGBQI9BbL/AAoJEKFjDI904Ldm7h0AoI4VFhltCuW2Zn48A74Xgzu8/olTAJ9V -F08eZjdl7K9pWiBzX6oadnUoe4hMBBMRAgAMBQI9g63zBYMGMxd2AAoJEALW7SHj -LE9LtskAn0PsgwHlwTblNpzdPPEsM1d1CmeLAJ973XpbNDi1pJTBnCVfoXRc062Q -iYhGBBARAgAGBQI9bhyKAAoJECjG9WuBfDVo1/IAn2hWKwwhToBp7gpf4tEAUTcQ -zPA8AKCSPy/zR5vGraCe9b0khM0xIo97OohMBBMRAgAMBQI9B00XBYMGr3hSAAoJ -EDxiytjk1DJNlk4AoIzYzUW+TNiMuZPTOjtde4W1fTwGAJ4qriMQhffELb1rx0/2 -EhCzIJ/mm4hMBBMRAgAMBQI9eTETBYMGPZRWAAoJEHBcU4nVwbNYojgAoImgdy8f -8ebZ6I7MKowG3+3tpa5BAJ48GVO36kTOnD4J+Nyz0F/MLGLZiIhMBBMRAgAMBQI9 -eHiyBYMGPky3AAoJENAanBlNdmzejv0AniQH42aw14zEjL5uPoEY1wFcAJ3wAJ4l -o+UKiqm139CtHhJsciA4Kou0m4hGBBARAgAGBQI9hEZJAAoJENQ8swWV/so0Uo4A -mwYZ6mM6fD0Vw9cNJxC/FnncoBKAAJ43kQBsNuDNqH2wL+/4Jrp7ptwBD4hGBBAR -AgAGBQI9heVLAAoJEHWXOhDW0ISm8nAAn32an3Z6SQDxDuEO7Y8jHarWI4hXAKCJ -QKY622p+6Wo71PSEu2WTqjK0YYhMBBMRAgAMBQI9hfwKBYMGMMlfAAoJEPVrJqOm -OZ5z/bsAoJ0fBgRyF5rfPLDTHXGJLeKk53qQAJ9+5EMx97bRUKFeZ8smVGeiSulU -6IhGBBARAgAGBQI9hOIEAAoJEPdR159VEXmP8OMAnjTmDf3wjiiP3uyqL3S7m37M -wkf3AJ463aKibRUMI7c1rb8vKwIl8ZuMGYhMBBMRAgAMBQI9iBDkBYMGLrSFAAoJ -EINly9zdTU7+EjAAoKsHyfV5SnquRti+mMsNji5ROgR5AKCNHcXgBhrhxur7z4TQ -EHQZQjZSr4hMBBARAgAMBQI9hgLlBYMGMMKEAAoJEFPihU4L4fDjVb8AoPJiuVC1 -sgR+bDo9ETZ8EyNSv9wnAKDlo87hORBJefm0HbHel1NPTCxruYhMBBMRAgAMBQI9 -iDsABYMGLoppAAoJEB29XnWDmeG7N8oAmgIHVng87j2/bKO7AuKxG2Kkg27LAJwP -XnwVyX37FBTjb8YCdF65lQ8DmYhGBBMRAgAGBQI9if0kAAoJEO+Cd8r+mR6YysYA -niTtcCjI0zkAov3fj8pWnhIql3oyAJ9HwiTRp/JwFoE1Iz+of1xBYsA59IkBIgQT -AQIADAUCPZlQAgWDBh11ZwAKCRAoi48EuFvgiIniB/4qMoypKBgh4jbz62TymXm5 -BT0hMp8NrbwK8b8soLYPM6EP9IeVoZnFDTYttStGMyeePzW/P6ycdCY+f6B7Rcmi -/oReW+HuAHWEkXXDWvMSq2gXrenba5dYJP01OyOIq1mo6a2VZiVfXXEXVnTmquIY -X1lNz0xMBfAJGTuxKo8Vx1WhteshyPvwhhwwRQ50OUjNy0638maWE1Sf1eOB2+MR -PhdrJZdYHFRm1+dGQu6RuZAM8Hl2IVg1ZmOtOpKp5mcBpuxfGWmAkJ1K3S/PHLEV -xG1MNoECkrlzhM/I8/o8Ur+v8wrhiB6Iq30CzE5zauG2CkLJwWx47+9kj0xMosYC -iIwEEhECAEwFAj2lxsUFgwYQ/qQ/Gmh0dHA6Ly93d3cubWF0aGVtYXRpay51bmkt -YmllbGVmZWxkLmRlL35tbXV0ei9zaWduLXBvbGljeS5odG1sAAoJEN6Fg/i9v+g4 -hUwAoL+SFYppl8RNG65aFSePk4Na0WsEAJ9aNeg1um17ZKB2W0i/R3IeHFomxYhM -BBMRAgAMBQI9tsGeBYMGAAPLAAoJEFZBJvIp8ZvR7L8AnjV2UtXiR9ALoFupIDbN -NVdCUgoqAJ9hRVkz4q8juG0yR8SYVxdh0WQW8bQLV2VybmVyIEtvY2iIWwQTEQIA -GwUCNu1I6gUJDMl8gAMLCgMDFQMCAxYCAQIXgAAKCRBd4kmWWwNYorXWAJ9SCW0i -eOpL7AY6vF+OIaMmw2ZW1gCgkto0eWfgpjAuVg6jXqR1wHt2pQOJAh4EEBQDAAYF -AjcvWdQACgkQbEwxpbHVFWcNxQf/bg14WGJ0GWMNSuuOOR0WYzUaNtzYpiLSVyLr -reXto8LBNwzbgzj2ramW7Ri+tYJAHLhtua8ZgSeibmgBuZasF8db1m5NN1ZcHBXG -TysAjp+KnicTZ9Orj75D9o3oSmMyRcisEhr+gkj0tVhGfOAOC6eKbufVuyYFDVIy -OyUBGlW7ApemzAzYemfs3DdjHn87lkjHMVESO4fM5rtLuSc7cBfL/e6ljaWQc5W8 -S0gIDv0VtL39pMW4BlpKa25r14oJywuUpvWCZusvDm7ZJnqZ/WmgOHQUsyYudTRO -pGIblsNg8iqC6huWpGSBRdu3oRQRhkqpfVdszz6BB/nAx01q2wf/Q+U9XId1jyzx -UL1SGgaYMf6QdyjHQ1oxuFLNxzM6C/M069twbNgXJ71RsDDXVxFZfSTjSiH100AP -9+9hb5mycaXLUOXYDvOSFzHBd/LsjFNVrrFbDs5Xw+cLGVHOIgR5IWAfgu5d1PAZ -U9uQVgdGnQfmZg383RSPxvR3fnZz1rHNUGmS6w7x6FVbxa1QU2t38gNacIwHATAP -cBpyJLfXoznbpg3ADbgCGyDjBwnuPQEQkYwRakbczRrge8IaPZbt2HYPoUsduXMZ -yJI8z5tvu7pUDws51nV1EX15BcN3++aY5pUyA1ItaaDymQVmoFbQC0BNMzMO53dM -nFko4i42kohGBBARAgAGBQI3OvmjAAoJEHUPZJXInZM+hosAnRntCkj/70shGTPx -gpUF74zA+EbzAKCcMkyHXIz2W0Isw3gDt27Z9ggsE4hGBBARAgAGBQI3NyPFAAoJ -EPbu3yAYS8TZh2UAoJVmzw85yHJzsXQ1vpO2IAPfv59NAJ9WY0oiYqb3q1MSxBRw -G0gViNCJ7YkBFQMFEDdD3tNSgFdEdlNAHQEByHEH/2JMfg71GgiyGJTKxCAymdyf -2j2yfH6wI782JK4BWV4c0E/V38q+jpIYslihV9t8s8w1XK5niMaLwlCOyBWOkDP3 -ech6+GPPtfB3cmlL2hS896PWZ1adQHgCeQpB837n56yj0aTs4L1xarbSVT22lUwM -iU6PwYdH2Rh8nh8FvN0IZsbln2nOj73qANQzNflmseUKF1Xh4ck8yLrRd4r6amhx -AVAfcYFRJN4zdLL3cmhgkt0ADZlzAwXnEjwdHHy7SvAJk1ecNOA9pFsOJbvnzufd -1afs/CbG78I+0JDhg75Z2Nwq8eKjsKqiO0zz/vG5yWSndZvWkTWz3D3b1xr1Id2I -RgQQEQIABgUCOCpiHgAKCRDj8lhUEo8OeQ+QAKCbOTscyUnWHSrDo4fIy0MThEjh -OgCeL4Kb7TWkd/OHQScVBO8sTUz0+2iIRgQQEQIABgUCOkzLRQAKCRDtRoHJvz35 -tFStAKDpqjOliIIQM9UAd7nj/z+rjwUs/wCeK+Ib1+PEic9pIoH4tdGZCNzaMtmI -RgQQEQIABgUCOcqLLwAKCRAXpkFt95SP2iZtAJ9hBjGmKl0wYHFs13yNsv1EOYfe -cwCghOZmcMnBfOkc25ItjyjdzliEdfOJARUDBRA5yphWGk+GS77fSDEBAYM7CACO -goIZ4+byHuDZ501gaiys9Mxxnw80IwRNcxmjOAJsR3mha+i1Fpme1rYJnKP+7mA6 -sTvPxdHY82216e4dUOKLnLQrBppNHXb/Cun1UnrXAvL/jOdyfH8L03CD8y71jZsx -LwS4vXrJY2ubpjGmtaxppjLsbbnU0jtyx5dxWe4CjDObqTyi8TAICpWXizsRSJs1 -BAK4OAfiJ1R2vjXR8OelRqWm+wZh/XCqGz3dFuNTuk0RouaeXPzMRIdhp6/4mkxU -B+fD+ONan3vHIK5qXvnGtz9qP3dqeuhu9T+xIoINu14PNb3FjKOpka7aemf6sFHi -JQdl/2P+CXBPQ9Wcf+N/iEYEEBECAAYFAjnKOw4ACgkQK7tDpvCerwquXwCfbW9x -GF2AHQakBPakh61xKmC8WEEAn3TytfY5qrTjxIj2HZFKN5QuQpYSiEYEEBECAAYF -AjnKnXcACgkQNfZhfFE679le7gCggQjsjFhjaIO1lWHfPusn0dqdhRYAn3rOW0XS -eh64V9o+VItH2LZngmNAiEYEEBECAAYFAjnLMigACgkQUaz2rXW+gJcIVgCfRRq0 -G2fCcZOFoey9uZGAkWctKsQAoLw6lUhdeZDgULrDC7OQRIk7CnMtiEYEEBECAAYF -AjgUDhkACgkQYAeQgHPH80+I2gCdHeTAPusmEfN2bdkijpW1gpxBvGoAn1kzL7Mg -7tC4pqlqw2fV3kRUy1a5iEYEEBECAAYFAjnQ39UACgkQbyOLwk/aWgxfIwCfb/Ge -MAD8w84hq5/aUQMCvVqUYqAAn07SKuWYsZLEUuPWIgYY0yoByJxviEYEEBECAAYF -AjnPp1IACgkQkVrMRaj0wv0IqwCfWGMeiZ58ysuZCAP9IsX3aKcSPtcAoJno1COO -jAMhoWjUiHctgLZX9+gTiEYEEBECAAYFAjnSCrEACgkQv+EgZWshSJq8jACfdf20 -dqs3IWOPHgFMdYb5VF+WkJUAn05quvyHB3Xug8csxWg6RwSfQBTBiEYEEBECAAYF -AjtIDxYACgkQBgac8paUV/DLWACgifbHtSi50JxmSr18WofeVcVcAXUAoJs99aH6 -/t9gkO34ajXjiIQxc0qMiEYEEBECAAYFAjtLFwcACgkQDqdWtRRIQ/XMGQCdH1u9 -tmtUYY3ExVLdT/H2IIQCU3MAoI69Y4Z17RDh4Bj2gmJwmEAmfDwbiEYEEBECAAYF -AjtF2QAACgkQI/q1+wgWzBuJgACeIak+A98IheVSowXG4J6jzBA439MAn2IFA8EB -/EkQ1rn7OEmFNX++PNZyiEYEEBECAAYFAjtF8RYACgkQJ4bCRH+KQBfSwgCaAvm7 -pL+LioYj/oKDBQ1pJAj+UqMAn10W8RKrYblMZ4L11R2TO9xOvFn6iEYEEBECAAYF -Ajr1mwEACgkQLBigKrTF83+E4ACffa4yaJ6Pj4uFZY7dVuiOfkuoTE8AniIdw0DV -kHBuxlNp9PAglhztyE+oiEYEEBECAAYFAjtJwaAACgkQUI/TY7yTaDkPjgCcDSJQ -UZBBP/5OvW48Q3BUkUkRSQkAn1Mjqe4WTFEEA8HK5h+KDcqR0aZIiEYEEBECAAYF -AjtMF8oACgkQ1w1fWGA80Hj2mwCfazudYZSMmQWO85xZvg0uTB3rhZQAn3DSyrvX -xIpmv0CcnBtUQu5N21kSiEYEEBECAAYFAjtIJ18ACgkQ11ldN0tyliUx5gCggbhG -1uzvdgHNY8oCt4cc6TfHUREAoJuRw8q2kbztnt8TQ4mjiTINcBXziEYEEBECAAYF -AjtFbTsACgkQ53XjJNtBs4ex3wCfXLPNscM4Uxtmy0/t5Ygg9lDWEQAAnR39P9eJ -tEeBtMPfbEGYc10ABqjkiEYEEBECAAYFAjrB0SkACgkQ0vCiU5+ISsiPkgCeOFay -t7NkcymwTC2UKNjjyukNDvAAoLq/bOTNZECtztYIMDQ2VrzZ3m6KiEYEEBECAAYF -AjtSxD8ACgkQO/YJxouvzb1F7ACfVp8vhxAWCeRZN3InlvYLrxFTng4An1QO6+D3 -QUjX+0YRNZ3tpZDTSd6QiEYEEBECAAYFAjuYRI4ACgkQkC29kYw4qQpqwACfcyB4 -krJFqyeHoKzRYDqW8JDUdvcAn2pa3UDeKM7FVe8LgCQyz0McM4JqiEYEEBECAAYF -AjwIEdIACgkQaliC34RARgJ9zgCfS1K0bROVSB+9wX4g+xEE0phEAToAn3etSLME -5hzsisIRMjUsGbBDe7+aiEYEEBECAAYFAjxxQYIACgkQOhqmNZCaVAYvbACgz9mX -zo/nC64mx03IFgL8oFuBAhIAoL91NILXxGYrkaOnM+2Ci20UvA3ZiEYEEBECAAYF -AjwjtVQACgkQRHJT9Ar9DKjv+QCbBE3lRMzyKxTbPUd9v+nB8EVqv4cAn0DxPkAI -kuriAuwtOjCypTDNydyxiQCVAwUQO4HgE1Ks6y7TpCxhAQHoBgP+JFmAnZT6FMa3 -zv08/AtbXLt1AVuMwepvLIzt6aX1lsL6b6Oo28yyeIUJHmq9K0yBte5RkYal3jWY -vn6+oXTDAzTScFB76uvmCtjagw8JIQlE20cRqY6xtzgY/n2evBtSEDswo9Ks8K+H -1u+H5dDsxKVqv15UGSq+diYp1oojWKiIRgQQEQIABgUCOomB3wAKCRBiiATbIPxs -9gZqAKCAyyoYk3rUm45CRjkyIpvhQ9CkHACeI1jBBv6GUTMkXuqc8QKHQwDGrw6I -RgQQEQIABgUCPJc2OAAKCRCDaLtZZvvBjHPHAJ9ytnnJPCOf1KHVL/IvcwEoGzy7 -FQCfSkLgaAixttrFx/VADkBjAWI9w8SIRgQQEQIABgUCPH6B8wAKCRCOO3Oe3SvM -nf92AKCcMycudrfI+yTF5V/fbANtMcvF/QCeNYLDiV9hq5LQu6Ya/24c309oSuGI -RgQQEQIABgUCPJc0OgAKCRCh6AJw2nQzloauAJ4sFFDwIBXM87w5PPZMwWpgshsW -twCgraomqiOYXb5Me0UIfPSGGIEB6Q2IRgQQEQIABgUCOsEI1AAKCRC3VqeMiCps -S7fSAJ0SxJ4W0nkrOIPmX8K8CFVm32WdBQCdGuZtXweSd1enf4M2hESCxxmT+uWI -RgQQEQIABgUCPIBjwQAKCRDXg2tsDNkg50Q+AKC3kOJl9EWS/MA95xEMIinek51T -CQCeOPUIMT4rODZGIr1nvdAzwHQnh2uIRgQQEQIABgUCPAf7XQAKCRDa0rBdXzwx -hUXyAJ4yhhoU3u/9UOa5i34bUFcPHNy66wCdHx8BwjIGNJ98HTIQjBoDs71ftnGI -RgQQEQIABgUCOvV5iwAKCRDsDq9xNneAJd2tAKCWUjHobYOQpIYoGFgKCzLLAUFc -tQCfY8kasI6i/QtLyMIwPZejhPup+yOIRgQQEQIABgUCPF2rQAAKCRDu8Ns0syEm -A3C/AJ4xzRCY5LRy0k5fUn1rcNaQzJR1/gCfeIiyVnuy2Qw6LVV3ITl9HZgO80WI -RgQQEQIABgUCPHDj4wAKCRAYzSWlIvOK82WeAJ4t2SRGRzIdUq22Xpn0hATET6Bo -2wCdGSj7sFA67mNcx8ZquDWsTbMOGwWIRgQQEQIABgUCPIzMJAAKCRCFuZB1wpEO -QaiIAJoCqvBefqR/doPvCyzWuBCasK0kogCghTq6J+jEG5unb5iNbqSNueQUwPSI -RgQQEQIABgUCPHN4gwAKCRCj4LnSejT63kntAKClIKAZDx4x5++wOwXQOURnO4Ac -2gCgrVMXC4rtmjBRAnJanW0oO00NvHeIRgQQEQIABgUCPIF3mQAKCRD/e9utmUPj -36WbAJ9L1qnP6AQexFXoQtLg20Iu+smxGQCfcB7GmKx0/7wrCiWJ4nBpU+K03aCI -RgQQEQIABgUCPHEnEgAKCRCxxHMXPntLc+QnAKDep6l1OyI0q4ZgLprVGUllMGqS -IQCfYbrKm8KlYAvjctZsxvLJ/+tjFKiIRgQTEQIABgUCPK9TigAKCRDqnGbqufjW -2YR7AJsHgVnrPp2ZInZ6kEh16hLwocs2EQCfZlxQMp+4WlVUO5X9syGmNtsclEiI -RgQQEQIABgUCPLE4MQAKCRAle3lOxmygPSlWAJ9Mgnzw4U0WWdQWg1l6YN1t3hmo -SwCfXLlnIKXlJiSoVMaJW2SC0ggSEruIRgQQEQIABgUCPLGPgwAKCRChxZJ8zl3O -DiqKAJ0euNiq427ZqmFaCAbkTQbrMJbkwQCfU1AmYqRMRSxtqdtU4HHUbnC9iR6I -RgQQEQIABgUCPLGC4AAKCRB664rtRzpJycGAAJ9SVCusNRvvxv3ckS9OED9/Vlqe -QgCeLjjxnFqDM+OeP+8fffIrXhqCerSIRgQQEQIABgUCPLKHOwAKCRBWUTOkUNSr -uT32AJ4wlzkq8LaAAeAJWO/oefsAqBj6swCdEUiuO6dvVKHvvnjZRGhYBWa483SI -RgQQEQIABgUCPPIgVAAKCRBfXzTuoLs96/0+AJ9xbXkPZxLhROSfXUFKqf6mCsDg -ogCgrMsNzvxfc4UPNVdM6+TxXz06yEaIRgQQEQIABgUCO0oVVwAKCRCWJIPhVmLH -NJgKAJ4mm33wsyrTar1bVsrmI9S8KRyxJgCfV2oVyhdy1dWcyPnfPzN8BpbQFzCI -RgQQEQIABgUCO1G5ZQAKCRDkOxU8y0Z+JxssAJ42lEk5L0BnurtuFfawEmCUouWh -OwCgubkVOdjqIDJJ89lmXABV4TrMwnCIRgQQEQIABgUCO1dCXwAKCRB5Fi829/aq -2SU3AJ9yDhOyzcL01/o2LI4AeFc7gkuG2QCfTnkgdviLYg7lNAtJCLS2TiS1lV+I -RgQQEQIABgUCO2c6WQAKCRDACw02IeU+vZxqAKDTsg3X8xpef7zJ3g1yn3/vbeAQ -GACeM0KgYABxxu8IJUTb2xcE0C9SjwyIRgQSEQIABgUCPQRb3gAKCRCP8RrF3+gP -su/YAJ9QAJeXSEN8Z4R1saOEhr+FJpkKuQCbBXhJ14mcGhdXbZUER6SZN/McocSI -TAQQEQIADAUCPQET/wWDBrWxagAKCRAUETjdo+RdZq2NAJ0X3oMzaR2t5MZtZMqN -MxO7AHcC1gCg7FMURGjJQKfudOy58PhCnEiQkKKIRgQTEQIABgUCPQWzAwAKCRCh -YwyPdOC3ZrjqAJ0XBJbN8SbK69+OeY0/MLK907ZHZwCglGXUhuX/aE9eN6eXV/Ty -lAtOFkCITAQTEQIADAUCPYOt8wWDBjMXdgAKCRAC1u0h4yxPS6DNAJoDnRKfJ67z -ae2HSKQ1WfMcPhbR4ACcD1bEYGaam9Zg6rks5PLZ9V7Y/4SIRgQQEQIABgUCPW4c -jAAKCRAoxvVrgXw1aE89AJoCmsW+CAQcFNVH4pbObRneX2KMsgCcDDZC0nUyWfPR -y03BInA5Ezzv8BGIRgQTEQIABgUCPQZEHwAKCRApvl0iaP1UnwUcAJwON3II8xaN -JutcoJUWMO25qmXjbwCdFIjt7VVhElxV0aasC2a7frQatCmITAQTEQIADAUCPQdN -FwWDBq94UgAKCRA8YsrY5NQyTYgyAJ9ReRl+ZmswUiJg7wX+dpAwGz/3hQCfZet/ -a5ohJis+50htGTFib5HY2tmITAQTEQIADAUCPXkxEwWDBj2UVgAKCRBwXFOJ1cGz -WFqVAKCJHkZNLHh9IKqSKTOs445cCicNVwCdEVDXd2aSMtxHLgTxvEu2bzE/IB2I -TAQTEQIADAUCPXh4sgWDBj5MtwAKCRDQGpwZTXZs3qu4AKCLa4WOHhLLQqPJ3vrR -29+lr/2O0wCeMfI9DS0dhKpJkMP2ppC9v8Xc+UyIRgQQEQIABgUCPYRGSwAKCRDU -PLMFlf7KNLPIAKCNQovcIfZRhyIQBqtlT0fRlgghZACcDojVonQWBaIXZt3+OBZo -EvaO13iIRgQQEQIABgUCPYXlTgAKCRB1lzoQ1tCEpu3+AJ9uUpKomiGqFoVrC1c+ -zxNfVSpj+wCeOrC6aEU3hgAB7PfqAi1MH0HFyYmITAQTEQIADAUCPYX8CgWDBjDJ -XwAKCRD1ayajpjmec9lyAJ9S/E1eOhZgSwBgnPfP4xYN4at8lACfeyVcX1x53Y4A -3diBhk1OUgLtRRqITAQTEQIADAUCPYgQ5AWDBi60hQAKCRCDZcvc3U1O/tBUAKCv -4L8/uCoYO6lhMLbWOXTuY98b9wCgtn3OSavVgXoGvuzNQqSxJqfp/C2ITAQQEQIA -DAUCPYYC5QWDBjDChAAKCRBT4oVOC+Hw4/6WAJ9MuNF9WKFE1BD8xUi4e216xf+z -/gCfVkG2HwbYS8J+I5TYqg6OXcxlQniITAQTEQIADAUCPYg7AAWDBi6KaQAKCRAd -vV51g5nhu5YzAJ9/Rhh0VnuB1zWqMJp5cOEJ8t7Q4ACfU4m5n94oaT6LRX9Jwuk4 -wuf9IIKIRgQTEQIABgUCPYn9JwAKCRDvgnfK/pkemDiiAKCPwGWVhMkRDmwXrZB3 -ar2jYU0nxwCfYr/vOnL0z86KD7Ihih9o37l+dRSITAQTEQIADAUCPbbBngWDBgAD -ywAKCRBWQSbyKfGb0fKKAJ9o1uPIiUdgD1wC/ywuTPm4dGhN7gCdHIM98AWIE9lm -HAk0OWZMQKiVcv+ZAaIEOlToJxEEAMJP+0akG7QQemN3cbXVC2RNZieKFkMF16eN -hXYS+i2BFkCPmHh7CmurW7/OrMYFimJgv/2P7lcMVyhYXbhvOxSYdexsNKK/5cTJ -A0PUZR3HjBVwRjms2OQCtfTpe5nM5u9cVc6+pGPouyR4+3DfEt/m6PyM83Q1/pgq -eF8YgdFZAKD/RQCveEwrrNwD96C9ZEayb10l5wP/XxdZ6TO3kkl4rd95sk7/czB7 -jc7pU07GYykZY5hOuGK/I5v9kuAt52pf4x5ccZ0augBFn6TFir9r3LmM1yK8P4TI -34iI0M8PriuXTQU1mSzHt2KMPz09shQsMK1SmmzYnSCTmKdH7LOKd/6MPIWeflQQ -cjas8UtRtdYclclynRQEAIGTMN16w+MRVdl1NFMuTSx+JYR1wEz/kak2zAyUrgDs -DqKomhI0nik7lCro9g7AMWoaKvX1YR+hPIdbSTGKmdVu+rira8CFIgo6o0QkbGDg -NMQp5x/fEJ0nSRbx1VKiAcMf9z5Dj5EVCr/fVp6/ccPLbRhrLEAT3gFYiwqSFozK -iGEEHxECACEFAjpU8FsCBwAXDIARP8cyBB0j6epm3bUAnJ28Id903GEACgkQx0Y2 -ObLXeV5XuACgodXarRcQ/wYmTKnT9XmWBvAGYEwAn1O1V/DaSGhpncs1Xa0g1KOP -QCWntCJQaGlsaXAgUi4gWmltbWVybWFubiA8cHJ6QG1pdC5lZHU+iF0EEBECABUF -AjpU6CcFCwkIBwMCGQEFGwMAAAAAEgkQx0Y2ObLXeV4HZUdQRwABAVZRAJ9ZZ9MM -fNJ7OsNrCA3ZnhBvt0cqigCgnJWebrW611Gx0uvZ7pCdXlnTKOOIRgQQEQIABgUC -OlTpEgAKCRBjy2kd+uvV/CT3AJ4puPh3NKLXkGazVHrjEroqzVVK+wCgtVlySO4M -DKtAIM9O4ULPvjziQTKIRgQQEQIABgUCOlcobQAKCRDXjLzlZqdLMVBtAKDa5VPc -b6NVH6tVeEDJUv+tBjp6oACeLoNtfbs2rvJkgKDHWEIDmJdgy2GIPwMFEDpY/hjw -IHNX9BSVKxECSZ0AoLdN+RJJ6H6mg8Wcx9b4tG5AmbyGAJ0ZpwSyUN3XEJBJjJhx -JVskRUWjSohGBBARAgAGBQI6WuayAAoJEGeQT60KeRYQ9JQAoOlYv2/aiZJwe3yC -jUCSOWkEbRlrAJ0TQfxQFd8pbhBUJkcCgzwyzUni2IhGBBARAgAGBQI9M6rpAAoJ -EKEu0kfAOWEFhaAAnRpCmerVTMPoiE4ve2k+XHzPY6+OAKC70yOHV5qJ5in5/6Fv -CR7q1Ijm/IhGBBARAgAGBQI9ShZgAAoJEF3SXIGrBS74pJMAoJiZOtCmtxXUw8Po -uPTjiQkV426QAJ9NO/5swW8XztDj2n9Jc3ywWOQBjYhGBBARAgAGBQI9/zyRAAoJ -EL/ZokjT43gqpCgAoLH3Hx4bUD46zFONDBVtCPBfTZ1zAKDlFWCSk0rlFO1rk1Pm -O5PBZMF9TohGBBARAgAGBQI+AOhjAAoJENzJorrQAZXP5F0AnjKFJbPXlGoH2ev5 -M49od2ZLQKbAAKCYXDiL0ugqwKtfTEjhmB38UYq+4IhGBBARAgAGBQI+AiiyAAoJ -EL4KTAGzPIi0ZngAn2e+FmRMGUYHXIv+pBgXEbbyq8RhAKCtch2stltkslCNcQ2A -FqGMFzutKohGBBARAgAGBQI+G0bGAAoJEFWlyXa6iGkV6AEAnRD+hxIZ8uyJV72f -C7zviyJUd+yZAKCPAcMn3MeTeU0stYzhkbyC2osddohGBBARAgAGBQI+G0k8AAoJ -EMv9oT9f+ltEGxEAn0o1m/608YZeHeh/Szggbs2BaKyAAKCAGmEu4JcCebZ7LD/m -iaKoTldmGIhGBBARAgAGBQI+G008AAoJEDvZ0dbO0S90riYAn3jiVIGA5TX6SiDL -Us2XRqkmBI0TAJwMhO8VnoFpyubrInbXuwWHiy2Mq4hGBBARAgAGBQI+Jx6pAAoJ -ELfsQ1eV0YbR3bkAoNXwk3gNboFFPYATZWWE6uqMCMHfAKD83kN37BYhhkcu/agE -7CZ6U7cJeYhGBBIRAgAGBQI89x5sAAoJEPFmQMK+QtymvL0AniHBqYKwQn8lXes0 -3A89hgAfDZrdAJ4xyBiu3vGWJVJTZQTsLSJUdGhtM4hGBDARAgAGBQI99j8ZAAoJ -EAn3V8du6TJCSWwAnjPDGz0f4r3ze/eIDeZ6utLO6peZAJsFcRbfaSajrbPhZ9E7 -TUL3p9bVuYhMBBARAgAMBQI8/lNABQMA8UKAAAoJEKOZAqfI4FDsuP8An30sBk82 -+o3RqTMf3RjhxYvocdMEAJ9nZxgwuvsRan60JypGDllH6PrKfYhMBBARAgAMBQI9 -pHWqBQMB1ASAAAoJEAn3V8du6TJCE7AAn1WQo6eo5o8VU7rR7kQntbkAh/NhAJ93 -Od0l9/OdcM2bOoZ+omfWVjdeZohFBBARAgAGBQI63+71AAoJEKx223MlHzXBZI0A -oMWsbMC24qg4Mp7oMMrH6w6gEv8yAJiLdfrphwcTmgTF/733HBObMywQiEUEEBEC -AAYFAjtUcBcACgkQp4aCct/T12ngEACXYfv/a7NuPFA3zpRUc0QpWCv3LQCfd/aN -bpLY3QNAGdWIrLsKTKF9IEmIRgQQEQIABgUCOleFogAKCRCsuxZLz3PsTI1gAJ0Z -T2DRscaui0RLxHsTRdhjQED8xgCgpx/V/+LCiztzXI1f0hGVIROAKV+IRgQQEQIA -BgUCOqqgAwAKCRDu0N9wv2fS62eUAJ4gHsEcqD1qNgjJ/rU4IsRMeKioCwCbBfOh -0S6PVWaRqd6zlXBy2g/NQzuIRgQQEQIABgUCOxXyTQAKCRDEeqmCjGVtDrbeAJ9a -qA3y1d31BxXg5aT/TrcWC11dnACgjTJGmNOL6jTSLyctHP557K6IOxiIRgQQEQIA -BgUCOyiObQAKCRCPrQIss6QEWVYBAKDO++09sRU/5u3rlpMuUo9F4bzKbgCePw6J -PtErRjAt8zfk8maUM0inwheIRgQQEQIABgUCOz6yWAAKCRAToEwwnJOdb4xJAJ91 -WRvsYFJrpNYIIRIUxvzJrTghPgCdHazYP0SQh4c5PNtAW1YHA5RkOPqIRgQQEQIA -BgUCO4RqoAAKCRAw1X2G2dTVLC4HAJ9SZoWWikGAHuwIefZOsTT1KWUZ7wCeP7jN -xxxYkVYQK23tb8dgY6mnTv6IRgQQEQIABgUCO6bRVAAKCRBiGZ/lFRHt+Bj5AKCx -28nM8btX06i1M+M0sl7rE1g30ACfbv5nZYUnvB/ltVlq4Upd+suWX+uIRgQQEQIA -BgUCO7EVnwAKCRBn2bOMCRwxhzkeAJ0aRutcMPoywIRtM+cSDgBFtpyP7ACgz/Q7 -VDZq9tNtnUVODuzQ9BbNFZGIRgQQEQIABgUCO7MaAQAKCRDUuoPv3nNX8jjcAKDH -DB5wW4+vUjjABrBFc9O/P7aItwCeOqO7qXqMZLjZ+WaAhCFhHwhtuk6IRgQQEQIA -BgUCO7Nk1AAKCRDmFRvBWc+F1s0jAKCJHzwV/1aKpm7TclQPzGDV4AGiYwCgyuZb -K1dFqZUwCB8p3+EgUFjvoMSIRgQQEQIABgUCO7+BdwAKCRA/zigQ4zaxBsdMAJ9n -/toag3d/RKUMBrkYM5CahuSHwQCdEDx8+v9R85EdIXWIua+NAIxDJkSIRgQQEQIA -BgUCO8KN4gAKCRDGTf4ZzQY9pitDAKDjV6oAlpjsGNZLgipjGHKVxwo4MACgtIRu -QwaNBHAkkPcblzdjskqxshmIRgQQEQIABgUCO8Nu2gAKCRBI1eMI/ua3cshMAJ9f -LUz4VSTpfEhJsNulV4FxsCWnkACgtKDn6Br3ncYiMCv0I1wKohwY9ciIRgQQEQIA -BgUCO8vVQgAKCRBj+Xyfj9I1PDMIAJ4j6Ysm4A7vidqast/lbQ82WEy68gCeN6Ed -wm8GttOsqHbI98LYMQ9aIAOIRgQQEQIABgUCO83H4QAKCRC9Na+xoKCd3L15AKDe -Qm24yV4yOW8g9YorPRvh9HAjBQCfTKpNbHEUxhWo1Yqco6AutXi6BCeIRgQQEQIA -BgUCO87XQAAKCRDEt8Xunj43nG2/AJwOjeqgl1r36sWU1lvIt9W55uYDGACcCwyE -VFtNJWoTH9y//OJ62Zh8eRyIRgQQEQIABgUCO9lQJgAKCRAn/j6KBbyBDt7xAJ9I -FWclfzF6xnhv1GpDKMCKeI4CQQCeLd0VBn/44vdt3H/8zzgKy5JlRS6IRgQQEQIA -BgUCO9oZ/QAKCRD7yTXKOHDv7S4CAJoDO2Womj2C2lL0F9me5Bv9srkgpQCeMuhM -kT4g2VCrQ9sw8Ua+FLVoafSIRgQQEQIABgUCO+rpigAKCRDQ0GT7hcGAUD4pAKDM -7iDJaCrHGehk7hMfN1kqMwOyiACgg4FlwomsUhIbCTrzi3btQuduX+iIRgQQEQIA -BgUCO/Hq/wAKCRBojqAxWqujDBYMAJ9e4nWFjVYSK3NXt+XYG5ByewNKPACePp/Y -d8ui91ViuNSbhHiwCAyYli6IRgQQEQIABgUCO/MZBgAKCRB8MVegZEc1dpe6AJ9o -nHdaU9zxdk10LVzDS8iQfJIl3wCgkQ3PHxJACbWq550Nuu6GLcyB6JOIRgQQEQIA -BgUCPAbp4QAKCRDRBkSXgVIbQqTxAJ0ap6aoVm0FBhMccZSamsEqj6gNXACeKURo -fxftwC0hax90mL/OLjJnLhyIRgQQEQIABgUCPAvK4QAKCRC0gt+wGaRZQ/m1AKD1 -5RoSFFxepgEbacXrUWhu3zvFZgCfeiCF0iX6bNnztwFEt/AJ//D3ZiyIRgQQEQIA -BgUCPB8wXQAKCRBqRzoxcSFero3PAKDzhIRGCfFfnuvcPTJs63q2rTiYmgCfS6Ct -YOMQyaYbjsCA2uNKod1h8wmIRgQQEQIABgUCPCIDJwAKCRBH07jLEUv/CMmjAKDF -e/lsmnnnNQzsAg732GEGBOkgxwCfdcvt9mtxU64JWSdB7GGOGDyMSiyIRgQQEQIA -BgUCPCu1uQAKCRA/sA/yl51MG59IAJsGzjndfoJFTA2uzbQCMcWeLUFnWQCgtXP+ -MIuRVK6bCGdbN1WVg0wlGHSIRgQQEQIABgUCPC6hGwAKCRCQ3qzudismmon3AJ0R -JDe8fCYq0Sv4Q+23UZqFBkSwRgCgx/McnOoHqTP5NdOWpZiekDuO2kKIRgQQEQIA -BgUCPDtoXQAKCRAtu3a/rdTJM2hSAJ0a1uLlOJ8Mc3NlRyAru52p6ryAAACfRuDB -R0+MumUd6a40Fo6VnkF92GKIRgQQEQIABgUCPESMCgAKCRBU3b7cPKNJbJ+fAJ9i -th4zBy4mGX8PN2OSBxuHMBBYpwCeJSc1wP6OgatNXzZfgERyC5tG1JGIRgQQEQIA -BgUCPFnfQQAKCRAqK7rFw91p1ajHAJ9w3XdBtInEbKaiJhIqe3lW1jNNVwCfevWY -Q7j0B2t2N617SBsbbGkDg2+IRgQQEQIABgUCPHSv2gAKCRCMnNnnGBSTGUrmAJwO -G7kZGIUFwcEnd3RtUE6QXy/eUwCgluH6J77g/pyyki767QxcWkSEXOmIRgQQEQIA -BgUCPJq0qgAKCRBh+N6vwPlo3JqPAKCjJ+WVShKpcHEv42g7TIFRx19DJgCeJaEC -5PHJEpAEpJ1R135pcuMUNoSIRgQQEQIABgUCPKjqXQAKCRANjPb1ymLYy680AKC7 -6S4RzQKzUhSBlxczxV/Cmu/q1gCg3WoE38XkyYC6gkqBNmVV+feOPbSIRgQQEQIA -BgUCPM0wtgAKCRDTbnq+bW2rfjUSAJ9dXeANti7bmyauyB9PB82NjThFfgCbBkAP -bzBJAQ36K81oEvhWhQ/W5XGIRgQQEQIABgUCPM3IMQAKCRAZ/kcgv1tNTvizAKD+ -n0cF2H2wPIL6SboTVcD5f73d3gCg14Aap9um4tdnPVzfnUHfFt7hOH6IRgQQEQIA -BgUCPNGFpAAKCRD+xEQOz1GrWP2wAKDqqBcavcBYeI6UASgP4EK8/6O8tgCg0lmx -Hg5uvmV+/i2jOeeg7pVhfwGIRgQQEQIABgUCPOl7swAKCRBajkD8RoFmTp0RAKDt -0G2HUMNvtLHIzCt8SjMrJw0FigCg6UuwWgtS7bu8Uff7qVwaEVDTfjqIRgQQEQIA -BgUCPQtJFAAKCRAedjxYs2DzDNlYAKCaXsLAViYpPAdMTKwx5tygb238iQCg0CnH -jDVjHnSGeQHW3ZopfKyCBueIRgQQEQIABgUCPSJKiwAKCRAhczGQ15EN9LGKAJ9A -cPB4iC45C98I1rbfHnjAbucPgQCffKYrZhvIu4zgrithMUJgWj92L8aIRgQQEQIA -BgUCPS1DpwAKCRC9LtZpliDVibPcAJ4iCO41EK1qeYYBFpdlgs++ZLnIxwCfapJe -qRCo6vFmKoO8rIFnXthRo6aIRgQQEQIABgUCPVAtQwAKCRCJa8Jbxq0h2sH9AJ9F -ZP5iSzzPURPGnuV2ZiQuMOlXnACeMXl+nY8UJxpQx7m7IkXoYJGQ06WIRgQQEQIA -BgUCPVWXmwAKCRBhzYTbSNrFULxWAJ0cYwjSWJAqgUf6Txh7htKD7Z1szQCff4cm -o6gvEZ9KIdUSVn1texZlPWaIRgQQEQIABgUCPVpoZgAKCRBRYjXIsb8e/XApAKC/ -O+8EfCnNLdoGfhPy+3wXh6daWACfe7fNhBoqDCSpx/M3CanNKFLrX0+IRgQQEQIA -BgUCPWx61wAKCRBgvJ6aA5EG+nvMAJ9NrNaPvX3eH5/rcHcONotBZM64NwCeLRkJ -6mhwQXyuCJA7O2bcZmmM7v6IRgQQEQIABgUCPZbpwwAKCRDl6YQED4SJxsoOAKDR -B3DbfVvBT9/OTVXRRhU3I2+w+QCeNn6vfmVYdsGnxF/JsU2zxwZGFiqIRgQQEQIA -BgUCPbiKtAAKCRBy5fD0v/sKQqu7AJ4zF/Xc8caK/6YhW+9enFllXJWd1gCfaPoU -vpL7STAf7csOdu7OuJjqNIyIRgQQEQIABgUCPcBJgQAKCRBiJ3ygAU3mL2GiAKCo -hIfGLHks1ZXU1hXWKb7XspZ0swCfbvBvZqHT+CG/f/Mjn/bz+5mC1tKIRgQQEQIA -BgUCPctC2QAKCRC+EN12UtmAuWk4AKCDKUggtEXCODsZE5z1KZvDfW8gIgCdG4/U -9uZWc93543xsCaSwAGycDwGIRgQQEQIABgUCPdlp7AAKCRCTIPRlt8lw5AlMAKD5 -Hxk0zjJ6mSAaQ19SXNgUsRaRXACeJK9ygsGIDYU89BK4dZqgNp8IhamIRgQQEQIA -BgUCPeoQEQAKCRAqPMPSVLnUtDGsAKCEVtQqWGdiOn8yV9fsTVthiPoTJwCgtVef -8X+ryog9JXNOoLEWZRlbdd+IRgQQEQIABgUCPeyLIwAKCRAB7tcRM4ilcqKGAJ9i -k6ciwb0jxluPVPNfnCX1wfAA7gCgtiWUauHTlTReuA9VHzIpbiUECe6IRgQQEQIA -BgUCPe90zAAKCRBgQUJYERYv8lUnAJ9HYLF0c1szV6mXHVYfs9M98dv9FgCg7bib -efmDzsQCu+WtLLcZEwzoVBeIRgQQEQIABgUCPfZ+ZQAKCRAgzpHsrMw8ohTcAJ9e -kusgYbayZ7v/De+B5I9fupxwtwCgiJR2PlmvOEEAqC/kindTDasxNYyISgQQEQIA -CgUCO7ctCwMFCHgACgkQNrbZSTk0JHJFQwCfbJqpwIyRP1aljIZr1lXBSnXhtHAA -oNvTyd1d+zPpcemdTVrFAWguaoWZiEoEEBECAAoFAjvPglcDBQF4AAoJEKdtqhto -3ur2p10AoPqefhnxZMpis41DC/c4qdX9nVRFAJ4uMrHZch9wN6MSle0Vsl49T4Ah -johKBBARAgAKBQI8yq0TAwUBeAAKCRAGRtjb7goSbYEKAKCtExe5j35XoE2XBqK9 -l6EBHKPfeQCg3dgjw4D/Tp1eFcmbyWzI9LzAcE2ISgQQEQIACgUCPMqwkwMFAXgA -CgkQsGW8s99TlO0v7ACffBGrzwOLjpml6xBrbZGl3N8Pz9YAoO8spPbi3+srQay+ -/9pm7Ri7QZ2giEoEEBECAAoFAj0MmyADBQF4AAoJEN8EHFonUVGwLvIAoKQi/o4c -MdTHlSUPMUNFl/WZz6xsAJoDsmYkpYGCd+0Iajp0e3QRrFcYIIhKBBARAgAKBQI9 -0HMdAwUCeAAKCRAWpsUqXecEL/RdAKDGpvXnLX+FG5oWdX9zpzEe0K3LNQCg2BVa -e9E+DvNP4eIHmbUWTCq3zICISgQQEQIACgUCPfFyrQMFAXgACgkQD95EpbMqVrW2 -5gCePUzxcWorKoc1um2aNX0rUfJ1+jIAn1gGFXQzGGPFBKVl5hgqfx/Y9TJFiEoE -EBECAAoFAj4/Hy8DBQF4AAoJEFLIO9tV3NgeLwkAniYrYaMTaQySM4J8eCFWZ+jp -jCcNAJ9q0IisXERQZJpnzY3SirSe8+/0KIhMBBARAgAMBQI7yJIHBQMB4TOAAAoJ -EMtTPRy1z8BdctkAoKLJRxjLZ02ddy73NoMS3PwTU8HEAJ9xPD9OTf3NctADtorK -sf0ydCyvcYhMBBARAgAMBQI8zGe2BQMB4TOAAAoJEJMn9WuF5FAX6zUAoL7noenk -79sWHpqaY5DY+V4KpCKvAKDySd5OjjcBTKXuvCCobSEixVv+/IicBBABAQAGBQI6 -ektkAAoJENEdYC5Hk8UppFYEAJI0VWk6aMSh4r1vT4sQZZNnszlsPiXq9HFts1o0 -GK0BBNgN7PRcVxQYXroDajSlUGhr3pBmx8LzIS1VQcIkGS5aMHed+UifhhdIbWDr -Pz4driXOQnAcB+isMeRfw1tf+5Quyp1BhrYyzSerwN3DwZC80Uq066Bhok9bQw/O -nwr2iQEcBBABAQAGBQI6V44hAAoJEJ7v5EjutjqxF7UH/26YqEaBnJxKkSzZdMQ4 -STppG7i2oMNbBD1EjDOPApJUYCmuHYH5QIe9QygNLcnGspywMyYa+frNJQE937V+ -FZ3uVoRT8CGaDb0ueIwLh/+wMrsldrSm+AhwjMkqtNXzuUXDngELtnU3rJ4qW7Zw -Sc9ELf7taHXfQOq6PqgUN87KLkFe9XkSOqHljO0byqRls8WuOBq64GpmqACPZW3n -CvDM+2E0BUxavit7Z+vcmLRwBB/VtJhhCBAUBn+SVf2EEg2YYNR4PLs7ewC5qiIF -CuCTl/cUj+1Yi2UDFg20KPxk0xWS0cwtmYGeQR56hCLvCxIZdwGIVb+dYdlk4eV5 -/UOJARwEEAEBAAYFAjwuoDwACgkQLRPpBcN2PZPEKQf/R58vHmZBgp7V8mgEKCJf -X8TCOqJrNYJ8Xt81IH0bXv1k4gGXVwIaavHLHPcf31Hau2sQ/hJm9KI71budHSBb -Wt4tnwNMFapI55xWWKPirM2TKnfoj+4kOOK4WuDjsTsjY0m4v9RE8XmocZHR53Yk -SyryPy2b/Ti3nQKsloUpC/kezmU8XBtP3cQfaZEEbnWKHQ+Ymkc3nrbIraEINULN -u5kP2T4scMRPe7D97vQR+6K2Vc5o20n942Pzb8u7BAgN43BwGAVS1KcoXT+lZrch -5bLgF1u5liSsn6FsHLTpOL3SecqF88tiiM+4V+bklXjZuXbrDU4Dl6gz/M4jF8TR -iokBHAQQAQIABgUCPcJBBAAKCRC/wh9eNY1Xd0lgCAC081rY08PtPQyJ72XPZWpn -pSAWZ/xTvki9vcwKcUIj3IZ66ZBD+jzE6C0520u1xCtMFmyglKg2WB23c+uXEb0i -GjTGOJ0TVTTf7nrYmuskFZbBDLtEnegNmU3IvHFFgPyYs28CZy1rAGNcwaw7rw2E -zxOQkcQUsYKM1iY9gpr2Nhk5iAVJF/wp+hfwzjUE1HiE68Q9+uV83AK+qVr4uTWb -7uoDx6hvF2GFlbwCk24ZRxA58/e68B9wZmfUytw23Qf0neZbn6T1i7WIh3qm0/0c -+vw59H57v2RWBXG/Hwddg+5SG5v7vGT3vNZWQpaZAL/doS00IJ/mLNTHYNRPuBzy -iQEgBBABAQAKBQI6pAOjAwUBeAAKCRCe7+RI7rY6sflmB/0SBqilNSoyKJxhb+pe -n/mC7oj/N4pil0jh1Xea/1rtXzoaHRjpGyLwj4cIKvscJ4zbGxTUwvCrIViGk47c -++0oLuKqdGkM0LeXm5iZYgemDeOU6v+0nWWSj9Tk5BlBXMpdhmn40ae9bh7w/nqr -V08Uyn3nuQ5Yer4voWuqLgcmzHQfQdDmM4VNl4tA5hqrXJww2rxqLLVgr7cxbShL -YOMs7trUfJ1IFeZDAs96LIJYK+3fFkPmmcYDDm5RX4HAkRC3gVoeM4xIfcKx/+yj -HK+kRIl4KdGE6ZtfCR/lCm77C9ObCYL5yRKA53D/DxuCJDEdCTfCkXGIWfBNkjVe -kZ/5iQIcBBABAgAGBQI8wHvhAAoJEGLQ3iYtQQ/r4iEP/jdgtJFzx9GqNL4rvKSg -XYB42KCABFkBN6uArgoDDVzLyB7Bo0zRUMJqrwMGyzsi9RRAFQsaMI7Ss4hrl67i -g3NZo1ErFoSQ4A3PW0ySm63jDpKWdZ1MSUTU/04yiVD2YsxTDIe2XGvdS33jeZLM -7o0MUxB/TrRRmu53f1t9jsKtiePKYJVSlTuhEG++IqaTgLhXpnOWnfbLrIxWVE+V -f/vEJe0Tbq9TiwMr/tHpADpe8pfHK+f3NewTwjYtWXMSTuqSViLPOhmi4L3Mkoi5 -GRD3T63iqbXC+hAfxf732kORc/RrX90Sn/GCvDEqHi6zHBvy+FIix/WXcDWr/hei -XQshA/13XDarhhY/2a34QORVGSJKL73UxtBnuMGRMfJR5CQVT5Wj+5gQ4e1SQizz -hBegJzyNIuUyOKEMXLNWdz7znh3Wg0bl12wUl0/TEtJsu/3VPoo9tuAZ4UJwuaZs -WjeLz/DK005KovequFDLzHnnaLSvSzK+tBYRwVgAxtwNxxmZMtyM+upY9DRgMUUA -b5CcbuxMScgf3UxB1do1Vj/KDZdWgoz+D5DykgKtFt/TLefB9h/PTbUiM+TqvCdt -cjFX59Ha1MahC9cWNJJL5Ja8881IAx2w0OGdULYAFyuppnZAloFRCaAvGWi5G6KN -+TcY+JeScGThXMqWsqGQfzdOiQIcBBABAgAGBQI9COyKAAoJEPItzwWrAPNwDJgP -/jtrlFmPWYyQJrujdS9+ccXgVTskO3ldcw6bJN/nr6RVvxAln8SiBxb5kbgHMnDa -8ZP9n42chovY6kBn31JBHAczLOvm5DRMGPOBlUaVMneUIqXgW/PuMdL8AUlbkGFq -8JMEzE4Vl+ppXNOvKtqfMNWgTOIbMxgIuQrSGI5UworRqgq5rJwSHVF8E3SXnL22 -yDt/+UdMdgXX1Xj4hjl2XN6Lly5jUkWayU/E7JixaXiNsdPgNkyXmKUXksHpqb6X -26tha/jwfbwBeQPABLwodvXd5YNxdFY507TloHxFsyGkApMZn/CB7HNs1DaIm0kE -PNBs4vJRFvDIuHN+KQyQo/3Loi/uS2tiakY3yqoPgFnQLltigEdMbfDuRZ7ZcluD -hu8LOqiez2ECTAxTTdm8yyr6STj9eTqDn24a6HTpBJ6MPU6lyrLmZOlQjf/+Bnvg -ByplCIj0f9wWdABjPTtssQ6VUMZt9cYBz7sTZA9haBJx+l9cyLCSeCSuVaAKSBUj -gWapzfhiA2+urtRUh+k6ncG9zizSSBrYU2FTMna/3w5qc82A+dvEp+t4c9v3uGnE -FBZ1H6XEXHoC5h9hCzu1UexPWcbB93Gw4FVRIPs6cbMHQoOrKjroPDn4m+ggG15y -3Do0Rg8/KUDlKo3tk1opVTeQUYjRY5s4C83yNa0VnU9BiQIcBBABAgAGBQI9WA6x -AAoJEDy9IGhaf+/msuEP/2Zw9S8t03kBkiQSX8kK5PVUYy9PVplwPiajhXORrqfC -nU/O6cCLaSHDmnkEao9Wf/aFxzXfYJ1I+trDv5Uuu054Q6oWq5hT9/s2nM6tfYX0 -ZU6f4E+k3o6tqLGKGcRyW8ge0DjImp3toDjq+XtNV0b6JbqmVOVJpQ/yNcqW/arp -6G3eJ9r3K37Lu/APyyV/fMsys2tcuuXDdjM0hcbsV9ULEvOLw22irqIsxaV6H9Tv -LV2FPEHe1ZmwzR2AsjkvWnd0nyadaXz+jsOXuis4TrK6ItehKx6aeCQbRgSu1bsu -6yK/WYTSo8FXxkbTeeaA6Ss8l6LtKjwEIlJsU0hHNbrzzko02Q37pcazeCYgs+UQ -XiEgyLx8HtfHIEpDrM5S/xWiO1b2y8t6OWkHwXtViBDSChKHNM6+mU0vLKE8t/un -o0kK0l9j8L+q5BJGPxwP9aJpLxS4Z1esaEieOrSuYtiXleRVaWYSImy5z6CLn7ia -hG9VIKHTThOUPIpjlqIZzmH5UiPiaVZxJxsf3ZljC2cKkrvwpJ6nzeW8Y1hCPXSt -7ckxo1bJXDkkrstyLvhMkdo3cEGxyWZSfFGTzXRF33l+aOChzwDCIjMSEghhRy9L -9baoVZt48dJ1hb5WP8Fhl0Edqnv8yAmp1lxw7MltTB66Yg9lH2HMS+DfI2UiPPIB -iQIcBBABAgAGBQI9zWhRAAoJEFB4dH78UWFuqQcP/2yMJyheLZ1sxWb45Z6G1WEQ -cdlsPcLJ2xC8bboYS/JUyEhia9t5/Hrv+DpGwsdh/IzUBEcqNfzZ8q2vXUVFwbCg -a4KMe0tUuw48tjuPDA+HLlnIcREVTI9PWMUmcTCRFX9DKu+vAEqOuHRbHk1zR84U -YJpio/wVnd6vMvpTWr2mQwr28JS5ue6qbgsjYMBw/0Ckz8pwNPbzdWw1oI+6jgRx -qbs76Lbm9v921yLOXoKNLL/tYmFIcpdVBYtnHEgS7lYud9L+aN9Zs27XgREKfG48 -eu0dTz1fgyu+NPShwD7KLDt8zTEgdIUVEIAfB7pENUs3KsA+Fv7muC0znWP273UT -XnjOz354aQrWMShz8HHyiCmXdiUsUNlT5t+T6L3IOYBnTxpsg9Uff8okC18pYHZY -Zc0c95uXAEmSF/UQhA9yg9P9Ed4Yx2esW9vhBz4Y0OZcolf1zbG84C8/rXaR5Pcl -AAQkpTccdjPB46usbNNwROtdjcH5hZQGcRUL4SXrUD0sDa2V4FO9cpqNjOvfW0Uu -AVLbrMdMC0ELXWd2nJnK4t4fSeu7u1ZTmfTRdgIT1LbmnlImVqr0Yr6dsaA6HElU -7egruxV10np0bJCxEcbGkS1BgnKY5cJfyycoP/svPedPcjG8xH9WUCCaw+ZcESv0 -o0cVQIZwR+7rYEuhtGvYiQIcBBABAgAGBQI98a1mAAoJEOc5MmkcU7c1Y0wP/iYQ -JFzjvAFcdj7O9QDpL1XnLRYrAy26wpJN9OnnD/UgnK6/HED5rb+YiLxkcpQWhKSS -b1Aw1OVVbnNVYPMpMHwvBW+or/ELyVplbPJlej+1EtrRtOMwiRpv8kByulhiNBGI -3f+/fYVOgX8Hb10L+iJ0t3P62uqb5RZrOrqIqNtNZceVC2jwaCqj5fwgZVaYUIGZ -NQIgHGGWLkP50Usqjyw0HY7C/Tk9ofShO6VzVs7GXwIIXuSwIEdQK8EnYgIDhXm3 -UpdxSL8NYarwZpWvIZYu4mDkHv2MjFt6Qs1Vu9Exx2xLjTl9B7UjTgaWBaXj8BCm -zzYvkSuA6sDf5cLiZTD2ZdUQra44ayrMgk/F1Hf5fchnCfnTdeXyO4u+6jrLpQV1 -IO2Kf+nYUkA0aETz8oxP3pXxLV3IFtF+bkGXuP+xP77qEKmpbAtcTfOy7lYcIIO3 -Rvgt1h1bb8AeA46qf4NiJt2gHInkbO2SSbWy6BX7BBPT/bO378XXLwResWYJkpen -VS9KLAQOaVnDLJG0U9896WJzIoy/HMFckt5x5MvZQMlMVfnTXvZt85v8pvbQcEEZ -HzGgxNtW4Qtifm1MDzcYukvbuSTYCxXvkjA+/POydJwGqjtqIl4QiZjSTd3TSGWN -5gdfBKZolVMCTYfY91uWKwrk36fH9Evrt+fcLuwltCJQaGlsaXAgUi4gWmltbWVy -bWFubiA8cHJ6QGFjbS5vcmc+iE4EEBECAAYFAjpU6LcAEgkQx0Y2ObLXeV4HZUdQ -RwABARPJAKDmKL2Aeo6OWwcZKyqSWLD4drQxfgCguJ7k7XEuQr+tL0ndoin0RSQT -kCGIRgQQEQIABgUCOlTpaQAKCRBjy2kd+uvV/KR+AJ4s/S2pVnwP2VTYRWspmR1q -7Cy3nQCghCxKjo8GF83DBvnMMso788Z+0aGIRgQQEQIABgUCOlcpSQAKCRDXjLzl -ZqdLMaqdAJ4+skmsueAfQwNisNSqsrWO7b8EdQCeJ4Qi0olSg30VfNpxWwQVbUPR -TBCIPwMFEDpY/irwIHNX9BSVKxECnREAnA9LFMAhvozVMzwtI2Ce9iKBhlfDAJ9n -NU1yQcqjta2lnWVY37hbzR4onIhGBBARAgAGBQI6Wua7AAoJEGeQT60KeRYQ6mMA -oN6JtcMoIgyI1lp8fSfMMP8JFT6kAKCWv4GEQpfrwd5bhCeig/GgXCW+IohGBBAR -AgAGBQI8qOreAAoJEA2M9vXKYtjLxZoAoIztE8A6X+QqMQ0IljqoG1gpalrxAJ9A -/Z/BXukY9CQwxZXYLhkrigzhYYhGBBARAgAGBQI9ShZ5AAoJEF3SXIGrBS74AFoA -n2UOPt6UuhAnMbIRV7NVIWq8mGo1AJ0QtGtftxPhL9PMKrL6dBhS1UkSFohGBBAR -AgAGBQI+G01ZAAoJEDvZ0dbO0S90GpQAn0DAeE1Sc4Z7u+atUH1eHWzUsFiyAKDU -rwSa8X+59J+uQ/SuWfpO5s1D9YhGBBARAgAGBQI+G1/lAAoJEMv9oT9f+ltETqoA -oPIJMDjCJM/qZ5B83UxkTnQSIh9iAJ4pnlUW5va5wDelZjImV25LSVGArYhGBBAR -AgAGBQI7v4F7AAoJED/OKBDjNrEGymMAoK/uW81TF/Gb3zXY+nYBRpTj0SFyAJ46 -9T+EoEZLIrkJSeRdBNRZcEYsZ4hGBBARAgAGBQI8O2hfAAoJEC27dr+t1MkzMqsA -oLnA1/AiVBb+dvWvEAJ8NL59+bb+AJ0QoK67VnfUqDtvnKyiesk+gKk4oohGBBAR -AgAGBQI8zQWNAAoJEJMn9WuF5FAXIhIAmgLLETMvvgz2sMgxbTOUjTZhhJHQAKD9 -EkkvQjU6yaQkN5Ap1sXA2EWWqohGBBARAgAGBQI86XvkAAoJEFqOQPxGgWZO/5EA -oPIcjMOsYbb9wUvdC0RZmyXmpfbHAJ9qn2LBH5NpxtnHc2jvrpmxkR7khohGBBAR -AgAGBQI9Ikq1AAoJECFzMZDXkQ30XioAoN+UmJ53f59tt4+TA2pSg+fRUfkIAJ0Z -HqSonfuuyASz3dTphhYRDSL1T4hGBBARAgAGBQI9UC4zAAoJEIlrwlvGrSHamVUA -oN+88Q63C63Wam39yaG9k/FLOaR1AKCOy6P4iIB9BfnIdTPOFW/hCD4U8YhGBBAR -AgAGBQI9WmkVAAoJEFFiNcixvx79n74An2XIyGO+wFvHppk+svgH2zzhBDYPAKDW -myFWdFlaUOBeGTgKH4EYnE10zohGBBARAgAGBQI9t7eNAAoJEEfTuMsRS/8IoLoA -n2h9OLbUDqdV77tIOCQd2NhRKfm9AJoCmveE6gG/NWcIMHtTqtPOIJAf1IhGBBAR -AgAGBQI99n54AAoJECDOkeyszDyiQQsAoNaXnBJGhkePBPKqyTto4SeslJSqAKCz -FpRiW6+UlkrAC8gB/nxAVk3hrohMBBARAgAMBQI6Vo9uBQMQ7XKAAAoJEGPLaR36 -69X8G/sAn3I1USQvNMEC0dN1El+FiHszGThPAJ9gOy90Lf/K4B39J5sHMYgn30Jy -QIkBHAQQAQEABgUCOleONAAKCRCe7+RI7rY6sT3MCACwNKSlyGgSPndG1Ou1px8I -BRAXEkD3Br5hTt1vTPb1LUFssBLTQBF+YgNvxA2ni47UjOa6Fj8LOm+6vMlMJcTb -Wq4KoB9k4on3ujXUJAV5thamfwuDC9U4EJpjFwFVQc4ipZMamv7Ox2u0OF9mJ5I8 -AKnC9z8bLp+fAiYhCMoXxecoGjvVC/2jD5bGa7wW1GaaD5DJTBcdkGmSu74q7k4J -YcJz3euECzcItYtE9XAcHiYEJm2Rjw821xAY6ZQk8pfu1VLsOBzQ5y2MPhn+sHKV -UU1+99uqZI1/eUG6gCFqzhmFMgLUJdfuYIQG9DqRkvVlCPUcdAolzFfz7mIw4ZI/ -iQEcBBABAgAGBQI9wkEEAAoJEL/CH141jVd3D4QIAMkZNMG+JAYvejnkkHtFiBqZ -mMfsWqqVK8GAsDPFxW/+D5YXV1dXZRytc0wB1KggobVOJaeiH9k6rmy5mmhIdq9I -FFlkO/vGN1W50o2XbMDuhFXX+bReOkRfJIC0hcaSqT6TH5q7QZncfVEwShRIOhtA -W4OWK6XJpU54Q5oMRT/8PnKIE6dHq8eCNFxYbhUCOXF+16cZ6Qw+uRvMuTcYH3gH -qj7UgWVO2/nyPSyvrcoZazsVy5FoLVwp9wpZ6rtAqv4SGtdLWkX1eGRxNEGPOUIX -Pgw7OTUE82W8GIn3alv9thYisNDkJRg40PfQxhJFOAOxOb1aZfqgCvnmVKZf9C2J -ASAEEAEBAAoFAjqkA7wDBQF4AAoJEJ7v5EjutjqxdC0H/1qqvMOgHHL6XLcAOXi1 -rpEVPiiddFxLkQcrvjEuAQyFFIJWsBMt86Rs3tr7iOt028n645PL5yUHcgtHZpRw -LUKI7Fn36WiZOwM4uWi2cEZhmY+49z3PfYq/WPH6EIcuJ0hFchNEMvoLOQ9IPylg -P8Aj0aIkbICdZelP2tmQzAKMdNtGGZAS56/Xb7cbkQiirHc0Nzojj4mO1oUUwHpY -jmApDS5sBQ5KiF2SQoe9ZtWToZUuYFmSHDvoFSZ1QqLJMeZzSsvVA4Pxk9dNhe68 -gdCihL81tFfeIU78Z7Kft75UJpuhyDUd64BH3/2/cHwtwsmoxe+1Ur9FFQM/06HR -C+iIRgQQEQIABgUCOlaPIgAKCRDHRjY5std5XgfRAKCSnx3toHhFsCAaIsCRkmFd -I4Hn9gCbBDKIqvBEjybcnaBW+iZufcjAzseIRgQQEQIABgUCOleFogAKCRCsuxZL -z3PsTDo9AJ97srZSNDeiQUHoiGsETRMKG6Uf+ACgwsiJIzN2rVgvAgCfq89g/efv -8hSIRgQQEQIABgUCOlrmxQAKCRBnkE+tCnkWEFGpAJ9MTxfQjleEdi8f4jNaD+FT -3dc2xgCg95lpK17OyyNr8a8afH3LeOErrmGIRgQQEQIABgUCOqqgvAAKCRDu0N9w -v2fS6wzzAKC4DGHdrN2edFO1Fxj36yATMn3AbACghUiAThZd2kiO8zNV0dHICrVM -2rDRzH//AAANOgEQAAEBAAAAAAAAAAAAAAAA/9j/4AAQSkZJRgABAQAAAQABAAD/ -2wBDAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEi -MEExNDk7Pj4+JS5ESUM8SDc9Pjv/2wBDAQoLCw4NDhwQEBw7KCIoOzs7Ozs7Ozs7 -Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozv/wAARCACQ -AHgDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QA -tRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS -0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn -aGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLD -xMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEB -AQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEE -BSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2 -Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOU -lZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn -6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDqKXFKDSEgDJOBXSeeHaoJrqKIfMwq -leanyUi/Osi4udqNLM+EUZJNNIlvsakuqjnYazbzxKlopLOHYfwqa5S/8QvOxjty -Y1z17msqWZpGAzuz1wP61LmuhrGk3udHceO9RL4gSNB6EbjVU+Ndd3YEir9UFc+n -LYC49jWhbt5UW0RIGbpyKzuzbliuhuWfjnUw377ypQv3vk2/rXVaV4o07VFCiUQz -d43P8j3rzVpnLESIgHoopZJIYIxPDg89Vb7tNSZLppnsIIYAggj1FKa4XQ/G7r5d -vexI0R4WVTgj6jpXbxyrNGskZ3IwyCD1FWncxaa3F24oNLRTJIyKKecUUwHjrWbq -l2Y/3KHk9a084HPauZu7gTXLsemeKEgkyLmuS8TaqXmNlG3yofnweprp7qdba1ln -bpGhavPH3yN5rH55DuJNKo9LF0Y3d2T2sTt+8dflPQYzk1twaJK8AeVCxfkKOMVB -o1qJLmJSPkHzH3ru4bRJlXjFc7Z2JXOBudBlIyEYAevaq8FkLRsld5J69xXpDaNC -5PByffAqlJ4b8wkFiPTjpSci/ZnA3cXDbmcsRkEmoILGWYkpu9zXfjwkzgGUqVHt -WhbaFbWyjEa7vYUlIfszy+e1uLEhnjfY3Xjiu28EeJZJ3XSpxuVUzFJ3Hsa0dU02 -IwMCgI78VxEcB0nxAnlOUDfPGfQ1pF6mNSN0eu0lQ2c4ubOKYfxoGqatjjG0UtFM -QTsFgdj2U1zGB2OfwroNTcrZPjvxXP5pxJkZniF9miz5/iwv61xA+aUDOR3x3rq/ -F0hWwhjH8cmT+ArmIIvNmSJeD61lU3OqivdOn0KNTPuU5xxgdBXZ2TAIOe1YGj2I -tLYYGTitSK7ghchpBk9hWD1OqKsbCcke1WkdcYIFUYZo3I2uDn0q2FIIx3pGy1JH -AJAAHNVpCu4kcCpFJaZgOiioJm2vt6E9KQzPvZAUIHNcL4jjC3Fq/cOR+FdtdHnH -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 -+0XjA5WKCGcEUQ== -=qUv4 +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 +vaNZkd4AnjSZe1/McdhZaqXAhYVSaMBztzPJAKC6h7das64oBlsDrOlg3s1bMWxt +b4hMBBMRAgAMBQJA5BmwBYMJdLs4AAoJEB3JH/OO9SDRVtwAnjKfc59zX5u/xGW9 +xjaaD/qDqhgRAKCCjeuTlVKxTpIXxdV+JqNFD/vPaYheBBMRAgAeAwsKAwMVAwID +FgIBAheAAhkBBQJAXdnoBQkTa4v/AAoJEF3iSZZbAwkQ7NIAoMuUXTqoRb8FBWFo +/nR2+Cxre8YtAKCnbhcRjLjP5aD0oUJ475P1VRXrAIkBFQMFEDtBwlDSJilEzmrG +wQEBS2cIAJIDAv8YprJDoy/wsYIYHZElpAxXaRK912Ic1HS3rFoDeADNvJhmWSgP +ZWu3V10aymJMYV/JqS+At0PS562nz/mZ9XPJk7jSMV/Oo+4mQCJLKGeA9nLDfDUj +GE/aSiuo2T9SDnJAhQQSNFv8jBlBrpQ4rVo+E8CAK39sUJFe9/////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////// +//////////////////////////////+JAhwEEAECAAYFAkAnci0ACgkQdEiKwUmJ +0lzteg/+NmuDO+cC7017u+C77+eF/fm4PGoQxKVUkwfgI1bd6SkRvYcjtUxAjJ3/ +6+Hra+P8lxo/WV2BCfkVy4YKzhOC2pdTtdlNq+1WiCJ39g6ve2mzWCPnhHpnuXKb +L42lDASmz9MjYzEppKK7vm3Z8KgG6TnbIQRWkxDU8PL18QTZpYWlyrv56yjJMOsH ++20i1GBtpP3R3+Dtd5dwLVHKLBd3EzircRjixvI+FV2IAVzSSpOaLxrjBDtxpWe9 +7TpTNcgCNKiTns7QzmIN4/XSQs+93SDmMcYAU8JIp2Wr1z1ESKFytdAI/UBVzSuc +qPgyBraDG43CWXhCtZgFkLjRB6Tr6K0jrB2qFBaauUFa6kTyEVIdWGKe5DR6ZO6d +h/eh4vIllkgeZdO0jjBofv2KX3vrVBGroeD7Ul5+JGmcZRfDtG7io+vqR7ffNDYp +Gc3Ev19gd7ScgAQC1knBhj0ZmICzLsShgZ7RPpNeCtAMEa7RaNQKbotBDrcP4N6Y +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 +0nnuB7/HKZg1LkyCrMJ0xIhTAkjntJCiASP2gauhV8ansbT1VaMumbumSj87Fj6B +HB+emNY8Dk1tyaFPtAcz1b69svUtdRg2SLV3nzasaLfGvJ4mR6zXI1QNcvw3KSCG +iaKXOkRllgQ7+qAFyqOTm7CfV1WMbfzbEL7lay9AwpTYKNOpylfADrClLt9IQ22b +xChY30dYcSxlkGTMu2/T/4QYMU/FYmVExnnROrvwiscz3lOIr/CyIHNpbCh9ZFHV +yZnlV7c6t1+KN1m4cfVSh9MiEXw6AKBA41x0XycB7QmDPqcFF2dpp9A1jUm3Wan5 +/D4NVpaMyMnwOGuTFpSedfJhAlLhlut6u3uDN99A9UWfWYjb5IKRuK+E2w6PHgbB +NVKf23YBTL5/AglqzNIye4kCHAQQAQIABgUCPMB74QAKCRBi0N4mLUEP6+IhD/43 +YLSRc8fRqjS+K7ykoF2AeNiggARZATergK4KAw1cy8gewaNM0VDCaq8DBss7IvUU +QBULGjCO0rOIa5eu4oNzWaNRKxaEkOANz1tMkput4w6SlnWdTElE1P9OMolQ9mLM +UwyHtlxr3Ut943mSzO6NDFMQf060UZrud39bfY7CrYnjymCVUpU7oRBvviKmk4C4 +V6Zzlp32y6yMVlRPlX/7xCXtE26vU4sDK/7R6QA6XvKXxyvn9zXsE8I2LVlzEk7q +klYizzoZouC9zJKIuRkQ90+t4qm1wvoQH8X+99pDkXP0a1/dEp/xgrwxKh4usxwb +8vhSIsf1l3A1q/4Xol0LIQP9d1w2q4YWP9mt+EDkVRkiSi+91MbQZ7jBkTHyUeQk +FU+Vo/uYEOHtUkIs84QXoCc8jSLlMjihDFyzVnc+854d1oNG5ddsFJdP0xLSbLv9 +1T6KPbbgGeFCcLmmbFo3i8/wytNOSqL3qrhQy8x552i0r0syvrQWEcFYAMbcDccZ +mTLcjPrqWPQ0YDFFAG+QnG7sTEnIH91MQdXaNVY/yv////////////////////// +//////////////////////////////////////////////////////////////// +/////////////////////////////////////////4hGBBARAgAGBQI+RiOsAAoJ +ELwLvDxB6y/Qd8MAoPjTI4l6IZpt6scDExfpLSlHcsFSAJ9+vIHypgzWFw3pF9qA +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 +AjqgbccACgkQdZnOPNfHdr9BewCfYmadIVDwAn9xxdIhnC6+is+XEy4AnjgmTHuE +XCSqZ4yCC956u/feFce2iEYEEBECAAYFAj5UB6AACgkQfuhJdu+IHex5lQCg0Kk/ +h4nALfQdsv2/jlILj5mi/rIAoLjwVieZd+LdmnJM9gCBOrAMN13giEYEEBECAAYF +Ajqgbb4ACgkQfuhJdu+IHewSjgCfdd09MlxuSuq2RTSCchRhe1gq5V4AoKQFpChG +ahg2RlE42SC6wr/nKSYGiEYEEBECAAYFAjrXRs8ACgkQl4mNkvSRvSEXJQCfR5v5 +YVWdhkRBzT2g8Sb09/bzg8oAn1vxJnP9p/SVwwrq2iRkD1IYVa6s0cx//wAADToB +EAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQEAAAEAAQAA/9sAQwAKBwcIBwYK +CAgICwoKCw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3LyYpNCkhIjBBMTQ5Oz4+PiUu +RElDPEg3PT47/9sAQwEKCwsODQ4cEBAcOygiKDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 +Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7/8AAEQgAkAB4AwEiAAIRAQMR +Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMF +BQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX +GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6 +g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV +1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB +AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXET +IjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJ +SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWm +p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5 ++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 +P2+tPUjdimAuABnsaKZMx8sgdaKEgbP/2YhOBBARAgAGBQI6Vo8iABIJEMdGNjmy +13leB2VHUEcAAQEH0QCgkp8d7aB4RbAgGiLAkZJhXSOB5/YAmwQyiKrwRI8m3J2g +Vvombn3IwM7HiEwEEBECAAwFAjpWj24FAxDtcoAACgkQY8tpHfrr1fwb+wCfcjVR +JC80wQLR03USX4WIezMZOE8An2A7L3Qt/8rgHf0nmwcxiCffQnJAiEYEEBECAAYF +AjpXJ98ACgkQ14y85WanSzH2bACgp+OZ5SJKlUO19ihz1yHlyZ/M+HoAoPI7Fe2h +xijKqiPc61xy9eESMerOiEYEEBECAAYFAjpa5sUACgkQZ5BPrQp5FhBRqQCfTE8X +0I5XhHYvH+IzWg/hU93XNsYAoPeZaStezssja/GvGnx9y3jhK65h0czX/wAADZIB +EAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQEAAAEAAQAA/9sAQwAKBwcIBwYK +CAgICwoKCw4YEA4NDQ4dFRYRGCMfJSQiHyIhJis3LyYpNCkhIjBBMTQ5Oz4+PiUu +RElDPEg3PT47/9sAQwEKCwsODQ4cEBAcOygiKDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7 +Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7/8AAEQgAjwB1AwEiAAIRAQMR +Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMF +BQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX +GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6 +g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV +1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB +AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXET +IjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJ +SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWm +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 +1l3vnLV3nhbZxS+ati0zvagX00tQgmGnTyYiaQCuekoBRHwl1RB9XNpHg1NiJB9b +2STwKP2xrcjxF8I5RojgR2NrivQdyFNNNIqDVxlOYOoGOXOzo00rJTHTLzjcIq+I +RgQTEQIABgUCPiMajwAKCRDwIHNX9BSVKzpVAKCetMZ2qnsrnUW3kdNIYfJuuQCC +wQCg7U1+/2+bHSzypswG9tEh9SEpnhuIRgQTEQIABgUCPia2YgAKCRBzz9YVLP4Y +o3YBAJ46CObblNgDTfJEygjfL+XLu7+8DwCfbd1Y/AfkoTdeX3uXKywnGld2y0GI +RgQTEQIABgUCPia27gAKCRDwNtr0voCUGAJrAJwIHxo8aOORFfMo1bde6YXfF8I7 ++gCfdNDM67jRdinZs0cUISa07GyjYR6ImQQTEQIAWQUCPibpbFIaaHR0cDovL3d3 +dy52b2x0YS5keW5kbnMub3JnL35td2wvcGdwL3BvbGljeS9DRkIwQTA0QzIwMjBF +RUQ1LURCNjk4RDcxOTkyNDI1NjAuYXNjAAoJEM+woEwgIO7VlRwAn3HibJmyRmOR +XvMjBUOR5oPkNwxQAKC5T2Sit1VkLK99GuRuWDPCHUkGKohGBBMRAgAGBQI+KCUn +AAoJENl6NwsfjC9vJoIAnRAfzn7cm051gPUq/Zl3wm3SEMFYAJ4jhy2f4ZOZdmDa +ncNedOf69yGeUohFBBMRAgAGBQI+KCVNAAoJEEaMBQvr3uIT1isAnAtVjrw4GC6W +Imc6tTeyUOI4MlRLAJUXWhVyQmJHH7vfcbtiq/wQlApdiJUEExECAFUFAj4oIrFO +Gmh0dHA6Ly93d3cucG9ib3guY29tL35wa2FobGUvcGdwL3BvbGljeS9ENjg1RDM5 +NzY5QTM4QURFLURCNjk4RDcxOTkyNDI1NjAuYXNjAAoJENaF05dpo4re3b0Aniz9 +SbeMvfPqbKPoTYZoINqN81LNAJ9YKRBP9a1aWMYfED455KAHS5fMO4hGBBIRAgAG +BQI+Kk4iAAoJEPnKAdXiam8otlcAnjmn6y81ExweviD92w0zCh0/RLH1AJ48f5Xq +gwuioZlc1b9rK3+vh3ETdIicBBMBAgAGBQI+JlVDAAoJEFV9A5rVx7XZX7MD/1D5 +h1xWtSZRTcU8iKQbvWVkvxjnxY/EbWphyt2BcRlobMtWuE2QstCO9Eqi4OpOsv+O +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 +aRChSVvBgkCRYkr97+kClNgmi+PLuUN1z4tspqdE761nRVvUl2x4XvLTJ21hU5eX +GGsC+qFP4Efe8B5kH+FexAfnFPPzou3GjbDbYv4CYi0pyhTxmauxyJyQrQ/MQUt0 +RFRkL8qCzWCR2BmH3jM3M0Wt0oKn8C8+fWItUh5U9fzv/K9GeO/SV8+zdL4MrdqD +stgqXNs27H+WeIgbXlUGIs0mONE6TtKZ5PXG5zFM1bz1vDdAYbY4eUWDABEBAAG0 +JVBHUCBHbG9iYWwgRGlyZWN0b3J5IFZlcmlmaWNhdGlvbiBLZXmJAVsEEAECAEUF +AkGz06wHCwkIBwMCCgIZAR4YbGRhcDovL2tleXNlcnZlci1iZXRhLnBncC5jb20F +GwMAAAADFgIBBR4BAAAABBUIAgoACgkQlxC4m8pXrXybrAf+NTy9mFTs3UuIE0hg +JZ/L1lJ+CP/hOVtV+LD39jd3B+D22cTePoWXtlZviotGVkRrDVLWLjoX7kBYSUk0 +Qhiji+g3RB3tAErOLsR1uBOvyMGfyvNRN9ecxW+vNssAUaXrHJJsrUAJqd6iU2Uq +w3lEPmaqBSxmP43LEXPrcvcHwKYQMLA2LXoUsnZ7014XW/FNb6HgguNVYob784ty +pdBjcuepv1mfiX+aakyQhxXYyOYgrAy1QBkIZsOhGLFe1ssKaif7gEH/8P6G1iEF +6CnzU5AS0daLYkfSG9NSpG1uJZvUXLPFhLCeQt9UyhFnXM7Flr8icoxW16E3604u +bM87rYhGBBARAgAGBQJBs9QJAAoJEKy7FkvPc+xM8gkAni83OlT/qIsnY1nmlQoH ++CrwOmT8AKDD32vPy+x268nB9lWnwGF8/klBEYhGBBARAgAGBQJBtWP0AAoJENNL +ycNgD6ABruwAn3rkWL6V+ptfqa4cZS+Msx743h7pAJ9wFDBOacU+LZIcd5ok+AGo +K8ge2NHMnv8AAA1ZARAAAQEAAAAAAAAAAAAAAAD/2P/gABBKRklGAAEBAAABAAEA +AP/bAEMACgcHCAcGCggICAsKCgsOGBAODQ0OHRUWERgjHyUkIh8iISYrNy8mKTQp +ISIwQTE0OTs+Pj4lLkRJQzxINz0+O//bAEMBCgsLDg0OHBAQHDsoIig7Ozs7Ozs7 +Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEI +AJAAeAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/ +xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHB +FVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2Rl +ZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6 +wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEB +AQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQID +EQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkq +NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqS +k5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl +5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqKrX99BptnJd3L7YoxkmuGvvi +zZRkrZWbykdGbgVpClOp8KJlOMdz0KivILj4p6xM2IYYoV/Op7PxX4mv18xJSVBz +leP61v8AVKiV5WRHtovY9YorzD/hMdat/vygsOoIqeD4l3URAubVJB3K8Gk8JVWy +uHtYnpFFc5oXjXTtcnFsivFORna3+NdEDmueUXF2kjRNPVC0UUVIwooooAKKKKAC +iiigDmPiG5XwjdYPXAP614dX0D4l0+HVNKNncFxHK3JQgEYBPGQfSuCfwBpCnia9 +/GVP/iK9DC4iFKDUjnq05Sd0eeL94V6X4N1HTRpqxzzLE6DnPfiq0HgXQHdkku75 +GHT51/8AiKst4H0aE4W/vRj/AGkP/slXWr0asbNsmFOcHcx9euLee/le1x5WTgjo +ea5+Z+TXayeFNMQbf7QvMdeqf/EUz/hCtLkUN9qvSD38xP8A4irhiqUUkmJ0pt3O +f8Iz+V4ihcsFA6knHpXr0ev6QkeJNUtAw6jzlyP1rzy48HaZaW7TxvcyOrKNsrKV +OWA6BR61u6TpkVqRIqlcrj5Rx+NcWJqRqT5om1OLirM6mPX9GmbbHqtmzennrn+d +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 +p0UURWXHtg5lWUiPEvjst0HXN0nW2CA1QA+6 +=wXhq -----END PGP PUBLIC KEY BLOCK----- From cvs at cvs.gnupg.org Tue Dec 28 12:27:15 2004 From: cvs at cvs.gnupg.org (cvs user wk) Date: Fri Jan 28 12:17:22 2005 Subject: gpgme-1-0-branch gpgme (18 files) Message-ID: Date: Tuesday, December 28, 2004 @ 12:32:51 Author: wk Path: /cvs/gpgme/gpgme Tag: gpgme-1-0-branch Modified: ChangeLog INSTALL NEWS README acinclude.m4 compile config.guess config.sub configure.ac depcomp doc/mdate-sh doc/texinfo.tex gpgme/gpgme.h install-sh m4/ChangeLog m4/pth.m4 missing mkinstalldirs * configure.ac: Require automake 1.9.3 and autoconf 2.59. * acinclude.m4: Changed quoting for automake 1.9. * README: Use SHA1 instead of MD5. * pth.m4: Changed quoting for use with automake 1.9. -----------------+ ChangeLog | 8 INSTALL | 52 NEWS | 2 README | 10 acinclude.m4 | 4 compile | 147 - config.guess | 95 config.sub | 57 configure.ac | 10 depcomp | 104 - doc/mdate-sh | 37 doc/texinfo.tex | 5594 ++++++++++++++++++++++++++++-------------------------- gpgme/gpgme.h | 2 install-sh | 471 ++-- m4/ChangeLog | 4 m4/pth.m4 | 6 missing | 131 - mkinstalldirs | 69 18 files changed, 3653 insertions(+), 3150 deletions(-) Index: gpgme/ChangeLog diff -u gpgme/ChangeLog:1.108.2.2 gpgme/ChangeLog:1.108.2.3 --- gpgme/ChangeLog:1.108.2.2 Sat Dec 11 16:50:12 2004 +++ gpgme/ChangeLog Tue Dec 28 12:32:51 2004 @@ -1,3 +1,11 @@ +2004-12-28 Werner Koch + + Released 1.0.2. + + * configure.ac: Require automake 1.9.3 and autoconf 2.59. + * acinclude.m4: Changed quoting for automake 1.9. + * README: Use SHA1 instead of MD5. + 2004-12-11 Marcus Brinkmann * configure.ac: Replace ttyname_r if it doesn't exist (and warn in Index: gpgme/INSTALL diff -u gpgme/INSTALL:1.4 gpgme/INSTALL:1.4.2.1 --- gpgme/INSTALL:1.4 Mon Jan 12 14:49:01 2004 +++ gpgme/INSTALL Tue Dec 28 12:32:51 2004 @@ -1,13 +1,16 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,9 +70,9 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -82,7 +85,7 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -99,19 +102,19 @@ Installation Names ================== - By default, `make install' will install the package's files in +By default, `make install' will install the package's files in `/usr/local/bin', `/usr/local/man', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. +give `configure' the option `--exec-prefix=PREFIX', the package will +use PREFIX as the prefix for installing programs and libraries. Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +140,11 @@ Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -167,9 +170,9 @@ Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +181,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -192,8 +195,7 @@ `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' Index: gpgme/NEWS diff -u gpgme/NEWS:1.136.2.1 gpgme/NEWS:1.136.2.2 --- gpgme/NEWS:1.136.2.1 Tue Dec 7 22:26:01 2004 +++ gpgme/NEWS Tue Dec 28 12:32:51 2004 @@ -1,4 +1,4 @@ -Noteworthy changes in version 1.0.2 (unreleased) +Noteworthy changes in version 1.0.2 (2004-12-28) ------------------------------------------------ * Changed the license of the library to the GNU Lesser General Public Index: gpgme/README diff -u gpgme/README:1.29.2.1 gpgme/README:1.29.2.2 --- gpgme/README:1.29.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/README Tue Dec 28 12:32:51 2004 @@ -44,7 +44,7 @@ libgpg-error 0.5. For support of the OpenPGP protocol (default), you should use the -latest version of GnuPG 1.2, available at: +latest version of GnuPG 1.2 or 1.4, available at: ftp://ftp.gnupg.org/gcrypt/gnupg/ You need at least GnuPG 1.2.2. @@ -55,7 +55,7 @@ For support of the CMS (Cryptographic Message Syntax) protocol, you need the latest CVS version of GnuPG 1.9, which is available in the GnuPG repository: -http://www.gnupg.org/(en)/download/cvs_access.html +http://www.gnupg.org/download/cvs_access.html Use the tag `GNUPG-1-9-BRANCH'. There are also snapshots available at: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/ @@ -99,13 +99,13 @@ with the fingerprint published elsewhere. b) If you don't have any of the above programs, you have to verify - the MD5 checksum: + the SHA1 checksum: - $ md5sum gpgme-x.y.z.tar.gz + $ sha1sum gpgme-x.y.z.tar.gz This should yield an output _similar_ to this: - fd9351b26b3189c1d577f0970f9dcadc gpgme-x.y.z.tar.gz + fd9351b26b3189c1d577f0970f9dcadc3412def1 gpgme-x.y.z.tar.gz Now check that this checksum is _exactly_ the same as the one published via the announcement list and probably via Usenet. Index: gpgme/acinclude.m4 diff -u gpgme/acinclude.m4:1.12.2.1 gpgme/acinclude.m4:1.12.2.2 --- gpgme/acinclude.m4:1.12.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/acinclude.m4 Tue Dec 28 12:32:51 2004 @@ -24,7 +24,7 @@ dnl We must use a temp file in the current directory because make dnl distcheck installs all sourcefiles RO. dnl (wk 2001-12-18) -AC_DEFUN(GNUPG_FIX_HDR_VERSION, +AC_DEFUN([GNUPG_FIX_HDR_VERSION], [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > fixhdr.tmp if cmp -s $srcdir/$1 fixhdr.tmp 2>/dev/null; then rm -f fixhdr.tmp @@ -47,7 +47,7 @@ dnl Do some check on how to implement va_copy. dnl May define MUST_COPY_VA_BY_VAL. dnl Actual test code taken from glib-1.1. -AC_DEFUN(GNUPG_CHECK_VA_COPY, +AC_DEFUN([GNUPG_CHECK_VA_COPY], [ AC_MSG_CHECKING(whether va_lists must be copied by value) AC_CACHE_VAL(gnupg_cv_must_copy_va_byval,[ gnupg_cv_must_copy_va_byval=no Index: gpgme/compile diff -u gpgme/compile:1.1 gpgme/compile:1.1.2.1 --- gpgme/compile:1.1 Mon Jan 12 14:49:01 2004 +++ gpgme/compile Tue Dec 28 12:32:51 2004 @@ -1,8 +1,9 @@ #! /bin/sh - # Wrapper for compilers which do not understand `-c -o'. -# Copyright 1999, 2000 Free Software Foundation, Inc. +scriptversion=2004-10-12.08 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -24,76 +25,118 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Usage: -# compile PROGRAM [ARGS]... -# `-o FOO.o' is removed from the args passed to the actual compile. - -prog=$1 -shift +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand `-c -o'. +Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file `INSTALL'. + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "compile $scriptversion" + exit 0 + ;; +esac ofile= cfile= -args= -while test $# -gt 0; do - case "$1" in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we do something ugly here. - ofile=$2 - shift - case "$ofile" in - *.o | *.obj) - ;; - *) - args="$args -o $ofile" - ofile= - ;; - esac - ;; - *.c) - cfile=$1 - args="$args $1" - ;; - *) - args="$args $1" - ;; - esac - shift +eat= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + # So we strip `-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$prog" $args + # If no `-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # `.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" fi # Name of file we expect compiler to create. -cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. # Note: use `[/.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do - if mkdir $lockdir > /dev/null 2>&1; then - break - fi - sleep 1 + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 done # FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir $lockdir; exit 1" 1 2 15 +trap "rmdir '$lockdir'; exit 1" 1 2 15 # Run the compile. -"$prog" $args -status=$? +"$@" +ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + mv "${cofile}bj" "$ofile" fi -rmdir $lockdir -exit $status +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gpgme/config.guess diff -u gpgme/config.guess:1.3 gpgme/config.guess:1.3.2.1 --- gpgme/config.guess:1.3 Tue Apr 6 16:41:28 2004 +++ gpgme/config.guess Tue Dec 28 12:32:51 2004 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-01-05' +timestamp='2004-08-13' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -53,7 +53,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -197,15 +197,21 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; + amd64:OpenBSD:*:*) + echo x86_64-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} + cats:OpenBSD:*:*) + echo arm-unknown-openbsd${UNAME_RELEASE} exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + luna88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -221,28 +227,33 @@ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} + echo mips64-unknown-openbsd${UNAME_RELEASE} exit 0 ;; sun3:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; + macppc:MirBSD:*:*) + echo powerppc-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -280,14 +291,12 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? @@ -405,6 +414,9 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -740,7 +752,7 @@ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` @@ -763,21 +775,7 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -829,6 +827,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -1069,9 +1070,9 @@ M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit 0 ;; - M68*:*:R3V[567]*:*) + M68*:*:R3V[5678]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1169,9 +1170,10 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - case `uname -p` in + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; @@ -1230,9 +1232,16 @@ SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; - *:DRAGONFLY:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms && exit 0 ;; + I*) echo ia64-dec-vms && exit 0 ;; + V*) echo vax-dec-vms && exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 Index: gpgme/config.sub diff -u gpgme/config.sub:1.3 gpgme/config.sub:1.3.2.1 --- gpgme/config.sub:1.3 Tue Apr 6 16:41:28 2004 +++ gpgme/config.sub Tue Dec 28 12:32:51 2004 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-01-05' +timestamp='2004-06-24' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -70,7 +70,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -145,7 +145,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -237,7 +237,7 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -262,7 +262,7 @@ | pyramid \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -300,7 +300,7 @@ | avr-* \ | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ @@ -308,7 +308,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* \ + | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -326,8 +326,9 @@ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ @@ -336,7 +337,7 @@ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -363,6 +364,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -442,12 +446,24 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -648,10 +664,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -732,10 +744,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -1048,6 +1056,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1070,7 +1081,7 @@ sh64) basic_machine=sh64-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1143,8 +1154,9 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ @@ -1362,6 +1374,9 @@ *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; Index: gpgme/configure.ac diff -u gpgme/configure.ac:1.93.2.2 gpgme/configure.ac:1.93.2.3 --- gpgme/configure.ac:1.93.2.2 Sat Dec 11 16:50:12 2004 +++ gpgme/configure.ac Tue Dec 28 12:32:51 2004 @@ -20,11 +20,11 @@ # (Process this file with autoconf to produce a configure script.) -AC_PREREQ(2.57) -min_automake_version="1.7.6" +AC_PREREQ(2.59) +min_automake_version="1.9.3" # Version number: Remember to change it immediately *after* a release. -AC_INIT(gpgme, 1.0.1, [bug-gpgme@gnupg.org]) +AC_INIT(gpgme, 1.0.2, [bug-gpgme@gnupg.org]) # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) @@ -35,7 +35,7 @@ # Subtract 2 from this value if you want to make the LFS transition an # ABI break. [Note to self: Remove this comment with the next regular break.] LIBGPGME_LT_AGE=3 -LIBGPGME_LT_REVISION=2 +LIBGPGME_LT_REVISION=3 # If the API is changed in an incompatible way: increment the next counter. GPGME_CONFIG_API_VERSION=1 @@ -44,7 +44,7 @@ NEED_GPGSM_VERSION=1.9.6 ############################################## AC_PREREQ(2.52) -AC_REVISION($Revision: 1.93.2.2 $) +AC_REVISION($Revision: 1.93.2.3 $) PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION Index: gpgme/depcomp diff -u gpgme/depcomp:1.1 gpgme/depcomp:1.1.2.1 --- gpgme/depcomp:1.1 Mon Jan 12 14:49:01 2004 +++ gpgme/depcomp Tue Dec 28 12:32:51 2004 @@ -1,7 +1,9 @@ #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. + +scriptversion=2004-05-31.23 + +# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,22 +27,45 @@ # Originally written by Alexandre Oliva . +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit 0 + ;; +esac + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" @@ -172,19 +197,25 @@ aix) # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` tmpdepfile="$stripped.u" - outname="$stripped.o" if test "$libtool" = yes; then "$@" -Wc,-M else "$@" -M fi - stat=$? + + if test -f "$tmpdepfile"; then : + else + stripped=`echo "$stripped" | sed 's,^.*/,,'` + tmpdepfile="$stripped.u" + fi + if test $stat -eq 0; then : else rm -f "$tmpdepfile" @@ -192,6 +223,7 @@ fi if test -f "$tmpdepfile"; then + outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. @@ -255,31 +287,40 @@ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + # Dependencies are output in .lo.d with libtool 1.4. + # With libtool 1.5 they are output both in $dir.libs/$base.o.d + # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the + # latter, because the former will be cleaned when $dir.libs is + # erased. tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" + tmpdepfile2="$dir$base.o.d" + tmpdepfile3="$dir.libs/$base.d" "$@" -Wc,-MD else tmpdepfile1="$dir$base.o.d" tmpdepfile2="$dir$base.d" + tmpdepfile3="$dir$base.d" "$@" -MD fi stat=$? if test $stat -eq 0; then : else - rm -f "$tmpdepfile1" "$tmpdepfile2" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi if test -f "$tmpdepfile1"; then tmpdepfile="$tmpdepfile1" - else + elif test -f "$tmpdepfile2"; then tmpdepfile="$tmpdepfile2" + else + tmpdepfile="$tmpdepfile3" fi if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -292,7 +333,7 @@ dashmstdout) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o. + # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? # Remove the call to Libtool. @@ -388,7 +429,7 @@ cpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout. + # always write the preprocessed file to stdout. "$@" || exit $? # Remove the call to Libtool. @@ -430,7 +471,7 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, + # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? IFS=" " @@ -470,3 +511,12 @@ esac exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gpgme/doc/mdate-sh diff -u gpgme/doc/mdate-sh:1.1 gpgme/doc/mdate-sh:1.1.2.1 --- gpgme/doc/mdate-sh:1.1 Mon Jan 12 14:49:06 2004 +++ gpgme/doc/mdate-sh Tue Dec 28 12:32:51 2004 @@ -1,5 +1,8 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. + +scriptversion=2003-11-09.00 + # Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 # @@ -22,6 +25,31 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +case $1 in + '') + echo "$0: No file. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: mdate-sh [--help] [--version] FILE + +Pretty-print the modification time of FILE. + +Report bugs to . +EOF + exit 0 + ;; + -v | --v*) + echo "mdate-sh $scriptversion" + exit 0 + ;; +esac + # Prevent date giving response in another language. LANG=C export LANG @@ -131,3 +159,12 @@ # The result. echo $day $month $year + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gpgme/doc/texinfo.tex diff -u gpgme/doc/texinfo.tex:1.1 gpgme/doc/texinfo.tex:1.1.2.1 --- gpgme/doc/texinfo.tex:1.1 Mon Jan 12 14:49:06 2004 +++ gpgme/doc/texinfo.tex Tue Dec 28 12:32:51 2004 @@ -3,10 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2003-05-04.08} +\def\texinfoversion{2004-10-31.06} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software +% Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -23,21 +24,16 @@ % to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% In other words, you are welcome to use, share and improve this program. -% You are forbidden to forbid anyone else to use, share and improve -% what you give them. Help stamp out software-hoarding! +% As a special exception, when this file is read by TeX when processing +% a Texinfo source document, you may use the result without +% restriction. (This has been our intent since Texinfo was invented.) % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: -% ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex -% (and all GNU mirrors, see http://www.gnu.org/order/ftp.html) +% http://www.gnu.org/software/texinfo/ (the Texinfo home page), or % ftp://tug.org/tex/texinfo.tex -% (and all CTAN mirrors, see http://www.ctan.org), -% and /home/gd/gnu/doc/texinfo.tex on the GNU machines. -% -% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. -% -% The texinfo.tex in any given Texinfo distribution could well be out +% (and all CTAN mirrors, see http://www.ctan.org). +% The texinfo.tex in any given distribution could well be out % of date, so if that's what you're using, please check. % % Send bug reports to bug-texinfo@gnu.org. Please include including a @@ -59,6 +55,9 @@ % It is possible to adapt texinfo.tex for other languages, to some % extent. You can get the existing language-specific files from the % full Texinfo distribution. +% +% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. + \message{Loading texinfo [version \texinfoversion]:} @@ -85,10 +84,13 @@ \let\ptexend=\end \let\ptexequiv=\equiv \let\ptexexclam=\! +\let\ptexfootnote=\footnote \let\ptexgtr=> \let\ptexhat=^ \let\ptexi=\i \let\ptexindent=\indent +\let\ptexnoindent=\noindent +\let\ptexinsert=\insert \let\ptexlbrace=\{ \let\ptexless=< \let\ptexplus=+ @@ -101,6 +103,15 @@ % starts a new line in the output. \newlinechar = `^^J +% Use TeX 3.0's \inputlineno to get the line number, for better error +% messages, but if we're using an old version of TeX, don't do anything. +% +\ifx\inputlineno\thisisundefined + \let\linenumber = \empty % Pre-3.0. +\else + \def\linenumber{l.\the\inputlineno:\space} +\fi + % Set up fixed words for English if not already set. \ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi \ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi @@ -139,43 +150,81 @@ \ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi \ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi \ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi -\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi \ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi -\ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi % In some macros, we cannot use the `\? notation---the left quote is % in some cases the escape char. \chardef\colonChar = `\: \chardef\commaChar = `\, \chardef\dotChar = `\. -\chardef\equalChar = `\= \chardef\exclamChar= `\! \chardef\questChar = `\? \chardef\semiChar = `\; -\chardef\spaceChar = `\ % \chardef\underChar = `\_ +\chardef\spaceChar = `\ % +\chardef\spacecat = 10 +\def\spaceisspace{\catcode\spaceChar=\spacecat} + % Ignore a token. % \def\gobble#1{} -% True if #1 is the empty string, i.e., called like `\ifempty{}'. -% -\def\ifempty#1{\ifemptyx #1\emptymarkA\emptymarkB}% -\def\ifemptyx#1#2\emptymarkB{\ifx #1\emptymarkA}% +% The following is used inside several \edef's. +\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname} % Hyphenation fixes. -\hyphenation{ap-pen-dix} -\hyphenation{eshell} -\hyphenation{mini-buf-fer mini-buf-fers} -\hyphenation{time-stamp} -\hyphenation{white-space} +\hyphenation{ + Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script + ap-pen-dix bit-map bit-maps + data-base data-bases eshell fall-ing half-way long-est man-u-script + man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm + par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces + spell-ing spell-ings + stand-alone strong-est time-stamp time-stamps which-ever white-space + wide-spread wrap-around +} % Margin to add to right of even pages, to left of odd pages. \newdimen\bindingoffset \newdimen\normaloffset \newdimen\pagewidth \newdimen\pageheight +% For a final copy, take out the rectangles +% that mark overfull boxes (in case you have decided +% that the text looks ok even though it passes the margin). +% +\def\finalout{\overfullrule=0pt} + +% @| inserts a changebar to the left of the current line. It should +% surround any changed text. This approach does *not* work if the +% change spans more than two lines of output. To handle that, we would +% have adopt a much more difficult approach (putting marks into the main +% vertical list for the beginning and end of each change). +% +\def\|{% + % \vadjust can only be used in horizontal mode. + \leavevmode + % + % Append this vertical mode material after the current line in the output. + \vadjust{% + % We want to insert a rule with the height and depth of the current + % leading; that is exactly what \strutbox is supposed to record. + \vskip-\baselineskip + % + % \vadjust-items are inserted at the left edge of the type. So + % the \llap here moves out into the left-hand margin. + \llap{% + % + % For a thicker or thinner bar, change the `1pt'. + \vrule height\baselineskip width1pt + % + % This is the space between the bar and the text. + \hskip 12pt + }% + }% +} + % Sometimes it is convenient to have everything in the transcript file % and nothing on the terminal. We don't just call \tracingall here, % since that produces some useless output on the terminal. We also make @@ -200,7 +249,7 @@ \tracingassigns1 \fi \tracingcommands3 % 3 gives us more in etex - \errorcontextlines\maxdimen + \errorcontextlines16 }% % add check for \lastpenalty to plain's definitions. If the last thing @@ -258,7 +307,7 @@ % the page break happens to be in the middle of an example. \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. - \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi + \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi % \ifcropmarks \vbox to \outervsize\bgroup \hsize = \outerhsize @@ -339,132 +388,162 @@ % the input line (except we remove a trailing comment). #1 should be a % macro which expects an ordinary undelimited TeX argument. % -\def\parsearg#1{% - \let\next = #1% +\def\parsearg{\parseargusing{}} +\def\parseargusing#1#2{% + \def\next{#2}% \begingroup \obeylines - \futurelet\temp\parseargx -} - -% If the next token is an obeyed space (from an @example environment or -% the like), remove it and recurse. Otherwise, we're done. -\def\parseargx{% - % \obeyedspace is defined far below, after the definition of \sepspaces. - \ifx\obeyedspace\temp - \expandafter\parseargdiscardspace - \else - \expandafter\parseargline - \fi + \spaceisspace + #1% + \parseargline\empty% Insert the \empty token, see \finishparsearg below. } -% Remove a single space (as the delimiter token to the macro call). -{\obeyspaces % - \gdef\parseargdiscardspace {\futurelet\temp\parseargx}} - {\obeylines % \gdef\parseargline#1^^M{% \endgroup % End of the group started in \parsearg. - % - % First remove any @c comment, then any @comment. - % Result of each macro is put in \toks0. - \argremovec #1\c\relax % - \expandafter\argremovecomment \the\toks0 \comment\relax % - % - % Call the caller's macro, saved as \next in \parsearg. - \expandafter\next\expandafter{\the\toks0}% + \argremovecomment #1\comment\ArgTerm% }% } -% Since all \c{,omment} does is throw away the argument, we can let TeX -% do that for us. The \relax here is matched by the \relax in the call -% in \parseargline; it could be more or less anything, its purpose is -% just to delimit the argument to the \c. -\def\argremovec#1\c#2\relax{\toks0 = {#1}} -\def\argremovecomment#1\comment#2\relax{\toks0 = {#1}} +% First remove any @comment, then any @c comment. +\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} +\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} -% \argremovec{,omment} might leave us with trailing spaces, though; e.g., +% Each occurence of `\^^M' or `\^^M' is replaced by a single space. +% +% \argremovec might leave us with trailing space, e.g., % @end itemize @c foo -% will have two active spaces as part of the argument with the -% `itemize'. Here we remove all active spaces from #1, and assign the -% result to \toks0. -% -% This loses if there are any *other* active characters besides spaces -% in the argument -- _ ^ +, for example -- since they get expanded. -% Fortunately, Texinfo does not define any such commands. (If it ever -% does, the catcode of the characters in questionwill have to be changed -% here.) But this means we cannot call \removeactivespaces as part of -% \argremovec{,omment}, since @c uses \parsearg, and thus the argument -% that \parsearg gets might well have any character at all in it. +% This space token undergoes the same procedure and is eventually removed +% by \finishparsearg. % -\def\removeactivespaces#1{% - \begingroup - \ignoreactivespaces - \edef\temp{#1}% - \global\toks0 = \expandafter{\temp}% - \endgroup +\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M} +\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M} +\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% + \def\temp{#3}% + \ifx\temp\empty + % We cannot use \next here, as it holds the macro to run; + % thus we reuse \temp. + \let\temp\finishparsearg + \else + \let\temp\argcheckspaces + \fi + % Put the space token in: + \temp#1 #3\ArgTerm } -% Change the active space to expand to nothing. +% If a _delimited_ argument is enclosed in braces, they get stripped; so +% to get _exactly_ the rest of the line, we had to prevent such situation. +% We prepended an \empty token at the very beginning and we expand it now, +% just before passing the control to \next. +% (Similarily, we have to think about #3 of \argcheckspacesY above: it is +% either the null string, or it ends with \^^M---thus there is no danger +% that a pair of braces would be stripped. % -\begingroup - \obeyspaces - \gdef\ignoreactivespaces{\obeyspaces\let =\empty} -\endgroup +% But first, we have to remove the trailing space token. +% +\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}} +% \parseargdef\foo{...} +% is roughly equivalent to +% \def\foo{\parsearg\Xfoo} +% \def\Xfoo#1{...} +% +% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my +% favourite TeX trick. --kasal, 16nov03 -\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} +\def\parseargdef#1{% + \expandafter \doparseargdef \csname\string#1\endcsname #1% +} +\def\doparseargdef#1#2{% + \def#2{\parsearg#1}% + \def#1##1% +} -%% These are used to keep @begin/@end levels from running away -%% Call \inENV within environments (after a \begingroup) -\newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi} -\def\ENVcheck{% -\ifENV\errmessage{Still within an environment; press RETURN to continue} -\endgroup\fi} % This is not perfect, but it should reduce lossage +% Several utility definitions with active space: +{ + \obeyspaces + \gdef\obeyedspace{ } -% @begin foo is the same as @foo, for now. -\newhelp\EMsimple{Press RETURN to continue.} + % Make each space character in the input produce a normal interword + % space in the output. Don't allow a line break at this space, as this + % is used only in environments like @example, where each line of input + % should produce a line of output anyway. + % + \gdef\sepspaces{\obeyspaces\let =\tie} + + % If an index command is used in an @example environment, any spaces + % therein should become regular spaces in the raw index file, not the + % expansion of \tie (\leavevmode \penalty \@M \ ). + \gdef\unsepspaces{\let =\space} +} -\outer\def\begin{\parsearg\beginxxx} -\def\beginxxx #1{% -\expandafter\ifx\csname #1\endcsname\relax -{\errhelp=\EMsimple \errmessage{Undefined command @begin #1}}\else -\csname #1\endcsname\fi} +\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} -% @end foo executes the definition of \Efoo. +% Define the framework for environments in texinfo.tex. It's used like this: % -\def\end{\parsearg\endxxx} -\def\endxxx #1{% - \removeactivespaces{#1}% - \edef\endthing{\the\toks0}% - % - \expandafter\ifx\csname E\endthing\endcsname\relax - \expandafter\ifx\csname \endthing\endcsname\relax - % There's no \foo, i.e., no ``environment'' foo. - \errhelp = \EMsimple - \errmessage{Undefined command `@end \endthing'}% - \else - \unmatchedenderror\endthing - \fi +% \envdef\foo{...} +% \def\Efoo{...} +% +% It's the responsibility of \envdef to insert \begingroup before the +% actual body; @end closes the group after calling \Efoo. \envdef also +% defines \thisenv, so the current environment is known; @end checks +% whether the environment name matches. The \checkenv macro can also be +% used to check whether the current environment is the one expected. +% +% Non-false conditionals (@iftex, @ifset) don't fit into this, so they +% are not treated as enviroments; they don't open a group. (The +% implementation of @end takes care not to call \endgroup in this +% special case.) + + +% At runtime, environments start with this: +\def\startenvironment#1{\begingroup\def\thisenv{#1}} +% initialize +\let\thisenv\empty + +% ... but they get defined via ``\envdef\foo{...}'': +\long\def\envdef#1#2{\def#1{\startenvironment#1#2}} +\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} + +% Check whether we're in the right environment: +\def\checkenv#1{% + \def\temp{#1}% + \ifx\thisenv\temp \else - % Everything's ok; the right environment has been started. - \csname E\endthing\endcsname + \badenverr \fi } -% There is an environment #1, but it hasn't been started. Give an error. -% -\def\unmatchedenderror#1{% +% Evironment mismatch, #1 expected: +\def\badenverr{% \errhelp = \EMsimple - \errmessage{This `@end #1' doesn't have a matching `@#1'}% + \errmessage{This command can appear only \inenvironment\temp, + not \inenvironment\thisenv}% +} +\def\inenvironment#1{% + \ifx#1\empty + out of any environment% + \else + in environment \expandafter\string#1% + \fi } -% Define the control sequence \E#1 to give an unmatched @end error. +% @end foo executes the definition of \Efoo. +% But first, it executes a specialized version of \checkenv % -\def\defineunmatchedend#1{% - \expandafter\def\csname E#1\endcsname{\unmatchedenderror{#1}}% +\parseargdef\end{% + \if 1\csname iscond.#1\endcsname + \else + % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03 + \expandafter\checkenv\csname#1\endcsname + \csname E#1\endcsname + \endgroup + \fi } +\newhelp\EMsimple{Press RETURN to continue.} + %% Simple single-character @ commands @@ -496,6 +575,9 @@ !gdef!rbraceatcmd[@}]% !endgroup +% @comma{} to avoid , parsing problems. +\let\comma = , + % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent % Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. \let\, = \c @@ -505,10 +587,12 @@ \let\ubaraccent = \b \let\udotaccent = \d -% Other special characters: @questiondown @exclamdown +% Other special characters: @questiondown @exclamdown @ordf @ordm % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. \def\questiondown{?`} \def\exclamdown{!`} +\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} +\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} % Dotless i and dotless j, used for accents. \def\imacro{i} @@ -521,6 +605,25 @@ \fi\fi } +% The \TeX{} logo, as in plain, but resetting the spacing so that a +% period following counts as ending a sentence. (Idea found in latex.) +% +\edef\TeX{\TeX \spacefactor=1000 } + +% @LaTeX{} logo. Not quite the same results as the definition in +% latex.ltx, since we use a different font for the raised A; it's most +% convenient for us to use an explicitly smaller font, rather than using +% the \scriptstyle font (since we don't reset \scriptstyle and +% \scriptscriptstyle). +% +\def\LaTeX{% + L\kern-.36em + {\setbox0=\hbox{T}% + \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}% + \kern-.15em + \TeX +} + % Be sure we're in horizontal mode when doing a tie, since we make space % equivalent to this in @example-like environments. Otherwise, a space % at the beginning of a line will start with \penalty -- and @@ -574,59 +677,14 @@ \newbox\groupbox \def\vfilllimit{0.7} % -\def\group{\begingroup - \ifnum\catcode13=\active \else +\envdef\group{% + \ifnum\catcode`\^^M=\active \else \errhelp = \groupinvalidhelp \errmessage{@group invalid in context where filling is enabled}% \fi - % - % The \vtop we start below produces a box with normal height and large - % depth; thus, TeX puts \baselineskip glue before it, and (when the - % next line of text is done) \lineskip glue after it. (See p.82 of - % the TeXbook.) Thus, space below is not quite equal to space - % above. But it's pretty close. - \def\Egroup{% - \egroup % End the \vtop. - % \dimen0 is the vertical size of the group's box. - \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox - % \dimen2 is how much space is left on the page (more or less). - \dimen2 = \pageheight \advance\dimen2 by -\pagetotal - % if the group doesn't fit on the current page, and it's a big big - % group, force a page break. - \ifdim \dimen0 > \dimen2 - \ifdim \pagetotal < \vfilllimit\pageheight - \page - \fi - \fi - \copy\groupbox - \endgroup % End the \group. - }% + \startsavinginserts % \setbox\groupbox = \vtop\bgroup - % We have to put a strut on the last line in case the @group is in - % the midst of an example, rather than completely enclosing it. - % Otherwise, the interline space between the last line of the group - % and the first line afterwards is too small. But we can't put the - % strut in \Egroup, since there it would be on a line by itself. - % Hence this just inserts a strut at the beginning of each line. - \everypar = {\strut}% - % - % Since we have a strut on every line, we don't need any of TeX's - % normal interline spacing. - \offinterlineskip - % - % OK, but now we have to do something about blank - % lines in the input in @example-like environments, which normally - % just turn into \lisppar, which will insert no space now that we've - % turned off the interline space. Simplest is to make them be an - % empty paragraph. - \ifx\par\lisppar - \edef\par{\leavevmode \par}% - % - % Reset ^^M's definition to new definition of \par. - \obeylines - \fi - % % Do @comment since we are called inside an environment such as % @example, where each end-of-line in the input causes an % end-of-line in the output. We don't want the end-of-line after @@ -636,6 +694,32 @@ \comment } % +% The \vtop produces a box with normal height and large depth; thus, TeX puts +% \baselineskip glue before it, and (when the next line of text is done) +% \lineskip glue after it. Thus, space below is not quite equal to space +% above. But it's pretty close. +\def\Egroup{% + % To get correct interline space between the last line of the group + % and the first line afterwards, we have to propagate \prevdepth. + \endgraf % Not \par, as it may have been set to \lisppar. + \global\dimen1 = \prevdepth + \egroup % End the \vtop. + % \dimen0 is the vertical size of the group's box. + \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox + % \dimen2 is how much space is left on the page (more or less). + \dimen2 = \pageheight \advance\dimen2 by -\pagetotal + % if the group doesn't fit on the current page, and it's a big big + % group, force a page break. + \ifdim \dimen0 > \dimen2 + \ifdim \pagetotal < \vfilllimit\pageheight + \page + \fi + \fi + \box\groupbox + \prevdepth = \dimen1 + \checkinserts +} +% % TeX puts in an \escapechar (i.e., `@') at the beginning of the help % message, so this ends up printing `@group can only ...'. % @@ -648,10 +732,8 @@ \newdimen\mil \mil=0.001in -\def\need{\parsearg\needx} - % Old definition--didn't work. -%\def\needx #1{\par % +%\parseargdef\need{\par % %% This method tries to make TeX break the page naturally %% if the depth of the box does not fit. %{\baselineskip=0pt% @@ -659,7 +741,7 @@ %\prevdepth=-1000pt %}} -\def\needx#1{% +\parseargdef\need{% % Ensure vertical mode, so we don't make a big box in the middle of a % paragraph. \par @@ -698,35 +780,10 @@ \fi } -% @br forces paragraph break +% @br forces paragraph break (and is undocumented). \let\br = \par -% @dots{} output an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in a typewriter -% font as three actual period characters. -% -\def\dots{% - \leavevmode - \hbox to 1.5em{% - \hskip 0pt plus 0.25fil minus 0.25fil - .\hss.\hss.% - \hskip 0pt plus 0.5fil minus 0.5fil - }% -} - -% @enddots{} is an end-of-sentence ellipsis. -% -\def\enddots{% - \leavevmode - \hbox to 2em{% - \hskip 0pt plus 0.25fil minus 0.25fil - .\hss.\hss.\hss.% - \hskip 0pt plus 0.5fil minus 0.5fil - }% - \spacefactor=3000 -} - % @page forces the start of a new page. % \def\page{\par\vfill\supereject} @@ -739,13 +796,11 @@ \newskip\exdentamount % This defn is used inside fill environments such as @defun. -\def\exdent{\parsearg\exdentyyy} -\def\exdentyyy #1{{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}} +\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break} % This defn is used inside nofill environments such as @example. -\def\nofillexdent{\parsearg\nofillexdentyyy} -\def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount -\leftline{\hskip\leftskip{\rm#1}}}} +\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount + \leftline{\hskip\leftskip{\rm#1}}}} % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current % paragraph. For more general purposes, use the \margin insertion @@ -797,8 +852,19 @@ } % @include file insert text of that file as input. -% Allow normal characters that we make active in the argument (a file name). -\def\include{\begingroup +% +\def\include{\parseargusing\filenamecatcodes\includezzz} +\def\includezzz#1{% + \pushthisfilestack + \def\thisfile{#1}% + {% + \makevalueexpandable + \def\temp{\input #1 }% + \expandafter + }\temp + \popthisfilestack +} +\def\filenamecatcodes{% \catcode`\\=\other \catcode`~=\other \catcode`^=\other @@ -807,33 +873,50 @@ \catcode`<=\other \catcode`>=\other \catcode`+=\other - \parsearg\includezzz} -% Restore active chars for included file. -\def\includezzz#1{\endgroup\begingroup - % Read the included file in a group so nested @include's work. - \def\thisfile{#1}% - \let\value=\expandablevalue - \input\thisfile -\endgroup} + \catcode`-=\other +} + +\def\pushthisfilestack{% + \expandafter\pushthisfilestackX\popthisfilestack\StackTerm +} +\def\pushthisfilestackX{% + \expandafter\pushthisfilestackY\thisfile\StackTerm +} +\def\pushthisfilestackY #1\StackTerm #2\StackTerm {% + \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}% +} + +\def\popthisfilestack{\errthisfilestackempty} +\def\errthisfilestackempty{\errmessage{Internal error: + the stack of filenames is empty.}} \def\thisfile{} % @center line % outputs that line, centered. % -\def\center{\parsearg\docenter} -\def\docenter#1{{% - \ifhmode \hfil\break \fi - \advance\hsize by -\leftskip - \advance\hsize by -\rightskip - \line{\hfil \ignorespaces#1\unskip \hfil}% - \ifhmode \break \fi -}} +\parseargdef\center{% + \ifhmode + \let\next\centerH + \else + \let\next\centerV + \fi + \next{\hfil \ignorespaces#1\unskip \hfil}% +} +\def\centerH#1{% + {% + \hfil\break + \advance\hsize by -\leftskip + \advance\hsize by -\rightskip + \line{#1}% + \break + }% +} +\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}} % @sp n outputs n lines of vertical space -\def\sp{\parsearg\spxxx} -\def\spxxx #1{\vskip #1\baselineskip} +\parseargdef\sp{\vskip #1\baselineskip} % @comment ...line which is ignored... % @c is the same as @comment @@ -854,8 +937,7 @@ \def\asisword{asis} % no translation, these are keywords \def\noneword{none} % -\def\paragraphindent{\parsearg\doparagraphindent} -\def\doparagraphindent#1{% +\parseargdef\paragraphindent{% \def\temp{#1}% \ifx\temp\asisword \else @@ -872,8 +954,7 @@ % We'll use ems for NCHARS like @paragraphindent. % It seems @exampleindent asis isn't necessary, but % I preserve it to make it similar to @paragraphindent. -\def\exampleindent{\parsearg\doexampleindent} -\def\doexampleindent#1{% +\parseargdef\exampleindent{% \def\temp{#1}% \ifx\temp\asisword \else @@ -887,21 +968,18 @@ % @firstparagraphindent WORD % If WORD is `none', then suppress indentation of the first paragraph -% after a section heading. If WORD is `insert', then do indentat such +% after a section heading. If WORD is `insert', then do indent at such % paragraphs. % % The paragraph indentation is suppressed or not by calling -% \suppressfirstparagraphindent, which the sectioning commands do. We -% switch the definition of this back and forth according to WORD. By -% default, we suppress indentation. +% \suppressfirstparagraphindent, which the sectioning commands do. +% We switch the definition of this back and forth according to WORD. +% By default, we suppress indentation. % \def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} -\newdimen\currentparindent -% \def\insertword{insert} % -\def\firstparagraphindent{\parsearg\dofirstparagraphindent} -\def\dofirstparagraphindent#1{% +\parseargdef\firstparagraphindent{% \def\temp{#1}% \ifx\temp\noneword \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent @@ -921,15 +999,24 @@ % \gdef\dosuppressfirstparagraphindent{% \gdef\indent{% - \global\let\indent=\ptexindent - \global\everypar = {}% + \restorefirstparagraphindent + \indent + }% + \gdef\noindent{% + \restorefirstparagraphindent + \noindent }% \global\everypar = {% - \kern-\parindent - \global\let\indent=\ptexindent - \global\everypar = {}% + \kern -\parindent + \restorefirstparagraphindent }% -}% +} + +\gdef\restorefirstparagraphindent{% + \global \let \indent = \ptexindent + \global \let \noindent = \ptexnoindent + \global \everypar = {}% +} % @asis just yields its argument. Used with @table, for example. @@ -937,23 +1024,18 @@ \def\asis#1{#1} % @math outputs its argument in math mode. -% We don't use $'s directly in the definition of \math because we need -% to set catcodes according to plain TeX first, to allow for subscripts, -% superscripts, special math chars, etc. -% -\let\implicitmath = $%$ font-lock fix % % One complication: _ usually means subscripts, but it could also mean % an actual _ character, as in @math{@var{some_variable} + 1}. So make -% _ within @math be active (mathcode "8000), and distinguish by seeing -% if the current family is \slfam, which is what @var uses. -% -{\catcode\underChar = \active -\gdef\mathunderscore{% - \catcode\underChar=\active - \def_{\ifnum\fam=\slfam \_\else\sb\fi}% -}} -% +% _ active, and distinguish by seeing if the current family is \slfam, +% which is what @var uses. +{ + \catcode\underChar = \active + \gdef\mathunderscore{% + \catcode\underChar=\active + \def_{\ifnum\fam=\slfam \_\else\sb\fi}% + } +} % Another complication: we want \\ (and @\) to output a \ character. % FYI, plain.tex uses \\ as a temporary control sequence (why?), but % this is not advertised and we don't care. Texinfo does not @@ -964,15 +1046,16 @@ % \def\math{% \tex - \mathcode`\_="8000 \mathunderscore + \mathunderscore \let\\ = \mathbackslash \mathactive - \implicitmath\finishmath} -\def\finishmath#1{#1\implicitmath\Etex} + $\finishmath +} +\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. % Some active characters (such as <) are spaced differently in math. -% We have to reset their definitions in case the @math was an -% argument to a command which set the catcodes (such as @item or @section). +% We have to reset their definitions in case the @math was an argument +% to a command which sets the catcodes (such as @item or @section). % { \catcode`^ = \active @@ -988,8 +1071,33 @@ } % @bullet and @minus need the same treatment as @math, just above. -\def\bullet{\implicitmath\ptexbullet\implicitmath} -\def\minus{\implicitmath-\implicitmath} +\def\bullet{$\ptexbullet$} +\def\minus{$-$} + +% @dots{} outputs an ellipsis using the current font. +% We do .5em per period so that it has the same spacing in a typewriter +% font as three actual period characters. +% +\def\dots{% + \leavevmode + \hbox to 1.5em{% + \hskip 0pt plus 0.25fil + .\hfil.\hfil.% + \hskip 0pt plus 0.5fil + }% +} + +% @enddots{} is an end-of-sentence ellipsis. +% +\def\enddots{% + \dots + \spacefactor=3000 +} + +% @comma{} is so commas can be inserted into text without messing up +% Texinfo's parsing. +% +\let\comma = , % @refill is a no-op. \let\refill=\relax @@ -1005,20 +1113,20 @@ % So open here the files we need to have open while reading the input. % This makes it possible to make a .fmt file for texinfo. \def\setfilename{% + \fixbackslash % Turn off hack to swallow `\input texinfo'. \iflinks - \readauxfile + \tryauxfile + % Open the new aux file. TeX will close it automatically at exit. + \immediate\openout\auxfile=\jobname.aux \fi % \openindices needs to do some work in any case. \openindices - \fixbackslash % Turn off hack to swallow `\input texinfo'. - \global\let\setfilename=\comment % Ignore extra @setfilename cmds. + \let\setfilename=\comment % Ignore extra @setfilename cmds. % % If texinfo.cnf is present on the system, read it. % Useful for site-wide @afourpaper, etc. - % Just to be on the safe side, close the input stream before the \input. \openin 1 texinfo.cnf - \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi - \closein1 - \temp + \ifeof 1 \else \input texinfo.cnf \fi + \closein 1 % \comment % Ignore the actual filename. } @@ -1054,17 +1162,23 @@ \newif\ifpdf \newif\ifpdfmakepagedest +% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 +% can be set). So we test for \relax and 0 as well as \undefined, +% borrowed from ifpdf.sty. \ifx\pdfoutput\undefined - \pdffalse - \let\pdfmkdest = \gobble - \let\pdfurl = \gobble - \let\endlink = \relax - \let\linkcolor = \relax - \let\pdfmakeoutlines = \relax \else - \pdftrue - \pdfoutput = 1 + \ifx\pdfoutput\relax + \else + \ifcase\pdfoutput + \else + \pdftrue + \fi + \fi +\fi +% +\ifpdf \input pdfcolor + \pdfcatalog{/PageMode /UseOutlines}% \def\dopdfimage#1#2#3{% \def\imagewidth{#2}% \def\imageheight{#3}% @@ -1085,7 +1199,13 @@ \ifnum\pdftexversion < 14 \else \pdfrefximage \pdflastximage \fi} - \def\pdfmkdest#1{{\normalturnoffactive \pdfdest name{#1} xyz}} + \def\pdfmkdest#1{{% + % We have to set dummies so commands such as @code in a section title + % aren't expanded. + \atdummies + \normalturnoffactive + \pdfdest name{#1} xyz% + }} \def\pdfmkpgn#1{#1} \let\linkcolor = \Blue % was Cyan, but that seems light? \def\endlink{\Black\pdfendlink} @@ -1094,48 +1214,94 @@ \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% \else \csname#1\endcsname \fi} \def\advancenumber#1{\tempnum=\expnumber{#1}\relax - \advance\tempnum by1 + \advance\tempnum by 1 \expandafter\xdef\csname#1\endcsname{\the\tempnum}} - \def\pdfmakeoutlines{{% - \openin 1 \jobname.toc - \ifeof 1\else\begingroup - \closein 1 + % + % #1 is the section text. #2 is the pdf expression for the number + % of subentries (or empty, for subsubsections). #3 is the node + % text, which might be empty if this toc entry had no + % corresponding node. #4 is the page number. + % + \def\dopdfoutline#1#2#3#4{% + % Generate a link to the node text if that exists; else, use the + % page number. We could generate a destination for the section + % text in the case where a section has no node, but it doesn't + % seem worthwhile, since most documents are normally structured. + \def\pdfoutlinedest{#3}% + \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi + % + \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}% + } + % + \def\pdfmakeoutlines{% + \begingroup % Thanh's hack / proper braces in bookmarks \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace % - \def\chapentry ##1##2##3{} - \def\secentry ##1##2##3##4{\advancenumber{chap##2}} - \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}} - \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}} - \let\appendixentry = \chapentry - \let\unnumbchapentry = \chapentry - \let\unnumbsecentry = \secentry - \let\unnumbsubsecentry = \subsecentry - \let\unnumbsubsubsecentry = \subsubsecentry + % Read toc silently, to get counts of subentries for \pdfoutline. + \def\numchapentry##1##2##3##4{% + \def\thischapnum{##2}% + \let\thissecnum\empty + \let\thissubsecnum\empty + }% + \def\numsecentry##1##2##3##4{% + \advancenumber{chap\thischapnum}% + \def\thissecnum{##2}% + \let\thissubsecnum\empty + }% + \def\numsubsecentry##1##2##3##4{% + \advancenumber{sec\thissecnum}% + \def\thissubsecnum{##2}% + }% + \def\numsubsubsecentry##1##2##3##4{% + \advancenumber{subsec\thissubsecnum}% + }% + \let\thischapnum\empty + \let\thissecnum\empty + \let\thissubsecnum\empty + % + % use \def rather than \let here because we redefine \chapentry et + % al. a second time, below. + \def\appentry{\numchapentry}% + \def\appsecentry{\numsecentry}% + \def\appsubsecentry{\numsubsecentry}% + \def\appsubsubsecentry{\numsubsubsecentry}% + \def\unnchapentry{\numchapentry}% + \def\unnsecentry{\numsecentry}% + \def\unnsubsecentry{\numsubsecentry}% + \def\unnsubsubsecentry{\numsubsubsecentry}% \input \jobname.toc - \def\chapentry ##1##2##3{% - \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}} - \def\secentry ##1##2##3##4{% - \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}} - \def\subsecentry ##1##2##3##4##5{% - \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}} - \def\subsubsecentry ##1##2##3##4##5##6{% - \pdfoutline goto name{\pdfmkpgn{##6}}{##1}} - \let\appendixentry = \chapentry - \let\unnumbchapentry = \chapentry - \let\unnumbsecentry = \secentry - \let\unnumbsubsecentry = \subsecentry - \let\unnumbsubsubsecentry = \subsubsecentry % - % Make special characters normal for writing to the pdf file. + % Read toc second time, this time actually producing the outlines. + % The `-' means take the \expnumber as the absolute number of + % subentries, which we calculated on our first read of the .toc above. + % + % We use the node names as the destinations. + \def\numchapentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% + \def\numsecentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% + \def\numsubsecentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% + \def\numsubsubsecentry##1##2##3##4{% count is always zero + \dopdfoutline{##1}{}{##3}{##4}}% + % + % PDF outlines are displayed using system fonts, instead of + % document fonts. Therefore we cannot use special characters, + % since the encoding is unknown. For example, the eogonek from + % Latin 2 (0xea) gets translated to a | character. Info from + % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. % + % xx to do this right, we have to translate 8-bit characters to + % their "best" equivalent, based on the @documentencoding. Right + % now, I guess we'll just let the pdf reader have its way. \indexnofonts - \let\tt=\relax \turnoffactive \input \jobname.toc - \endgroup\fi - }} + \endgroup + } + % \def\makelinks #1,{% \def\params{#1}\def\E{END}% \ifx\params\E @@ -1166,7 +1332,6 @@ \def\ppn#1{\pgn=#1\gobble} \def\ppnn{\pgn=\first} \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,} - \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} \def\skipspaces#1{\def\PP{#1}\def\D{|}% \ifx\PP\D\let\nextsp\relax \else\let\nextsp\skipspaces @@ -1184,18 +1349,17 @@ \def\pdfurl#1{% \begingroup \normalturnoffactive\def\@{@}% - \let\value=\expandablevalue + \makevalueexpandable \leavevmode\Red \startlink attr{/Border [0 0 0]}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}% - % #1 \endgroup} \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} \def\maketoks{% - \expandafter\poptoks\the\toksA|ENDTOKS| + \expandafter\poptoks\the\toksA|ENDTOKS|\relax \ifx\first0\adn0 \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 @@ -1215,20 +1379,44 @@ \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} \linkcolor #1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} -\fi % \ifx\pdfoutput +\else + \let\pdfmkdest = \gobble + \let\pdfurl = \gobble + \let\endlink = \relax + \let\linkcolor = \relax + \let\pdfmakeoutlines = \relax +\fi % \ifx\pdfoutput \message{fonts,} -% Font-change commands. + +% Change the current font style to #1, remembering it in \curfontstyle. +% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in +% italics, not bold italics. +% +\def\setfontstyle#1{% + \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. + \csname ten#1\endcsname % change the current font +} + +% Select #1 fonts with the current style. +% +\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} + +\def\rm{\fam=0 \setfontstyle{rm}} +\def\it{\fam=\itfam \setfontstyle{it}} +\def\sl{\fam=\slfam \setfontstyle{sl}} +\def\bf{\fam=\bffam \setfontstyle{bf}} +\def\tt{\fam=\ttfam \setfontstyle{tt}} % Texinfo sort of supports the sans serif font style, which plain TeX does not. -% So we set up a \sf analogous to plain's \rm, etc. +% So we set up a \sf. \newfam\sffam -\def\sf{\fam=\sffam \tensf} +\def\sf{\fam=\sffam \setfontstyle{sf}} \let\li = \sf % Sometimes we call it \li, not \sf. -% We don't need math for this one. -\def\ttsl{\tenttsl} +% We don't need math for this font style. +\def\ttsl{\setfontstyle{ttsl}} % Default leading. \newdimen\textleading \textleading = 13.2pt @@ -1279,6 +1467,7 @@ \def\scshape{csc} \def\scbshape{csc} +% Text fonts (11.2pt, magstep1). \newcount\mainmagstep \ifx\bigger\relax % not really supported. @@ -1290,10 +1479,6 @@ \setfont\textrm\rmshape{10}{\mainmagstep} \setfont\texttt\ttshape{10}{\mainmagstep} \fi -% Instead of cmb10, you may want to use cmbx10. -% cmbx10 is a prettier font on its own, but cmb10 -% looks better when embedded in a line with cmr10 -% (in Bob's opinion). \setfont\textbf\bfshape{10}{\mainmagstep} \setfont\textit\itshape{10}{\mainmagstep} \setfont\textsl\slshape{10}{\mainmagstep} @@ -1303,10 +1488,11 @@ \font\texti=cmmi10 scaled \mainmagstep \font\textsy=cmsy10 scaled \mainmagstep -% A few fonts for @defun, etc. -\setfont\defbf\bxshape{10}{\magstep1} %was 1314 +% A few fonts for @defun names and args. +\setfont\defbf\bfshape{10}{\magstep1} \setfont\deftt\ttshape{10}{\magstep1} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf} +\setfont\defttsl\ttslshape{10}{\magstep1} +\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} % Fonts for indices, footnotes, small examples (9pt). \setfont\smallrm\rmshape{9}{1000} @@ -1332,7 +1518,7 @@ \font\smalleri=cmmi8 \font\smallersy=cmsy8 -% Fonts for title page: +% Fonts for title page (20.4pt): \setfont\titlerm\rmbshape{12}{\magstep3} \setfont\titleit\itbshape{10}{\magstep4} \setfont\titlesl\slbshape{10}{\magstep4} @@ -1378,11 +1564,21 @@ \setfont\ssecttsl\ttslshape{10}{1315} \setfont\ssecsf\sfbshape{12}{\magstephalf} \let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{\magstep1} +\setfont\ssecsc\scbshape{10}{1315} \font\sseci=cmmi12 scaled \magstephalf \font\ssecsy=cmsy10 scaled 1315 -% The smallcaps and symbol fonts should actually be scaled \magstep1.5, -% but that is not a standard magnification. + +% Reduced fonts for @acro in text (10pt). +\setfont\reducedrm\rmshape{10}{1000} +\setfont\reducedtt\ttshape{10}{1000} +\setfont\reducedbf\bfshape{10}{1000} +\setfont\reducedit\itshape{10}{1000} +\setfont\reducedsl\slshape{10}{1000} +\setfont\reducedsf\sfshape{10}{1000} +\setfont\reducedsc\scshape{10}{1000} +\setfont\reducedttsl\ttslshape{10}{1000} +\font\reducedi=cmmi10 +\font\reducedsy=cmsy10 % In order for the font changes to affect most math symbols and letters, % we have to define the \textfont of the standard families. Since @@ -1397,50 +1593,72 @@ } % The font-changing commands redefine the meanings of \tenSTYLE, instead -% of just \STYLE. We do this so that font changes will continue to work -% in math mode, where it is the current \fam that is relevant in most -% cases, not the current font. Plain TeX does \def\bf{\fam=\bffam -% \tenbf}, for example. By redefining \tenbf, we obviate the need to -% redefine \bf itself. +% of just \STYLE. We do this because \STYLE needs to also set the +% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire +% \tenSTYLE to set the current font. +% +% Each font-changing command also sets the names \lsize (one size lower) +% and \lllsize (three sizes lower). These relative commands are used in +% the LaTeX logo and acronyms. +% +% This all needs generalizing, badly. +% \def\textfonts{% \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc - \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl + \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy + \let\tenttsl=\textttsl + \def\lsize{reduced}\def\lllsize{smaller}% \resetmathfonts \setleading{\textleading}} \def\titlefonts{% \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy \let\tenttsl=\titlettsl + \def\lsize{chap}\def\lllsize{subsec}% \resetmathfonts \setleading{25pt}} \def\titlefont#1{{\titlefonts\rm #1}} \def\chapfonts{% \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl + \def\lsize{sec}\def\lllsize{text}% \resetmathfonts \setleading{19pt}} \def\secfonts{% \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc - \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl + \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy + \let\tenttsl=\secttsl + \def\lsize{subsec}\def\lllsize{reduced}% \resetmathfonts \setleading{16pt}} \def\subsecfonts{% \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc - \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl + \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy + \let\tenttsl=\ssecttsl + \def\lsize{text}\def\lllsize{small}% \resetmathfonts \setleading{15pt}} -\let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf? +\let\subsubsecfonts = \subsecfonts +\def\reducedfonts{% + \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl + \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc + \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy + \let\tenttsl=\reducedttsl + \def\lsize{small}\def\lllsize{smaller}% + \resetmathfonts \setleading{10.5pt}} \def\smallfonts{% \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy \let\tenttsl=\smallttsl + \def\lsize{smaller}\def\lllsize{smaller}% \resetmathfonts \setleading{10.5pt}} \def\smallerfonts{% \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy \let\tenttsl=\smallerttsl + \def\lsize{smaller}\def\lllsize{smaller}% \resetmathfonts \setleading{9.5pt}} % Set the fonts to use with the @small... environments. @@ -1449,7 +1667,7 @@ % About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample % can fit this many characters: % 8.5x11=86 smallbook=72 a4=90 a5=69 -% If we use \smallerfonts (8pt), then we can fit this many characters: +% If we use \scriptfonts (8pt), then we can fit this many characters: % 8.5x11=90+ smallbook=80 a4=90+ a5=77 % For me, subjectively, the few extra characters that fit aren't worth % the additional smallness of 8pt. So I'm making the default 9pt. @@ -1457,14 +1675,13 @@ % By the way, for comparison, here's what fits with @example (10pt): % 8.5x11=71 smallbook=60 a4=75 a5=58 % -% I wish we used A4 paper on this side of the Atlantic. -% +% I wish the USA used A4 paper. % --karl, 24jan03. % Set up the default fonts, so we can use them for creating boxes. % -\textfonts +\textfonts \rm % Define these so they can be easily changed for other fonts. \def\angleleft{$\langle$} @@ -1475,7 +1692,7 @@ % Fonts for short table of contents. \setfont\shortcontrm\rmshape{12}{1000} -\setfont\shortcontbf\bxshape{12}{1000} +\setfont\shortcontbf\bfshape{10}{\magstep1} % no cmb12 \setfont\shortcontsl\slshape{12}{1000} \setfont\shortconttt\ttshape{12}{1000} @@ -1489,11 +1706,19 @@ \def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx} \def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx} +% like \smartslanted except unconditionally uses \ttsl. +% @var is set to this for defun arguments. +\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx} + +% like \smartslanted except unconditionally use \sl. We never want +% ttsl for book titles, do we? +\def\cite#1{{\sl #1}\futurelet\next\smartitalicx} + \let\i=\smartitalic +\let\slanted=\smartslanted \let\var=\smartslanted \let\dfn=\smartslanted \let\emph=\smartitalic -\let\cite=\smartslanted \def\b#1{{\bf #1}} \let\strong=\b @@ -1520,7 +1745,6 @@ {\tt \rawbackslash \frenchspacing #1}% \null } -\let\ttfont=\t \def\samp#1{`\tclose{#1}'\null} \setfont\keyrm\rmshape{8}{1000} \font\keysy=cmsy9 @@ -1561,7 +1785,7 @@ \null } -% We *must* turn on hyphenation at `-' and `_' in \code. +% We *must* turn on hyphenation at `-' and `_' in @code. % Otherwise, it is too hard to avoid overfull hboxes % in the Emacs manual, the Library manual, etc. @@ -1579,10 +1803,6 @@ \catcode`\_=\active \let_\codeunder \codex } - % - % If we end up with any active - characters when handling the index, - % just treat them as a normal -. - \global\def\indexbreaks{\catcode`\-=\active \let-\realdash} } \def\realdash{-} @@ -1606,8 +1826,7 @@ % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), % `example' (@kbd uses ttsl only inside of @example and friends), % or `code' (@kbd uses normal tty font always). -\def\kbdinputstyle{\parsearg\kbdinputstylexxx} -\def\kbdinputstylexxx#1{% +\parseargdef\kbdinputstyle{% \def\arg{#1}% \ifx\arg\worddistinct \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% @@ -1633,8 +1852,8 @@ \else{\tclose{\kbdfont\look}}\fi \else{\tclose{\kbdfont\look}}\fi} -% For @url, @env, @command quotes seem unnecessary, so use \code. -\let\url=\code +% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. +\let\indicateurl=\code \let\env=\code \let\command=\code @@ -1666,6 +1885,10 @@ \endlink \endgroup} +% @url synonym for @uref, since that's how everyone uses it. +% +\let\url=\uref + % rms does not like angle brackets --karl, 17may97. % So now @email is just like @uref, unless we are pdf. % @@ -1707,22 +1930,53 @@ \def\sc#1{{\smallcaps#1}} % smallcaps font \def\ii#1{{\it #1}} % italic font -% @acronym downcases the argument and prints in smallcaps. -\def\acronym#1{{\smallcaps \lowercase{#1}}} +% @acronym for "FBI", "NATO", and the like. +% We print this one point size smaller, since it's intended for +% all-uppercase. +% +\def\acronym#1{\doacronym #1,,\finish} +\def\doacronym#1,#2,#3\finish{% + {\selectfonts\lsize #1}% + \def\temp{#2}% + \ifx\temp\empty \else + \space ({\unsepspaces \ignorespaces \temp \unskip})% + \fi +} + +% @abbr for "Comput. J." and the like. +% No font change, but don't do end-of-sentence spacing. +% +\def\abbr#1{\doabbr #1,,\finish} +\def\doabbr#1,#2,#3\finish{% + {\frenchspacing #1}% + \def\temp{#2}% + \ifx\temp\empty \else + \space ({\unsepspaces \ignorespaces \temp \unskip})% + \fi +} -% @pounds{} is a sterling sign. +% @pounds{} is a sterling sign, which Knuth put in the CM italic font. +% \def\pounds{{\it\$}} -% @registeredsymbol - R in a circle. For now, only works in text size; -% we'd have to redo the font mechanism to change the \scriptstyle and -% \scriptscriptstyle font sizes to make it look right in headings. +% @registeredsymbol - R in a circle. The font for the R should really +% be smaller yet, but lllsize is the best we can do for now. % Adapted from the plain.tex definition of \copyright. % \def\registeredsymbol{% - $^{{\ooalign{\hfil\raise.07ex\hbox{$\scriptstyle\rm R$}\hfil\crcr\Orb}}% + $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% + \hfil\crcr\Orb}}% }$% } +% Laurent Siebenmann reports \Orb undefined with: +% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 +% so we'll define it if necessary. +% +\ifx\Orb\undefined +\def\Orb{\mathhexbox20D} +\fi + \message{page headings,} @@ -1741,87 +1995,103 @@ \newif\ifsetshortcontentsaftertitlepage \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue -\def\shorttitlepage{\parsearg\shorttitlepagezzz} -\def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% +\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% \endgroup\page\hbox{}\page} -\def\titlepage{\begingroup \parindent=0pt \textfonts - \let\subtitlerm=\tenrm - \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}% - % - \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines - \let\tt=\authortt}% - % - % Leave some space at the very top of the page. - \vglue\titlepagetopglue - % - % Now you can print the title using @title. - \def\title{\parsearg\titlezzz}% - \def\titlezzz##1{\leftline{\titlefonts\rm ##1} - % print a rule at the page bottom also. - \finishedtitlepagefalse - \vskip4pt \hrule height 4pt width \hsize \vskip4pt}% - % No rule at page bottom unless we print one at the top with @title. - \finishedtitlepagetrue - % - % Now you can put text using @subtitle. - \def\subtitle{\parsearg\subtitlezzz}% - \def\subtitlezzz##1{{\subtitlefont \rightline{##1}}}% - % - % @author should come last, but may come many times. - \def\author{\parsearg\authorzzz}% - \def\authorzzz##1{\ifseenauthor\else\vskip 0pt plus 1filll\seenauthortrue\fi - {\authorfont \leftline{##1}}}% - % - % Most title ``pages'' are actually two pages long, with space - % at the top of the second. We don't want the ragged left on the second. - \let\oldpage = \page - \def\page{% +\envdef\titlepage{% + % Open one extra group, as we want to close it in the middle of \Etitlepage. + \begingroup + \parindent=0pt \textfonts + % Leave some space at the very top of the page. + \vglue\titlepagetopglue + % No rule at page bottom unless we print one at the top with @title. + \finishedtitlepagetrue + % + % Most title ``pages'' are actually two pages long, with space + % at the top of the second. We don't want the ragged left on the second. + \let\oldpage = \page + \def\page{% \iffinishedtitlepage\else - \finishtitlepage + \finishtitlepage \fi - \oldpage \let\page = \oldpage - \hbox{}}% -% \def\page{\oldpage \hbox{}} + \page + \null + }% } \def\Etitlepage{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - % It is important to do the page break before ending the group, - % because the headline and footline are only empty inside the group. - % If we use the new definition of \page, we always get a blank page - % after the title page, which we certainly don't want. - \oldpage - \endgroup - % - % Need this before the \...aftertitlepage checks so that if they are - % in effect the toc pages will come out with page numbers. - \HEADINGSon - % - % If they want short, they certainly want long too. - \ifsetshortcontentsaftertitlepage - \shortcontents - \contents - \global\let\shortcontents = \relax - \global\let\contents = \relax - \fi - % - \ifsetcontentsaftertitlepage - \contents - \global\let\contents = \relax - \global\let\shortcontents = \relax - \fi + \iffinishedtitlepage\else + \finishtitlepage + \fi + % It is important to do the page break before ending the group, + % because the headline and footline are only empty inside the group. + % If we use the new definition of \page, we always get a blank page + % after the title page, which we certainly don't want. + \oldpage + \endgroup + % + % Need this before the \...aftertitlepage checks so that if they are + % in effect the toc pages will come out with page numbers. + \HEADINGSon + % + % If they want short, they certainly want long too. + \ifsetshortcontentsaftertitlepage + \shortcontents + \contents + \global\let\shortcontents = \relax + \global\let\contents = \relax + \fi + % + \ifsetcontentsaftertitlepage + \contents + \global\let\contents = \relax + \global\let\shortcontents = \relax + \fi } \def\finishtitlepage{% - \vskip4pt \hrule height 2pt width \hsize - \vskip\titlepagebottomglue - \finishedtitlepagetrue + \vskip4pt \hrule height 2pt width \hsize + \vskip\titlepagebottomglue + \finishedtitlepagetrue +} + +%%% Macros to be used within @titlepage: + +\let\subtitlerm=\tenrm +\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} + +\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines + \let\tt=\authortt} + +\parseargdef\title{% + \checkenv\titlepage + \leftline{\titlefonts\rm #1} + % print a rule at the page bottom also. + \finishedtitlepagefalse + \vskip4pt \hrule height 4pt width \hsize \vskip4pt +} + +\parseargdef\subtitle{% + \checkenv\titlepage + {\subtitlefont \rightline{#1}}% +} + +% @author should come last, but may come many times. +% It can also be used inside @quotation. +% +\parseargdef\author{% + \def\temp{\quotation}% + \ifx\thisenv\temp + \def\quotationauthor{#1}% printed in \Equotation. + \else + \checkenv\titlepage + \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi + {\authorfont \leftline{#1}}% + \fi } + %%% Set up page headings and footings. \let\thispage=\folio @@ -1831,7 +2101,7 @@ \newtoks\evenfootline % footline on even pages \newtoks\oddfootline % footline on odd pages -% Now make Tex use those variables +% Now make TeX use those variables \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline \else \the\evenheadline \fi}} \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline @@ -1845,32 +2115,27 @@ % @evenfooting @thisfile|| % @oddfooting ||@thisfile -\def\evenheading{\parsearg\evenheadingxxx} -\def\oddheading{\parsearg\oddheadingxxx} -\def\everyheading{\parsearg\everyheadingxxx} - -\def\evenfooting{\parsearg\evenfootingxxx} -\def\oddfooting{\parsearg\oddfootingxxx} -\def\everyfooting{\parsearg\everyfootingxxx} -{\catcode`\@=0 % - -\gdef\evenheadingxxx #1{\evenheadingyyy #1@|@|@|@|\finish} -\gdef\evenheadingyyy #1@|#2@|#3@|#4\finish{% +\def\evenheading{\parsearg\evenheadingxxx} +\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} +\def\evenheadingyyy #1\|#2\|#3\|#4\finish{% \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} -\gdef\oddheadingxxx #1{\oddheadingyyy #1@|@|@|@|\finish} -\gdef\oddheadingyyy #1@|#2@|#3@|#4\finish{% +\def\oddheading{\parsearg\oddheadingxxx} +\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} +\def\oddheadingyyy #1\|#2\|#3\|#4\finish{% \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} -\gdef\everyheadingxxx#1{\oddheadingxxx{#1}\evenheadingxxx{#1}}% +\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% -\gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish} -\gdef\evenfootingyyy #1@|#2@|#3@|#4\finish{% +\def\evenfooting{\parsearg\evenfootingxxx} +\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish} +\def\evenfootingyyy #1\|#2\|#3\|#4\finish{% \global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} -\gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish} -\gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{% +\def\oddfooting{\parsearg\oddfootingxxx} +\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish} +\def\oddfootingyyy #1\|#2\|#3\|#4\finish{% \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}% % % Leave some space for the footline. Hopefully ok to assume @@ -1879,9 +2144,8 @@ \global\advance\vsize by -\baselineskip } -\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}} -% -}% unbind the catcode of @. +\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} + % @headings double turns headings on for double-sided printing. % @headings single turns headings on for single-sided printing. @@ -1895,7 +2159,7 @@ \def\headings #1 {\csname HEADINGS#1\endcsname} -\def\HEADINGSoff{ +\def\HEADINGSoff{% \global\evenheadline={\hfil} \global\evenfootline={\hfil} \global\oddheadline={\hfil} \global\oddfootline={\hfil}} \HEADINGSoff @@ -1904,7 +2168,7 @@ % chapter name on inside top of right hand pages, document % title on inside top of left hand pages, and page numbers on outside top % edge of all pages. -\def\HEADINGSdouble{ +\def\HEADINGSdouble{% \global\pageno=1 \global\evenfootline={\hfil} \global\oddfootline={\hfil} @@ -1916,7 +2180,7 @@ % For single-sided printing, chapter title goes across top left of page, % page number on top right. -\def\HEADINGSsingle{ +\def\HEADINGSsingle{% \global\pageno=1 \global\evenfootline={\hfil} \global\oddfootline={\hfil} @@ -1963,12 +2227,11 @@ % @settitle line... specifies the title of the document, for headings. % It generates no output of its own. \def\thistitle{\putwordNoTitle} -\def\settitle{\parsearg\settitlezzz} -\def\settitlezzz #1{\gdef\thistitle{#1}} +\def\settitle{\parsearg{\gdef\thistitle}} \message{tables,} -% Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x). +% Tables -- @table, @ftable, @vtable, @item(x). % default indentation of table text \newdimen\tableindent \tableindent=.8in @@ -1980,7 +2243,7 @@ % used internally for \itemindent minus \itemmargin \newdimen\itemmax -% Note @table, @vtable, and @vtable define @item, @itemx, etc., with +% Note @table, @ftable, and @vtable define @item, @itemx, etc., with % these defs. % They also define \itemindex % to index the item name in whatever manner is desired (perhaps none). @@ -1992,22 +2255,10 @@ \def\internalBitem{\smallbreak \parsearg\itemzzz} \def\internalBitemx{\itemxpar \parsearg\itemzzz} -\def\internalBxitem "#1"{\def\xitemsubtopix{#1} \smallbreak \parsearg\xitemzzz} -\def\internalBxitemx "#1"{\def\xitemsubtopix{#1} \itemxpar \parsearg\xitemzzz} - -\def\internalBkitem{\smallbreak \parsearg\kitemzzz} -\def\internalBkitemx{\itemxpar \parsearg\kitemzzz} - -\def\kitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \lastfunction}}% - \itemzzz {#1}} - -\def\xitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \xitemsubtopic}}% - \itemzzz {#1}} - \def\itemzzz #1{\begingroup % \advance\hsize by -\rightskip \advance\hsize by -\tableindent - \setbox0=\hbox{\itemfont{#1}}% + \setbox0=\hbox{\itemindicate{#1}}% \itemindex{#1}% \nobreak % This prevents a break before @itemx. % @@ -2031,17 +2282,13 @@ % \parskip glue -- logically it's part of the @item we just started. \nobreak \vskip-\parskip % - % Stop a page break at the \parskip glue coming up. (Unfortunately - % we can't prevent a possible page break at the following - % \baselineskip glue.) However, if what follows is an environment - % such as @example, there will be no \parskip glue; then - % the negative vskip we just would cause the example and the item to - % crash together. So we use this bizarre value of 10001 as a signal - % to \aboveenvbreak to insert \parskip glue after all. - % (Possibly there are other commands that could be followed by - % @example which need the same treatment, but not section titles; or - % maybe section titles are the only special case and they should be - % penalty 10001...) + % Stop a page break at the \parskip glue coming up. However, if + % what follows is an environment such as @example, there will be no + % \parskip glue; then the negative vskip we just inserted would + % cause the example and the item to crash together. So we use this + % bizarre value of 10001 as a signal to \aboveenvbreak to insert + % \parskip glue after all. Section titles are handled this way also. + % \penalty 10001 \endgroup \itemxneedsnegativevskipfalse @@ -2061,81 +2308,72 @@ \fi } -\def\item{\errmessage{@item while not in a table}} -\def\itemx{\errmessage{@itemx while not in a table}} -\def\kitem{\errmessage{@kitem while not in a table}} -\def\kitemx{\errmessage{@kitemx while not in a table}} -\def\xitem{\errmessage{@xitem while not in a table}} -\def\xitemx{\errmessage{@xitemx while not in a table}} - -% Contains a kludge to get @end[description] to work. -\def\description{\tablez{\dontindex}{1}{}{}{}{}} +\def\item{\errmessage{@item while not in a list environment}} +\def\itemx{\errmessage{@itemx while not in a list environment}} % @table, @ftable, @vtable. -\def\table{\begingroup\inENV\obeylines\obeyspaces\tablex} -{\obeylines\obeyspaces% -\gdef\tablex #1^^M{% -\tabley\dontindex#1 \endtabley}} - -\def\ftable{\begingroup\inENV\obeylines\obeyspaces\ftablex} -{\obeylines\obeyspaces% -\gdef\ftablex #1^^M{% -\tabley\fnitemindex#1 \endtabley -\def\Eftable{\endgraf\afterenvbreak\endgroup}% -\let\Etable=\relax}} - -\def\vtable{\begingroup\inENV\obeylines\obeyspaces\vtablex} -{\obeylines\obeyspaces% -\gdef\vtablex #1^^M{% -\tabley\vritemindex#1 \endtabley -\def\Evtable{\endgraf\afterenvbreak\endgroup}% -\let\Etable=\relax}} - -\def\dontindex #1{} -\def\fnitemindex #1{\doind {fn}{\code{#1}}}% -\def\vritemindex #1{\doind {vr}{\code{#1}}}% - -{\obeyspaces % -\gdef\tabley#1#2 #3 #4 #5 #6 #7\endtabley{\endgroup% -\tablez{#1}{#2}{#3}{#4}{#5}{#6}}} - -\def\tablez #1#2#3#4#5#6{% -\aboveenvbreak % -\begingroup % -\def\Edescription{\Etable}% Necessary kludge. -\let\itemindex=#1% -\ifnum 0#3>0 \advance \leftskip by #3\mil \fi % -\ifnum 0#4>0 \tableindent=#4\mil \fi % -\ifnum 0#5>0 \advance \rightskip by #5\mil \fi % -\def\itemfont{#2}% -\itemmax=\tableindent % -\advance \itemmax by -\itemmargin % -\advance \leftskip by \tableindent % -\exdentamount=\tableindent -\parindent = 0pt -\parskip = \smallskipamount -\ifdim \parskip=0pt \parskip=2pt \fi% -\def\Etable{\endgraf\afterenvbreak\endgroup}% -\let\item = \internalBitem % -\let\itemx = \internalBitemx % -\let\kitem = \internalBkitem % -\let\kitemx = \internalBkitemx % -\let\xitem = \internalBxitem % -\let\xitemx = \internalBxitemx % +\envdef\table{% + \let\itemindex\gobble + \tablecheck{table}% +} +\envdef\ftable{% + \def\itemindex ##1{\doind {fn}{\code{##1}}}% + \tablecheck{ftable}% +} +\envdef\vtable{% + \def\itemindex ##1{\doind {vr}{\code{##1}}}% + \tablecheck{vtable}% +} +\def\tablecheck#1{% + \ifnum \the\catcode`\^^M=\active + \endgroup + \errmessage{This command won't work in this context; perhaps the problem is + that we are \inenvironment\thisenv}% + \def\next{\doignore{#1}}% + \else + \let\next\tablex + \fi + \next +} +\def\tablex#1{% + \def\itemindicate{#1}% + \parsearg\tabley } +\def\tabley#1{% + {% + \makevalueexpandable + \edef\temp{\noexpand\tablez #1\space\space\space}% + \expandafter + }\temp \endtablez +} +\def\tablez #1 #2 #3 #4\endtablez{% + \aboveenvbreak + \ifnum 0#1>0 \advance \leftskip by #1\mil \fi + \ifnum 0#2>0 \tableindent=#2\mil \fi + \ifnum 0#3>0 \advance \rightskip by #3\mil \fi + \itemmax=\tableindent + \advance \itemmax by -\itemmargin + \advance \leftskip by \tableindent + \exdentamount=\tableindent + \parindent = 0pt + \parskip = \smallskipamount + \ifdim \parskip=0pt \parskip=2pt \fi + \let\item = \internalBitem + \let\itemx = \internalBitemx +} +\def\Etable{\endgraf\afterenvbreak} +\let\Eftable\Etable +\let\Evtable\Etable +\let\Eitemize\Etable +\let\Eenumerate\Etable % This is the counter used by @enumerate, which is really @itemize \newcount \itemno -\def\itemize{\parsearg\itemizezzz} +\envdef\itemize{\parsearg\doitemize} -\def\itemizezzz #1{% - \begingroup % ended by the @end itemize - \itemizey {#1}{\Eitemize} -} - -\def\itemizey#1#2{% +\def\doitemize#1{% \aboveenvbreak \itemmax=\itemindent \advance\itemmax by -\itemmargin @@ -2144,13 +2382,33 @@ \parindent=0pt \parskip=\smallskipamount \ifdim\parskip=0pt \parskip=2pt \fi - \def#2{\endgraf\afterenvbreak\endgroup}% \def\itemcontents{#1}% % @itemize with no arg is equivalent to @itemize @bullet. \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi \let\item=\itemizeitem } +% Definition of @item while inside @itemize and @enumerate. +% +\def\itemizeitem{% + \advance\itemno by 1 % for enumerations + {\let\par=\endgraf \smallbreak}% reasonable place to break + {% + % If the document has an @itemize directly after a section title, a + % \nobreak will be last on the list, and \sectionheading will have + % done a \vskip-\parskip. In that case, we don't want to zero + % parskip, or the item text will crash with the heading. On the + % other hand, when there is normal text preceding the item (as there + % usually is), we do want to zero parskip, or there would be too much + % space. In that case, we won't have a \nobreak before. At least + % that's the theory. + \ifnum\lastpenalty<10000 \parskip=0in \fi + \noindent + \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% + \vadjust{\penalty 1200}}% not good to break after first line of item. + \flushcr +} + % \splitoff TOKENS\endmark defines \first to be the first token in % TOKENS, and \rest to be the remainder. % @@ -2160,11 +2418,8 @@ % or number, to specify the first label in the enumerated list. No % argument is the same as `1'. % -\def\enumerate{\parsearg\enumeratezzz} -\def\enumeratezzz #1{\enumeratey #1 \endenumeratey} +\envparseargdef\enumerate{\enumeratey #1 \endenumeratey} \def\enumeratey #1 #2\endenumeratey{% - \begingroup % ended by the @end enumerate - % % If we were given no argument, pretend we were given `1'. \def\thearg{#1}% \ifx\thearg\empty \def\thearg{1}\fi @@ -2235,13 +2490,13 @@ }% } -% Call itemizey, adding a period to the first argument and supplying the +% Call \doitemize, adding a period to the first argument and supplying the % common last two arguments. Also subtract one from the initial value in % \itemno, since @item increments \itemno. % \def\startenumeration#1{% \advance\itemno by -1 - \itemizey{#1.}\Eenumerate\flushcr + \doitemize{#1.}\flushcr } % @alphaenumerate and @capsenumerate are abbreviations for giving an arg @@ -2252,16 +2507,6 @@ \def\Ealphaenumerate{\Eenumerate} \def\Ecapsenumerate{\Eenumerate} -% Definition of @item while inside @itemize. - -\def\itemizeitem{% -\advance\itemno by 1 -{\let\par=\endgraf \smallbreak}% -\ifhmode \errmessage{In hmode at itemizeitem}\fi -{\parskip=0in \hskip 0pt -\hbox to 0pt{\hss \itemcontents\hskip \itemmargin}% -\vadjust{\penalty 1200}}% -\flushcr} % @multitable macros % Amy Hendrickson, 8/18/94, 3/6/96 @@ -2288,24 +2533,14 @@ % @multitable {Column 1 template} {Column 2 template} {Column 3 template} % @item ... % using the widest term desired in each column. -% -% For those who want to use more than one line's worth of words in -% the preamble, break the line within one argument and it -% will parse correctly, i.e., -% -% @multitable {Column 1 template} {Column 2 template} {Column 3 -% template} -% Not: -% @multitable {Column 1 template} {Column 2 template} -% {Column 3 template} % Each new table line starts with @item, each subsequent new column % starts with @tab. Empty columns may be produced by supplying @tab's % with nothing between them for as many times as empty columns are needed, % ie, @tab@tab@tab will produce two empty columns. -% @item, @tab, @multitable or @end multitable do not need to be on their -% own lines, but it will not hurt if they are. +% @item, @tab do not need to be on their own lines, but it will not hurt +% if they are. % Sample multitable: @@ -2349,13 +2584,12 @@ \def\xcolumnfractions{\columnfractions} \newif\ifsetpercent -% #1 is the part of the @columnfraction before the decimal point, which -% is presumably either 0 or the empty string (but we don't check, we -% just throw it away). #2 is the decimal part, which we use as the -% percent of \hsize for this column. -\def\pickupwholefraction#1.#2 {% +% #1 is the @columnfraction, usually a decimal number like .5, but might +% be just 1. We just use it, whatever it is. +% +\def\pickupwholefraction#1 {% \global\advance\colcount by 1 - \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}% + \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}% \setuptable } @@ -2388,18 +2622,33 @@ \go } +% multitable-only commands. +% +% @headitem starts a heading row, which we typeset in bold. +% Assignments have to be global since we are inside the implicit group +% of an alignment entry. Note that \everycr resets \everytab. +\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}% +% +% A \tab used to include \hskip1sp. But then the space in a template +% line is not enough. That is bad. So let's go back to just `&' until +% we encounter the problem it was intended to solve again. +% --karl, nathan@acm.org, 20apr99. +\def\tab{\checkenv\multitable &\the\everytab}% + % @multitable ... @end multitable definitions: % -\def\multitable{\parsearg\dotable} -\def\dotable#1{\bgroup +\newtoks\everytab % insert after every tab. +% +\envdef\multitable{% \vskip\parskip - \let\item=\crcrwithfootnotes - % A \tab used to include \hskip1sp. But then the space in a template - % line is not enough. That is bad. So let's go back to just & until - % we encounter the problem it was intended to solve again. --karl, - % nathan@acm.org, 20apr99. - \let\tab=&% - \let\startfootins=\startsavedfootnote + \startsavinginserts + % + % @item within a multitable starts a normal row. + % We use \def instead of \let so that if one of the multitable entries + % contains an @itemize, we don't choke on the \item (seen as \crcr aka + % \endtemplate) expanding \doitemize. + \def\item{\crcr}% + % \tolerance=9500 \hbadness=9500 \setmultitablespacing @@ -2407,85 +2656,93 @@ \parindent=\multitableparindent \overfullrule=0pt \global\colcount=0 - \def\Emultitable{% - \global\setpercentfalse - \crcrwithfootnotes\crcr - \egroup\egroup + % + \everycr = {% + \noalign{% + \global\everytab={}% + \global\colcount=0 % Reset the column counter. + % Check for saved footnotes, etc. + \checkinserts + % Keeps underfull box messages off when table breaks over pages. + %\filbreak + % Maybe so, but it also creates really weird page breaks when the + % table breaks over pages. Wouldn't \vfil be better? Wait until the + % problem manifests itself, so it can be fixed for real --karl. + }% }% % + \parsearg\domultitable +} +\def\domultitable#1{% % To parse everything between @multitable and @item: \setuptable#1 \endsetuptable % - % \everycr will reset column counter, \colcount, at the end of - % each line. Every column entry will cause \colcount to advance by one. - % The table preamble - % looks at the current \colcount to find the correct column width. - \everycr{\noalign{% - % - % \filbreak%% keeps underfull box messages off when table breaks over pages. - % Maybe so, but it also creates really weird page breaks when the table - % breaks over pages. Wouldn't \vfil be better? Wait until the problem - % manifests itself, so it can be fixed for real --karl. - \global\colcount=0\relax}}% - % % This preamble sets up a generic column definition, which will % be used as many times as user calls for columns. % \vtop will set a single line and will also let text wrap and % continue for many paragraphs if desired. - \halign\bgroup&\global\advance\colcount by 1\relax - \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname + \halign\bgroup &% + \global\advance\colcount by 1 + \multistrut + \vtop{% + % Use the current \colcount to find the correct column width: + \hsize=\expandafter\csname col\the\colcount\endcsname + % + % In order to keep entries from bumping into each other + % we will add a \leftskip of \multitablecolspace to all columns after + % the first one. + % + % If a template has been used, we will add \multitablecolspace + % to the width of each template entry. + % + % If the user has set preamble in terms of percent of \hsize we will + % use that dimension as the width of the column, and the \leftskip + % will keep entries from bumping into each other. Table will start at + % left margin and final column will justify at right margin. + % + % Make sure we don't inherit \rightskip from the outer environment. + \rightskip=0pt + \ifnum\colcount=1 + % The first column will be indented with the surrounding text. + \advance\hsize by\leftskip + \else + \ifsetpercent \else + % If user has not set preamble in terms of percent of \hsize + % we will advance \hsize by \multitablecolspace. + \advance\hsize by \multitablecolspace + \fi + % In either case we will make \leftskip=\multitablecolspace: + \leftskip=\multitablecolspace + \fi + % Ignoring space at the beginning and end avoids an occasional spurious + % blank line, when TeX decides to break the line at the space before the + % box from the multistrut, so the strut ends up on a line by itself. + % For example: + % @multitable @columnfractions .11 .89 + % @item @code{#} + % @tab Legal holiday which is valid in major parts of the whole country. + % Is automatically provided with highlighting sequences respectively + % marking characters. + \noindent\ignorespaces##\unskip\multistrut + }\cr +} +\def\Emultitable{% + \crcr + \egroup % end the \halign + \global\setpercentfalse +} + +\def\setmultitablespacing{% + \def\multistrut{\strut}% just use the standard line spacing % - % In order to keep entries from bumping into each other - % we will add a \leftskip of \multitablecolspace to all columns after - % the first one. - % - % If a template has been used, we will add \multitablecolspace - % to the width of each template entry. - % - % If the user has set preamble in terms of percent of \hsize we will - % use that dimension as the width of the column, and the \leftskip - % will keep entries from bumping into each other. Table will start at - % left margin and final column will justify at right margin. - % - % Make sure we don't inherit \rightskip from the outer environment. - \rightskip=0pt - \ifnum\colcount=1 - % The first column will be indented with the surrounding text. - \advance\hsize by\leftskip - \else - \ifsetpercent \else - % If user has not set preamble in terms of percent of \hsize - % we will advance \hsize by \multitablecolspace. - \advance\hsize by \multitablecolspace - \fi - % In either case we will make \leftskip=\multitablecolspace: - \leftskip=\multitablecolspace - \fi - % Ignoring space at the beginning and end avoids an occasional spurious - % blank line, when TeX decides to break the line at the space before the - % box from the multistrut, so the strut ends up on a line by itself. - % For example: - % @multitable @columnfractions .11 .89 - % @item @code{#} - % @tab Legal holiday which is valid in major parts of the whole country. - % Is automatically provided with highlighting sequences respectively marking - % characters. - \noindent\ignorespaces##\unskip\multistrut}\cr -} - -\def\setmultitablespacing{% test to see if user has set \multitablelinespace. -% If so, do nothing. If not, give it an appropriate dimension based on -% current baselineskip. + % Compute \multitablelinespace (if not defined by user) for use in + % \multitableparskip calculation. We used define \multistrut based on + % this, but (ironically) that caused the spacing to be off. + % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. \ifdim\multitablelinespace=0pt \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip \global\advance\multitablelinespace by-\ht0 -%% strut to put in table in case some entry doesn't have descenders, -%% to keep lines equally spaced -\let\multistrut = \strut -\else -%% FIXME: what is \box0 supposed to be? -\gdef\multistrut{\vrule height\multitablelinespace depth\dp0 -width0pt\relax} \fi +\fi %% Test to see if parskip is larger than space between lines of %% table. If not, do nothing. %% If so, set to same dimension as multitablelinespace. @@ -2500,163 +2757,33 @@ %% than skip between lines in the table. \fi} -% In case a @footnote appears inside an alignment, save the footnote -% text to a box and make the \insert when a row of the table is -% finished. Otherwise, the insertion is lost, it never migrates to the -% main vertical list. --kasal, 22jan03. -% -\newbox\savedfootnotes -% -% \dotable \let's \startfootins to this, so that \dofootnote will call -% it instead of starting the insertion right away. -\def\startsavedfootnote{% - \global\setbox\savedfootnotes = \vbox\bgroup - \unvbox\savedfootnotes -} -\def\crcrwithfootnotes{% - \crcr - \ifvoid\savedfootnotes \else - \noalign{\insert\footins{\box\savedfootnotes}}% - \fi -} \message{conditionals,} -% Prevent errors for section commands. -% Used in @ignore and in failing conditionals. -\def\ignoresections{% - \let\chapter=\relax - \let\unnumbered=\relax - \let\top=\relax - \let\unnumberedsec=\relax - \let\unnumberedsection=\relax - \let\unnumberedsubsec=\relax - \let\unnumberedsubsection=\relax - \let\unnumberedsubsubsec=\relax - \let\unnumberedsubsubsection=\relax - \let\section=\relax - \let\subsec=\relax - \let\subsubsec=\relax - \let\subsection=\relax - \let\subsubsection=\relax - \let\appendix=\relax - \let\appendixsec=\relax - \let\appendixsection=\relax - \let\appendixsubsec=\relax - \let\appendixsubsection=\relax - \let\appendixsubsubsec=\relax - \let\appendixsubsubsection=\relax - \let\contents=\relax - \let\smallbook=\relax - \let\titlepage=\relax -} - -% Used in nested conditionals, where we have to parse the Texinfo source -% and so want to turn off most commands, in case they are used -% incorrectly. -% -% We use \empty instead of \relax for the @def... commands, so that \end -% doesn't throw an error. For instance: -% @ignore -% @deffn ... -% @end deffn -% @end ignore -% -% The @end deffn is going to get expanded, because we're trying to allow -% nested conditionals. But we don't want to expand the actual @deffn, -% since it might be syntactically correct and intended to be ignored. -% Since \end checks for \relax, using \empty does not cause an error. -% -\def\ignoremorecommands{% - \let\defcodeindex = \relax - \let\defcv = \empty - \let\defcvx = \empty - \let\Edefcv = \empty - \let\deffn = \empty - \let\deffnx = \empty - \let\Edeffn = \empty - \let\defindex = \relax - \let\defivar = \empty - \let\defivarx = \empty - \let\Edefivar = \empty - \let\defmac = \empty - \let\defmacx = \empty - \let\Edefmac = \empty - \let\defmethod = \empty - \let\defmethodx = \empty - \let\Edefmethod = \empty - \let\defop = \empty - \let\defopx = \empty - \let\Edefop = \empty - \let\defopt = \empty - \let\defoptx = \empty - \let\Edefopt = \empty - \let\defspec = \empty - \let\defspecx = \empty - \let\Edefspec = \empty - \let\deftp = \empty - \let\deftpx = \empty - \let\Edeftp = \empty - \let\deftypefn = \empty - \let\deftypefnx = \empty - \let\Edeftypefn = \empty - \let\deftypefun = \empty - \let\deftypefunx = \empty - \let\Edeftypefun = \empty - \let\deftypeivar = \empty - \let\deftypeivarx = \empty - \let\Edeftypeivar = \empty - \let\deftypemethod = \empty - \let\deftypemethodx = \empty - \let\Edeftypemethod = \empty - \let\deftypeop = \empty - \let\deftypeopx = \empty - \let\Edeftypeop = \empty - \let\deftypevar = \empty - \let\deftypevarx = \empty - \let\Edeftypevar = \empty - \let\deftypevr = \empty - \let\deftypevrx = \empty - \let\Edeftypevr = \empty - \let\defun = \empty - \let\defunx = \empty - \let\Edefun = \empty - \let\defvar = \empty - \let\defvarx = \empty - \let\Edefvar = \empty - \let\defvr = \empty - \let\defvrx = \empty - \let\Edefvr = \empty - \let\clear = \relax - \let\down = \relax - \let\evenfooting = \relax - \let\evenheading = \relax - \let\everyfooting = \relax - \let\everyheading = \relax - \let\headings = \relax - \let\include = \relax - \let\item = \relax - \let\lowersections = \relax - \let\oddfooting = \relax - \let\oddheading = \relax - \let\printindex = \relax - \let\pxref = \relax - \let\raisesections = \relax - \let\ref = \relax - \let\set = \relax - \let\setchapternewpage = \relax - \let\setchapterstyle = \relax - \let\settitle = \relax - \let\up = \relax - \let\verbatiminclude = \relax - \let\xref = \relax -} + +% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, +% @ifnotxml always succeed. They currently do nothing; we don't +% attempt to check whether the conditionals are properly nested. But we +% have to remember that they are conditionals, so that @end doesn't +% attempt to close an environment group. +% +\def\makecond#1{% + \expandafter\let\csname #1\endcsname = \relax + \expandafter\let\csname iscond.#1\endcsname = 1 +} +\makecond{iftex} +\makecond{ifnotdocbook} +\makecond{ifnothtml} +\makecond{ifnotinfo} +\makecond{ifnotplaintext} +\makecond{ifnotxml} % Ignore @ignore, @ifhtml, @ifinfo, and the like. % \def\direntry{\doignore{direntry}} -\def\documentdescriptionword{documentdescription} \def\documentdescription{\doignore{documentdescription}} +\def\docbook{\doignore{docbook}} \def\html{\doignore{html}} +\def\ifdocbook{\doignore{ifdocbook}} \def\ifhtml{\doignore{ifhtml}} \def\ifinfo{\doignore{ifinfo}} \def\ifnottex{\doignore{ifnottex}} @@ -2666,198 +2793,133 @@ \def\menu{\doignore{menu}} \def\xml{\doignore{xml}} -% @dircategory CATEGORY -- specify a category of the dir file -% which this file should belong to. Ignore this in TeX. -\let\dircategory = \comment - -% Ignore text until a line `@end #1'. +% Ignore text until a line `@end #1', keeping track of nested conditionals. % +% A count to remember the depth of nesting. +\newcount\doignorecount + \def\doignore#1{\begingroup - % Don't complain about control sequences we have declared \outer. - \ignoresections - % - % Define a command to swallow text until we reach `@end #1'. - % This @ is a catcode 12 token (that is the normal catcode of @ in - % this texinfo.tex file). We change the catcode of @ below to match. - \long\def\doignoretext##1@end #1{\enddoignore}% + % Scan in ``verbatim'' mode: + \catcode`\@ = \other + \catcode`\{ = \other + \catcode`\} = \other % % Make sure that spaces turn into tokens that match what \doignoretext wants. - \catcode\spaceChar = 10 + \spaceisspace % - % Ignore braces, too, so mismatched braces don't cause trouble. - \catcode`\{ = 9 - \catcode`\} = 9 - % - % We must not have @c interpreted as a control sequence. - \catcode`\@ = 12 - % - \def\ignoreword{#1}% - \ifx\ignoreword\documentdescriptionword - % The c kludge breaks documentdescription, since - % `documentdescription' contains a `c'. Means not everything will - % be ignored inside @documentdescription, but oh well... - \else - % Make the letter c a comment character so that the rest of the line - % will be ignored. This way, the document can have (for example) - % @c @end ifinfo - % and the @end ifinfo will be properly ignored. - % (We've just changed @ to catcode 12.) - \catcode`\c = 14 - \fi - % - % And now expand the command defined above. - \doignoretext -} - -% What we do to finish off ignored text. -% -\def\enddoignore{\endgroup\ignorespaces}% - -\newif\ifwarnedobs\warnedobsfalse -\def\obstexwarn{% - \ifwarnedobs\relax\else - % We need to warn folks that they may have trouble with TeX 3.0. - % This uses \immediate\write16 rather than \message to get newlines. - \immediate\write16{} - \immediate\write16{WARNING: for users of Unix TeX 3.0!} - \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).} - \immediate\write16{If you are running another version of TeX, relax.} - \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} - \immediate\write16{ Then upgrade your TeX installation if you can.} - \immediate\write16{ (See ftp://ftp.gnu.org/non-gnu/TeX.README.)} - \immediate\write16{If you are stuck with version 3.0, run the} - \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} - \immediate\write16{ to use a workaround.} - \immediate\write16{} - \global\warnedobstrue - \fi -} - -% **In TeX 3.0, setting text in \nullfont hangs tex. For a -% workaround (which requires the file ``dummy.tfm'' to be installed), -% uncomment the following line: -%%%%%\font\nullfont=dummy\let\obstexwarn=\relax - -% Ignore text, except that we keep track of conditional commands for -% purposes of nesting, up to an `@end #1' command. -% -\def\nestedignore#1{% - \obstexwarn - % We must actually expand the ignored text to look for the @end - % command, so that nested ignore constructs work. Thus, we put the - % text into a \vbox and then do nothing with the result. To minimize - % the chance of memory overflow, we follow the approach outlined on - % page 401 of the TeXbook. - % - \setbox0 = \vbox\bgroup - % Don't complain about control sequences we have declared \outer. - \ignoresections - % - % Define `@end #1' to end the box, which will in turn undefine the - % @end command again. - \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}% - % - % We are going to be parsing Texinfo commands. Most cause no - % trouble when they are used incorrectly, but some commands do - % complicated argument parsing or otherwise get confused, so we - % undefine them. - % - % We can't do anything about stray @-signs, unfortunately; - % they'll produce `undefined control sequence' errors. - \ignoremorecommands - % - % Set the current font to be \nullfont, a TeX primitive, and define - % all the font commands to also use \nullfont. We don't use - % dummy.tfm, as suggested in the TeXbook, because some sites - % might not have that installed. Therefore, math mode will still - % produce output, but that should be an extremely small amount of - % stuff compared to the main input. - % - \nullfont - \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont - \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont - \let\tensf=\nullfont - % Similarly for index fonts. - \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont - \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont - \let\smallsf=\nullfont - % Similarly for smallexample fonts. - \let\smallerrm=\nullfont \let\smallerit=\nullfont \let\smallersl=\nullfont - \let\smallerbf=\nullfont \let\smallertt=\nullfont \let\smallersc=\nullfont - \let\smallersf=\nullfont - % - % Don't complain when characters are missing from the fonts. - \tracinglostchars = 0 - % - % Don't bother to do space factor calculations. - \frenchspacing - % - % Don't report underfull hboxes. - \hbadness = 10000 - % - % Do minimal line-breaking. - \pretolerance = 10000 + % Count number of #1's that we've seen. + \doignorecount = 0 + % + % Swallow text until we reach the matching `@end #1'. + \dodoignore{#1}% +} + +{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source. + \obeylines % + % + \gdef\dodoignore#1{% + % #1 contains the command name as a string, e.g., `ifinfo'. % - % Do not execute instructions in @tex. - \def\tex{\doignore{tex}}% - % Do not execute macro definitions. - % `c' is a comment character, so the word `macro' will get cut off. - \def\macro{\doignore{ma}}% + % Define a command to find the next `@end #1', which must be on a line + % by itself. + \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}% + % And this command to find another #1 command, at the beginning of a + % line. (Otherwise, we would consider a line `@c @ifset', for + % example, to count as an @ifset for nesting.) + \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% + % + % And now expand that command. + \obeylines % + \doignoretext ^^M% + }% +} + +\def\doignoreyyy#1{% + \def\temp{#1}% + \ifx\temp\empty % Nothing found. + \let\next\doignoretextzzz + \else % Found a nested condition, ... + \advance\doignorecount by 1 + \let\next\doignoretextyyy % ..., look for another. + % If we're here, #1 ends with ^^M\ifinfo (for example). + \fi + \next #1% the token \_STOP_ is present just after this macro. +} + +% We have to swallow the remaining "\_STOP_". +% +\def\doignoretextzzz#1{% + \ifnum\doignorecount = 0 % We have just found the outermost @end. + \let\next\enddoignore + \else % Still inside a nested condition. + \advance\doignorecount by -1 + \let\next\doignoretext % Look for the next @end. + \fi + \next } +% Finish off ignored text. +\def\enddoignore{\endgroup\ignorespaces} + + % @set VAR sets the variable VAR to an empty value. % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. % % Since we want to separate VAR from REST-OF-LINE (which might be % empty), we can't just use \parsearg; we have to insert a space of our % own to delimit the rest of the line, and then take it out again if we -% didn't need it. Make sure the catcode of space is correct to avoid -% losing inside @example, for instance. +% didn't need it. +% We rely on the fact that \parsearg sets \catcode`\ =10. % -\def\set{\begingroup\catcode` =10 - \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR. - \parsearg\setxxx} -\def\setxxx#1{\setyyy#1 \endsetyyy} +\parseargdef\set{\setyyy#1 \endsetyyy} \def\setyyy#1 #2\endsetyyy{% - \def\temp{#2}% - \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty - \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted. - \fi - \endgroup + {% + \makevalueexpandable + \def\temp{#2}% + \edef\next{\gdef\makecsname{SET#1}}% + \ifx\temp\empty + \next{}% + \else + \setzzz#2\endsetzzz + \fi + }% } -% Can't use \xdef to pre-expand #2 and save some time, since \temp or -% \next or other control sequences that we've defined might get us into -% an infinite loop. Consider `@set foo @cite{bar}'. -\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}} +% Remove the trailing space \setxxx inserted. +\def\setzzz#1 \endsetzzz{\next{#1}} % @clear VAR clears (i.e., unsets) the variable VAR. % -\def\clear{\parsearg\clearxxx} -\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax} +\parseargdef\clear{% + {% + \makevalueexpandable + \global\expandafter\let\csname SET#1\endcsname=\relax + }% +} % @value{foo} gets the text saved in variable foo. +\def\value{\begingroup\makevalueexpandable\valuexxx} +\def\valuexxx#1{\expandablevalue{#1}\endgroup} { - \catcode`\_ = \active + \catcode`\- = \active \catcode`\_ = \active % - % We might end up with active _ or - characters in the argument if - % we're called from @code, as @code{@value{foo-bar_}}. So \let any - % such active characters to their normal equivalents. - \gdef\value{\begingroup + \gdef\makevalueexpandable{% + \let\value = \expandablevalue + % We don't want these characters active, ... \catcode`\-=\other \catcode`\_=\other - \indexbreaks \let_\normalunderscore - \valuexxx} + % ..., but we might end up with active ones in the argument if + % we're called from @code, as @code{@value{foo-bar_}}, though. + % So \let them to their normal equivalents. + \let-\realdash \let_\normalunderscore + } } -\def\valuexxx#1{\expandablevalue{#1}\endgroup} % We have this subroutine so that we can handle at least some @value's -% properly in indexes (we \let\value to this in \indexdummies). Ones -% whose names contain - or _ still won't work, but we can't do anything -% about that. The command has to be fully expandable (if the variable -% is set), since the result winds up in the index file. This means that -% if the variable's value contains other Texinfo commands, it's almost -% certain it will fail (although perhaps we could fix that with -% sufficient work to do a one-level expansion on the result, instead of -% complete). +% properly in indexes (we call \makevalueexpandable in \indexdummies). +% The command has to be fully expandable (if the variable is set), since +% the result winds up in the index file. This means that if the +% variable's value contains other Texinfo commands, it's almost certain +% it will fail (although perhaps we could fix that with sufficient work +% to do a one-level expansion on the result, instead of complete). % \def\expandablevalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax @@ -2871,55 +2933,36 @@ % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. % -\def\ifset{\parsearg\doifset} -\def\doifset#1{% - \expandafter\ifx\csname SET#1\endcsname\relax - \let\next=\ifsetfail - \else - \let\next=\ifsetsucceed - \fi - \next +% To get special treatment of `@end ifset,' call \makeond and the redefine. +% +\makecond{ifset} +\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} +\def\doifset#1#2{% + {% + \makevalueexpandable + \let\next=\empty + \expandafter\ifx\csname SET#2\endcsname\relax + #1% If not set, redefine \next. + \fi + \expandafter + }\next } -\def\ifsetsucceed{\conditionalsucceed{ifset}} -\def\ifsetfail{\nestedignore{ifset}} -\defineunmatchedend{ifset} +\def\ifsetfail{\doignore{ifset}} % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been % defined with @set, or has been undefined with @clear. % -\def\ifclear{\parsearg\doifclear} -\def\doifclear#1{% - \expandafter\ifx\csname SET#1\endcsname\relax - \let\next=\ifclearsucceed - \else - \let\next=\ifclearfail - \fi - \next -} -\def\ifclearsucceed{\conditionalsucceed{ifclear}} -\def\ifclearfail{\nestedignore{ifclear}} -\defineunmatchedend{ifclear} - -% @iftex, @ifnothtml, @ifnotinfo, @ifnotplaintext always succeed; we -% read the text following, through the first @end iftex (etc.). Make -% `@end iftex' (etc.) valid only after an @iftex. -% -\def\iftex{\conditionalsucceed{iftex}} -\def\ifnothtml{\conditionalsucceed{ifnothtml}} -\def\ifnotinfo{\conditionalsucceed{ifnotinfo}} -\def\ifnotplaintext{\conditionalsucceed{ifnotplaintext}} -\defineunmatchedend{iftex} -\defineunmatchedend{ifnothtml} -\defineunmatchedend{ifnotinfo} -\defineunmatchedend{ifnotplaintext} - -% True conditional. Since \set globally defines its variables, we can -% just start and end a group (to keep the @end definition undefined at -% the outer level). -% -\def\conditionalsucceed#1{\begingroup - \expandafter\def\csname E#1\endcsname{\endgroup}% -} +% The `\else' inside the `\doifset' parameter is a trick to reuse the +% above code: if the variable is not set, do nothing, if it is set, +% then redefine \next to \ifclearfail. +% +\makecond{ifclear} +\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} +\def\ifclearfail{\doignore{ifclear}} + +% @dircategory CATEGORY -- specify a category of the dir file +% which this file should belong to. Ignore this in TeX. +\let\dircategory=\comment % @defininfoenclose. \let\definfoenclose=\comment @@ -3044,6 +3087,7 @@ \def\definedummyletter##1{% \expandafter\def\csname ##1\endcsname{\realbackslash ##1}% }% + \let\definedummyaccent\definedummyletter % % Do the redefinitions. \commondummies @@ -3066,6 +3110,7 @@ \def\definedummyletter##1{% \expandafter\def\csname ##1\endcsname{@##1}% }% + \let\definedummyaccent\definedummyletter % % Do the redefinitions. \commondummies @@ -3078,26 +3123,11 @@ % \normalturnoffactive % - % Control letters and accents. + \commondummiesnofonts + % \definedummyletter{_}% - \definedummyletter{,}% - \definedummyletter{"}% - \definedummyletter{`}% - \definedummyletter{'}% - \definedummyletter{^}% - \definedummyletter{~}% - \definedummyletter{=}% - \definedummyword{u}% - \definedummyword{v}% - \definedummyword{H}% - \definedummyword{dotaccent}% - \definedummyword{ringaccent}% - \definedummyword{tieaccent}% - \definedummyword{ubaraccent}% - \definedummyword{udotaccent}% - \definedummyword{dotless}% % - % Other non-English letters. + % Non-English letters. \definedummyword{AA}% \definedummyword{AE}% \definedummyword{L}% @@ -3109,6 +3139,10 @@ \definedummyword{oe}% \definedummyword{o}% \definedummyword{ss}% + \definedummyword{exclamdown}% + \definedummyword{questiondown}% + \definedummyword{ordf}% + \definedummyword{ordm}% % % Although these internal commands shouldn't show up, sometimes they do. \definedummyword{bf}% @@ -3120,37 +3154,14 @@ \definedummyword{tclose}% \definedummyword{tt}% % - % Texinfo font commands. - \definedummyword{b}% - \definedummyword{i}% - \definedummyword{r}% - \definedummyword{sc}% - \definedummyword{t}% - % + \definedummyword{LaTeX}% \definedummyword{TeX}% - \definedummyword{acronym}% - \definedummyword{cite}% - \definedummyword{code}% - \definedummyword{command}% - \definedummyword{dfn}% - \definedummyword{dots}% - \definedummyword{emph}% - \definedummyword{env}% - \definedummyword{file}% - \definedummyword{kbd}% - \definedummyword{key}% - \definedummyword{math}% - \definedummyword{option}% - \definedummyword{samp}% - \definedummyword{strong}% - \definedummyword{uref}% - \definedummyword{url}% - \definedummyword{var}% - \definedummyword{w}% % % Assorted special characters. \definedummyword{bullet}% + \definedummyword{comma}% \definedummyword{copyright}% + \definedummyword{registeredsymbol}% \definedummyword{dots}% \definedummyword{enddots}% \definedummyword{equiv}% @@ -3162,10 +3173,9 @@ \definedummyword{print}% \definedummyword{result}% % - % Handle some cases of @value -- where the variable name does not - % contain - or _, and the value does not contain any + % Handle some cases of @value -- where it does not contain any % (non-fully-expandable) commands. - \let\value = \expandablevalue + \makevalueexpandable % % Normal spaces, not active ones. \unsepspaces @@ -3174,45 +3184,97 @@ \turnoffmacros } -% If an index command is used in an @example environment, any spaces -% therein should become regular spaces in the raw index file, not the -% expansion of \tie (\leavevmode \penalty \@M \ ). -{\obeyspaces - \gdef\unsepspaces{\obeyspaces\let =\space}} - +% \commondummiesnofonts: common to \commondummies and \indexnofonts. +% +% Better have this without active chars. +{ + \catcode`\~=\other + \gdef\commondummiesnofonts{% + % Control letters and accents. + \definedummyletter{!}% + \definedummyaccent{"}% + \definedummyaccent{'}% + \definedummyletter{*}% + \definedummyaccent{,}% + \definedummyletter{.}% + \definedummyletter{/}% + \definedummyletter{:}% + \definedummyaccent{=}% + \definedummyletter{?}% + \definedummyaccent{^}% + \definedummyaccent{`}% + \definedummyaccent{~}% + \definedummyword{u}% + \definedummyword{v}% + \definedummyword{H}% + \definedummyword{dotaccent}% + \definedummyword{ringaccent}% + \definedummyword{tieaccent}% + \definedummyword{ubaraccent}% + \definedummyword{udotaccent}% + \definedummyword{dotless}% + % + % Texinfo font commands. + \definedummyword{b}% + \definedummyword{i}% + \definedummyword{r}% + \definedummyword{sc}% + \definedummyword{t}% + % + % Commands that take arguments. + \definedummyword{acronym}% + \definedummyword{cite}% + \definedummyword{code}% + \definedummyword{command}% + \definedummyword{dfn}% + \definedummyword{emph}% + \definedummyword{env}% + \definedummyword{file}% + \definedummyword{kbd}% + \definedummyword{key}% + \definedummyword{math}% + \definedummyword{option}% + \definedummyword{samp}% + \definedummyword{strong}% + \definedummyword{tie}% + \definedummyword{uref}% + \definedummyword{url}% + \definedummyword{var}% + \definedummyword{verb}% + \definedummyword{w}% + } +} % \indexnofonts is used when outputting the strings to sort the index % by, and when constructing control sequence names. It eliminates all % control sequences and just writes whatever the best ASCII sort string % would be for a given command (usually its argument). % -\def\indexdummytex{TeX} -\def\indexdummydots{...} -% \def\indexnofonts{% + % Accent commands should become @asis. + \def\definedummyaccent##1{% + \expandafter\let\csname ##1\endcsname\asis + }% + % We can just ignore other control letters. + \def\definedummyletter##1{% + \expandafter\def\csname ##1\endcsname{}% + }% + % Hopefully, all control words can become @asis. + \let\definedummyword\definedummyaccent + % + \commondummiesnofonts + % + % Don't no-op \tt, since it isn't a user-level command + % and is used in the definitions of the active chars like <, >, |, etc. + % Likewise with the other plain tex font commands. + %\let\tt=\asis + % \def\ { }% \def\@{@}% % how to handle braces? \def\_{\normalunderscore}% % - \let\,=\asis - \let\"=\asis - \let\`=\asis - \let\'=\asis - \let\^=\asis - \let\~=\asis - \let\==\asis - \let\u=\asis - \let\v=\asis - \let\H=\asis - \let\dotaccent=\asis - \let\ringaccent=\asis - \let\tieaccent=\asis - \let\ubaraccent=\asis - \let\udotaccent=\asis - \let\dotless=\asis - % - % Other non-English letters. + % Non-English letters. \def\AA{AA}% \def\AE{AE}% \def\L{L}% @@ -3226,130 +3288,169 @@ \def\ss{ss}% \def\exclamdown{!}% \def\questiondown{?}% + \def\ordf{a}% + \def\ordm{o}% % - % Don't no-op \tt, since it isn't a user-level command - % and is used in the definitions of the active chars like <, >, |, etc. - % Likewise with the other plain tex font commands. - %\let\tt=\asis + \def\LaTeX{LaTeX}% + \def\TeX{TeX}% + % + % Assorted special characters. + % (The following {} will end up in the sort string, but that's ok.) + \def\bullet{bullet}% + \def\comma{,}% + \def\copyright{copyright}% + \def\registeredsymbol{R}% + \def\dots{...}% + \def\enddots{...}% + \def\equiv{==}% + \def\error{error}% + \def\expansion{==>}% + \def\minus{-}% + \def\pounds{pounds}% + \def\point{.}% + \def\print{-|}% + \def\result{=>}% % - % Texinfo font commands. - \let\b=\asis - \let\i=\asis - \let\r=\asis - \let\sc=\asis - \let\t=\asis - % - \let\TeX=\indexdummytex - \let\acronym=\asis - \let\cite=\asis - \let\code=\asis - \let\command=\asis - \let\dfn=\asis - \let\dots=\indexdummydots - \let\emph=\asis - \let\env=\asis - \let\file=\asis - \let\kbd=\asis - \let\key=\asis - \let\math=\asis - \let\option=\asis - \let\samp=\asis - \let\strong=\asis - \let\uref=\asis - \let\url=\asis - \let\var=\asis - \let\w=\asis + % Don't write macro names. + \emptyusermacros } \let\indexbackslash=0 %overridden during \printindex. \let\SETmarginindex=\relax % put index entries in margin (undocumented)? -% For \ifx comparisons. -\def\emptymacro{\empty} - % Most index entries go through here, but \dosubind is the general case. -% -\def\doind#1#2{\dosubind{#1}{#2}\empty} +% #1 is the index name, #2 is the entry text. +\def\doind#1#2{\dosubind{#1}{#2}{}} % Workhorse for all \fooindexes. % #1 is name of index, #2 is stuff to put there, #3 is subentry -- -% \empty if called from \doind, as we usually are. The main exception -% is with defuns, which call us directly. +% empty if called from \doind, as we usually are (the main exception +% is with most defuns, which call us directly). % \def\dosubind#1#2#3{% + \iflinks + {% + % Store the main index entry text (including the third arg). + \toks0 = {#2}% + % If third arg is present, precede it with a space. + \def\thirdarg{#3}% + \ifx\thirdarg\empty \else + \toks0 = \expandafter{\the\toks0 \space #3}% + \fi + % + \edef\writeto{\csname#1indfile\endcsname}% + % + \ifvmode + \dosubindsanitize + \else + \dosubindwrite + \fi + }% + \fi +} + +% Write the entry in \toks0 to the index file: +% +\def\dosubindwrite{% % Put the index entry in the margin if desired. \ifx\SETmarginindex\relax\else - \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}% + \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% \fi - {% - \count255=\lastpenalty - {% - \indexdummies % Must do this here, since \bf, etc expand at this stage - \escapechar=`\\ - {% - \let\folio = 0% We will expand all macros now EXCEPT \folio. - \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now - % so it will be output as is; and it will print as backslash. - % - % The main index entry text. - \toks0 = {#2}% - % - % If third arg is present, precede it with space in sort key. - \def\thirdarg{#3}% - \ifx\thirdarg\emptymacro \else - % If the third (subentry) arg is present, add it to the index - % line to write. - \toks0 = \expandafter{\the\toks0 \space #3}% - \fi - % - % Process the index entry with all font commands turned off, to - % get the string to sort by. - {\indexnofonts - \edef\temp{\the\toks0}% need full expansion - \xdef\indexsorttmp{\temp}% - }% - % - % Set up the complete index entry, with both the sort key and - % the original text, including any font commands. We write - % three arguments to \entry to the .?? file (four in the - % subentry case), texindex reduces to two when writing the .??s - % sorted result. - \edef\temp{% - \write\csname#1indfile\endcsname{% - \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}% - }% - % - % If a skip is the last thing on the list now, preserve it - % by backing up by \lastskip, doing the \write, then inserting - % the skip again. Otherwise, the whatsit generated by the - % \write will make \lastskip zero. The result is that sequences - % like this: - % @end defun - % @tindex whatever - % @defun ... - % will have extra space inserted, because the \medbreak in the - % start of the @defun won't see the skip inserted by the @end of - % the previous defun. - % - % But don't do any of this if we're not in vertical mode. We - % don't want to do a \vskip and prematurely end a paragraph. - % - % Avoid page breaks due to these extra skips, too. - % - \iflinks - \ifvmode - \skip0 = \lastskip - \ifdim\lastskip = 0pt \else \nobreak\vskip-\skip0 \fi - \fi - % - \temp % do the write - % - \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi - \fi - }% - }% - \penalty\count255 + % + % Remember, we are within a group. + \indexdummies % Must do this here, since \bf, etc expand at this stage + \escapechar=`\\ + \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now + % so it will be output as is; and it will print as backslash. + % + % Process the index entry with all font commands turned off, to + % get the string to sort by. + {\indexnofonts + \edef\temp{\the\toks0}% need full expansion + \xdef\indexsorttmp{\temp}% + }% + % + % Set up the complete index entry, with both the sort key and + % the original text, including any font commands. We write + % three arguments to \entry to the .?? file (four in the + % subentry case), texindex reduces to two when writing the .??s + % sorted result. + \edef\temp{% + \write\writeto{% + \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}% }% + \temp +} + +% Take care of unwanted page breaks: +% +% If a skip is the last thing on the list now, preserve it +% by backing up by \lastskip, doing the \write, then inserting +% the skip again. Otherwise, the whatsit generated by the +% \write will make \lastskip zero. The result is that sequences +% like this: +% @end defun +% @tindex whatever +% @defun ... +% will have extra space inserted, because the \medbreak in the +% start of the @defun won't see the skip inserted by the @end of +% the previous defun. +% +% But don't do any of this if we're not in vertical mode. We +% don't want to do a \vskip and prematurely end a paragraph. +% +% Avoid page breaks due to these extra skips, too. +% +% But wait, there is a catch there: +% We'll have to check whether \lastskip is zero skip. \ifdim is not +% sufficient for this purpose, as it ignores stretch and shrink parts +% of the skip. The only way seems to be to check the textual +% representation of the skip. +% +% The following is almost like \def\zeroskipmacro{0.0pt} except that +% the ``p'' and ``t'' characters have catcode \other, not 11 (letter). +% +\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} +% +% ..., ready, GO: +% +\def\dosubindsanitize{% + % \lastskip and \lastpenalty cannot both be nonzero simultaneously. + \skip0 = \lastskip + \edef\lastskipmacro{\the\lastskip}% + \count255 = \lastpenalty + % + % If \lastskip is nonzero, that means the last item was a + % skip. And since a skip is discardable, that means this + % -\skip0 glue we're inserting is preceded by a + % non-discardable item, therefore it is not a potential + % breakpoint, therefore no \nobreak needed. + \ifx\lastskipmacro\zeroskipmacro + \else + \vskip-\skip0 + \fi + % + \dosubindwrite + % + \ifx\lastskipmacro\zeroskipmacro + % If \lastskip was zero, perhaps the last item was a penalty, and + % perhaps it was >=10000, e.g., a \nobreak. In that case, we want + % to re-insert the same penalty (values >10000 are used for various + % signals); since we just inserted a non-discardable item, any + % following glue (such as a \parskip) would be a breakpoint. For example: + % + % @deffn deffn-whatever + % @vindex index-whatever + % Description. + % would allow a break between the index-whatever whatsit + % and the "Description." paragraph. + \ifnum\count255>9999 \penalty\count255 \fi + \else + % On the other hand, if we had a nonzero \lastskip, + % this make-up glue would be preceded by a non-discardable item + % (the whatsit from the \write), so we must insert a \nobreak. + \nobreak\vskip\skip0 + \fi } % The index entry written in the file actually looks like @@ -3387,14 +3488,12 @@ % @printindex causes a particular index (the ??s file) to get printed. % It does not print any chapter heading (usually an @unnumbered). % -\def\printindex{\parsearg\doprintindex} -\def\doprintindex#1{\begingroup +\parseargdef\printindex{\begingroup \dobreak \chapheadingskip{10000}% % \smallfonts \rm \tolerance = 9500 \everypar = {}% don't want the \kern\-parindent from indentation suppression. - \indexbreaks % % See if the index file exists and is nonempty. % Change catcode of @ here so that if the index file contains @@ -3421,7 +3520,7 @@ % Index files are almost Texinfo source, but we use \ as the escape % character. It would be better to use @, but that's too big a change % to make right now. - \def\indexbackslash{\rawbackslashxx}% + \def\indexbackslash{\backslashcurfont}% \catcode`\\ = 0 \escapechar = `\\ \begindoublecolumns @@ -3443,7 +3542,10 @@ \removelastskip % % We like breaks before the index initials, so insert a bonus. - \penalty -300 + \nobreak + \vskip 0pt plus 3\baselineskip + \penalty 0 + \vskip 0pt plus -3\baselineskip % % Typeset the initial. Making this add up to a whole number of % baselineskips increases the chance of the dots lining up from column @@ -3453,80 +3555,100 @@ % No shrink because it confuses \balancecolumns. \vskip 1.67\baselineskip plus .5\baselineskip \leftline{\secbf #1}% - \vskip .33\baselineskip plus .1\baselineskip - % % Do our best not to break after the initial. \nobreak + \vskip .33\baselineskip plus .1\baselineskip }} -% This typesets a paragraph consisting of #1, dot leaders, and then #2 -% flush to the right margin. It is used for index and table of contents -% entries. The paragraph is indented by \leftskip. -% -\def\entry#1#2{\begingroup - % - % Start a new paragraph if necessary, so our assignments below can't - % affect previous text. - \par - % - % Do not fill out the last line with white space. - \parfillskip = 0in - % - % No extra space above this paragraph. - \parskip = 0in - % - % Do not prefer a separate line ending with a hyphen to fewer lines. - \finalhyphendemerits = 0 - % - % \hangindent is only relevant when the entry text and page number - % don't both fit on one line. In that case, bob suggests starting the - % dots pretty far over on the line. Unfortunately, a large - % indentation looks wrong when the entry text itself is broken across - % lines. So we use a small indentation and put up with long leaders. - % - % \hangafter is reset to 1 (which is the value we want) at the start - % of each paragraph, so we need not do anything with that. - \hangindent = 2em - % - % When the entry text needs to be broken, just fill out the first line - % with blank space. - \rightskip = 0pt plus1fil - % - % A bit of stretch before each entry for the benefit of balancing columns. - \vskip 0pt plus1pt - % - % Start a ``paragraph'' for the index entry so the line breaking - % parameters we've set above will have an effect. - \noindent - % - % Insert the text of the index entry. TeX will do line-breaking on it. - #1% - % The following is kludged to not output a line of dots in the index if - % there are no page numbers. The next person who breaks this will be - % cursed by a Unix daemon. - \def\tempa{{\rm }}% - \def\tempb{#2}% - \edef\tempc{\tempa}% - \edef\tempd{\tempb}% - \ifx\tempc\tempd\ \else% - % - % If we must, put the page number on a line of its own, and fill out - % this line with blank space. (The \hfil is overwhelmed with the - % fill leaders glue in \indexdotfill if the page number does fit.) - \hfil\penalty50 - \null\nobreak\indexdotfill % Have leaders before the page number. - % - % The `\ ' here is removed by the implicit \unskip that TeX does as - % part of (the primitive) \par. Without it, a spurious underfull - % \hbox ensues. - \ifpdf - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. +% \entry typesets a paragraph consisting of the text (#1), dot leaders, and +% then page number (#2) flushed to the right margin. It is used for index +% and table of contents entries. The paragraph is indented by \leftskip. +% +% A straightforward implementation would start like this: +% \def\entry#1#2{... +% But this frozes the catcodes in the argument, and can cause problems to +% @code, which sets - active. This problem was fixed by a kludge--- +% ``-'' was active throughout whole index, but this isn't really right. +% +% The right solution is to prevent \entry from swallowing the whole text. +% --kasal, 21nov03 +\def\entry{% + \begingroup + % + % Start a new paragraph if necessary, so our assignments below can't + % affect previous text. + \par + % + % Do not fill out the last line with white space. + \parfillskip = 0in + % + % No extra space above this paragraph. + \parskip = 0in + % + % Do not prefer a separate line ending with a hyphen to fewer lines. + \finalhyphendemerits = 0 + % + % \hangindent is only relevant when the entry text and page number + % don't both fit on one line. In that case, bob suggests starting the + % dots pretty far over on the line. Unfortunately, a large + % indentation looks wrong when the entry text itself is broken across + % lines. So we use a small indentation and put up with long leaders. + % + % \hangafter is reset to 1 (which is the value we want) at the start + % of each paragraph, so we need not do anything with that. + \hangindent = 2em + % + % When the entry text needs to be broken, just fill out the first line + % with blank space. + \rightskip = 0pt plus1fil + % + % A bit of stretch before each entry for the benefit of balancing + % columns. + \vskip 0pt plus1pt + % + % Swallow the left brace of the text (first parameter): + \afterassignment\doentry + \let\temp = +} +\def\doentry{% + \bgroup % Instead of the swallowed brace. + \noindent + \aftergroup\finishentry + % And now comes the text of the entry. +} +\def\finishentry#1{% + % #1 is the page number. + % + % The following is kludged to not output a line of dots in the index if + % there are no page numbers. The next person who breaks this will be + % cursed by a Unix daemon. + \def\tempa{{\rm }}% + \def\tempb{#1}% + \edef\tempc{\tempa}% + \edef\tempd{\tempb}% + \ifx\tempc\tempd + \ % \else - \ #2% The page number ends the paragraph. + % + % If we must, put the page number on a line of its own, and fill out + % this line with blank space. (The \hfil is overwhelmed with the + % fill leaders glue in \indexdotfill if the page number does fit.) + \hfil\penalty50 + \null\nobreak\indexdotfill % Have leaders before the page number. + % + % The `\ ' here is removed by the implicit \unskip that TeX does as + % part of (the primitive) \par. Without it, a spurious underfull + % \hbox ensues. + \ifpdf + \pdfgettoks#1.% + \ \the\toksA + \else + \ #1% + \fi \fi - \fi% - \par -\endgroup} + \par + \endgroup +} % Like \dotfill except takes at least 1 em. \def\indexdotfill{\cleaders @@ -3695,6 +3817,12 @@ \message{sectioning,} % Chapters, sections, etc. +% \unnumberedno is an oxymoron, of course. But we count the unnumbered +% sections so that we can refer to them unambiguously in the pdf +% outlines by their "section number". We avoid collisions with chapter +% numbers by starting them at 10000. (If a document ever has 10000 +% chapters, we're in trouble anyway, I'm sure.) +\newcount\unnumberedno \unnumberedno = 10000 \newcount\chapno \newcount\secno \secno=0 \newcount\subsecno \subsecno=0 @@ -3702,9 +3830,12 @@ % This counter is funny since it counts through charcodes of letters A, B, ... \newcount\appendixno \appendixno = `\@ +% % \def\appendixletter{\char\the\appendixno} -% We do the following for the sake of pdftex, which needs the actual +% We do the following ugly conditional instead of the above simple +% construct for the sake of pdftex, which needs the actual % letter in the expansion, not just typeset. +% \def\appendixletter{% \ifnum\appendixno=`A A% \else\ifnum\appendixno=`B B% @@ -3742,11 +3873,12 @@ % Each @chapter defines this as the name of the chapter. % page headings and footings can use it. @section does likewise. +% However, they are not reliable, because we don't use marks. \def\thischapter{} \def\thissection{} \newcount\absseclevel % used to calculate proper heading level -\newcount\secbase\secbase=0 % @raise/lowersections modify this count +\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count % @raisesections: treat @section as chapter, @subsection as section, etc. \def\raisesections{\global\advance\secbase by -1} @@ -3756,121 +3888,142 @@ \def\lowersections{\global\advance\secbase by 1} \let\down=\lowersections % original BFox name -% Choose a numbered-heading macro -% #1 is heading level if unmodified by @raisesections or @lowersections -% #2 is text for heading -\def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1 -\ifcase\absseclevel - \chapterzzz{#2} -\or - \seczzz{#2} -\or - \numberedsubseczzz{#2} -\or - \numberedsubsubseczzz{#2} -\else - \ifnum \absseclevel<0 - \chapterzzz{#2} +% we only have subsub. +\chardef\maxseclevel = 3 +% +% A numbered section within an unnumbered changes to unnumbered too. +% To achive this, remember the "biggest" unnum. sec. we are currently in: +\chardef\unmlevel = \maxseclevel +% +% Trace whether the current chapter is an appendix or not: +% \chapheadtype is "N" or "A", unnumbered chapters are ignored. +\def\chapheadtype{N} + +% Choose a heading macro +% #1 is heading type +% #2 is heading level +% #3 is text for heading +\def\genhead#1#2#3{% + % Compute the abs. sec. level: + \absseclevel=#2 + \advance\absseclevel by \secbase + % Make sure \absseclevel doesn't fall outside the range: + \ifnum \absseclevel < 0 + \absseclevel = 0 \else - \numberedsubsubseczzz{#2} + \ifnum \absseclevel > 3 + \absseclevel = 3 + \fi \fi -\fi -\suppressfirstparagraphindent -} - -% like \numhead, but chooses appendix heading levels -\def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1 -\ifcase\absseclevel - \appendixzzz{#2} -\or - \appendixsectionzzz{#2} -\or - \appendixsubseczzz{#2} -\or - \appendixsubsubseczzz{#2} -\else - \ifnum \absseclevel<0 - \appendixzzz{#2} + % The heading type: + \def\headtype{#1}% + \if \headtype U% + \ifnum \absseclevel < \unmlevel + \chardef\unmlevel = \absseclevel + \fi \else - \appendixsubsubseczzz{#2} + % Check for appendix sections: + \ifnum \absseclevel = 0 + \edef\chapheadtype{\headtype}% + \else + \if \headtype A\if \chapheadtype N% + \errmessage{@appendix... within a non-appendix chapter}% + \fi\fi + \fi + % Check for numbered within unnumbered: + \ifnum \absseclevel > \unmlevel + \def\headtype{U}% + \else + \chardef\unmlevel = 3 + \fi \fi -\fi -\suppressfirstparagraphindent -} - -% like \numhead, but chooses numberless heading levels -\def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1 -\ifcase\absseclevel - \unnumberedzzz{#2} -\or - \unnumberedseczzz{#2} -\or - \unnumberedsubseczzz{#2} -\or - \unnumberedsubsubseczzz{#2} -\else - \ifnum \absseclevel<0 - \unnumberedzzz{#2} + % Now print the heading: + \if \headtype U% + \ifcase\absseclevel + \unnumberedzzz{#3}% + \or \unnumberedseczzz{#3}% + \or \unnumberedsubseczzz{#3}% + \or \unnumberedsubsubseczzz{#3}% + \fi \else - \unnumberedsubsubseczzz{#2} + \if \headtype A% + \ifcase\absseclevel + \appendixzzz{#3}% + \or \appendixsectionzzz{#3}% + \or \appendixsubseczzz{#3}% + \or \appendixsubsubseczzz{#3}% + \fi + \else + \ifcase\absseclevel + \chapterzzz{#3}% + \or \seczzz{#3}% + \or \numberedsubseczzz{#3}% + \or \numberedsubsubseczzz{#3}% + \fi + \fi \fi -\fi -\suppressfirstparagraphindent + \suppressfirstparagraphindent } -% @chapter, @appendix, @unnumbered. -\def\thischaptername{No Chapter Title} -\outer\def\chapter{\parsearg\chapteryyy} -\def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz -\def\chapterzzz #1{% - \secno=0 \subsecno=0 \subsubsecno=0 - \global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}% - \chapmacro {#1}{\the\chapno}% - \gdef\thissection{#1}% - \gdef\thischaptername{#1}% - % We don't substitute the actual chapter name into \thischapter - % because we don't want its macros evaluated now. - \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}% - \writetocentry{chap}{#1}{{\the\chapno}} - \donoderef +% an interface: +\def\numhead{\genhead N} +\def\apphead{\genhead A} +\def\unnmhead{\genhead U} + +% @chapter, @appendix, @unnumbered. Increment top-level counter, reset +% all lower-level sectioning counters to zero. +% +% Also set \chaplevelprefix, which we prepend to @float sequence numbers +% (e.g., figures), q.v. By default (before any chapter), that is empty. +\let\chaplevelprefix = \empty +% +\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz +\def\chapterzzz#1{% + % section resetting is \global in case the chapter is in a group, such + % as an @include file. + \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 + \global\advance\chapno by 1 + % + % Used for \float. + \gdef\chaplevelprefix{\the\chapno.}% + \resetallfloatnos + % + \message{\putwordChapter\space \the\chapno}% + % + % Write the actual heading. + \chapmacro{#1}{Ynumbered}{\the\chapno}% + % + % So @section and the like are numbered underneath this chapter. \global\let\section = \numberedsec \global\let\subsection = \numberedsubsec \global\let\subsubsection = \numberedsubsubsec } -% we use \chapno to avoid indenting back -\def\appendixbox#1{% - \setbox0 = \hbox{\putwordAppendix{} \the\chapno}% - \hbox to \wd0{#1\hss}} - -\outer\def\appendix{\parsearg\appendixyyy} -\def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz -\def\appendixzzz #1{% - \secno=0 \subsecno=0 \subsubsecno=0 - \global\advance \appendixno by 1 - \message{\putwordAppendix\space \appendixletter}% - \chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}% - \gdef\thissection{#1}% - \gdef\thischaptername{#1}% - \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}% - \writetocentry{appendix}{#1}{{\appendixletter}} - \appendixnoderef +\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz +\def\appendixzzz#1{% + \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 + \global\advance\appendixno by 1 + \gdef\chaplevelprefix{\appendixletter.}% + \resetallfloatnos + % + \def\appendixnum{\putwordAppendix\space \appendixletter}% + \message{\appendixnum}% + % + \chapmacro{#1}{Yappendix}{\appendixletter}% + % \global\let\section = \appendixsec \global\let\subsection = \appendixsubsec \global\let\subsubsection = \appendixsubsubsec } -% @centerchap is like @unnumbered, but the heading is centered. -\outer\def\centerchap{\parsearg\centerchapyyy} -\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}} - -% @top is like @unnumbered. -\outer\def\top{\parsearg\unnumberedyyy} - -\outer\def\unnumbered{\parsearg\unnumberedyyy} -\def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz -\def\unnumberedzzz #1{% - \secno=0 \subsecno=0 \subsubsecno=0 +\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz +\def\unnumberedzzz#1{% + \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 + \global\advance\unnumberedno by 1 + % + % Since an unnumbered has no number, no prefix for figures. + \global\let\chaplevelprefix = \empty + \resetallfloatnos % % This used to be simply \message{#1}, but TeX fully expands the % argument to \message. Therefore, if #1 contained @-commands, TeX @@ -3883,134 +4036,98 @@ % \the to achieve this: TeX expands \the only once, % simply yielding the contents of . (We also do this for % the toc entries.) - \toks0 = {#1}\message{(\the\toks0)}% + \toks0 = {#1}% + \message{(\the\toks0)}% + % + \chapmacro{#1}{Ynothing}{\the\unnumberedno}% % - \unnumbchapmacro {#1}% - \gdef\thischapter{#1}\gdef\thissection{#1}% - \writetocentry{unnumbchap}{#1}{{\the\chapno}} - \unnumbnoderef \global\let\section = \unnumberedsec \global\let\subsection = \unnumberedsubsec \global\let\subsubsection = \unnumberedsubsubsec } -% Sections. -\outer\def\numberedsec{\parsearg\secyyy} -\def\secyyy #1{\numhead1{#1}} % normally calls seczzz -\def\seczzz #1{% - \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % - \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}% - \writetocentry{sec}{#1}{{\the\chapno}{\the\secno}} - \donoderef - \nobreak +% @centerchap is like @unnumbered, but the heading is centered. +\outer\parseargdef\centerchap{% + % Well, we could do the following in a group, but that would break + % an assumption that \chapmacro is called at the outermost level. + % Thus we are safer this way: --kasal, 24feb04 + \let\centerparametersmaybe = \centerparameters + \unnmhead0{#1}% + \let\centerparametersmaybe = \relax } -\outer\def\appendixsection{\parsearg\appendixsecyyy} -\outer\def\appendixsec{\parsearg\appendixsecyyy} -\def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz -\def\appendixsectionzzz #1{% - \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % - \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}% - \writetocentry{sec}{#1}{{\appendixletter}{\the\secno}} - \appendixnoderef - \nobreak -} +% @top is like @unnumbered. +\let\top\unnumbered -\outer\def\unnumberedsec{\parsearg\unnumberedsecyyy} -\def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz -\def\unnumberedseczzz #1{% - \plainsecheading {#1}\gdef\thissection{#1}% - \writetocentry{unnumbsec}{#1}{{\the\chapno}{\the\secno}} - \unnumbnoderef - \nobreak +% Sections. +\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz +\def\seczzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 + \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% +} + +\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz +\def\appendixsectionzzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 + \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% +} +\let\appendixsec\appendixsection + +\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz +\def\unnumberedseczzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 + \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% } % Subsections. -\outer\def\numberedsubsec{\parsearg\numberedsubsecyyy} -\def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz -\def\numberedsubseczzz #1{% - \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % - \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}% - \writetocentry{subsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}} - \donoderef - \nobreak -} - -\outer\def\appendixsubsec{\parsearg\appendixsubsecyyy} -\def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz -\def\appendixsubseczzz #1{% - \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % - \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}% - \writetocentry{subsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}} - \appendixnoderef - \nobreak -} - -\outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy} -\def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz -\def\unnumberedsubseczzz #1{% - \plainsubsecheading {#1}\gdef\thissection{#1}% - \writetocentry{unnumbsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}} - \unnumbnoderef - \nobreak +\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz +\def\numberedsubseczzz#1{% + \global\subsubsecno=0 \global\advance\subsecno by 1 + \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% +} + +\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz +\def\appendixsubseczzz#1{% + \global\subsubsecno=0 \global\advance\subsecno by 1 + \sectionheading{#1}{subsec}{Yappendix}% + {\appendixletter.\the\secno.\the\subsecno}% +} + +\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz +\def\unnumberedsubseczzz#1{% + \global\subsubsecno=0 \global\advance\subsecno by 1 + \sectionheading{#1}{subsec}{Ynothing}% + {\the\unnumberedno.\the\secno.\the\subsecno}% } % Subsubsections. -\outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy} -\def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz -\def\numberedsubsubseczzz #1{% - \gdef\thissection{#1}\global\advance \subsubsecno by 1 % - \subsubsecheading {#1} - {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}% - \writetocentry{subsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}} - \donoderef - \nobreak -} - -\outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy} -\def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz -\def\appendixsubsubseczzz #1{% - \gdef\thissection{#1}\global\advance \subsubsecno by 1 % - \subsubsecheading {#1} - {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}% - \writetocentry{subsubsec}{#1}{{\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}} - \appendixnoderef - \nobreak -} - -\outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy} -\def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz -\def\unnumberedsubsubseczzz #1{% - \plainsubsubsecheading {#1}\gdef\thissection{#1}% - \writetocentry{unnumbsubsubsec}{#1}{{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}} - \unnumbnoderef - \nobreak +\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz +\def\numberedsubsubseczzz#1{% + \global\advance\subsubsecno by 1 + \sectionheading{#1}{subsubsec}{Ynumbered}% + {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% +} + +\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz +\def\appendixsubsubseczzz#1{% + \global\advance\subsubsecno by 1 + \sectionheading{#1}{subsubsec}{Yappendix}% + {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% +} + +\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz +\def\unnumberedsubsubseczzz#1{% + \global\advance\subsubsecno by 1 + \sectionheading{#1}{subsubsec}{Ynothing}% + {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% } -% These are variants which are not "outer", so they can appear in @ifinfo. -% Actually, they should now be obsolete; ordinary section commands should work. -\def\infotop{\parsearg\unnumberedzzz} -\def\infounnumbered{\parsearg\unnumberedzzz} -\def\infounnumberedsec{\parsearg\unnumberedseczzz} -\def\infounnumberedsubsec{\parsearg\unnumberedsubseczzz} -\def\infounnumberedsubsubsec{\parsearg\unnumberedsubsubseczzz} - -\def\infoappendix{\parsearg\appendixzzz} -\def\infoappendixsec{\parsearg\appendixseczzz} -\def\infoappendixsubsec{\parsearg\appendixsubseczzz} -\def\infoappendixsubsubsec{\parsearg\appendixsubsubseczzz} - -\def\infochapter{\parsearg\chapterzzz} -\def\infosection{\parsearg\sectionzzz} -\def\infosubsection{\parsearg\subsectionzzz} -\def\infosubsubsection{\parsearg\subsubsectionzzz} - % These macros control what the section commands do, according % to what kind of chapter we are in (ordinary, appendix, or unnumbered). % Define them by default for a numbered chapter. -\global\let\section = \numberedsec -\global\let\subsection = \numberedsubsec -\global\let\subsubsection = \numberedsubsubsec +\let\section = \numberedsec +\let\subsection = \numberedsubsec +\let\subsubsection = \numberedsubsubsec % Define @majorheading, @heading and @subheading @@ -4023,23 +4140,27 @@ % if justification is not attempted. Hence \raggedright. -\def\majorheading{\parsearg\majorheadingzzz} -\def\majorheadingzzz #1{% +\def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% - {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\penalty 200} + \parsearg\chapheadingzzz +} -\def\chapheading{\parsearg\chapheadingzzz} -\def\chapheadingzzz #1{\chapbreak % +\def\chapheading{\chapbreak \parsearg\chapheadingzzz} +\def\chapheadingzzz#1{% {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\penalty 200} + \rm #1\hfill}}% + \bigskip \par\penalty 200\relax + \suppressfirstparagraphindent +} % @heading, @subheading, @subsubheading. -\def\heading{\parsearg\plainsecheading} -\def\subheading{\parsearg\plainsubsecheading} -\def\subsubheading{\parsearg\plainsubsubsecheading} +\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{} + \suppressfirstparagraphindent} +\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{} + \suppressfirstparagraphindent} +\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} + \suppressfirstparagraphindent} % These macros generate a chapter, section, etc. heading only % (including whitespace, linebreaking, etc. around it), @@ -4048,8 +4169,6 @@ %%% Args are the skip and penalty (usually negative) \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi} -\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} - %%% Define plain chapter starts, and page on/off switching for it % Parameter controlling skip before chapter headings (if needed) @@ -4072,7 +4191,7 @@ \global\let\pagealignmacro=\chappager \global\def\HEADINGSon{\HEADINGSsingle}} -\def\CHAPPAGodd{ +\def\CHAPPAGodd{% \global\let\contentsalignmacro = \chapoddpage \global\let\pchapsepmacro=\chapoddpage \global\let\pagealignmacro=\chapoddpage @@ -4080,116 +4199,193 @@ \CHAPPAGon -\def\CHAPFplain{ -\global\let\chapmacro=\chfplain -\global\let\unnumbchapmacro=\unnchfplain -\global\let\centerchapmacro=\centerchfplain} - -% Plain chapter opening. -% #1 is the text, #2 the chapter number or empty if unnumbered. -\def\chfplain#1#2{% +% Chapter opening. +% +% #1 is the text, #2 is the section type (Ynumbered, Ynothing, +% Yappendix, Yomitfromtoc), #3 the chapter number. +% +% To test against our argument. +\def\Ynothingkeyword{Ynothing} +\def\Yomitfromtockeyword{Yomitfromtoc} +\def\Yappendixkeyword{Yappendix} +% +\def\chapmacro#1#2#3{% \pchapsepmacro {% \chapfonts \rm - \def\chapnum{#2}% - \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}% + % + % Have to define \thissection before calling \donoderef, because the + % xref code eventually uses it. On the other hand, it has to be called + % after \pchapsepmacro, or the headline will change too soon. + \gdef\thissection{#1}% + \gdef\thischaptername{#1}% + % + % Only insert the separating space if we have a chapter/appendix + % number, and don't print the unnumbered ``number''. + \def\temptype{#2}% + \ifx\temptype\Ynothingkeyword + \setbox0 = \hbox{}% + \def\toctype{unnchap}% + \def\thischapter{#1}% + \else\ifx\temptype\Yomitfromtockeyword + \setbox0 = \hbox{}% contents like unnumbered, but no toc entry + \def\toctype{omit}% + \xdef\thischapter{}% + \else\ifx\temptype\Yappendixkeyword + \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% + \def\toctype{app}% + % We don't substitute the actual chapter name into \thischapter + % because we don't want its macros evaluated now. And we don't + % use \thissection because that changes with each section. + % + \xdef\thischapter{\putwordAppendix{} \appendixletter: + \noexpand\thischaptername}% + \else + \setbox0 = \hbox{#3\enspace}% + \def\toctype{numchap}% + \xdef\thischapter{\putwordChapter{} \the\chapno: + \noexpand\thischaptername}% + \fi\fi\fi + % + % Write the toc entry for this chapter. Must come before the + % \donoderef, because we include the current node name in the toc + % entry, and \donoderef resets it to empty. + \writetocentry{\toctype}{#1}{#3}% + % + % For pdftex, we have to write out the node definition (aka, make + % the pdfdest) after any page break, but before the actual text has + % been typeset. If the destination for the pdf outline is after the + % text, then jumping from the outline may wind up with the text not + % being visible, for instance under high magnification. + \donoderef{#2}% + % + % Typeset the actual heading. \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright - \hangindent = \wd0 \centerparametersmaybe + \hangindent=\wd0 \centerparametersmaybe \unhbox0 #1\par}% }% \nobreak\bigskip % no page break after a chapter title \nobreak } -% Plain opening for unnumbered. -\def\unnchfplain#1{\chfplain{#1}{}} - % @centerchap -- centered and unnumbered. \let\centerparametersmaybe = \relax -\def\centerchfplain#1{{% - \def\centerparametersmaybe{% - \advance\rightskip by 3\rightskip - \leftskip = \rightskip - \parfillskip = 0pt - }% - \chfplain{#1}{}% -}} +\def\centerparameters{% + \advance\rightskip by 3\rightskip + \leftskip = \rightskip + \parfillskip = 0pt +} -\CHAPFplain % The default +% I don't think this chapter style is supported any more, so I'm not +% updating it with the new noderef stuff. We'll see. --karl, 11aug03. +% +\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} +% \def\unnchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright \rm #1\hfill}}\bigskip \par\nobreak } - \def\chfopen #1#2{\chapoddpage {\chapfonts \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% \par\penalty 5000 % } - \def\centerchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt \hfill {\rm #1}\hfill}}\bigskip \par\nobreak } +\def\CHAPFopen{% + \global\let\chapmacro=\chfopen + \global\let\centerchapmacro=\centerchfopen} -\def\CHAPFopen{ -\global\let\chapmacro=\chfopen -\global\let\unnumbchapmacro=\unnchfopen -\global\let\centerchapmacro=\centerchfopen} - -% Section titles. +% Section titles. These macros combine the section number parts and +% call the generic \sectionheading to do the printing. +% \newskip\secheadingskip -\def\secheadingbreak{\dobreak \secheadingskip {-1000}} -\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}} -\def\plainsecheading#1{\sectionheading{sec}{}{#1}} +\def\secheadingbreak{\dobreak \secheadingskip{-1000}} % Subsection titles. -\newskip \subsecheadingskip -\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}} -\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}} -\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}} +\newskip\subsecheadingskip +\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}} % Subsubsection titles. -\let\subsubsecheadingskip = \subsecheadingskip -\let\subsubsecheadingbreak = \subsecheadingbreak -\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}} -\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}} +\def\subsubsecheadingskip{\subsecheadingskip} +\def\subsubsecheadingbreak{\subsecheadingbreak} -% Print any size section title. +% Print any size, any type, section title. % -% #1 is the section type (sec/subsec/subsubsec), #2 is the section -% number (maybe empty), #3 the text. -\def\sectionheading#1#2#3{% - {% - \expandafter\advance\csname #1headingskip\endcsname by \parskip - \csname #1headingbreak\endcsname - }% +% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is +% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the +% section number. +% +\def\sectionheading#1#2#3#4{% {% % Switch to the right set of fonts. - \csname #1fonts\endcsname \rm + \csname #2fonts\endcsname \rm + % + % Insert space above the heading. + \csname #2headingbreak\endcsname % - % Only insert the separating space if we have a section number. - \def\secnum{#2}% - \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}% + % Only insert the space after the number if we have a section number. + \def\sectionlevel{#2}% + \def\temptype{#3}% + % + \ifx\temptype\Ynothingkeyword + \setbox0 = \hbox{}% + \def\toctype{unn}% + \gdef\thissection{#1}% + \else\ifx\temptype\Yomitfromtockeyword + % for @headings -- no section number, don't include in toc, + % and don't redefine \thissection. + \setbox0 = \hbox{}% + \def\toctype{omit}% + \let\sectionlevel=\empty + \else\ifx\temptype\Yappendixkeyword + \setbox0 = \hbox{#4\enspace}% + \def\toctype{app}% + \gdef\thissection{#1}% + \else + \setbox0 = \hbox{#4\enspace}% + \def\toctype{num}% + \gdef\thissection{#1}% + \fi\fi\fi + % + % Write the toc entry (before \donoderef). See comments in \chfplain. + \writetocentry{\toctype\sectionlevel}{#1}{#4}% + % + % Write the node reference (= pdf destination for pdftex). + % Again, see comments in \chfplain. + \donoderef{#3}% % + % Output the actual section heading. \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright - \hangindent = \wd0 % zero if no section number - \unhbox0 #3}% + \hangindent=\wd0 % zero if no section number + \unhbox0 #1}% }% - % Add extra space after the heading -- either a line space or a - % paragraph space, whichever is more. (Some people like to set - % \parskip to large values for some reason.) Don't allow stretch, though. - \nobreak - \ifdim\parskip>\normalbaselineskip - \kern\parskip - \else - \kern\normalbaselineskip - \fi + % Add extra space after the heading -- half of whatever came above it. + % Don't allow stretch, though. + \kern .5 \csname #2headingskip\endcsname + % + % Do not let the kern be a potential breakpoint, as it would be if it + % was followed by glue. \nobreak + % + % We'll almost certainly start a paragraph next, so don't let that + % glue accumulate. (Not a breakpoint because it's preceded by a + % discardable item.) + \vskip-\parskip + % + % This is purely so the last item on the list is a known \penalty > + % 10000. This is so \startdefun can avoid allowing breakpoints after + % section headings. Otherwise, it would insert a valid breakpoint between: + % + % @section sec-whatever + % @deffn def-whatever + \penalty 10001 } @@ -4198,119 +4394,152 @@ \newwrite\tocfile % Write an entry to the toc file, opening it if necessary. -% Called from @chapter, etc. We supply {\folio} at the end of the -% argument, which will end up as the last argument to the \...entry macro. +% Called from @chapter, etc. +% +% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} +% We append the current node name (if any) and page number as additional +% arguments for the \{chap,sec,...}entry macros which will eventually +% read this. The node name is used in the pdf outlines as the +% destination to jump to. % -% Usage: \writetocentry{chap}{The Name of The Game}{{\the\chapno}} % We open the .toc file for writing here instead of at @setfilename (or % any other fixed time) so that @contents can be anywhere in the document. +% But if #1 is `omit', then we don't do anything. This is used for the +% table of contents chapter openings themselves. % \newif\iftocfileopened +\def\omitkeyword{omit}% +% \def\writetocentry#1#2#3{% - \iftocfileopened\else - \immediate\openout\tocfile = \jobname.toc - \global\tocfileopenedtrue - \fi - % - \iflinks - \toks0 = {#2}% - \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}#3{\folio}}}% - \temp + \edef\writetoctype{#1}% + \ifx\writetoctype\omitkeyword \else + \iftocfileopened\else + \immediate\openout\tocfile = \jobname.toc + \global\tocfileopenedtrue + \fi + % + \iflinks + \toks0 = {#2}% + \toks2 = \expandafter{\lastnode}% + \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}% + {\the\toks2}{\noexpand\folio}}}% + \temp + \fi \fi % - % Tell \shipout to create a page destination if we're doing pdf, which - % will be the target of the links in the table of contents. We can't - % just do it on every page because the title pages are numbered 1 and - % 2 (the page numbers aren't printed), and so are the first two pages - % of the document. Thus, we'd have two destinations named `1', and - % two named `2'. - \ifpdf \pdfmakepagedesttrue \fi + % Tell \shipout to create a pdf destination on each page, if we're + % writing pdf. These are used in the table of contents. We can't + % just write one on every page because the title pages are numbered + % 1 and 2 (the page numbers aren't printed), and so are the first + % two pages of the document. Thus, we'd have two destinations named + % `1', and two named `2'. + \ifpdf \global\pdfmakepagedesttrue \fi } \newskip\contentsrightmargin \contentsrightmargin=1in \newcount\savepageno \newcount\lastnegativepageno \lastnegativepageno = -1 -% Finish up the main text and prepare to read what we've written -% to \tocfile. +% Prepare to read what we've written to \tocfile. % \def\startcontents#1{% - % If @setchapternewpage on, and @headings double, the contents should - % start on an odd page, unlike chapters. Thus, we maintain - % \contentsalignmacro in parallel with \pagealignmacro. - % From: Torbjorn Granlund - \contentsalignmacro - \immediate\closeout\tocfile - % - % Don't need to put `Contents' or `Short Contents' in the headline. - % It is abundantly clear what they are. - \unnumbchapmacro{#1}\def\thischapter{}% - \savepageno = \pageno - \begingroup % Set up to handle contents files properly. - \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 - % We can't do this, because then an actual ^ in a section - % title fails, e.g., @chapter ^ -- exponentiation. --karl, 9jul97. - %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi - \raggedbottom % Worry more about breakpoints than the bottom. - \advance\hsize by -\contentsrightmargin % Don't use the full line length. - % - % Roman numerals for page numbers. - \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi + % If @setchapternewpage on, and @headings double, the contents should + % start on an odd page, unlike chapters. Thus, we maintain + % \contentsalignmacro in parallel with \pagealignmacro. + % From: Torbjorn Granlund + \contentsalignmacro + \immediate\closeout\tocfile + % + % Don't need to put `Contents' or `Short Contents' in the headline. + % It is abundantly clear what they are. + \def\thischapter{}% + \chapmacro{#1}{Yomitfromtoc}{}% + % + \savepageno = \pageno + \begingroup % Set up to handle contents files properly. + \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 + % We can't do this, because then an actual ^ in a section + % title fails, e.g., @chapter ^ -- exponentiation. --karl, 9jul97. + %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi + \raggedbottom % Worry more about breakpoints than the bottom. + \advance\hsize by -\contentsrightmargin % Don't use the full line length. + % + % Roman numerals for page numbers. + \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi } % Normal (long) toc. \def\contents{% - \startcontents{\putwordTOC}% - \openin 1 \jobname.toc - \ifeof 1 \else - \closein 1 - \input \jobname.toc - \fi - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \pdfmakeoutlines - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno + \startcontents{\putwordTOC}% + \openin 1 \jobname.toc + \ifeof 1 \else + \input \jobname.toc + \fi + \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect + \ifeof 1 \else + \pdfmakeoutlines + \fi + \closein 1 + \endgroup + \lastnegativepageno = \pageno + \global\pageno = \savepageno } % And just the chapters. \def\summarycontents{% - \startcontents{\putwordShortTOC}% - % - \let\chapentry = \shortchapentry - \let\appendixentry = \shortappendixentry - \let\unnumbchapentry = \shortunnumberedentry - % We want a true roman here for the page numbers. - \secfonts - \let\rm=\shortcontrm \let\bf=\shortcontbf - \let\sl=\shortcontsl \let\tt=\shortconttt - \rm - \hyphenpenalty = 10000 - \advance\baselineskip by 1pt % Open it up a little. - \def\secentry ##1##2##3##4{} - \def\subsecentry ##1##2##3##4##5{} - \def\subsubsecentry ##1##2##3##4##5##6{} - \let\unnumbsecentry = \secentry - \let\unnumbsubsecentry = \subsecentry - \let\unnumbsubsubsecentry = \subsubsecentry - \openin 1 \jobname.toc - \ifeof 1 \else - \closein 1 - \input \jobname.toc - \fi - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno + \startcontents{\putwordShortTOC}% + % + \let\numchapentry = \shortchapentry + \let\appentry = \shortchapentry + \let\unnchapentry = \shortunnchapentry + % We want a true roman here for the page numbers. + \secfonts + \let\rm=\shortcontrm \let\bf=\shortcontbf + \let\sl=\shortcontsl \let\tt=\shortconttt + \rm + \hyphenpenalty = 10000 + \advance\baselineskip by 1pt % Open it up a little. + \def\numsecentry##1##2##3##4{} + \let\appsecentry = \numsecentry + \let\unnsecentry = \numsecentry + \let\numsubsecentry = \numsecentry + \let\appsubsecentry = \numsecentry + \let\unnsubsecentry = \numsecentry + \let\numsubsubsecentry = \numsecentry + \let\appsubsubsecentry = \numsecentry + \let\unnsubsubsecentry = \numsecentry + \openin 1 \jobname.toc + \ifeof 1 \else + \input \jobname.toc + \fi + \closein 1 + \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect + \endgroup + \lastnegativepageno = \pageno + \global\pageno = \savepageno } \let\shortcontents = \summarycontents -\ifpdf - \pdfcatalog{/PageMode /UseOutlines}% -\fi +% Typeset the label for a chapter or appendix for the short contents. +% The arg is, e.g., `A' for an appendix, or `3' for a chapter. +% +\def\shortchaplabel#1{% + % This space should be enough, since a single number is .5em, and the + % widest letter (M) is 1em, at least in the Computer Modern fonts. + % But use \hss just in case. + % (This space doesn't include the extra space that gets added after + % the label; that gets put in by \shortchapentry above.) + % + % We'd like to right-justify chapter numbers, but that looks strange + % with appendix letters. And right-justifying numbers and + % left-justifying letters looks strange when there is less than 10 + % chapters. Have to read the whole toc once to know how many chapters + % there are before deciding ... + \hbox to 1em{#1\hss}% +} % These macros generate individual entries in the table of contents. % The first argument is the chapter or section name. @@ -4318,58 +4547,46 @@ % The arguments in between are the chapter number, section number, ... % Chapters, in the main contents. -\def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}} +\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} % % Chapters, in the short toc. % See comments in \dochapentry re vbox and related settings. -\def\shortchapentry#1#2#3{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}% +\def\shortchapentry#1#2#3#4{% + \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% } % Appendices, in the main contents. -\def\appendixentry#1#2#3{% - \dochapentry{\appendixbox{\putwordAppendix{} #2}\labelspace#1}{#3}} -% -% Appendices, in the short toc. -\let\shortappendixentry = \shortchapentry - -% Typeset the label for a chapter or appendix for the short contents. -% The arg is, e.g., `Appendix A' for an appendix, or `3' for a chapter. -% We could simplify the code here by writing out an \appendixentry -% command in the toc file for appendices, instead of using \chapentry -% for both, but it doesn't seem worth it. +% Need the word Appendix, and a fixed-size box. % -\newdimen\shortappendixwidth +\def\appendixbox#1{% + % We use M since it's probably the widest letter. + \setbox0 = \hbox{\putwordAppendix{} M}% + \hbox to \wd0{\putwordAppendix{} #1\hss}} % -\def\shortchaplabel#1{% - % This space should be enough, since a single number is .5em, and the - % widest letter (M) is 1em, at least in the Computer Modern fonts. - % But use \hss just in case. - % (This space doesn't include the extra space that gets added after - % the label; that gets put in by \shortchapentry above.) - \dimen0 = 1em - \hbox to \dimen0{#1\hss}% -} +\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}} % Unnumbered chapters. -\def\unnumbchapentry#1#2#3{\dochapentry{#1}{#3}} -\def\shortunnumberedentry#1#2#3{\tocentry{#1}{\doshortpageno\bgroup#3\egroup}} +\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} +\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} % Sections. -\def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}} -\def\unnumbsecentry#1#2#3#4{\dosecentry{#1}{#4}} +\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} +\let\appsecentry=\numsecentry +\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} % Subsections. -\def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}} -\def\unnumbsubsecentry#1#2#3#4#5{\dosubsecentry{#1}{#5}} +\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} +\let\appsubsecentry=\numsubsecentry +\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} % And subsubsections. -\def\subsubsecentry#1#2#3#4#5#6{% - \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}} -\def\unnumbsubsubsecentry#1#2#3#4#5#6{\dosubsubsecentry{#1}{#6}} +\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} +\let\appsubsubsecentry=\numsubsubsecentry +\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} % This parameter controls the indentation of the various levels. -\newdimen\tocindent \tocindent = 3pc +% Same as \defaultparindent. +\newdimen\tocindent \tocindent = 15pt % Now for the actual typesetting. In all these, #1 is the text and #2 is the % page number. @@ -4400,17 +4617,8 @@ \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} -% Final typesetting of a toc entry; we use the same \entry macro as for -% the index entries, but we want to suppress hyphenation here. (We -% can't do that in the \entry macro, since index entries might consist -% of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.) -\def\tocentry#1#2{\begingroup - \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks - % Do not use \turnoffactive in these arguments. Since the toc is - % typeset in cmr, characters such as _ would come out wrong; we - % have to do the usual translation tricks. - \entry{#1}{#2}% -\endgroup} +% We use the same \entry macro as for the index entries. +\let\tocentry = \entry % Space between chapter (or whatever) number and the title. \def\labelspace{\hskip1em \relax} @@ -4420,8 +4628,8 @@ \def\chapentryfonts{\secfonts \rm} \def\secentryfonts{\textfonts} -\let\subsecentryfonts = \textfonts -\let\subsubsecentryfonts = \textfonts +\def\subsecentryfonts{\textfonts} +\def\subsubsecentryfonts{\textfonts} \message{environments,} @@ -4448,10 +4656,10 @@ % The text. (`r' is open on the right, `e' somewhat less so on the left.) \setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt} % -\global\setbox\errorbox=\hbox to \dimen0{\hfil +\setbox\errorbox=\hbox to \dimen0{\hfil \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. \advance\hsize by -2\dimen2 % Rules. - \vbox{ + \vbox{% \hrule height\dimen2 \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. @@ -4465,14 +4673,13 @@ % One exception: @ is still an escape character, so that @end tex works. % But \@ or @@ will get a plain tex @ character. -\def\tex{\begingroup +\envdef\tex{% \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie \catcode `\%=14 \catcode `\+=\other \catcode `\"=\other - \catcode `\==\other \catcode `\|=\other \catcode `\<=\other \catcode `\>=\other @@ -4488,6 +4695,7 @@ \let\!=\ptexexclam \let\i=\ptexi \let\indent=\ptexindent + \let\noindent=\ptexnoindent \let\{=\ptexlbrace \let\+=\tabalign \let\}=\ptexrbrace @@ -4498,10 +4706,11 @@ \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}% \def\@{@}% -\let\Etex=\endgroup} +} +% There is no need to define \Etex. % Define @lisp ... @end lisp. -% @lisp does a \begingroup so it can rebind things, +% @lisp environment forms a group so it can rebind things, % including the definition of @end lisp (which normally is erroneous). % Amount to narrow the margins by for @lisp. @@ -4512,19 +4721,6 @@ % have any width. \def\lisppar{\null\endgraf} -% Make each space character in the input produce a normal interword -% space in the output. Don't allow a line break at this space, as this -% is used only in environments like @example, where each line of input -% should produce a line of output anyway. -% -{\obeyspaces % -\gdef\sepspaces{\obeyspaces\let =\tie}} - -% Define \obeyedspace to be our active space, whatever it is. This is -% for use in \parsearg. -{\sepspaces% -\global\let\obeyedspace= } - % This space is always present above and below environments. \newskip\envskipamount \envskipamount = 0pt @@ -4534,7 +4730,8 @@ % start of the next paragraph will insert \parskip. % \def\aboveenvbreak{{% - % =10000 instead of <10000 because of a special case in \itemzzz, q.v. + % =10000 instead of <10000 because of a special case in \itemzzz and + % \sectionheading, q.v. \ifnum \lastpenalty=10000 \else \advance\envskipamount by \parskip \endgraf @@ -4542,7 +4739,7 @@ \removelastskip % it's not a good place to break if the last penalty was \nobreak % or better ... - \ifnum\lastpenalty>10000 \else \penalty-50 \fi + \ifnum\lastpenalty<10000 \penalty-50 \fi \vskip\envskipamount \fi \fi @@ -4574,52 +4771,52 @@ % \newskip\lskip\newskip\rskip -\def\cartouche{% -\par % can't be in the midst of a paragraph. -\begingroup - \lskip=\leftskip \rskip=\rightskip - \leftskip=0pt\rightskip=0pt %we want these *outside*. - \cartinner=\hsize \advance\cartinner by-\lskip - \advance\cartinner by-\rskip - \cartouter=\hsize - \advance\cartouter by 18.4pt % allow for 3pt kerns on either -% side, and for 6pt waste from -% each corner char, and rule thickness - \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip - % Flag to tell @lisp, etc., not to narrow margin. - \let\nonarrowing=\comment - \vbox\bgroup - \baselineskip=0pt\parskip=0pt\lineskip=0pt - \carttop - \hbox\bgroup - \hskip\lskip - \vrule\kern3pt - \vbox\bgroup - \hsize=\cartinner - \kern3pt - \begingroup - \baselineskip=\normbskip - \lineskip=\normlskip - \parskip=\normpskip - \vskip -\parskip +\envdef\cartouche{% + \ifhmode\par\fi % can't be in the midst of a paragraph. + \startsavinginserts + \lskip=\leftskip \rskip=\rightskip + \leftskip=0pt\rightskip=0pt % we want these *outside*. + \cartinner=\hsize \advance\cartinner by-\lskip + \advance\cartinner by-\rskip + \cartouter=\hsize + \advance\cartouter by 18.4pt % allow for 3pt kerns on either + % side, and for 6pt waste from + % each corner char, and rule thickness + \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip + % Flag to tell @lisp, etc., not to narrow margin. + \let\nonarrowing=\comment + \vbox\bgroup + \baselineskip=0pt\parskip=0pt\lineskip=0pt + \carttop + \hbox\bgroup + \hskip\lskip + \vrule\kern3pt + \vbox\bgroup + \kern3pt + \hsize=\cartinner + \baselineskip=\normbskip + \lineskip=\normlskip + \parskip=\normpskip + \vskip -\parskip + \comment % For explanation, see the end of \def\group. +} \def\Ecartouche{% - \endgroup - \kern3pt - \egroup - \kern3pt\vrule - \hskip\rskip - \egroup - \cartbot - \egroup -\endgroup -}} + \ifhmode\par\fi + \kern3pt + \egroup + \kern3pt\vrule + \hskip\rskip + \egroup + \cartbot + \egroup + \checkinserts +} % This macro is called at the beginning of all the @example variants, % inside a group. \def\nonfillstart{% \aboveenvbreak - \inENV % This group ends at the end of the body \hfuzz = 12pt % Don't be fussy \sepspaces % Make spaces be word-separators rather than space tokens. \let\par = \lisppar % don't ignore blank lines @@ -4632,103 +4829,99 @@ \ifx\nonarrowing\relax \advance \leftskip by \lispnarrowing \exdentamount=\lispnarrowing - \let\exdent=\nofillexdent - \let\nonarrowing=\relax \fi + \let\exdent=\nofillexdent } -% Define the \E... control sequence only if we are inside the particular -% environment, so the error checking in \end will work. -% -% To end an @example-like environment, we first end the paragraph (via -% \afterenvbreak's vertical glue), and then the group. That way we keep -% the zero \parskip that the environments set -- \parskip glue will be -% inserted at the beginning of the next paragraph in the document, after -% the environment. +% If you want all examples etc. small: @set dispenvsize small. +% If you want even small examples the full size: @set dispenvsize nosmall. +% This affects the following displayed environments: +% @example, @display, @format, @lisp % -\def\nonfillfinish{\afterenvbreak\endgroup} +\def\smallword{small} +\def\nosmallword{nosmall} +\let\SETdispenvsize\relax +\def\setnormaldispenv{% + \ifx\SETdispenvsize\smallword + \smallexamplefonts \rm + \fi +} +\def\setsmalldispenv{% + \ifx\SETdispenvsize\nosmallword + \else + \smallexamplefonts \rm + \fi +} -% @lisp: indented, narrowed, typewriter font. -\def\lisp{\begingroup - \nonfillstart - \let\Elisp = \nonfillfinish - \tt - \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. - \gobble % eat return +% We often define two environments, @foo and @smallfoo. +% Let's do it by one command: +\def\makedispenv #1#2{ + \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2} + \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2} + \expandafter\let\csname E#1\endcsname \afterenvbreak + \expandafter\let\csname Esmall#1\endcsname \afterenvbreak } -% @example: Same as @lisp. -\def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp} +% Define two synonyms: +\def\maketwodispenvs #1#2#3{ + \makedispenv{#1}{#3} + \makedispenv{#2}{#3} +} +% @lisp: indented, narrowed, typewriter font; @example: same as @lisp. +% % @smallexample and @smalllisp: use smaller fonts. % Originally contributed by Pavel@xerox. -\def\smalllisp{\begingroup - \def\Esmalllisp{\nonfillfinish\endgroup}% - \def\Esmallexample{\nonfillfinish\endgroup}% - \smallexamplefonts - \lisp +% +\maketwodispenvs {lisp}{example}{% + \nonfillstart + \tt + \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. + \gobble % eat return } -\let\smallexample = \smalllisp - -% @display: same as @lisp except keep current font. +% @display/@smalldisplay: same as @lisp except keep current font. % -\def\display{\begingroup +\makedispenv {display}{% \nonfillstart - \let\Edisplay = \nonfillfinish \gobble } -% -% @smalldisplay: @display plus smaller fonts. -% -\def\smalldisplay{\begingroup - \def\Esmalldisplay{\nonfillfinish\endgroup}% - \smallexamplefonts \rm - \display -} -% @format: same as @display except don't narrow margins. +% @format/@smallformat: same as @display except don't narrow margins. % -\def\format{\begingroup - \let\nonarrowing = t +\makedispenv{format}{% + \let\nonarrowing = t% \nonfillstart - \let\Eformat = \nonfillfinish \gobble } -% -% @smallformat: @format plus smaller fonts. -% -\def\smallformat{\begingroup - \def\Esmallformat{\nonfillfinish\endgroup}% - \smallexamplefonts \rm - \format -} -% @flushleft (same as @format). -% -\def\flushleft{\begingroup \def\Eflushleft{\nonfillfinish\endgroup}\format} +% @flushleft: same as @format, but doesn't obey \SETdispenvsize. +\envdef\flushleft{% + \let\nonarrowing = t% + \nonfillstart + \gobble +} +\let\Eflushleft = \afterenvbreak % @flushright. % -\def\flushright{\begingroup - \let\nonarrowing = t +\envdef\flushright{% + \let\nonarrowing = t% \nonfillstart - \let\Eflushright = \nonfillfinish \advance\leftskip by 0pt plus 1fill \gobble } +\let\Eflushright = \afterenvbreak % @quotation does normal linebreaking (hence we can't use \nonfillstart) -% and narrows the margins. +% and narrows the margins. We keep \parskip nonzero in general, since +% we're doing normal filling. So, when using \aboveenvbreak and +% \afterenvbreak, temporarily make \parskip 0. % -\def\quotation{% - \begingroup\inENV %This group ends at the end of the @quotation body +\envdef\quotation{% {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip \parindent=0pt - % We have retained a nonzero parskip for the environment, since we're - % doing normal filling. So to avoid extra space below the environment... - \def\Equotation{\parskip = 0pt \nonfillfinish}% % % @cartouche defines \nonarrowing to inhibit narrowing at next level down. \ifx\nonarrowing\relax @@ -4737,6 +4930,27 @@ \exdentamount = \lispnarrowing \let\nonarrowing = \relax \fi + \parsearg\quotationlabel +} + +% We have retained a nonzero parskip for the environment, since we're +% doing normal filling. +% +\def\Equotation{% + \par + \ifx\quotationauthor\undefined\else + % indent a bit. + \leftline{\kern 2\leftskip \sl ---\quotationauthor}% + \fi + {\parskip=0pt \afterenvbreak}% +} + +% If we're given an argument, typeset it in bold with a colon after. +\def\quotationlabel#1{% + \def\temp{#1}% + \ifx\temp\empty \else + {\bf #1: }% + \fi } @@ -4758,7 +4972,7 @@ % % [Knuth] p. 380 \def\uncatcodespecials{% - \def\do##1{\catcode`##1=12}\dospecials} + \def\do##1{\catcode`##1=\other}\dospecials} % % [Knuth] pp. 380,381,391 % Disable Spanish ligatures ?` and !` of \tt font @@ -4806,6 +5020,8 @@ } \endgroup \def\setupverbatim{% + \nonfillstart + \advance\leftskip by -\defbodyindent % Easiest (and conventionally used) font for verbatim \tt \def\par{\leavevmode\egroup\box0\endgraf}% @@ -4827,7 +5043,7 @@ % % [Knuth] p. 382; only eat outer {} \begingroup - \catcode`[=1\catcode`]=2\catcode`\{=12\catcode`\}=12 + \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next] \endgroup % @@ -4844,13 +5060,6 @@ % we need not redefine '\', '{' and '}'. % % Inspired by LaTeX's verbatim command set [latex.ltx] -%% Include LaTeX hack for completeness -- never know -%% \begingroup -%% \catcode`|=0 \catcode`[=1 -%% \catcode`]=2\catcode`\{=12\catcode`\}=12\catcode`\ =\active -%% \catcode`\\=12|gdef|doverbatim#1@end verbatim[ -%% #1|endgroup|def|Everbatim[]|end[verbatim]] -%% |endgroup % \begingroup \catcode`\ =\active @@ -4858,54 +5067,32 @@ % ignore everything up to the first ^^M, that's the newline at the end % of the @verbatim input line itself. Otherwise we get an extra blank % line in the output. - \gdef\doverbatim#1^^M#2@end verbatim{#2\end{verbatim}}% + \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% + % We really want {...\end verbatim} in the body of the macro, but + % without the active space; thus we have to use \xdef and \gobble. \endgroup % -\def\verbatim{% - \def\Everbatim{\nonfillfinish\endgroup}% - \begingroup - \nonfillstart - \advance\leftskip by -\defbodyindent - \begingroup\setupverbatim\doverbatim +\envdef\verbatim{% + \setupverbatim\doverbatim } +\let\Everbatim = \afterenvbreak + % @verbatiminclude FILE - insert text of file in verbatim environment. % -% Allow normal characters that we make active in the argument (a file name). -\def\verbatiminclude{% - \begingroup - \catcode`\\=\other - \catcode`~=\other - \catcode`^=\other - \catcode`_=\other - \catcode`|=\other - \catcode`<=\other - \catcode`>=\other - \catcode`+=\other - \parsearg\doverbatiminclude -} -\def\setupverbatiminclude{% - \begingroup - \nonfillstart - \advance\leftskip by -\defbodyindent - \begingroup\setupverbatim -} +\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude} % \def\doverbatiminclude#1{% - % Restore active chars for included file. - \endgroup - \begingroup - \let\value=\expandablevalue - \def\thisfile{#1}% - \expandafter\expandafter\setupverbatiminclude\input\thisfile - \endgroup - \nonfillfinish - \endgroup + {% + \makevalueexpandable + \setupverbatim + \input #1 + \afterenvbreak + }% } % @copying ... @end copying. -% Save the text away for @insertcopying later. Many commands won't be -% allowed in this context, but that's ok. +% Save the text away for @insertcopying later. % % We save the uninterpreted tokens, rather than creating a box. % Saving the text in a box would be much easier, but then all the @@ -4914,670 +5101,392 @@ % file; b) letting users define the frontmatter in as flexible order as % possible is very desirable. % -\def\copying{\begingroup - % Define a command to swallow text until we reach `@end copying'. - % \ is the escape char in this texinfo.tex file, so it is the - % delimiter for the command; @ will be the escape char when we read - % it, but that doesn't matter. - \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}% - % - % We must preserve ^^M's in the input file; see \insertcopying below. - \catcode`\^^M = \active - \docopying -} - -% What we do to finish off the copying text. -% -\def\enddocopying{\endgroup\ignorespaces} - -% @insertcopying. Here we must play games with ^^M's. On the one hand, -% we need them to delimit commands such as `@end quotation', so they -% must be active. On the other hand, we certainly don't want every -% end-of-line to be a \par, as would happen with the normal active -% definition of ^^M. On the third hand, two ^^M's in a row should still -% generate a \par. -% -% Our approach is to make ^^M insert a space and a penalty1 normally; -% then it can also check if \lastpenalty=1. If it does, then manually -% do \par. -% -% This messes up the normal definitions of @c[omment], so we redefine -% it. Similarly for @ignore. (These commands are used in the gcc -% manual for man page generation.) -% -% Seems pretty fragile, most line-oriented commands will presumably -% fail, but for the limited use of getting the copying text (which -% should be quite simple) inserted, we can hope it's ok. -% -{\catcode`\^^M=\active % -\gdef\insertcopying{\begingroup % - \parindent = 0pt % looks wrong on title page - \def^^M{% - \ifnum \lastpenalty=1 % - \par % - \else % - \space \penalty 1 % - \fi % - }% - % - % Fix @c[omment] for catcode 13 ^^M's. - \def\c##1^^M{\ignorespaces}% - \let\comment = \c % - % - % Don't bother jumping through all the hoops that \doignore does, it - % would be very hard since the catcodes are already set. - \long\def\ignore##1\end ignore{\ignorespaces}% - % - \copyingtext % -\endgroup}% +\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} +\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} +% +\def\insertcopying{% + \begingroup + \parindent = 0pt % paragraph indentation looks wrong on title page + \scanexp\copyingtext + \endgroup } \message{defuns,} % @defun etc. -% Allow user to change definition object font (\df) internally -\def\setdeffont#1 {\csname DEF#1\endcsname} - \newskip\defbodyindent \defbodyindent=.4in \newskip\defargsindent \defargsindent=50pt \newskip\deflastargmargin \deflastargmargin=18pt -\newcount\parencount - -% We want ()&[] to print specially on the defun line. -% -\def\activeparens{% - \catcode`\(=\active \catcode`\)=\active - \catcode`\&=\active - \catcode`\[=\active \catcode`\]=\active -} - -% Make control sequences which act like normal parenthesis chars. -\let\lparen = ( \let\rparen = ) - -{\activeparens % Now, smart parens don't turn on until &foo (see \amprm) - -% Be sure that we always have a definition for `(', etc. For example, -% if the fn name has parens in it, \boldbrax will not be in effect yet, -% so TeX would otherwise complain about undefined control sequence. -\global\let(=\lparen \global\let)=\rparen -\global\let[=\lbrack \global\let]=\rbrack - -\gdef\functionparens{\boldbrax\let&=\amprm\parencount=0 } -\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} -% This is used to turn on special parens -% but make & act ordinary (given that it's active). -\gdef\boldbraxnoamp{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb\let&=\ampnr} - -% Definitions of (, ) and & used in args for functions. -% This is the definition of ( outside of all parentheses. -\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested - \global\advance\parencount by 1 -} -% -% This is the definition of ( when already inside a level of parens. -\gdef\opnested{\char`\(\global\advance\parencount by 1 } -% -\gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0. - % also in that case restore the outer-level definition of (. - \ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi - \global\advance \parencount by -1 } -% If we encounter &foo, then turn on ()-hacking afterwards -\gdef\amprm#1 {{\rm\}\let(=\oprm \let)=\clrm\ } -% -\gdef\normalparens{\boldbrax\let&=\ampnr} -} % End of definition inside \activeparens -%% These parens (in \boldbrax) actually are a little bolder than the -%% contained text. This is especially needed for [ and ] -\def\opnr{{\sf\char`\(}\global\advance\parencount by 1 } -\def\clnr{{\sf\char`\)}\global\advance\parencount by -1 } -\let\ampnr = \& -\def\lbrb{{\bf\char`\[}} -\def\rbrb{{\bf\char`\]}} - -% Active &'s sneak into the index arguments, so make sure it's defined. -{ - \catcode`& = \active - \global\let& = \ampnr -} - -% \defname, which formats the name of the @def (not the args). -% #1 is the function name. -% #2 is the type of definition, such as "Function". -% -\def\defname#1#2{% - % How we'll output the type name. Putting it in brackets helps - % distinguish it from the body text that may end up on the next line - % just below it. - \ifempty{#2}% - \def\defnametype{}% +% Start the processing of @deffn: +\def\startdefun{% + \ifnum\lastpenalty<10000 + \medbreak \else - \def\defnametype{[\rm #2]}% + % If there are two @def commands in a row, we'll have a \nobreak, + % which is there to keep the function description together with its + % header. But if there's nothing but headers, we need to allow a + % break somewhere. Check specifically for penalty 10002, inserted + % by \defargscommonending, instead of 10000, since the sectioning + % commands also insert a nobreak penalty, and we don't want to allow + % a break between a section heading and a defun. + % + \ifnum\lastpenalty=10002 \penalty2000 \fi + % + % Similarly, after a section heading, do not allow a break. + % But do insert the glue. + \medskip % preceded by discardable penalty, so not a breakpoint \fi % - % Get the values of \leftskip and \rightskip as they were outside the @def... - \dimen2=\leftskip - \advance\dimen2 by -\defbodyindent - % - % Figure out values for the paragraph shape. - \setbox0=\hbox{\hskip \deflastargmargin{\defnametype}}% - \dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line - \dimen1=\hsize \advance \dimen1 by -\defargsindent % size for continuations - \parshape 2 0in \dimen0 \defargsindent \dimen1 - % - % Output arg 2 ("Function" or some such) but stuck inside a box of - % width 0 so it does not interfere with linebreaking. - \noindent - % - {% Adjust \hsize to exclude the ambient margins, - % so that \rightline will obey them. - \advance \hsize by -\dimen2 - \dimen3 = 0pt % was -1.25pc - \rlap{\rightline{\defnametype\kern\dimen3}}% - }% - % - % Allow all lines to be underfull without complaint: - \tolerance=10000 \hbadness=10000 - \advance\leftskip by -\defbodyindent - \exdentamount=\defbodyindent - {\df #1}\enskip % output function name - % \defunargs will be called next to output the arguments, if any. -} - -% Common pieces to start any @def... -% #1 is the \E... control sequence to end the definition (which we define). -% #2 is the \...x control sequence (which our caller defines). -% #3 is the control sequence to process the header, such as \defunheader. -% -\def\parsebodycommon#1#2#3{% - \begingroup\inENV - % If there are two @def commands in a row, we'll have a \nobreak, - % which is there to keep the function description together with its - % header. But if there's nothing but headers, we want to allow a - % break after all. Check for penalty 10002 (inserted by - % \defargscommonending) instead of 10000, since the sectioning - % commands insert a \penalty10000, and we don't want to allow a break - % between a section heading and a defun. - \ifnum\lastpenalty=10002 \penalty0 \fi - \medbreak - % - % Define the \E... end token that this defining construct specifies - % so that it will exit this group. - \def#1{\endgraf\endgroup\medbreak}% - % \parindent=0in \advance\leftskip by \defbodyindent \exdentamount=\defbodyindent } -% Common part of the \...x definitions. -% -\def\defxbodycommon{% - % As with \parsebodycommon above, allow line break if we have multiple - % x headers in a row. It's not a great place, though. - \ifnum\lastpenalty=10000 \penalty1000 \fi +\def\dodefunx#1{% + % First, check whether we are in the right environment: + \checkenv#1% % - \begingroup\obeylines -} - -% Process body of @defun, @deffn, @defmac, etc. -% -\def\defparsebody#1#2#3{% - \parsebodycommon{#1}{#2}{#3}% - \def#2{\defxbodycommon \activeparens \spacesplit#3}% - \catcode\equalChar=\active - \begingroup\obeylines\activeparens - \spacesplit#3% -} - -% #1, #2, #3 are the common arguments (see \parsebodycommon above). -% #4, delimited by the space, is the class name. -% -\def\defmethparsebody#1#2#3#4 {% - \parsebodycommon{#1}{#2}{#3}% - \def#2##1 {\defxbodycommon \activeparens \spacesplit{#3{##1}}}% - \begingroup\obeylines\activeparens - % The \empty here prevents misinterpretation of a construct such as - % @deffn {whatever} {Enharmonic comma} - % See comments at \deftpparsebody, although in our case we don't have - % to remove the \empty afterwards, since it is empty. - \spacesplit{#3{#4}}\empty -} - -% Used for @deftypemethod and @deftypeivar. -% #1, #2, #3 are the common arguments (see \defparsebody). -% #4, delimited by a space, is the class name. -% #5 is the method's return type. -% -\def\deftypemethparsebody#1#2#3#4 #5 {% - \parsebodycommon{#1}{#2}{#3}% - \def#2##1 ##2 {\defxbodycommon \activeparens \spacesplit{#3{##1}{##2}}}% - \begingroup\obeylines\activeparens - \spacesplit{#3{#4}{#5}}% + % As above, allow line break if we have multiple x headers in a row. + % It's not a great place, though. + \ifnum\lastpenalty=10002 \penalty3000 \fi + % + % And now, it's time to reuse the body of the original defun: + \expandafter\gobbledefun#1% } +\def\gobbledefun#1\startdefun{} -% Used for @deftypeop. The change from \deftypemethparsebody is an -% extra argument at the beginning which is the `category', instead of it -% being the hardwired string `Method' or `Instance Variable'. We have -% to account for this both in the \...x definition and in parsing the -% input at hand. Thus also need a control sequence (passed as #5) for -% the \E... definition to assign the category name to. +% \printdefunline \deffnheader{text} % -\def\deftypeopparsebody#1#2#3#4#5 #6 {% - \parsebodycommon{#1}{#2}{#3}% - \def#2##1 ##2 ##3 {\def#4{##1}% - \defxbodycommon \activeparens \spacesplit{#3{##2}{##3}}}% - \begingroup\obeylines\activeparens - \spacesplit{#3{#5}{#6}}% +\def\printdefunline#1#2{% + \begingroup + % call \deffnheader: + #1#2 \endheader + % common ending: + \interlinepenalty = 10000 + \advance\rightskip by 0pt plus 1fil + \endgraf + \nobreak\vskip -\parskip + \penalty 10002 % signal to \startdefun and \dodefunx + % Some of the @defun-type tags do not enable magic parentheses, + % rendering the following check redundant. But we don't optimize. + \checkparencounts + \endgroup } -% For @defop. -\def\defopparsebody #1#2#3#4#5 {% - \parsebodycommon{#1}{#2}{#3}% - \def#2##1 ##2 {\def#4{##1}% - \defxbodycommon \activeparens \spacesplit{#3{##2}}}% - \begingroup\obeylines\activeparens - \spacesplit{#3{#5}}% -} +\def\Edefun{\endgraf\medbreak} -% These parsing functions are similar to the preceding ones -% except that they do not make parens into active characters. -% These are used for "variables" since they have no arguments. +% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; +% the only thing remainnig is to define \deffnheader. % -\def\defvarparsebody #1#2#3{% - \parsebodycommon{#1}{#2}{#3}% - \def#2{\defxbodycommon \spacesplit#3}% - \catcode\equalChar=\active - \begingroup\obeylines - \spacesplit#3% -} - -% @defopvar. -\def\defopvarparsebody #1#2#3#4#5 {% - \parsebodycommon{#1}{#2}{#3}% - \def#2##1 ##2 {\def#4{##1}% - \defxbodycommon \spacesplit{#3{##2}}}% - \begingroup\obeylines - \spacesplit{#3{#5}}% -} - -\def\defvrparsebody#1#2#3#4 {% - \parsebodycommon{#1}{#2}{#3}% - \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}% - \begingroup\obeylines - \spacesplit{#3{#4}}% +\def\makedefun#1{% + \expandafter\let\csname E#1\endcsname = \Edefun + \edef\temp{\noexpand\domakedefun + \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% + \temp } -% This loses on `@deftp {Data Type} {struct termios}' -- it thinks the -% type is just `struct', because we lose the braces in `{struct -% termios}' when \spacesplit reads its undelimited argument. Sigh. -% \let\deftpparsebody=\defvrparsebody +% \domakedefun \deffn \deffnx \deffnheader % -% So, to get around this, we put \empty in with the type name. That -% way, TeX won't find exactly `{...}' as an undelimited argument, and -% won't strip off the braces. +% Define \deffn and \deffnx, without parameters. +% \deffnheader has to be defined explicitly. % -\def\deftpparsebody #1#2#3#4 {% - \parsebodycommon{#1}{#2}{#3}% - \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}% - \begingroup\obeylines - \spacesplit{\parsetpheaderline{#3{#4}}}\empty +\def\domakedefun#1#2#3{% + \envdef#1{% + \startdefun + \parseargusing\activeparens{\printdefunline#3}% + }% + \def#2{\dodefunx#1}% + \def#3% } -% Fine, but then we have to eventually remove the \empty *and* the -% braces (if any). That's what this does. -% -\def\removeemptybraces\empty#1\relax{#1} - -% After \spacesplit has done its work, this is called -- #1 is the final -% thing to call, #2 the type name (which starts with \empty), and #3 -% (which might be empty) the arguments. -% -\def\parsetpheaderline#1#2#3{% - #1{\removeemptybraces#2\relax}{#3}% -}% +%%% Untyped functions: -% Split up #2 (the rest of the input line) at the first space token. -% call #1 with two arguments: -% the first is all of #2 before the space token, -% the second is all of #2 after that space token. -% If #2 contains no space token, all of it is passed as the first arg -% and the second is passed as empty. -% -{\obeylines % - \gdef\spacesplit#1#2^^M{\endgroup\spacesplitx{#1}#2 \relax\spacesplitx}% - \long\gdef\spacesplitx#1#2 #3#4\spacesplitx{% - \ifx\relax #3% - #1{#2}{}% - \else % - #1{#2}{#3#4}% - \fi}% -} +% @deffn category name args +\makedefun{deffn}{\deffngeneral{}} -% Define @defun. +% @deffn category class name args +\makedefun{defop}#1 {\defopon{#1\ \putwordon}} -% This is called to end the arguments processing for all the @def... commands. -% -\def\defargscommonending{% - \interlinepenalty = 10000 - \advance\rightskip by 0pt plus 1fil - \endgraf - \nobreak\vskip -\parskip - \penalty 10002 % signal to \parsebodycommon. -} +% \defopon {category on}class name args +\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } -% This expands the args and terminates the paragraph they comprise. +% \deffngeneral {subind}category name args % -\def\defunargs#1{\functionparens \sl -% Expand, preventing hyphenation at `-' chars. -% Note that groups don't affect changes in \hyphenchar. -% Set the font temporarily and use \font in case \setfont made \tensl a macro. -{\tensl\hyphenchar\font=0}% -#1% -{\tensl\hyphenchar\font=45}% -\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi% - \defargscommonending +\def\deffngeneral#1#2 #3 #4\endheader{% + % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. + \dosubind{fn}{\code{#3}}{#1}% + \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% } -\def\deftypefunargs #1{% -% Expand, preventing hyphenation at `-' chars. -% Note that groups don't affect changes in \hyphenchar. -% Use \boldbraxnoamp, not \functionparens, so that & is not special. -\boldbraxnoamp -\tclose{#1}% avoid \code because of side effects on active chars - \defargscommonending -} +%%% Typed functions: -% Do complete processing of one @defun or @defunx line already parsed. +% @deftypefn category type name args +\makedefun{deftypefn}{\deftypefngeneral{}} -% @deffn Command forward-char nchars +% @deftypeop category class type name args +\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} -\def\deffn{\defmethparsebody\Edeffn\deffnx\deffnheader} +% \deftypeopon {category on}class type name args +\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } -\def\deffnheader #1#2#3{\doind {fn}{\code{#2}}% -\begingroup\defname {#2}{#1}\defunargs{#3}\endgroup % -\catcode\equalChar=\other % Turn off change made in \defparsebody +% \deftypefngeneral {subind}category type name args +% +\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% + \dosubind{fn}{\code{#4}}{#1}% + \defname{#2}{#3}{#4}\defunargs{#5\unskip}% } -% @defun == @deffn Function - -\def\defun{\defparsebody\Edefun\defunx\defunheader} +%%% Typed variables: -\def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index -\begingroup\defname {#1}{\putwordDeffunc}% -\defunargs {#2}\endgroup % -\catcode\equalChar=\other % Turn off change made in \defparsebody -} +% @deftypevr category type var args +\makedefun{deftypevr}{\deftypecvgeneral{}} -% @deftypefun int foobar (int @var{foo}, float @var{bar}) +% @deftypecv category class type var args +\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} -\def\deftypefun{\defparsebody\Edeftypefun\deftypefunx\deftypefunheader} +% \deftypecvof {category of}class type var args +\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } -% #1 is the data type. #2 is the name and args. -\def\deftypefunheader #1#2{\deftypefunheaderx{#1}#2 \relax} -% #1 is the data type, #2 the name, #3 the args. -\def\deftypefunheaderx #1#2 #3\relax{% -\doind {fn}{\code{#2}}% Make entry in function index -\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypefun}% -\deftypefunargs {#3}\endgroup % -\catcode\equalChar=\other % Turn off change made in \defparsebody +% \deftypecvgeneral {subind}category type var args +% +\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% + \dosubind{vr}{\code{#4}}{#1}% + \defname{#2}{#3}{#4}\defunargs{#5\unskip}% } -% @deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar}) - -\def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader} +%%% Untyped variables: -% \defheaderxcond#1\relax$.$ -% puts #1 in @code, followed by a space, but does nothing if #1 is null. -\def\defheaderxcond#1#2$.${\ifx#1\relax\else\code{#1#2} \fi} +% @defvr category var args +\makedefun{defvr}#1 {\deftypevrheader{#1} {} } -% #1 is the classification. #2 is the data type. #3 is the name and args. -\def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax} -% #1 is the classification, #2 the data type, #3 the name, #4 the args. -\def\deftypefnheaderx #1#2#3 #4\relax{% -\doind {fn}{\code{#3}}% Make entry in function index -\begingroup -\normalparens % notably, turn off `&' magic, which prevents -% at least some C++ text from working -\defname {\defheaderxcond#2\relax$.$#3}{#1}% -\deftypefunargs {#4}\endgroup % -\catcode\equalChar=\other % Turn off change made in \defparsebody -} - -% @defmac == @deffn Macro +% @defcv category class var args +\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} -\def\defmac{\defparsebody\Edefmac\defmacx\defmacheader} +% \defcvof {category of}class var args +\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } -\def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index -\begingroup\defname {#1}{\putwordDefmac}% -\defunargs {#2}\endgroup % -\catcode\equalChar=\other % Turn off change made in \defparsebody +%%% Type: +% @deftp category name args +\makedefun{deftp}#1 #2 #3\endheader{% + \doind{tp}{\code{#2}}% + \defname{#1}{}{#2}\defunargs{#3\unskip}% } -% @defspec == @deffn Special Form - -\def\defspec{\defparsebody\Edefspec\defspecx\defspecheader} - -\def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index -\begingroup\defname {#1}{\putwordDefspec}% -\defunargs {#2}\endgroup % -\catcode\equalChar=\other % Turn off change made in \defparsebody -} +% Remaining @defun-like shortcuts: +\makedefun{defun}{\deffnheader{\putwordDeffunc} } +\makedefun{defmac}{\deffnheader{\putwordDefmac} } +\makedefun{defspec}{\deffnheader{\putwordDefspec} } +\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} } +\makedefun{defvar}{\defvrheader{\putwordDefvar} } +\makedefun{defopt}{\defvrheader{\putwordDefopt} } +\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } +\makedefun{defmethod}{\defopon\putwordMethodon} +\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} +\makedefun{defivar}{\defcvof\putwordInstanceVariableof} +\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} -% @defop CATEGORY CLASS OPERATION ARG... +% \defname, which formats the name of the @def (not the args). +% #1 is the category, such as "Function". +% #2 is the return type, if any. +% #3 is the function name. % -\def\defop #1 {\def\defoptype{#1}% -\defopparsebody\Edefop\defopx\defopheader\defoptype} +% We are followed by (but not passed) the arguments, if any. % -\def\defopheader#1#2#3{% - \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% function index entry - \begingroup - \defname{#2}{\defoptype\ \putwordon\ #1}% - \defunargs{#3}% - \endgroup +\def\defname#1#2#3{% + % Get the values of \leftskip and \rightskip as they were outside the @def... + \advance\leftskip by -\defbodyindent + % + % How we'll format the type name. Putting it in brackets helps + % distinguish it from the body text that may end up on the next line + % just below it. + \def\temp{#1}% + \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi} + % + % Figure out line sizes for the paragraph shape. + % The first line needs space for \box0; but if \rightskip is nonzero, + % we need only space for the part of \box0 which exceeds it: + \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip + % The continuations: + \dimen2=\hsize \advance\dimen2 by -\defargsindent + % (plain.tex says that \dimen1 should be used only as global.) + \parshape 2 0in \dimen0 \defargsindent \dimen2 + % + % Put the type name to the right margin. + \noindent + \hbox to 0pt{% + \hfil\box0 \kern-\hsize + % \hsize has to be shortened this way: + \kern\leftskip + % Intentionally do not respect \rightskip, since we need the space. + }% + % + % Allow all lines to be underfull without complaint: + \tolerance=10000 \hbadness=10000 + \exdentamount=\defbodyindent + {% + % defun fonts. We use typewriter by default (used to be bold) because: + % . we're printing identifiers, they should be in tt in principle. + % . in languages with many accents, such as Czech or French, it's + % common to leave accents off identifiers. The result looks ok in + % tt, but exceedingly strange in rm. + % . we don't want -- and --- to be treated as ligatures. + % . this still does not fix the ?` and !` ligatures, but so far no + % one has made identifiers using them :). + \df \tt + \def\temp{#2}% return value type + \ifx\temp\empty\else \tclose{\temp} \fi + #3% output function name + }% + {\rm\enskip}% hskip 0.5 em of \tenrm + % + \boldbrax + % arguments will be output next, if any. } -% @deftypeop CATEGORY CLASS TYPE OPERATION ARG... +% Print arguments in slanted roman (not ttsl), inconsistently with using +% tt for the name. This is because literal text is sometimes needed in +% the argument list (groff manual), and ttsl and tt are not very +% distinguishable. Prevent hyphenation at `-' chars. % -\def\deftypeop #1 {\def\deftypeopcategory{#1}% - \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader - \deftypeopcategory} -% -% #1 is the class name, #2 the data type, #3 the operation name, #4 the args. -\def\deftypeopheader#1#2#3#4{% - \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index - \begingroup - \defname{\defheaderxcond#2\relax$.$#3} - {\deftypeopcategory\ \putwordon\ \code{#1}}% - \deftypefunargs{#4}% - \endgroup +\def\defunargs#1{% + % use sl by default (not ttsl), + % tt for the names. + \df \sl \hyphenchar\font=0 + % + % On the other hand, if an argument has two dashes (for instance), we + % want a way to get ttsl. Let's try @var for that. + \let\var=\ttslanted + #1% + \sl\hyphenchar\font=45 } -% @deftypemethod CLASS TYPE METHOD ARG... -% -\def\deftypemethod{% - \deftypemethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader} +% We want ()&[] to print specially on the defun line. % -% #1 is the class name, #2 the data type, #3 the method name, #4 the args. -\def\deftypemethodheader#1#2#3#4{% - \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index - \begingroup - \defname{\defheaderxcond#2\relax$.$#3}{\putwordMethodon\ \code{#1}}% - \deftypefunargs{#4}% - \endgroup +\def\activeparens{% + \catcode`\(=\active \catcode`\)=\active + \catcode`\[=\active \catcode`\]=\active + \catcode`\&=\active } -% @deftypeivar CLASS TYPE VARNAME -% -\def\deftypeivar{% - \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader} -% -% #1 is the class name, #2 the data type, #3 the variable name. -\def\deftypeivarheader#1#2#3{% - \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index - \begingroup - \defname{\defheaderxcond#2\relax$.$#3} - {\putwordInstanceVariableof\ \code{#1}}% - \defvarargs{#3}% - \endgroup -} +% Make control sequences which act like normal parenthesis chars. +\let\lparen = ( \let\rparen = ) -% @defmethod == @defop Method -% -\def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader} -% -% #1 is the class name, #2 the method name, #3 the args. -\def\defmethodheader#1#2#3{% - \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% entry in function index - \begingroup - \defname{#2}{\putwordMethodon\ \code{#1}}% - \defunargs{#3}% - \endgroup +% Be sure that we always have a definition for `(', etc. For example, +% if the fn name has parens in it, \boldbrax will not be in effect yet, +% so TeX would otherwise complain about undefined control sequence. +{ + \activeparens + \global\let(=\lparen \global\let)=\rparen + \global\let[=\lbrack \global\let]=\rbrack + \global\let& = \& + + \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} + \gdef\magicamp{\let&=\amprm} } -% @defcv {Class Option} foo-class foo-flag +\newcount\parencount -\def\defcv #1 {\def\defcvtype{#1}% -\defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype} +% If we encounter &foo, then turn on ()-hacking afterwards +\newif\ifampseen +\def\amprm#1 {\ampseentrue{\bf\ }} -\def\defcvarheader #1#2#3{% - \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% variable index entry - \begingroup - \defname{#2}{\defcvtype\ \putwordof\ #1}% - \defvarargs{#3}% - \endgroup +\def\parenfont{% + \ifampseen + % At the first level, print parens in roman, + % otherwise use the default font. + \ifnum \parencount=1 \rm \fi + \else + % The \sf parens (in \boldbrax) actually are a little bolder than + % the contained text. This is especially needed for [ and ] . + \sf + \fi } - -% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME -% -\def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader} -% -\def\defivarheader#1#2#3{% - \dosubind{vr}{\code{#2}}{\putwordof\ \code{#1}}% entry in var index - \begingroup - \defname{#2}{\putwordInstanceVariableof\ #1}% - \defvarargs{#3}% - \endgroup +\def\infirstlevel#1{% + \ifampseen + \ifnum\parencount=1 + #1% + \fi + \fi } +\def\bfafterword#1 {#1 \bf} -% @defvar -% First, define the processing that is wanted for arguments of @defvar. -% This is actually simple: just print them in roman. -% This must expand the args and terminate the paragraph they make up -\def\defvarargs #1{\normalparens #1% - \defargscommonending +\def\opnr{% + \global\advance\parencount by 1 + {\parenfont(}% + \infirstlevel \bfafterword } - -% @defvr Counter foo-count - -\def\defvr{\defvrparsebody\Edefvr\defvrx\defvrheader} - -\def\defvrheader #1#2#3{\doind {vr}{\code{#2}}% -\begingroup\defname {#2}{#1}\defvarargs{#3}\endgroup} - -% @defvar == @defvr Variable - -\def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader} - -\def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index -\begingroup\defname {#1}{\putwordDefvar}% -\defvarargs {#2}\endgroup % +\def\clnr{% + {\parenfont)}% + \infirstlevel \sl + \global\advance\parencount by -1 } -% @defopt == @defvr {User Option} - -\def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader} - -\def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index -\begingroup\defname {#1}{\putwordDefopt}% -\defvarargs {#2}\endgroup % +\newcount\brackcount +\def\lbrb{% + \global\advance\brackcount by 1 + {\bf[}% +} +\def\rbrb{% + {\bf]}% + \global\advance\brackcount by -1 } -% @deftypevar int foobar - -\def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader} - -% #1 is the data type. #2 is the name, perhaps followed by text that -% is actually part of the data type, which should not be put into the index. -\def\deftypevarheader #1#2{% -\dovarind#2 \relax% Make entry in variables index -\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypevar}% - \defargscommonending -\endgroup} -\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}} - -% @deftypevr {Global Flag} int enable - -\def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader} - -\def\deftypevrheader #1#2#3{\dovarind#3 \relax% -\begingroup\defname {\defheaderxcond#2\relax$.$#3}{#1} - \defargscommonending -\endgroup} - -% Now define @deftp -% Args are printed in bold, a slight difference from @defvar. - -\def\deftpargs #1{\bf \defvarargs{#1}} - -% @deftp Class window height width ... - -\def\deftp{\deftpparsebody\Edeftp\deftpx\deftpheader} - -\def\deftpheader #1#2#3{\doind {tp}{\code{#2}}% -\begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup} - -% These definitions are used if you use @defunx (etc.) -% anywhere other than immediately after a @defun or @defunx. -% -\def\defcvx#1 {\errmessage{@defcvx in invalid context}} -\def\deffnx#1 {\errmessage{@deffnx in invalid context}} -\def\defivarx#1 {\errmessage{@defivarx in invalid context}} -\def\defmacx#1 {\errmessage{@defmacx in invalid context}} -\def\defmethodx#1 {\errmessage{@defmethodx in invalid context}} -\def\defoptx #1 {\errmessage{@defoptx in invalid context}} -\def\defopx#1 {\errmessage{@defopx in invalid context}} -\def\defspecx#1 {\errmessage{@defspecx in invalid context}} -\def\deftpx#1 {\errmessage{@deftpx in invalid context}} -\def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}} -\def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}} -\def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}} -\def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}} -\def\deftypeopx#1 {\errmessage{@deftypeopx in invalid context}} -\def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}} -\def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}} -\def\defunx#1 {\errmessage{@defunx in invalid context}} -\def\defvarx#1 {\errmessage{@defvarx in invalid context}} -\def\defvrx#1 {\errmessage{@defvrx in invalid context}} +\def\checkparencounts{% + \ifnum\parencount=0 \else \badparencount \fi + \ifnum\brackcount=0 \else \badbrackcount \fi +} +\def\badparencount{% + \errmessage{Unbalanced parentheses in @def}% + \global\parencount=0 +} +\def\badbrackcount{% + \errmessage{Unbalanced square braces in @def}% + \global\brackcount=0 +} \message{macros,} % @macro. -% To do this right we need a feature of e-TeX, \scantokens, -% which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\undefined - \newwrite\macscribble - \def\scanmacro#1{% - \begingroup \newlinechar`\^^M - % Undo catcode changes of \startcontents and \doprintindex - \catcode`\@=0 \catcode`\\=\other \escapechar=`\@ - % Append \endinput to make sure that TeX does not see the ending newline. - \toks0={#1\endinput}% - \immediate\openout\macscribble=\jobname.tmp - \immediate\write\macscribble{\the\toks0}% - \immediate\closeout\macscribble - \let\xeatspaces\eatspaces - \input \jobname.tmp - \endgroup +% To do this right we need a feature of e-TeX, \scantokens, +% which we arrange to emulate with a temporary file in ordinary TeX. +\ifx\eTeXversion\undefined + \newwrite\macscribble + \def\scantokens#1{% + \toks0={#1}% + \immediate\openout\macscribble=\jobname.tmp + \immediate\write\macscribble{\the\toks0}% + \immediate\closeout\macscribble + \input \jobname.tmp + } +\fi + +\def\scanmacro#1{% + \begingroup + \newlinechar`\^^M + \let\xeatspaces\eatspaces + % Undo catcode changes of \startcontents and \doprintindex + % When called from @insertcopying or (short)caption, we need active + % backslash to get it printed correctly. Previously, we had + % \catcode`\\=\other instead. We'll see whether a problem appears + % with macro expansion. --kasal, 19aug04 + \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ + % ... and \example + \spaceisspace + % + % Append \endinput to make sure that TeX does not see the ending newline. + % + % I've verified that it is necessary both for e-TeX and for ordinary TeX + % --kasal, 29nov03 + \scantokens{#1\endinput}% + \endgroup +} + +\def\scanexp#1{% + \edef\temp{\noexpand\scanmacro{#1}}% + \temp } -\else -\def\scanmacro#1{% -\begingroup \newlinechar`\^^M -% Undo catcode changes of \startcontents and \doprintindex -\catcode`\@=0 \catcode`\\=\other \escapechar=`\@ -\let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup} -\fi \newcount\paramno % Count of parameters \newtoks\macname % Macro name @@ -5586,13 +5495,15 @@ % \do\macro1\do\macro2... % Utility routines. -% Thisdoes \let #1 = #2, except with \csnames. +% This does \let #1 = #2, with \csnames; that is, +% \let \csname#1\endcsname = \csname#2\endcsname +% (except of course we have to play expansion games). +% \def\cslet#1#2{% -\expandafter\expandafter -\expandafter\let -\expandafter\expandafter -\csname#1\endcsname -\csname#2\endcsname} + \expandafter\let + \csname#1\expandafter\endcsname + \csname#2\endcsname +} % Trim leading and trailing spaces off a string. % Concepts from aro-bend problem 15 (see CTAN). @@ -5619,30 +5530,36 @@ % done by making ^^M (\endlinechar) catcode 12 when reading the macro % body, and then making it the \newlinechar in \scanmacro. -\def\macrobodyctxt{% - \catcode`\~=\other +\def\scanctxt{% + \catcode`\"=\other + \catcode`\+=\other + \catcode`\<=\other + \catcode`\>=\other + \catcode`\@=\other \catcode`\^=\other \catcode`\_=\other \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\+=\other + \catcode`\~=\other +} + +\def\scanargctxt{% + \scanctxt + \catcode`\\=\other + \catcode`\^^M=\other +} + +\def\macrobodyctxt{% + \scanctxt \catcode`\{=\other \catcode`\}=\other - \catcode`\@=\other \catcode`\^^M=\other - \usembodybackslash} + \usembodybackslash +} \def\macroargctxt{% - \catcode`\~=\other - \catcode`\^=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\+=\other - \catcode`\@=\other - \catcode`\\=\other} + \scanctxt + \catcode`\\=\other +} % \mbodybackslash is the definition of \ in @macro bodies. % It maps \foo\ => \csname macarg.foo\endcsname => #N @@ -5683,8 +5600,7 @@ \else \expandafter\parsemacbody \fi} -\def\unmacro{\parsearg\dounmacro} -\def\dounmacro#1{% +\parseargdef\unmacro{% \if1\csname ismacro.#1\endcsname \global\cslet{#1}{macsave.#1}% \global\expandafter\let \csname ismacro.#1\endcsname=0% @@ -5825,25 +5741,41 @@ \expandafter\parsearg \fi \next} -% We mant to disable all macros during \shipout so that they are not +% We want to disable all macros during \shipout so that they are not % expanded by \write. \def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}% \edef\next{\macrolist}\expandafter\endgroup\next} +% For \indexnofonts, we need to get rid of all macros, leaving only the +% arguments (if present). Of course this is not nearly correct, but it +% is the best we can do for now. makeinfo does not expand macros in the +% argument to @deffn, which ends up writing an index entry, and texindex +% isn't prepared for an index sort entry that starts with \. +% +% Since macro invocations are followed by braces, we can just redefine them +% to take a single TeX argument. The case of a macro invocation that +% goes to end-of-line is not handled. +% +\def\emptyusermacros{\begingroup + \def\do##1{\let\noexpand##1=\noexpand\asis}% + \edef\next{\macrolist}\expandafter\endgroup\next} + % @alias. % We need some trickery to remove the optional spaces around the equal % sign. Just make them active and then expand them all to nothing. -\def\alias{\begingroup\obeyspaces\parsearg\aliasxxx} +\def\alias{\parseargusing\obeyspaces\aliasxxx} \def\aliasxxx #1{\aliasyyy#1\relax} -\def\aliasyyy #1=#2\relax{\ignoreactivespaces -\edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=% - \expandafter\noexpand\csname#2\endcsname}% -\expandafter\endgroup\next} +\def\aliasyyy #1=#2\relax{% + {% + \expandafter\let\obeyedspace=\empty + \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}% + }% + \next +} \message{cross references,} -% @xref etc. \newwrite\auxfile @@ -5855,64 +5787,70 @@ \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, node \samp{\ignorespaces#1{}}} -% @node's job is to define \lastnode. -\def\node{\ENVcheck\parsearg\nodezzz} -\def\nodezzz#1{\nodexxx #1,\finishnodeparse} -\def\nodexxx#1,#2\finishnodeparse{\gdef\lastnode{#1}} +% @node's only job in TeX is to define \lastnode, which is used in +% cross-references. The @node line might or might not have commas, and +% might or might not have spaces before the first comma, like: +% @node foo , bar , ... +% We don't want such trailing spaces in the node name. +% +\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse} +% +% also remove a trailing comma, in case of something like this: +% @node Help-Cross, , , Cross-refs +\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} +\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} + \let\nwnode=\node -\let\lastnode=\relax +\let\lastnode=\empty -% The sectioning commands (@chapter, etc.) call these. -\def\donoderef{% - \ifx\lastnode\relax\else - \expandafter\expandafter\expandafter\setref{\lastnode}% - {Ysectionnumberandtype}% - \global\let\lastnode=\relax - \fi -} -\def\unnumbnoderef{% - \ifx\lastnode\relax\else - \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}% - \global\let\lastnode=\relax - \fi -} -\def\appendixnoderef{% - \ifx\lastnode\relax\else - \expandafter\expandafter\expandafter\setref{\lastnode}% - {Yappendixletterandtype}% - \global\let\lastnode=\relax +% Write a cross-reference definition for the current node. #1 is the +% type (Ynumbered, Yappendix, Ynothing). +% +\def\donoderef#1{% + \ifx\lastnode\empty\else + \setref{\lastnode}{#1}% + \global\let\lastnode=\empty \fi } - % @anchor{NAME} -- define xref target at arbitrary point. % \newcount\savesfregister -\gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} -\gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} -\gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} +% +\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} +\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} +\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an -% anchor), namely NAME-title (the corresponding @chapter/etc. name), -% NAME-pg (the page number), and NAME-snt (section number and type). -% Called from \foonoderef. -% -% We have to set \indexdummies so commands such as @code in a section -% title aren't expanded. It would be nicer not to expand the titles in -% the first place, but there's so many layers that that is hard to do. -% -% Likewise, use \turnoffactive so that punctuation chars such as underscore -% and backslash work in node names. +% anchor), which consists of three parts: +% 1) NAME-title - the current sectioning name taken from \thissection, +% or the anchor name. +% 2) NAME-snt - section number and type, passed as the SNT arg, or +% empty for anchors. +% 3) NAME-pg - the page number. +% +% This is called from \donoderef, \anchor, and \dofloat. In the case of +% floats, there is an additional part, which is not written here: +% 4) NAME-lof - the text as it should appear in a @listoffloats. % -\def\setref#1#2{{% - \atdummies +\def\setref#1#2{% \pdfmkdest{#1}% - % - \turnoffactive - \dosetq{#1-title}{Ytitle}% - \dosetq{#1-pg}{Ypagenumber}% - \dosetq{#1-snt}{#2}% -}} + \iflinks + {% + \atdummies % preserve commands, but don't expand them + \turnoffactive + \otherbackslash + \edef\writexrdef##1##2{% + \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef + ##1}{##2}}% these are parameters of \writexrdef + }% + \toks0 = \expandafter{\thissection}% + \immediate \writexrdef{title}{\the\toks0 }% + \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. + \writexrdef{pg}{\folio}% will be written later, during \shipout + }% + \fi +} % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed @@ -5925,38 +5863,33 @@ \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup \unsepspaces \def\printedmanual{\ignorespaces #5}% - \def\printednodename{\ignorespaces #3}% - \setbox1=\hbox{\printedmanual}% - \setbox0=\hbox{\printednodename}% + \def\printedrefname{\ignorespaces #3}% + \setbox1=\hbox{\printedmanual\unskip}% + \setbox0=\hbox{\printedrefname\unskip}% \ifdim \wd0 = 0pt % No printed node name was explicitly given. \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax % Use the node name inside the square brackets. - \def\printednodename{\ignorespaces #1}% + \def\printedrefname{\ignorespaces #1}% \else % Use the actual chapter/section title appear inside % the square brackets. Use the real section title if we have it. \ifdim \wd1 > 0pt % It is in another manual, so we don't have it. - \def\printednodename{\ignorespaces #1}% + \def\printedrefname{\ignorespaces #1}% \else \ifhavexrefs % We know the real title if we have the xref values. - \def\printednodename{\refx{#1-title}{}}% + \def\printedrefname{\refx{#1-title}{}}% \else % Otherwise just copy the Info node name. - \def\printednodename{\ignorespaces #1}% + \def\printedrefname{\ignorespaces #1}% \fi% \fi \fi \fi % - % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not - % insert empty discretionaries after hyphens, which means that it will - % not find a line break at a hyphen in a node names. Since some manuals - % are best written with fairly long node names, containing hyphens, this - % is a loss. Therefore, we give the text of the node name again, so it - % is as if TeX is seeing it for the first time. + % Make link in pdf output. \ifpdf \leavevmode \getfilename{#4}% @@ -5966,64 +5899,86 @@ goto file{\the\filename.pdf} name{#1}% \else \startlink attr{/Border [0 0 0]}% - goto name{#1}% + goto name{\pdfmkpgn{#1}}% \fi }% \linkcolor \fi % - \ifdim \wd1 > 0pt - \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}% - \else - % _ (for example) has to be the character _ for the purposes of the - % control sequence corresponding to the node, but it has to expand - % into the usual \leavevmode...\vrule stuff for purposes of - % printing. So we \turnoffactive for the \refx-snt, back on for the - % printing, back off for the \refx-pg. - {\turnoffactive \otherbackslash - % Only output a following space if the -snt ref is nonempty; for - % @unnumbered and @anchor, it won't be. - \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% - \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi - }% - % output the `[mynode]' via a macro. - \xrefprintnodename\printednodename + % Float references are printed completely differently: "Figure 1.2" + % instead of "[somenode], p.3". We distinguish them by the + % LABEL-title being set to a magic string. + {% + % Have to otherify everything special to allow the \csname to + % include an _ in the xref name, etc. + \indexnofonts + \turnoffactive + \otherbackslash + \expandafter\global\expandafter\let\expandafter\Xthisreftitle + \csname XR#1-title\endcsname + }% + \iffloat\Xthisreftitle + % If the user specified the print name (third arg) to the ref, + % print it instead of our usual "Figure 1.2". + \ifdim\wd0 = 0pt + \refx{#1-snt}% + \else + \printedrefname + \fi % - % But we always want a comma and a space: - ,\space + % if the user also gave the printed manual name (fifth arg), append + % "in MANUALNAME". + \ifdim \wd1 > 0pt + \space \putwordin{} \cite{\printedmanual}% + \fi + \else + % node/anchor (non-float) references. % - % output the `page 3'. - \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}% + % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not + % insert empty discretionaries after hyphens, which means that it will + % not find a line break at a hyphen in a node names. Since some manuals + % are best written with fairly long node names, containing hyphens, this + % is a loss. Therefore, we give the text of the node name again, so it + % is as if TeX is seeing it for the first time. + \ifdim \wd1 > 0pt + \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}% + \else + % _ (for example) has to be the character _ for the purposes of the + % control sequence corresponding to the node, but it has to expand + % into the usual \leavevmode...\vrule stuff for purposes of + % printing. So we \turnoffactive for the \refx-snt, back on for the + % printing, back off for the \refx-pg. + {\turnoffactive \otherbackslash + % Only output a following space if the -snt ref is nonempty; for + % @unnumbered and @anchor, it won't be. + \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% + \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi + }% + % output the `[mynode]' via a macro so it can be overridden. + \xrefprintnodename\printedrefname + % + % But we always want a comma and a space: + ,\space + % + % output the `page 3'. + \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}% + \fi \fi \endlink \endgroup} % This macro is called from \xrefX for the `[nodename]' part of xref % output. It's a separate macro only so it can be changed more easily, -% since not square brackets don't work in some documents. Particularly +% since square brackets don't work well in some documents. Particularly % one that Bob is working on :). % \def\xrefprintnodename#1{[#1]} -% \dosetq is called from \setref to do the actual \write (\iflinks). -% -\def\dosetq#1#2{% - {\let\folio=0% - \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}% - \iflinks \next \fi - }% -} - -% \internalsetq{foo}{page} expands into -% CHARACTERS @xrdef{foo}{...expansion of \page...} -\def\internalsetq#1#2{@xrdef{#1}{\csname #2\endcsname}} - -% Things to be expanded by \internalsetq. +% Things referred to by \setref. % -\def\Ypagenumber{\folio} -\def\Ytitle{\thissection} \def\Ynothing{} -\def\Ysectionnumberandtype{% +\def\Yomitfromtoc{} +\def\Ynumbered{% \ifnum\secno=0 \putwordChapter@tie \the\chapno \else \ifnum\subsecno=0 @@ -6034,8 +5989,7 @@ \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno \fi\fi\fi } - -\def\Yappendixletterandtype{% +\def\Yappendix{% \ifnum\secno=0 \putwordAppendix@tie @char\the\appendixno{}% \else \ifnum\subsecno=0 @@ -6048,15 +6002,6 @@ \fi\fi\fi } -% Use TeX 3.0's \inputlineno to get the line number, for better error -% messages, but if we're using an old version of TeX, don't do anything. -% -\ifx\inputlineno\thisisundefined - \let\linenumber = \empty % Pre-3.0. -\else - \def\linenumber{\the\inputlineno:\space} -\fi - % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME. % If its value is nonempty, SUFFIX is output afterward. % @@ -6065,7 +6010,7 @@ \indexnofonts \otherbackslash \expandafter\global\expandafter\let\expandafter\thisrefX - \csname X#1\endcsname + \csname XR#1\endcsname }% \ifx\thisrefX\relax % If not defined, say something at least. @@ -6087,11 +6032,44 @@ #2% Output the suffix in any case. } -% This is the macro invoked by entries in the aux file. -% -\def\xrdef#1{\expandafter\gdef\csname X#1\endcsname} +% This is the macro invoked by entries in the aux file. Usually it's +% just a \def (we prepend XR to the control sequence name to avoid +% collisions). But if this is a float type, we have more work to do. +% +\def\xrdef#1#2{% + \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value. + % + % Was that xref control sequence that we just defined for a float? + \expandafter\iffloat\csname XR#1\endcsname + % it was a float, and we have the (safe) float type in \iffloattype. + \expandafter\let\expandafter\floatlist + \csname floatlist\iffloattype\endcsname + % + % Is this the first time we've seen this float type? + \expandafter\ifx\floatlist\relax + \toks0 = {\do}% yes, so just \do + \else + % had it before, so preserve previous elements in list. + \toks0 = \expandafter{\floatlist\do}% + \fi + % + % Remember this xref in the control sequence \floatlistFLOATTYPE, + % for later use in \listoffloats. + \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}% + \fi +} % Read the last existing aux file, if any. No error if none exists. +% +\def\tryauxfile{% + \openin 1 \jobname.aux + \ifeof 1 \else + \readauxfile + \global\havexrefstrue + \fi + \closein 1 +} + \def\readauxfile{\begingroup \catcode`\^^@=\other \catcode`\^^A=\other @@ -6150,7 +6128,16 @@ \catcode`\%=\other \catcode`+=\other % avoid \+ for paranoia even though we've turned it off % - % Make the characters 128-255 be printing characters + % This is to support \ in node names and titles, since the \ + % characters end up in a \csname. It's easier than + % leaving it active and making its active definition an actual \ + % character. What I don't understand is why it works in the *value* + % of the xrdef. Seems like it should be a catcode12 \, and that + % should not typeset properly. But it works, so I'm moving on for + % now. --karl, 15jan04. + \catcode`\\=\other + % + % Make the characters 128-255 be printing characters. {% \count 1=128 \def\loop{% @@ -6160,31 +6147,17 @@ }% }% % - % Turn off \ as an escape so we do not lose on - % entries which were dumped with control sequences in their names. - % For example, @xrdef{$\leq $-fun}{page ...} made by @defun ^^ - % Reference to such entries still does not work the way one would wish, - % but at least they do not bomb out when the aux file is read in. - \catcode`\\=\other - % - % @ is our escape character in .aux files. + % @ is our escape character in .aux files, and we need braces. \catcode`\{=1 \catcode`\}=2 \catcode`\@=0 % - \openin 1 \jobname.aux - \ifeof 1 \else - \closein 1 - \input \jobname.aux - \global\havexrefstrue - \global\warnedobstrue - \fi - % Open the new aux file. TeX will close it automatically at exit. - \openout\auxfile=\jobname.aux + \input \jobname.aux \endgroup} -% Footnotes. +\message{insertions,} +% including footnotes. \newcount \footnoteno @@ -6198,13 +6171,12 @@ % @footnotestyle is meaningful for info output only. \let\footnotestyle=\comment -\let\ptexfootnote=\footnote - {\catcode `\@=11 % % Auto-number footnotes. Otherwise like plain. \gdef\footnote{% \let\indent=\ptexindent + \let\noindent=\ptexnoindent \global\advance\footnoteno by \@ne \edef\thisfootno{$^{\the\footnoteno}$}% % @@ -6222,17 +6194,12 @@ % Don't bother with the trickery in plain.tex to not require the % footnote text as a parameter. Our footnotes don't need to be so general. % -% Oh yes, they do; otherwise, @ifset and anything else that uses -% \parseargline fail inside footnotes because the tokens are fixed when +% Oh yes, they do; otherwise, @ifset (and anything else that uses +% \parseargline) fails inside footnotes because the tokens are fixed when % the footnote is read. --karl, 16nov96. % -% The start of the footnote looks usually like this: -\gdef\startfootins{\insert\footins\bgroup} -% -% ... but this macro is redefined inside @multitable. -% \gdef\dofootnote{% - \startfootins + \insert\footins\bgroup % We want to typeset this text as a normal paragraph, even if the % footnote reference occurs in (for example) a display environment. % So reset some parameters. @@ -6268,40 +6235,66 @@ } }%end \catcode `\@=11 -% @| inserts a changebar to the left of the current line. It should -% surround any changed text. This approach does *not* work if the -% change spans more than two lines of output. To handle that, we would -% have adopt a much more difficult approach (putting marks into the main -% vertical list for the beginning and end of each change). -% -\def\|{% - % \vadjust can only be used in horizontal mode. - \leavevmode - % - % Append this vertical mode material after the current line in the output. - \vadjust{% - % We want to insert a rule with the height and depth of the current - % leading; that is exactly what \strutbox is supposed to record. - \vskip-\baselineskip - % - % \vadjust-items are inserted at the left edge of the type. So - % the \llap here moves out into the left-hand margin. - \llap{% - % - % For a thicker or thinner bar, change the `1pt'. - \vrule height\baselineskip width1pt - % - % This is the space between the bar and the text. - \hskip 12pt - }% - }% +% In case a @footnote appears in a vbox, save the footnote text and create +% the real \insert just after the vbox finished. Otherwise, the insertion +% would be lost. +% Similarily, if a @footnote appears inside an alignment, save the footnote +% text to a box and make the \insert when a row of the table is finished. +% And the same can be done for other insert classes. --kasal, 16nov03. + +% Replace the \insert primitive by a cheating macro. +% Deeper inside, just make sure that the saved insertions are not spilled +% out prematurely. +% +\def\startsavinginserts{% + \ifx \insert\ptexinsert + \let\insert\saveinsert + \else + \let\checkinserts\relax + \fi } -% For a final copy, take out the rectangles -% that mark overfull boxes (in case you have decided -% that the text looks ok even though it passes the margin). +% This \insert replacement works for both \insert\footins{foo} and +% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}. % -\def\finalout{\overfullrule=0pt} +\def\saveinsert#1{% + \edef\next{\noexpand\savetobox \makeSAVEname#1}% + \afterassignment\next + % swallow the left brace + \let\temp = +} +\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}} +\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1} + +\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi} + +\def\placesaveins#1{% + \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname + {\box#1}% +} + +% eat @SAVE -- beware, all of them have catcode \other: +{ + \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-) + \gdef\gobblesave @SAVE{} +} + +% initialization: +\def\newsaveins #1{% + \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}% + \next +} +\def\newsaveinsX #1{% + \csname newbox\endcsname #1% + \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts + \checksaveins #1}% +} + +% initialize: +\let\checkinserts\empty +\newsaveins\footins +\newsaveins\margin + % @image. We use the macros from epsf.tex to support this. % If epsf.tex is not installed and @image is used, we complain. @@ -6311,12 +6304,12 @@ % undone and the next image would fail. \openin 1 = epsf.tex \ifeof 1 \else - \closein 1 % Do not bother showing banner with epsf.tex v2.7k (available in % doc/epsf.tex and on ctan). \def\epsfannounce{\toks0 = }% \input epsf.tex \fi +\closein 1 % % We will only complain once about lack of epsf.tex. \newif\ifwarnednoepsf @@ -6372,6 +6365,269 @@ \endgroup} +% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables, +% etc. We don't actually implement floating yet, we always include the +% float "here". But it seemed the best name for the future. +% +\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish} + +% There may be a space before second and/or third parameter; delete it. +\def\eatcommaspace#1, {#1,} + +% #1 is the optional FLOATTYPE, the text label for this float, typically +% "Figure", "Table", "Example", etc. Can't contain commas. If omitted, +% this float will not be numbered and cannot be referred to. +% +% #2 is the optional xref label. Also must be present for the float to +% be referable. +% +% #3 is the optional positioning argument; for now, it is ignored. It +% will somehow specify the positions allowed to float to (here, top, bottom). +% +% We keep a separate counter for each FLOATTYPE, which we reset at each +% chapter-level command. +\let\resetallfloatnos=\empty +% +\def\dofloat#1,#2,#3,#4\finish{% + \let\thiscaption=\empty + \let\thisshortcaption=\empty + % + % don't lose footnotes inside @float. + % + % BEWARE: when the floats start float, we have to issue warning whenever an + % insert appears inside a float which could possibly float. --kasal, 26may04 + % + \startsavinginserts + % + % We can't be used inside a paragraph. + \par + % + \vtop\bgroup + \def\floattype{#1}% + \def\floatlabel{#2}% + \def\floatloc{#3}% we do nothing with this yet. + % + \ifx\floattype\empty + \let\safefloattype=\empty + \else + {% + % the floattype might have accents or other special characters, + % but we need to use it in a control sequence name. + \indexnofonts + \turnoffactive + \xdef\safefloattype{\floattype}% + }% + \fi + % + % If label is given but no type, we handle that as the empty type. + \ifx\floatlabel\empty \else + % We want each FLOATTYPE to be numbered separately (Figure 1, + % Table 1, Figure 2, ...). (And if no label, no number.) + % + \expandafter\getfloatno\csname\safefloattype floatno\endcsname + \global\advance\floatno by 1 + % + {% + % This magic value for \thissection is output by \setref as the + % XREFLABEL-title value. \xrefX uses it to distinguish float + % labels (which have a completely different output format) from + % node and anchor labels. And \xrdef uses it to construct the + % lists of floats. + % + \edef\thissection{\floatmagic=\safefloattype}% + \setref{\floatlabel}{Yfloat}% + }% + \fi + % + % start with \parskip glue, I guess. + \vskip\parskip + % + % Don't suppress indentation if a float happens to start a section. + \restorefirstparagraphindent +} + +% we have these possibilities: +% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap +% @float Foo,lbl & no caption: Foo 1.1 +% @float Foo & @caption{Cap}: Foo: Cap +% @float Foo & no caption: Foo +% @float ,lbl & Caption{Cap}: 1.1: Cap +% @float ,lbl & no caption: 1.1 +% @float & @caption{Cap}: Cap +% @float & no caption: +% +\def\Efloat{% + \let\floatident = \empty + % + % In all cases, if we have a float type, it comes first. + \ifx\floattype\empty \else \def\floatident{\floattype}\fi + % + % If we have an xref label, the number comes next. + \ifx\floatlabel\empty \else + \ifx\floattype\empty \else % if also had float type, need tie first. + \appendtomacro\floatident{\tie}% + \fi + % the number. + \appendtomacro\floatident{\chaplevelprefix\the\floatno}% + \fi + % + % Start the printed caption with what we've constructed in + % \floatident, but keep it separate; we need \floatident again. + \let\captionline = \floatident + % + \ifx\thiscaption\empty \else + \ifx\floatident\empty \else + \appendtomacro\captionline{: }% had ident, so need a colon between + \fi + % + % caption text. + \appendtomacro\captionline{\scanexp\thiscaption}% + \fi + % + % If we have anything to print, print it, with space before. + % Eventually this needs to become an \insert. + \ifx\captionline\empty \else + \vskip.5\parskip + \captionline + % + % Space below caption. + \vskip\parskip + \fi + % + % If have an xref label, write the list of floats info. Do this + % after the caption, to avoid chance of it being a breakpoint. + \ifx\floatlabel\empty \else + % Write the text that goes in the lof to the aux file as + % \floatlabel-lof. Besides \floatident, we include the short + % caption if specified, else the full caption if specified, else nothing. + {% + \atdummies \turnoffactive \otherbackslash + % since we read the caption text in the macro world, where ^^M + % is turned into a normal character, we have to scan it back, so + % we don't write the literal three characters "^^M" into the aux file. + \scanexp{% + \xdef\noexpand\gtemp{% + \ifx\thisshortcaption\empty + \thiscaption + \else + \thisshortcaption + \fi + }% + }% + \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident + \ifx\gtemp\empty \else : \gtemp \fi}}% + }% + \fi + \egroup % end of \vtop + % + % place the captured inserts + % + % BEWARE: when the floats start float, we have to issue warning whenever an + % insert appears inside a float which could possibly float. --kasal, 26may04 + % + \checkinserts +} + +% Append the tokens #2 to the definition of macro #1, not expanding either. +% +\def\appendtomacro#1#2{% + \expandafter\def\expandafter#1\expandafter{#1#2}% +} + +% @caption, @shortcaption +% +\def\caption{\docaption\thiscaption} +\def\shortcaption{\docaption\thisshortcaption} +\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} +\def\defcaption#1#2{\egroup \def#1{#2}} + +% The parameter is the control sequence identifying the counter we are +% going to use. Create it if it doesn't exist and assign it to \floatno. +\def\getfloatno#1{% + \ifx#1\relax + % Haven't seen this figure type before. + \csname newcount\endcsname #1% + % + % Remember to reset this floatno at the next chap. + \expandafter\gdef\expandafter\resetallfloatnos + \expandafter{\resetallfloatnos #1=0 }% + \fi + \let\floatno#1% +} + +% \setref calls this to get the XREFLABEL-snt value. We want an @xref +% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we +% first read the @float command. +% +\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}% + +% Magic string used for the XREFLABEL-title value, so \xrefX can +% distinguish floats from other xref types. +\def\floatmagic{!!float!!} + +% #1 is the control sequence we are passed; we expand into a conditional +% which is true if #1 represents a float ref. That is, the magic +% \thissection value which we \setref above. +% +\def\iffloat#1{\expandafter\doiffloat#1==\finish} +% +% #1 is (maybe) the \floatmagic string. If so, #2 will be the +% (safe) float type for this float. We set \iffloattype to #2. +% +\def\doiffloat#1=#2=#3\finish{% + \def\temp{#1}% + \def\iffloattype{#2}% + \ifx\temp\floatmagic +} + +% @listoffloats FLOATTYPE - print a list of floats like a table of contents. +% +\parseargdef\listoffloats{% + \def\floattype{#1}% floattype + {% + % the floattype might have accents or other special characters, + % but we need to use it in a control sequence name. + \indexnofonts + \turnoffactive + \xdef\safefloattype{\floattype}% + }% + % + % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE. + \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax + \ifhavexrefs + % if the user said @listoffloats foo but never @float foo. + \message{\linenumber No `\safefloattype' floats to list.}% + \fi + \else + \begingroup + \leftskip=\tocindent % indent these entries like a toc + \let\do=\listoffloatsdo + \csname floatlist\safefloattype\endcsname + \endgroup + \fi +} + +% This is called on each entry in a list of floats. We're passed the +% xref label, in the form LABEL-title, which is how we save it in the +% aux file. We strip off the -title and look up \XRLABEL-lof, which +% has the text we're supposed to typeset here. +% +% Figures without xref labels will not be included in the list (since +% they won't appear in the aux file). +% +\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish} +\def\listoffloatsdoentry#1-title\finish{{% + % Can't fully expand XR#1-lof because it can contain anything. Just + % pass the control sequence. On the other hand, XR#1-pg is just the + % page number, and we want to fully expand that so we can get a link + % in pdf output. + \toksA = \expandafter{\csname XR#1-lof\endcsname}% + % + % use the same \entry macro we use to generate the TOC and index. + \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}% + \writeentry +}} + \message{localization,} % and i18n. @@ -6380,19 +6636,17 @@ % properly. Single argument is the language abbreviation. % It would be nice if we could set up a hyphenation file here. % -\def\documentlanguage{\parsearg\dodocumentlanguage} -\def\dodocumentlanguage#1{% +\parseargdef\documentlanguage{% \tex % read txi-??.tex file in plain TeX. - % Read the file if it exists. - \openin 1 txi-#1.tex - \ifeof1 - \errhelp = \nolanghelp - \errmessage{Cannot read language file txi-#1.tex}% - \let\temp = \relax - \else - \def\temp{\input txi-#1.tex }% - \fi - \temp + % Read the file if it exists. + \openin 1 txi-#1.tex + \ifeof 1 + \errhelp = \nolanghelp + \errmessage{Cannot read language file txi-#1.tex}% + \else + \input txi-#1.tex + \fi + \closein 1 \endgroup } \newhelp\nolanghelp{The given language definition file cannot be found or @@ -6575,8 +6829,7 @@ % Perhaps we should allow setting the margins, \topskip, \parskip, % and/or leading, also. Or perhaps we should compute them somehow. % -\def\pagesizes{\parsearg\pagesizesxxx} -\def\pagesizesxxx#1{\pagesizesyyy #1,,\finish} +\parseargdef\pagesizes{\pagesizesyyy #1,,\finish} \def\pagesizesyyy#1,#2,#3\finish{{% \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi \globaldefs = 1 @@ -6623,8 +6876,8 @@ \def\normalplus{+} \def\normaldollar{$}%$ font-lock fix -% This macro is used to make a character print one way in ttfont -% where it can probably just be output, and another way in other fonts, +% This macro is used to make a character print one way in \tt +% (where it can probably be output as-is), and another way in other fonts, % where something hairier probably needs to be done. % % #1 is what to print if we are indeed using \tt; #2 is what to print @@ -6672,13 +6925,6 @@ \catcode`\$=\active \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix -% Set up an active definition for =, but don't enable it most of the time. -{\catcode`\==\active -\global\def={{\tt \char 61}}} - -\catcode`+=\active -\catcode`\_=\active - % If a .fmt file is being used, characters that might appear in a file % name cannot be active until we have parsed the command line. % So turn them off again, and have \everyjob (or @setfilename) turn them on. @@ -6687,15 +6933,16 @@ \catcode`\@=0 -% \rawbackslashxx outputs one backslash character in current font, +% \backslashcurfont outputs one backslash character in current font, % as in \char`\\. -\global\chardef\rawbackslashxx=`\\ +\global\chardef\backslashcurfont=`\\ +\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work -% \rawbackslash defines an active \ to do \rawbackslashxx. +% \rawbackslash defines an active \ to do \backslashcurfont. % \otherbackslash defines an active \ to be a literal `\' character with % catcode other. {\catcode`\\=\active - @gdef@rawbackslash{@let\=@rawbackslashxx} + @gdef@rawbackslash{@let\=@backslashcurfont} @gdef@otherbackslash{@let\=@realbackslash} } @@ -6703,7 +6950,7 @@ {\catcode`\\=\other @gdef@realbackslash{\}} % \normalbackslash outputs one backslash in fixed width font. -\def\normalbackslash{{\tt\rawbackslashxx}} +\def\normalbackslash{{\tt\backslashcurfont}} \catcode`\\=\active @@ -6720,6 +6967,7 @@ @let>=@normalgreater @let+=@normalplus @let$=@normaldollar %$ font-lock fix + @unsepspaces } % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of @@ -6759,10 +7007,6 @@ @catcode`@# = @other @catcode`@% = @other -@c Set initial fonts. -@textfonts -@rm - @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) @@ -6771,3 +7015,9 @@ @c time-stamp-format: "%:y-%02m-%02d.%02H" @c time-stamp-end: "}" @c End: + +@c vim:sw=2: + +@ignore + arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 +@end ignore Index: gpgme/gpgme/gpgme.h diff -u gpgme/gpgme/gpgme.h:1.149.2.1 gpgme/gpgme/gpgme.h:1.149.2.2 --- gpgme/gpgme/gpgme.h:1.149.2.1 Tue Dec 7 22:11:52 2004 +++ gpgme/gpgme/gpgme.h Tue Dec 28 12:32:50 2004 @@ -75,7 +75,7 @@ AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "1.0.1" +#define GPGME_VERSION "1.0.2" /* Some opaque data types used by GPGME. */ Index: gpgme/install-sh diff -u gpgme/install-sh:1.1 gpgme/install-sh:1.1.2.1 --- gpgme/install-sh:1.1 Mon Jan 12 14:49:01 2004 +++ gpgme/install-sh Tue Dec 28 12:32:51 2004 @@ -1,7 +1,8 @@ #!/bin/sh -# # install - install a program, script, or datafile -# + +scriptversion=2004-10-22.00 + # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -41,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -59,236 +58,266 @@ rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit 0;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' + -t) dstarg=$2 + shift + shift + continue;; -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 + -T) no_target_directory=true shift + continue;; - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi + --version) echo "$0 $scriptversion"; exit 0;; - pathcomp=$pathcomp/ + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac -fi && + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit; } +done # The final little trick to "correctly" pass the exit status to the exit trap. - { - (exit 0); exit + (exit 0); exit } + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gpgme/m4/ChangeLog diff -u gpgme/m4/ChangeLog:1.2 gpgme/m4/ChangeLog:1.2.2.1 --- gpgme/m4/ChangeLog:1.2 Tue Sep 14 20:31:45 2004 +++ gpgme/m4/ChangeLog Tue Dec 28 12:32:50 2004 @@ -1,3 +1,7 @@ +2004-12-28 Werner Koch + + * pth.m4: Changed quoting for use with automake 1.9. + 2004-09-14 Marcus Brinkmann * pth.m4: Disable _ac_pth_line, and don't fail if Pth is not Index: gpgme/m4/pth.m4 diff -u gpgme/m4/pth.m4:1.2 gpgme/m4/pth.m4:1.2.2.1 --- gpgme/m4/pth.m4:1.2 Tue Sep 14 20:31:44 2004 +++ gpgme/m4/pth.m4 Tue Dec 28 12:32:50 2004 @@ -40,7 +40,7 @@ dnl ## dnl dnl # auxilliary macros -AC_DEFUN(_AC_PTH_ERROR, [dnl +AC_DEFUN([_AC_PTH_ERROR], [dnl AC_MSG_RESULT([*FAILED*]) dnl define(_ac_pth_line,dnl dnl "+------------------------------------------------------------------------+") @@ -52,13 +52,13 @@ dnl undefine(_ac_pth_line) exit 1 ]) -AC_DEFUN(_AC_PTH_VERBOSE, [dnl +AC_DEFUN([_AC_PTH_VERBOSE], [dnl if test ".$verbose" = .yes; then AC_MSG_RESULT([ $1]) fi ]) dnl # the user macro -AC_DEFUN(AC_CHECK_PTH, [dnl +AC_DEFUN([AC_CHECK_PTH], [dnl dnl dnl # prerequisites AC_REQUIRE([AC_PROG_CC])dnl Index: gpgme/missing diff -u gpgme/missing:1.1 gpgme/missing:1.1.2.1 --- gpgme/missing:1.1 Mon Jan 12 14:49:01 2004 +++ gpgme/missing Tue Dec 28 12:32:51 2004 @@ -1,6 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. + +scriptversion=2004-09-07.08 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 +# Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -38,18 +42,24 @@ configure_ac=configure.in fi +msg="missing on your system" + case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= shift "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in -h|--h|--he|--hel|--help) echo "\ @@ -74,11 +84,15 @@ lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit 0 ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" + echo "missing $scriptversion (GNU Automake)" + exit 0 ;; -*) @@ -87,14 +101,44 @@ exit 1 ;; - aclocal*) +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 fi + ;; +esac +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -102,13 +146,8 @@ ;; autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -116,13 +155,8 @@ ;; autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -140,13 +174,8 @@ ;; automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -156,16 +185,11 @@ ;; autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the proper tools for further handling them. - You can get \`$1Help2man' as part of \`Autoconf' from any GNU + You can get \`$1' as part of \`Autoconf' from any GNU archive site." file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` @@ -185,7 +209,7 @@ bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -215,7 +239,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -237,13 +261,8 @@ ;; help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." @@ -262,13 +281,8 @@ ;; makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -284,10 +298,6 @@ tar) shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi # We have already tried tar in the generic part. # Look for gnutar/gtar before invocation to avoid ugly error @@ -323,10 +333,10 @@ *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -334,3 +344,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: Index: gpgme/mkinstalldirs diff -u gpgme/mkinstalldirs:1.1 gpgme/mkinstalldirs:1.1.2.1 --- gpgme/mkinstalldirs:1.1 Mon Jan 12 14:49:01 2004 +++ gpgme/mkinstalldirs Tue Dec 28 12:32:51 2004 @@ -1,20 +1,32 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman + +scriptversion=2004-02-15.20 + +# Original author: Noah Friedman # Created: 1993-05-16 -# Public domain +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to or send patches to +# . errstatus=0 dirmode="" usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to ." # process command line arguments while test $# -gt 0 ; do case $1 in -h | --help | --h*) # -h for help - echo "$usage" 1>&2 + echo "$usage" exit 0 ;; -m) # -m PERM arg @@ -23,6 +35,10 @@ dirmode=$1 shift ;; + --version) + echo "$0 $scriptversion" + exit 0 + ;; --) # stop option processing shift break @@ -50,17 +66,37 @@ 0) exit 0 ;; esac +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. case $dirmode in '') - if mkdir -p -- . 2>/dev/null; then + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then echo "mkdir -p -- $*" exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version fi ;; *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done fi ;; esac @@ -84,17 +120,17 @@ mkdir "$pathcomp" || lasterr=$? if test ! -d "$pathcomp"; then - errstatus=$lasterr + errstatus=$lasterr else - if test ! -z "$dirmode"; then + if test ! -z "$dirmode"; then echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi fi fi @@ -107,5 +143,8 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" # End: -# mkinstalldirs ends here

.*o#s7lTnqu.E.s8Drq +s8Vrns8Mfnp\fMZN0oipQB[^"PnB%FOcGipPB)oPs7uZos82irqu.Q7rVH@I,;J;/SuI8WR#1bBM"&e?a5EH?2MNRdY!qYU3irorhIrr*K,qYR.' +F+]rVZ]gp\t0irqcrE:6V<1OHuF$Pl[,4rKR>I&!C"gp\k-lq#(0hr;Zcks7uZoruV1< +qYds+NC`a@rVuoqrr2rtrqu]ns8;3WnFGT-s3LZLqZ$TUm.'Q +"g=i;p\OjcrrN-!huSJ>#L-5N1%W&`Pf^2p&+gnrqkjHrr2os +s8!8'AoWL6ko`+serr2rtrWrGF9Tbj)O-Z=5Q2d*)rjGa_8+uu]s8Dlprr;p)rr<#sjgDG![%b>2d/F=NrVuYlSt2IWJ,~> +%q/[h]>Mb4`l?!=aNVfJ`o5#=b5KBj`l#Aj<)n(H`Q6'<`l@qt1<%GY`6QmaK1hEHcHF5OaMu6@ +b0%fF_TBd9`5g';`6ZZJfZ_iN?\Xc,Q'dr-R@0D.m?J?HS<8i#QB5j3ak"AKa3_rJ`Q6."asP3R +`Q#pAd*G+/Uf:uD,-0MGa2cED]>MCse]YtTb/_WHceQt'nG`%Znc&"Wm;D:[o(2JPjhACB_ns=. +_7f1.na>o7naZ>Ke,Jk(n`\lNeTr\f[\Ns_SO.*_99g5ai=1us2kbka2lc,8:)l0bK7uNrQ#Gjc-4/A]pVkk +6;:*s^!b"%ap?52a1>VO7nm`K~> +$2*9dUt*=)]E!##D:&6NsoEcc>CF)cJIHZ3dc +('FI7rrahf=aGX`5tjR:<_-GGM2dd,<+rhqeC[5(#V9Y/GB8(iearb9qu$Hml0\BIrXA`)s8)Jd +MM6@DQWs:as7HdEu#rW`E#s8Dlqq>("4s8;iqqtm*uMdH>V +s8N&prr2rtrqu]ns82-UnF>K/s3glRs8N#os8V-HnaH1%~> +"gFl9p\XserrN-!huVbsI +rr)lqi5W[Qec#IGrW)oqrrLulrkg8'_8F41`Pf[5_8F+3]TJ#5Pa%;lO-#@2`5KR4_o0L1a2#a4 +aJk;^OHc(1Os5gI_T'*r>%1<+>uPR/WNNUUB4e?nce3/bNLn2-`PfX/o_e^mrqkjHrr2lr%fZA" +UkjSF5a>RLs8W&to`"jg$MeOkOI;`!PEhE!rg!MJmZm[8%[^[/Z1J"qrr;rsrr)lnrr;lp%f6/( +rqrBrLgC#Ws8N#or;Q]q#l`nmZa-p1_tha[$NL,*rVuShS=Q7UJ,~> +%q8^f]>Vk5`l?!=aNVfJ`o5#=b5KCI`l#Ak<)n%H`Q6'=aN2NHaN2E=`6-TYauOQJGg4LTaNhlH +`lQM@re]YtTb/_WHceQt'nFQ8Nnc/(Wm:Z"[p@J7L^pUnk_o0O4 +_7f1.na>o7naZ)@nbMhQftFr.^r+"+_RmeXpYjS.9dLPn&N4m&[C9U+1MCW@Ma;oseGnq%n`\Be +f?)(SaNDrE^<+I9`Q$9MdFF;*IW[`.6.=6*b0Tt+!6Y2[s2PAgf2cgBPb!a3P6R/5Q'[o,Qh-I_ +Q^O8.Q'7>mOH>K%8!VENccF8Ha2Gm>^r==5aN4A'+NqgGbK87q=*HjS`6-0E`lQ6@aNVfG^Uok5 +84-'EHbIkK$HpT9`lPVq91M]lJ,~> +$2J,~> +"gXu9p\b$frrN-!hu:Lo3SaKp5!<)\4&Ge_,?]Rt?`T?5!h`5'1\r;RW5qr[AGrr2rt +rq?BbCdN\u5+HGooDe[bnbrpjoMCL5OIMK"Q'Ra'Pld28Q2[*LPn'.CO+LMmq#(-_s8)Qkr;?Tn +rXSl+qZ$TeJo#aDq>^?hq#16lrr2p&jgDG$[%GG8df'URrVuirp8=FOT! +%qJgf]>_q6`Q#mo7rp`bSp@nC6^qIS%`PK:*_nj1SqruKo3&`lS/%s2bScaj/(QAn= +$2NK:s8W)qqYpKmr;ZfUrr;uurr2iprr^jLs*qt^9foUTN@B_;6&rVccrqYh6*rr;fo +p\jm_fM?dTPa7SuPEhK#Pj"A=Ocl&qPb(P=qu?Zos8N)squ?]q)u]U4p\12$VKlfh5FM->rVuls +qr#E1_peP^s8N!7s82T`_M^!a#QOaqA<<"FPNA).PRitBS!BLW7_ANsrVZ]qrV-*d+9269rq'WL7-saGs8N&m +r;?Qorr2ips7u$Tna>01s3glRs8Durs8V-JnF64'~> +#.128p\k*jr;Qfss53hUr;cirrsA]$n=6J]^%hL'q>UEo&Gu;'q!sq_HY<'Ms8Doqrr;oq(B+%- +s7u]ks8;fJ;0S.dQBd\uQ'[f$k`lID@tY*=66JZm2-:ImK1\A#Jf6?\-TaMPm5_8,^@rri>uk3r9Jrr"[BlFLq9f0JrVuiror"COT +%q\pd]>i"6`Q#m/]0#l&Q`R;oNI8t2Va3)ZMbK.]C +aNDZHaN_lOcGRfBbKA5A3G=83QC!o$Q'ISsrg!GKn!+*?PF%AgM_>"SrlG2`c2P^9aND`LaMu9< +dEL0pAXI@??nQfLc-+5LajA,>^Uh&-bJq]Ia2uKMgsXsHoCMMBr9s[UCAIi"]#);&_SF(-`PfU* +lh9l:nF#i@_Sj=,_8*q(])Vg!n)2HkJlsTtF,PJ\$NL6LDf(CbNOmmEmHaK4eaD,4 +`Q#mBRS`lQBH_nNgL<_,_T +8r14/a9fo/a2k\q9h%lsJ,~> +$2`W:s8W)qqu6Tnr;ZfUrr;uurr2iprr^p=lJMR?qYh!&rr;rsr;O;iP#2)Ts8Drsqu.E0s8Vfm +qt^0^C3ks8;lrr;6NorYth5q#BtRWi/7!ED?0+qu?]q +s81`m_o't$rVulr#ljesoYQB/F`[P*rHJQiG\UUs"TSW#!"T)> +#.C>8pAP!ir;Qfss53hUr;cirrsA]$n=HS^]D;@&q>M$*s8W&tqu+)bOAGiRs8Dusrr;oq(]==5 +pAb*frq0A_Mj]ltPa7Q!QBmf%Qg'bIQ^*u&R9Ic1r;HZqr;Q`prr2lp*<-!UBks7uX!qu$26G*A,QrfmJLlBV=4%[E9GO-booRT4"ApAXs_qu?Wo!<)os +$2a]kM(@T`s8)`ms8N#srs.PlZaR30eG7Mk$2so'rplnXS=d0=~> +%qo'd]#Mn5`l?!=aNVfJ`o5#=b5KBh`l#Gr;H7SA`6-0BrQ>/]$cL',a3`#WRk04HdJh;nc,doE +aND[)a;)nF`73)Xf$c]7I?Bb\QC=,+QB[Strg!GKn!+9HP*_/e6DhuJa3Dj-a=tNOaNDZLb/hTB +`Q6]_/tS^p?"5h@cc=/J`QQ]N\\,D`e]YtTb/_WHceQt'nFQ8Nnc/(XnSIgpq"h>,]u\73^r411 +`50+Pp@7S?mdp&>s7t`i^:hY0`PK@-^q[^ro_\L[p>t;]bclL`3*'^PO![M?F%^n]`nUIWlLjMo +mb,_$`P]^@]u&(>bf\#BcbmQF`AMmCAX6hFdaZ:Zb/hU%`<+'#aSa0laMc6I?"](XPa.MtOctuq +Qh$CYPED&oR@9Y9R[BG!Ob]!]85QA;f[%Rbao03YaT'C*a2uBB`7@#('"Z6+`5p'BaN2BBbf[i; +]ouJf852X8^ +$2r`9s8W)qr;Q]or;ZfUrr;uurr2iprr^s>lJ;F=qYh!)o)Jabs7C5/LdUh3rVlfrqu.E3rqcZm +pA1IJNgQ,kQ^!c$Pa.Q"Q'Ra#Pn'.FNgO1Jp&G'hrr;uoq>1-krYth9q=K2kWG>.M8B15ps8N&t +s8Clo_o't$rVulr'`\(*oYQB/F`VVHG^4U]H$*q5%gr78rrW)u%16!OEccSOH?aCD7h6",!!*-) +quA8R),kL*f+8u6>q +#.UG7p&4mhr;Qfss53hUr;cirrs8W#nXlb`\bZ-trY#8&s8Vloo5@H[6M:6Srr;uss8DrsrtbV1 +s8DZeTg+R)Q].8qQ^p`P]U0^r!t, +WdB8=GCPI2OH5TfNfoaE`kKF-_Sa4$^UT)8Dc9D!76WYDKoD+RR_uqX_o0@_qu7!"k3i3Hrr2rt +qu6U)nFhKY-E=+NP`q;qPaIc(Q^O.rP($6-q#(0f +rVccprX\u*s8W#a7=S>,s82ins8N#trr2rt#lW\hZa[<2g%j"o#ljl#m\6;BTXK@~> +%r,0c\]2e4a2Z*>aNVfJ`o5#=b5KBh`l#Jt;H7M?`666CrQ>/]$I$*&bf8/Q9gs@RrlHD/ccF,G +aNDZH`Q,j6cI((pM(O=@P)>NhQC4),Q]mPpPa.O4Qg^2&QB@&e9SCR3aMQ$Ebf%B:`lQ&6Y`koa5`l6-LaLJaf\^emCb0%cHb0Skkg[P46r:)*)p@n?f]",Jrb/D'5`5T[2 +]^,:]mdTZ9oCDV8\]2A"`Q?6=^AbrV_nbO-lgaB0nac#3h4f7>>$auq3@nTtVSC4&q!785jjW\O +ai26:`m297cHXSWb0e2H`m;`eIsruKSh.\&bKS,M`l5j5`Q$!Ab08#NaMuBOe4>@SR[9;'Octuq +Qh$CZPE(`iR@^+FSt)".Od2/gO`ERHg"+]oa2\+ts2b5_+NMLBaMl+\HT]`Q6-?aNVfE +^:TM-84cQIPJ5Db#g:3(X]J1b:NM$~> +&-(M@s8W)srVZTmr;6Eks5EtVrsA]&r;Q`rfBV\\rr;fn%f65*q>^6ipSqIoanl&5rr;lp%K$2* +rq>,9?^?b;R$a0DPEhY,h"gaFrr2rpqu?ZorqufrrYte7qVk;LSO%@@oC`.] +s8;ors8Clp_o't$rVulr'`\(*oYQB/F`V_NH$Xd^G&_(,#RC;.!s]#4!WE'/#Z>P\FaAC\G&BY] +"98T(!(?tk!!*'""q+ORH?OX]G&qqI2AR,?)^?s`0d[hG!!!6UD0pbTH&^AGrVQNjrr20LqYpNo +rqcZnqu?Ii8q9T9TT+0nnG`If#Pn;kM//HDQKsh7QN*6MPRit@QC!o'R@053=&m*4qYg3g+929; +r5_WIPQ1CWs8Dlqr;?Qns8Mrqs7P[No^:<1s3goGs8W#us53hE!;h9~> +#.UD5o_ndfqZ#=Ls8NB(qX^G[Y.+3&q#1s(s8Vopq#C)d>#!-7s7u]nrr<#trW3&trr3Z*gdGG6 +Ng,ouQ'R]#PEqT#QBma!Pm3G=_8F'4G("dbIX[-4O-,QfPE;eNffK`QN"`*_ns4]s8W)trtkRpn,E:arr2corqufo +;G)C0;4WVgqYgBlqu?Tnrr36#r:GbXQBd]uPld26PPp^TQ^F&&Q^L6krVd9+rVlf; +8n=+bqZ$Tpqu6WqrXAc)s8W#R['R9MSDF"frWrQ%q!+KBS"[ +%r>Bf\AlV1a2l?AaNDZH`nJK@`OfMU[S;W]!TWPfE`6\5JmHW]Ymb,_$ +`P]^@]thk:bfn5Ja25X9d5XCB:fWg)=4,:8rlG,Zrl#DfaND`Nb/VB>b1PNp?]pW=Po5dIOHZ*( +TUq[>OckolQ(4;#P!qR1e]l:Wrl$/&aNVfJa2>m?Ud&1/eAKAK`P]g;`lQ +&-(\@s8W#srqu]nrqZBhs5Eqfr;Q`rr;6Els4ZZ+jo>AZo)9R*j@F0;qu-Qlqu?]ps8W&tp]($\ +`($/[QBqK7s-2c5&!WNHOdMAtR@fX`LA:fGrV?Ens7lTn*rH!9s8)G(P,DPkF'":rs82ips8Dup +i5NUOe,91Err*Z4qtTg#LO"#cH@gNgH$3h1&.AjK!r`09"U5)4!WW608T8foI!^9Z57dl'!sAr4 +rW!9+!WrK-%TmduJ:@K?2InKH"pk;7&/#Qe&e,$F!!b/tGC4RYN7IP"rVlfrs68nHrr<#trr;lq +qtf>6LP%ISW*%[KrVlusrr;rmrX\o+s8)ch9Tk[,S!KD'Q]U0k0Tq`cIqYkUr;ZQls8Dlqqu6Hl +qt+`Q:%nJ`rr)iqrVuosrr;uprr;NYq![Xus8UOH!rr8srr3,anF#Z>J,~> +$+m"8pAb$hrVlfps53eds8Mros8W)qorFmh[.*tko)9L)i^R[1r;Zfrqu?]qrr;lqq#C0_`'foU +iKXt=RZil$Pa%N(NGjLFs82fqr;Q]q"Si#rrVHNn)>Wu>OJH)aDcDVks82ios8N&ri5WaTf)>RH +rW)oqrrLulrkirp`kfI0a1]<4G^+O]H?spdK8YkTOH>O0aiM<6^W"$dJ9-'[FaJ=XIt`iBOcYT_ +`PoR/_S*h*]T[D[I!9dWF)uSWM3*m^M3l2p^r=4-o`+sis8W)pk3rU%ZOcklqPEq;uP3nP6Pk^LbP*V8\B<(\)s7u]prqufps8Dus +ok\b@o(rCdrr<#rrXAc)s8W&K\[AcSRd'^trX/])rVufSURRgJ]mp~> +%rtrk\AlG*`QZQG`QH?E`ne]D`lQBF\7863BX#@ooZ7'T(t6Yg?>%^.aiDNHai)9BaND6Cc-raQ +O-'=("I5=AR@!l;!0cl:&X8`JOd_T%R$rkAD:I.W`Q$!ub^RXQ`luBIcHO5E^ra^H;1tQC=(Xg8 +dEfeV`lH'CeAer.\%1&4`lcHEai_rbdbF9_n*'0)mJ$VTs0fJO^r""._7[Iu`l>d+\_ZlHlg=-5 +oAIBk_7mh/`4s.*_o0I.]!1>algXH5q#C6@[(*fY\[f2TZFIQ^_8 +&-(\Bs8W&ts8;corqZBhs5O"hr;6Els8;]js8Up&,!!*0'qu@67=_VbuG'%[p'EA.?"9So,!<3*9 +!!<^6FaS7VG&q+J"onf,!!<6'!<<0"!"B#>11toYFEiboo`+mhrr3)am.gSZrt550r;QTkmV6`m +>th;c7E +r;Zcprr2lrs8N#trqlWnnaZAAm*G_3df'=JrVHNn"R#=Cl2#o~> +"hg_5p&FshrW3&urr:pUrr3H)r;ZfrqtRLnX0Cpes76-qrUjN?=nVUis8W)r%KHD+qu?ZiEDMm_ +Q'@NnPn07EPF%K#P`goRD#=&.rVulr!<)or"TSB!rqcTn)YF'T5 +`RXqcrr)orrVloT_#D4Z_SNn(_nX03GBe@Xrcg,BG^P.&OHGZb^qde,^qdgbKQ_QhG^"IVG^Fpo +MN!QAP`M?I_8"%/_=dj.rVlfpqW@;Ir;H`srVld(mqH]g +=@]?W=8MjirVloqrr2rrrr91$NL)(s81ZIS"6:iJ,~> +%s_Mt\&ZD+a3DlJ`QH?E`o5#=`XU)3`lQEI\S"W8Aui_ho#N!#fhcKUc,@TBd`TGBa2Q-?bg4^= +6BR=pQ'IPsQ'[r.Qg0i7R$!T!Q("#&LNQ_Sd*9VRaND`Obf\#H`QucLccF)D^=\fISVo^G>r0aI +aihfKa2Q('!]YDA%rkp\2]tM8#`PT. +`4Ne+`Pfp;`50:,`5TU,Zg75Qkk+WJpscjfaMu3B`P]U1_u@SF_naXip[[q:cg99*a2l9Cd(R08 +b/hZD`5]a:aj%k!@!Z0TWf96k_Rdk8da#hK_8F:6b0%fEa1T@9dFQMnL67djPb"&$PN%i]S!0=t +Mbo&Ub0.f;ai)HMb/VQJ^ase!eBQ%O`5]d7_o9jEbf[r?["21I6r?a`_pZX+aU$,6^mnCo5u +&-(Y?s8W)us8;corqZBhs5O"er;6Els8;cls8V-@o&frOnbrpkC3rk"rVuQhs8N#qrrq\F@[<+C +rg*MJs-2c5&!rHFR#mc$Q]YAEr;QTnqtU.)s82fpp\OpipJmui9LEZ/?2+C!p\t3mr/q"2FYH$+1SF*)D8.LG +CO1lfo`+mhrr3)am.gSZrtkY6rqu]mql,p](6a7Zj.0RZj&p +Q2d!PR%'!tc2.J>rr3K%rVHQjpP3m:HM[U?rr)iqs8W,u%0->(rr;NWp%.Fos8UOH$NL)#s8W#Z +nF#Q>J,~> +"i6t6nGiIdrW3&urr:pUrr3H)r;ZfrqtRh!WikFZs76-qrV'rK:WWS9q#'sf"mh+TPDkh,PQ@&8 +jcp@CP*VJsRZs+t;Y9haqu?TnrW)orrYGP5s82fqq"t*koi%K^84%0&>PS6up\t1!rr;oS`l,jH +rVc`p!<)lr@,A]:_o0U3`lQ-/H$=O[H[L0eI!^3dIts,MQBAAla25p7VKm9-I!p9eIX-9cH%(I, +PEM-Bahtm4`5.OZFFJO]I!Bp_I!g?mMNO!]QGpk]^WF@cs8W&srr)]UnGiFcs8Nc1s8W"s:PaBu +L8SjnqZ$QpqYpHls8Drsrso&.s7ZKmnjJP)R@05*Qf42:Q^!Z$RYs;Pq#C?mrt5),rVufiKlV6X +q#(0lrVlisrr2rr$i^2+r6i!Y\$VasqpGECr +%t.buYf+K"a3DlK`QH?E`o5#=`XU)3`lQEI]5^PFA"p`[o#N!#fiDlNU<_'#bg4;H`5fpDe]2W) +N/O*jQ'IPqPEhQ(Qg0iTQ]dZ%OIDK"Jj.f9c,I`?aND`Obf\#HaO%uK`kK:2eB^7@U.%7W<^b<] +bJDQLa2Q-`lQEHa_/W2_SsR:_nYI6qXsa`rQr*c`Q#pAaN)?B`PKC0`koI2q>'[Kkg/VIaiDKBb0[i9 +ai_]G`l,p;`lcTTM`l]E?\tCUNQBAecH+/HaMYp8aNDZH`kfO5dE'njdk???TV%R9P*=mj0U@oa +Pa-_GY0kV=aiM`DbK/#Sd;30"?.-s=`lH0?`P][=c-4>M^U/Jg7n6 +&-(M:s8W&ts8;corqZBhs5O"gr;6Els8;cls8VHDn`TrPnGX=(GZpA-eG]FDs8N&up]'s[<0^0gs8DurrVGHk +_o(%&rVulr&HDY&oYQB/F`MM>ASG0T$3Kbu$4'XRBl.<@&c`(rr2p"kj8*Drr3f5s8W#qrVt_CItUfcUSUc`n,N@ar;Z]jrX\o+ +o`+jbrpc4`Q^!MqP*Y'l)O$8LQ]IK'CRkG%qYg'dq>C'fbY +$HAd^Hos7lWeoi.$:PF7Ys +Pa.Q#jcpLDR[0/&Q][D%qt9pfs8N&urr2lprZ_C=r;Zcrs8MVXEMdhCEHOjAqZ$9hrVQWos8:fp +`5U:*rVlcrrVca+hS@%H`5TU-aLZS@G'J<0H:rU1H@^p6P)m&h]#2L`IrTa]H?adcI!L'aGC"gr +O-,:;_Rn"3_N/e^Jq8#hIs$'bI=-?hKSknPR``Xf_8a=as8W&srr)]UnGiFcs8N)srr3Pd7!sJ[ +4JJ]Lr9jU`r;HZorr;rr&HD\.p&Fsbs7):^PELojPaLBo)3U>QNgH2KR/d$Zrq6 +%te2"W56Ek`m)cJ`QH?E`o5#=`XL#2`lQEI]7!=PA":=(a<8a^?UT>qXjGP=c,drG]ZS:D4FW0N +SXGb0PECukPF%X#Q$nmcQBRT#PDhETcd0eS_SsO;bg"ASaN2TF`llp=b/h`G_ns:1aMka_qtC'i$2r)U]>r(1aNha'a9'>q^])+a^oifu3\NKocd +O,[+cg!%IT]?A+9cJ#H\Ae +&-(J8s8W)us8;forqZBhs5O"hr;6Kns8;cns8VcFn`g)RrUKk)pj#,HK4FZNr;?TopAb0lDgI\2 +Pa%<#QBpQr$'pg?S!f5$QLanOrrW)tqt^49s82imrVuilp.M6_5>ZZ>6K\1Cs8N&ts8Domi5NUO +eboCGrr*T2qtTg#LO"#_Chmrf&.SsM!s/N&!<3)r!"'<=EcZ"S$Np\=#5\B;"UGA;!W`<+(.rUi +An2qk#QXo*!I-Hs8)]moBK#:T(`-^!<<&trr<#t +s8NH's8VKSp%RIrs8UOHs8NB%s8VcSn*]9:J,~> +$-f3Bj88fTrVlfps5M2YhT$PnbsF%Gs68"@e]]trr<#ns8W"6G`n&LOcGio +Q2[*3PmNb@Pae)"QBq(9rr33#s8;orrr)fp,6.Q?qu?]pp[q(NVE@OtBKtVWs8W)ur;ZcrrSY]6 +`RXqcrr)orrVm;_^r+(._oC!0G^4R\rd=Zm(4:RYI"$^*OHHod`Q4^"G'eFZH@(0lrd#'"H?t!l +M2db0aMkp4LO/rH+F83SGBeC\H[9s`I=R<7UW(3gbJ1mds8W&srr)]UnGiId)?'U8rVuiqp47[J +G!C2MEfg=us8W#srVuoqrr +%?4b*TtnXe`m)`I`Q63ZaT'6hb/hTDc-!_V8605d^;TT`+O&/5-!P+Re'H@aai1g4dFME8Mi=!i +Q(XJ-OcY]hQ^?s%;3mH2S!f5$N7H8%c,[W@^rFO@c-4>OaNMWE^VJ(:cIXq>TJoGd?nTIEaN;NI +ai;9Bd`/f2]"?M9`lcHEai_rbdbF9_o_ACbo!cS4>]Y;1t_o0R7`Pf[0^qIFm_S"Ckp$h_6cg99*a2l9Cd(R08b5TI" +a2uKGbfe>ZBm#>a7!4u)ESJa`aMQ$9`l@tu'$A53^rOOAairCL*c7(/S;rVnj-:UJQ]%#jRZrh_ +,JMaRaj%ZBd*L*!L5=C1ccjPTrlPhp`Q$'Ebf[r>YB!B,9hJ[!_pZU5aihoK]o#c\7oc=7~> +"973/rr)lsr;ZcrqZ6]rir8uU%fZM.r;6Kns8:F:lMpn_nGX-oqi[7VXS`%is8N&upn:9BT:D75 +rKcK/%[33EOcuDc0(&Q8qu6Tkq#:9m+SYp3q#>huVenqIEGn)3qtU3ko`+sirVGHk_o(%&rVulr +&c_b'oYQB/F`D;/:`0]I#RL\2!s&H(rW5=c#8L'Y?9Ai("UG>>#R:M7!X]2@$jm1@!sTE8FE(h( +)[6TT!!!B:$kE^O"U>DD$O6q@+(]82FFK5!o`+mhrr3)am.gSZrrE#srY,8,qtWj+Jqm8kW2`GY +s8Dupqu?Kks8;os$haProU15HQ^a&%RGjDPPEhYtQ^!f*0erS*r:9d_r;9HOQn.+ks8N#ts8N#s +s8W)ursJZ's6B(Hp>FX(s3goHrs8N%s7,7@m,S+r~> +$.YfLhu!EQrVlfps5*pAP"!p7Fj8S!TA&PEV5r +rg)]3&rr2p%qT>M'StO_d~> +%@Ugu&he@;+AjC9PB.2*M_T0s: +dDj,Jd`/f2]"?M9`lcHEai_rbdbF9_o_\IK\$<3J^:jKZs1M.@^qme"]=>D_hu;rj\$`od]tM1q +^qIFt]Y(kf\$icS]BoRpo;]L-\@];]^V.1l_8*h#]tLtc\?a$Lo_%_8cg99*a2l9Cd(R08b5TI" +a2lEGbK.oU0P,`j=$`LI1=+OpahYd9aNFJ&'$A;5_9's:bK._HBO@!pOcu)pj-;?_O-,ljR$El! ++rf=jcbRQBe(m39L_RGDc-"2PaiM]L`l?0Fbf[r>XDCU#:.f*,_pZX+aU$&0]S0 +"9700rVccrr;ZcrqZ6]rir8rTs8W,s!<2ut"Olo*r;Z9c(]+10/r,QWq"Oddo`+J[5@g.HNLuK$ +Pi7lLEnqu6U:qZ#5FWM)XdEc,JgrVHQjqu?HkrVcTN`P]UDr;HZp +rXf,,q"2FYH$+.@58bCX*#&n]&H*1X&.]&#rC/MSM$/1`A'.Om#(.fLqI.OQVm*E6s" +68UPN-SR/)1Gq'J0.\V)0f(U<.4-KNE-cVZO4 +#25lNg\_$Nrr2lri;W`Us8Dut$3'l#jd<0Qde`q4rY5>2r@EPZ62('Qs7ZKa:ci'NPDYn0P5ggH +QKFG?Ruif(Oc++*o`+pfrVuco"98B!qu6U9qu>8AUn'\SEG];crVZ]mr;ZKjrr;rT`l,gGrVc`p +!<)lr%,Se;_o09TF*;eXG]`n/rH\Efs*=Wg'7YV>]on/2PDYNdPECobN/s-\NW"niOHPI2^V5nl +QB@2qS!TD(OHP`hPEM#gO-#ZmQ,1DY]#)8Us8W&srr)]UnGiCb&cMb/rVu\D@t9/\3+AeDDYa,, +s8Doss8N!"s8;lkr;Qu$=d5)7Q'C6m$^d*;S!&u"NDr2 +$`%KGPeP2ZaNVlJ`SJW8`XU#3aN2TH^nOG)?AQ85n]2fjd+&eWLbdf6e'>nWa#PhZR@',5S!fV. +PECrhPEhL!PnBLIP+@YjCi@PD`4s=-`Q6-CrldFG`lQ?D`PBL1ftKbGS3:(nCKrsQb07]>cbmc@ +ajA&;^V%2/bJq]Ia2uKMgsXsHoCVRrW3*;8['KY>rO*QP\[o;YZEpmsn%lQRd*1"dcHjbYbKeMY +rlPqq`l5m*kOeGg_TU!@e'udnd*0h_rmDY5daHIeb/WrBpZq"gm+9A"aMuBL]tVV2rlG,^0$2>X +aNi+?<.BaZ4^O_1=k1U9^r+17bf\#HaNDZL_SsC5aiMl^N_GP!Q]dDnj-BY.s,8P!Q^F5%:Gk2X +hqHK&c;&&+11\SQbK7fF`l?6IaMudo4~> +"97*/rr2otrqlTorr:sVs8;oss82lrrr3)KnEK`Is76.*rV66X4Hc:$qXs^_oM@_)B9JRER$Ei& +iKXq8SUEkrr;olrZhI>s8Mrqp19Si>XEFODaDV@r;6Ejs8DurrVGHk_o(%&rVulr +&HDY&oYQB/F`VY:EGT?&A8(sR!+u.Bs(3iqC2%6o5&4nJ@W-$lAnGdnD0'`4ChdZtC2%Bo@Q/FQ +FE;&1C1UshBkqX+D#S,\Ci=6-A7&A#F*31bOOWq&rVlfr"6f+Hrr2p6rr;rsq>C9ejZJ9OK0_MZ +W*@mPq>:3hq>Lp#rr<#os8D`d`E/=kOID?kPq\DiP*_K"S +$/MAQf_YUIrVlfps5UC%qZ$TmpVp3tQ]R`%iKY=GRZa#%PF%>n7W;W'dI[.7;NZ-4nc&Rf +r;Q]q!rW#qrr*?(rVulj]XG2QVn`!(df'UPrr2lk_kEZpU#LS~> +$*7lKOhA]Sa3;d,`o"l:`X^)4aNDZH_l?I:>Ca<)`q.7h`l,a=cnUKA.b`4ue]fd#.VP*8Q^jJ/ +RZm`5"-]":Qg'c2OIVMuPa>^;e\T5I^r+42aND`Lb/hQAcc3r=^WP&'O/H2JDJj8LYKb/,_o9pB +`l-!G`jidr]@G*Eb0%cHb0Skkg[Oh+q!7_Jp%S1Xrql`lrV/2FrVcWgp\2Soo(DGKs82Zfqtg3i +rq?0`q"aa\p\"6uoC2AFnGE(VqYL!Zo_8.WrVulqrtG:uc1UK"h9YH>aiDKBb0[i9aiaV(0?VJ[ +c,IcOb/>ZWL5//TMkE_Qd(mB=`QZQKaMu`m(DPOI;9"OlDW\PE1ulR@0G6PES:C +8_LDoe;c\GC/3+%bK@iC`5BR4/6VC.!]Z&7=#g(&rHW!L3@D@<~> +#QNK3p](6mrVQKnrr:sV"oSB"s8;fnrs$j^BiW/d716+=p]1R32_qj--)%[N:-jr;Q`rr@aE-chaOOWq&rVlfr"6f+Hrr2rrrr)a*ogXRcK7enGX. +#j8(]c2.D=r;QWoi;W`Us8N&us8<3#p6r%`a85`)rXf,+s8;YfM3O/f[`EbNP]TXsPl?sIQK=A; +QBRK!Q^:O]qu6Tsrr<#qrr)lsrr +$G(.]K>#7H`luTHrl3m;rl4uZrlPPe_ReX2&KJL6hg@N0o=;uW-`R0/e@ +PEZ!."-]":Qgp@@PPpdHQOfCGOHu/p9r8nF6/Bo_/"No^VqL)tW^qp\b$er;?9^o()51cg99*a2l9Cd(R08b5TK\b5TI! +c-e4iJVT#76Dou7e&]VLaNVlNaMu"1kO9T$R'd`;d9bK%T0E)fP,ABTK~> +#liQ4pAb-lr;QZm!ri6"iVj#Yrr<#rr;HWtdHp2hrr;Qg&-)M+qt*`HS=3\\GCkrZIJ]>ePms.I +Q&gr^=o&'srr)irq#2NL6krVcTN`P]UDr;HZprXAi(q"2FY +H$+7QG]n90FT?L^FoHOrG^4FZG&_P8=t46-F)Z8HH$]I7!."Nh/U;YaDK'T4B-pr.Is,p[Fa84S +F*;_LG'eLWEdi%KFC?@HE-?GTJ/lJMVl~> +#j8([b5D5U?m#&ACL +OdVH#h3Ir'"-Ja3Nr>%FRS\.Rp&G$irqufrrVuj,s8Mrps8;#g[^E?4f_k]rrX/W(s8M\tURdsN +m=5~> +$GUXeJ%inDaNDZHrl3m;s2GSgaN2NHaMu30? +oCqqL\a/n[mHsT7rq$0[+78CZm-dDW(b/_ZE +^V%.oc-abV`lQBJaLd[;779gDQ,:Pga9g#1_R+)Y92B3KJ,~> +&-(>=o)JXfr;Q]nr;Q]qs5!YTr;QZp"4lc)mJd.VrXei(rVlcq7pUe3NL$0#3K]W]PlR!HPQmSE +Le[XBs7H:(pAadbrL7W*HphdkG&B*3b4ko1r;Zfq#lrr2p"kj8*Drr;rrrVR2X4bAH;M1B/2TVl#fpAb$err<#qrr;m$o1b@5P`qMs +iKaA-rKRn\PtlXmQ]ugd`VT9-q#C +$1=df_YsB3r;Q]orrN,tir8rWs8EB*rr)fpq4jml^\@6s&,6,&rql[`>D&&qP+7[oO8G4BQJn)/ +P5^[MS!o1/p\k-frqud0pAadbrgIW&GX?.aF_rm1b5))8rr3B)s8N&si5W^Rec#IGrW)oqrrLul +rknTL!5nQJ&AuT/^lF5b_Sj@1`50:*^qoud(;[Z&_SOL9V2^2Jahtp4a1oF*_Sa:0rl#ej_p5g4 +aMO7#TuXsca2#Oas8W&srr)]UnGi=`rr3Q/ffak +&'K6%G/(r:aNDZH`l5s=b2UMB`Xg&0aNDZH`lGf%>ZbaJ`5_Di&B_u;a3<)m/4=E.Kp/'k3fs6& +s,m;Es-)lo^;;Cn,DqYnK7/alKdQrpZM8Ho>7r[oC)2Aj3R)DaiDKBb0[i9aiaP&s2tA_.E9T: ++`r +#63TRHQrr)j!hraCkrr;Qgrr3E*rqH3_>A\SPNIj`ifp)l(SrT/!O-i3+ +r;?NorV?Hmruq=?nO0UU2-OsCD0'Ya^[qL'rr2rrs8Domi5NUOeboCGrr*6(qtTg#LO"#`FnTuM +G]n=VHZF1@;%EaA@!-[9F`qtTI!U$\F`hkPH$++G@m:b6)-q*#G'.tRH?sgZG'.hHHuaXRDJW`4% +2q'/FE_PNNR[V#rVlfr"6f+Hrr2rrrr)a*l:->[L4Y#-3..T@Qi-[Uqu6Wqqu6Wn#PUoQR?sA)Q +Jn,-QMm'ZN1H.l>[9][q"aabqtU$fq>UEls8N&u#Q4W%l0n37dJj0orX/](rVuoSl0R^%s*t~> +#559r\GQ+%rr2lr!WN&Wrr2rtrX/])rVccmY,&83oC)\Ys8W'*p%\8cCil#%J4H"'QJe#7Nh28t +OcYtspA=jfs8E)urr2`n&,ZCs7'<.==Di7tEc4:Zp&=t#rr)`orr;rT`l,gGrVc`p!<)lr"l@&4 +_o0Ic_A:&+_T'@0aMEpqOM/HI_8O=0_8*k'_Z%F^_Sa4+a2b!G(Bq>1-jqtg?lr;QitrVlfr$iKu'r7eNe\$;Cls3U`Or;Z`a +W1olRYkNY~> +&(Q89Cq[a0b0%fH`l5s=b2UMB`Xg&0aNDZF`lGi1=BAq7`5_Di&B`AGai2KJf%WPqDjZW?8='+7 +s-*JJrKm#=s-*JJrKdhNSrAqnMNKR=bPocdbW*_eaMu6=`Q#p@d*(%e/>8Lf>An\"DJCts_p$$< +b0A,M`5g0A\A,\ie]YtTb/_WHceQt'nFQ8Io_nC\nIb6Zlh1,G^q7JWq=jIKmd0E4rU^'Z&G,Pc +o_eOA^TkNGo^VSDnacYM+S"pflg*O$lL=K>ag/\/nG2bBkKiMHaiDKBb0[i9aiaV(s2H,$b/hZD +bebcKJ;8i0IlDS==Ei<>b08#LaMu6@aNFM+$d-Q1b0DViPaS,+Qf45/QS"JdPEhDmSrts1;)BZR +e'QF_`5^0H`kT7&_p$HNaMl0Cc,dGN90kpB9!Q@Td`;d=`lGit?r0NoHJa5~> +%0,AIkl:V]s8N#qr;Q]qhuQMNc_Y$(I0?PF[ns +5kb-RrW)omrZhI +$2Cs(ZhjV"s8N#ss8W&urSmhRrsJc(rVu]-T<>NfrUBdtpAY*lr;ZT=O*j&L4c5JiQ2R$+PmNqE +O-?0"N^i+;Sr8bhU<:Ko`59@`s8W&srr)]UnGiIds8W,urr3K-qa,"LK7Sf(6V*rO7d^0Sp&=sj#"Fi< +OdV;siKaA+rKR_ZPE:GtWV$#^r;?Nn!V? +&)<+KA\,n*bK@oI`l5p(2-X +Km5pQS!u%Te^2J:a9'B&aSs?^a9fl/eL--1Odh>oiKaD//X;N`Q'Io*Oap,oi8)l,b0A#KdD*cA +_o'I7b08)N`Pp'Gb.2sn5XA1A\AZD8a9p,1a1nKU:J4W;j+%~> +%0,MMkPtS]r;Q]nr;Q]qhu^Hoq#'pco_n:O=+m!(fp)o.Pa@r" +S;p28rVuNh'Dqh0k"i%E:0h"EE,BVO2u`dMq#(0lr/q"2FYH$+1NF`qnN +F`qnNFa!_+&T_u+=V_/F!!cbLGB\4SF`hm)FTli+E+qiXrW"5Q??:71EH$)GH$4@UG&q_LEcPo) +.gZ@Z"?:.2G'\=jeF`e>rr2p"kj8*Drr;rrrVR9'M`urFLPBDOVe`5cHMmO8r;HWps82fqr!2lh +Q(=,,PaUKqrKdDI&!<-CPsO^3o_\R]rVQHbs7uZor;ZcrrsJ](q=*kBm,%dAs3goHrs8Q&s4lf( +m.gU2~> +"SKF'YkS.ss8N#ts8E#sir8lUs8N&s#lj_JS?9*Yqu-*b!;HKm$i0_srqHHbp/cp9P5(=BPiS): +PE_E*NLc,'q#16jrqufqrZ_7>ro?bOQVCagF)Pl70K/q1qu$Kor;Zfrs8Lrr`5L4)rVlcrrVca! +hS@%H`:CeX`5p$9Mi![`NkiKK_8F4._8?)e'#_]/ag7.dO,Ae7`kfX4_o9L/rPJTQ)o]V6aiU-5 +OH5C%b.>C3_85gEs8DrrrVG[Gs8Drss8W)trt,2-N'2lBKnX)HUhHTXHMmU +&)<=P@(=A'b0%fH`l5pGbf%$+]Y2k=`lcHEai_rbdbF9_oCMMPo+1Znp;"8X^qKC9p%%YDnFHMKs7--\&Gl=f +_RR=i\+falo^M8;naZSLs7%?*me?PRc+:O!\_?uKnbD(hm+9A"aMuBL]tVV2aN2B?`Q64$a:leF +Cb's\L4NctPMVQTPEhE"PEh>k0\"t,cH*lCa2l3H +`l5s?bfn5Nb/hK>bg";@F\+e`8mAmFdDu[ +%0,bUj8]/Wr;Q]nr;Q]qiVjDgrquZkrr<#ss8Ud>jnJfTo)A[h!W2iprs8DtqsjMBO-Q+2PhhT7 +Q]IT%Nf[/8q>UEnrVlikrZ_4=?'MQq_Jr[uF*_ahd.I/6r;?Toq>^ElqV]?1_q"\`s8N!2s82T` +_M]+Y+H$XUUEcQ;GH$OXWEb7`W!sSo/'k;<,EccDD +G^4OYH$OXXGB%V80Fn6g!sUJqH[9aZN7@M"rVlfr"6f+Hrr2rrrqu[*nO%b^Jp`<&H:2M18D=(@ +r;HWps82fqr!39!6^!LrP`Xjh".#=?QMm'ZQ^*f&